aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Noldor2010-07-31 15:52:02 +0000
committerGravatar Noldor2010-07-31 15:52:02 +0000
commite0b58a05845530522c82c41d7c769039cbb53939 (patch)
treebaab4cee0481b72c82f0b03eaaa3b21122e8c587 /src
parentfix for #865 (diff)
downloadKVIrc-e0b58a05845530522c82c41d7c769039cbb53939.tar.gz
KVIrc-e0b58a05845530522c82c41d7c769039cbb53939.tar.bz2
KVIrc-e0b58a05845530522c82c41d7c769039cbb53939.zip
More memory leaks fixes
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4723 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
-rw-r--r--src/kvirc/sparser/kvi_sp_literal.cpp9
-rw-r--r--src/kvirc/ui/kvi_console.cpp7
-rw-r--r--src/kvirc/ui/kvi_query.cpp7
-rw-r--r--src/kvirc/ui/kvi_selectors.cpp4
-rw-r--r--src/modules/codetester/codetester.cpp8
-rw-r--r--src/modules/str/libkvistr.cpp2
6 files changed, 27 insertions, 10 deletions
diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp
index 5c1c63231..6a43a682c 100644
--- a/src/kvirc/sparser/kvi_sp_literal.cpp
+++ b/src/kvirc/sparser/kvi_sp_literal.cpp
@@ -574,7 +574,12 @@ 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()) KviKvsScript::run("snd.play $0",0,new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnMeKickedSound))));
+ 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);
+ }
QString szPass = chan->channelKey();
@@ -2146,4 +2151,4 @@ void KviServerParser::parseLiteralAuthenticate(KviIrcMessage *msg)
// :AUTHENTICATE +
KviStr szAuth(msg->safeParam(0));
msg->connection()->handleAuthenticate(szAuth);
-} \ No newline at end of file
+}
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index 72416751d..b2444afe3 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -572,7 +572,12 @@ 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) KviKvsScript::run("snd.play $0",0,new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnHighlightedMessageSound))));
+ 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);
+ }
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 90d9d664d..b366c577b 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/kvi_query.cpp
@@ -281,8 +281,11 @@ void KviQuery::slotDndEvents(const QString &pcFile)
void KviQuery::triggerCreationEvents()
{
if(!KVI_OPTION_STRING(KviOption_stringOnNewQueryOpenedSound).isEmpty())
- KviKvsScript::run("snd.play $0",0,new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnNewQueryOpenedSound))));
-
+ {
+ KviKvsVariantList lParams;
+ lParams.append(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnNewQueryOpenedSound)));
+ KviKvsScript::run("snd.play $0",0,&lParams);
+ }
KVS_TRIGGER_EVENT_0(KviEvent_OnQueryWindowCreated,this);
}
diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp
index a8ca4756a..5845a248d 100644
--- a/src/kvirc/ui/kvi_selectors.cpp
+++ b/src/kvirc/ui/kvi_selectors.cpp
@@ -809,7 +809,9 @@ KviSoundSelector::~KviSoundSelector()
void KviSoundSelector::playSound()
{
- KviKvsScript::run("snd.play $0",0,new KviKvsVariantList(new KviKvsVariant(m_pLineEdit->text())));
+ KviKvsVariantList lParams;
+ lParams.append(new KviKvsVariant(m_pLineEdit->text()));
+ KviKvsScript::run("snd.play $0",0,&lParams);
}
void KviSoundSelector::setEnabled(bool bEnabled)
diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp
index af74506fd..04418c4fe 100644
--- a/src/modules/codetester/codetester.cpp
+++ b/src/modules/codetester/codetester.cpp
@@ -73,12 +73,14 @@ KviCodeTester::~KviCodeTester()
void KviCodeTester::execute()
{
- QString parms = m_pParams->text();
+ QStringList szParams = m_pParams->text().split(" ");
QString buffer;
m_pEditor->getText(buffer);
KviConsole * con = g_pApp->activeConsole();
- //KviParameterList * l = new KviParameterList(parms.ptr());
- KviKvsScript::run(buffer,con,new KviKvsVariantList(new QString(parms)));
+ KviKvsVariantList lParams;
+ for(int i=0;i<szParams.count();i++)
+ lParams.append(new KviKvsVariant(szParams.at(i)));
+ KviKvsScript::run(buffer,con,&lParams);
}
KviCodeTesterWindow::KviCodeTesterWindow(KviFrame * lpFrm)
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index bc9799ccc..a190c1caa 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -1097,7 +1097,7 @@ static bool str_kvs_fnc_rightfromlast(KviKvsModuleFunctionCall * c)
@short:
Matches a fixed string against a wildcard expression
@syntax:
- <bool> $str.match(<expression:string>,<string:string>[,<case:bool>[,<flags:string>]])
+ <bool> $str.match(<expression:string>,<string:string>[,<flags:string>[,<case:bool>]])
@description:
Returns 1 if the fixed <string> matches the <expression>, 0 otherwise.[br]
If <flags> contains the flag 'r' then <expression> is treated as a full