reverted parts of 4723

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4726 17fca916-40b9-46aa-a4ea-0a15b648b75c

5 files changed, 8 insertions, 25 deletions

diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp
index 6a43a682c..5ffdd473d 100644
--- a/src/kvirc/sparser/kvi_sp_literal.cpp
+++ b/src/kvirc/sparser/kvi_sp_literal.cpp
@@ -574,12 +574,7 @@ void KviServerParser::parseLiteralKick(KviIrcMessage *msg)
 		if(KVS_TRIGGER_EVENT_4_HALTED(KviEvent_OnMeKick,chan,
 				szNick,szUser,szHost,szKickMsg))
 			msg->setHaltOutput();
-		if(!KVI_OPTION_STRING(KviOption_stringOnMeKickedSound).isEmpty())
-		{
-			KviKvsVariantList lParams;
-			lParams.append(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnMeKickedSound)));
-			KviKvsScript::run("snd.play $0",0,&lParams);
-		}
+		if(!KVI_OPTION_STRING(KviOption_stringOnMeKickedSound).isEmpty()) KviKvsScript::run("snd.play $0",0,new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnMeKickedSound))));
 
 		QString szPass = chan->channelKey();
 
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index b2444afe3..72416751d 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -572,12 +572,7 @@ void KviConsole::closeEvent(QCloseEvent *e)
 // internal helper for applyHighlighting
 int KviConsole::triggerOnHighlight(KviWindow *wnd,int type,const QString &nick,const QString &user,const QString &host,const QString &szMsg,const QString &trigger)
 {
-	if(!KVI_OPTION_STRING(KviOption_stringOnHighlightedMessageSound).isEmpty() && wnd!=g_pActiveWindow)
-	{
-		KviKvsVariantList lParams;
-		lParams.append(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnHighlightedMessageSound)));
-		KviKvsScript::run("snd.play $0",0,&lParams);
-	}
+	if(!KVI_OPTION_STRING(KviOption_stringOnHighlightedMessageSound).isEmpty() && wnd!=g_pActiveWindow) KviKvsScript::run("snd.play $0",0,new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnHighlightedMessageSound))));
 	QString szMessageType;
 	KviQString::sprintf(szMessageType,"%d",type);
 	if(KVS_TRIGGER_EVENT_7_HALTED(KviEvent_OnHighlight,
diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
index b366c577b..90d9d664d 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/kvi_query.cpp
@@ -281,11 +281,8 @@ void KviQuery::slotDndEvents(const QString &pcFile)
 void KviQuery::triggerCreationEvents()
 {
 	if(!KVI_OPTION_STRING(KviOption_stringOnNewQueryOpenedSound).isEmpty())
-	{
-		KviKvsVariantList lParams;
-		lParams.append(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnNewQueryOpenedSound)));
-		KviKvsScript::run("snd.play $0",0,&lParams);
-	}
+		KviKvsScript::run("snd.play $0",0,new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnNewQueryOpenedSound))));
+
 	KVS_TRIGGER_EVENT_0(KviEvent_OnQueryWindowCreated,this);
 }
 
diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp
index 5845a248d..a8ca4756a 100644
--- a/src/kvirc/ui/kvi_selectors.cpp
+++ b/src/kvirc/ui/kvi_selectors.cpp
@@ -809,9 +809,7 @@ KviSoundSelector::~KviSoundSelector()
 
 void KviSoundSelector::playSound()
 {
-	KviKvsVariantList lParams;
-	lParams.append(new KviKvsVariant(m_pLineEdit->text()));
-	KviKvsScript::run("snd.play $0",0,&lParams);
+	KviKvsScript::run("snd.play $0",0,new KviKvsVariantList(new KviKvsVariant(m_pLineEdit->text())));
 }
 
 void KviSoundSelector::setEnabled(bool bEnabled)
diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp
index 04418c4fe..af74506fd 100644
--- a/src/modules/codetester/codetester.cpp
+++ b/src/modules/codetester/codetester.cpp
@@ -73,14 +73,12 @@ KviCodeTester::~KviCodeTester()
 
 void KviCodeTester::execute()
 {
-	QStringList szParams = m_pParams->text().split(" ");
+	QString parms = m_pParams->text();
 	QString buffer;
 	m_pEditor->getText(buffer);
 	KviConsole * con = g_pApp->activeConsole();
-	KviKvsVariantList lParams;
-	for(int i=0;i<szParams.count();i++)
-		lParams.append(new KviKvsVariant(szParams.at(i)));
-	KviKvsScript::run(buffer,con,&lParams);
+	//KviParameterList * l = new KviParameterList(parms.ptr());
+	KviKvsScript::run(buffer,con,new KviKvsVariantList(new QString(parms)));
 }
 
 KviCodeTesterWindow::KviCodeTesterWindow(KviFrame * lpFrm)