7 files changed, 39 insertions, 21 deletions
diff --git a/src/modules/addon/addonfunctions.cpp b/src/modules/addon/addonfunctions.cpp
index f9248e977..7efd047e1 100644
--- a/src/modules/addon/addonfunctions.cpp
+++ b/src/modules/addon/addonfunctions.cpp
@@ -229,17 +229,8 @@ namespace KviAddonFunctions
 		}
 
 		// Now we have all stuff in ~/.config/KVIrc/tmp/$rand
-		if(!
-				KviKvsScript::run(
-						QString::fromAscii("parse \"%1/install.kvs\"")
-								.arg(
-										szUnpackPath
-											.replace("\\","\\\\")
-											.replace("\"","\\\"")
-									),
-						g_pActiveWindow
-					)
-				)
+		KviQString::escapeKvs(&szUnpackPath, KviQString::EscapeSpace);
+		if(!KviKvsScript::run(QString::fromAscii("parse %1/install.kvs").arg(szUnpackPath), g_pActiveWindow))
 		{
 			// Parsing the script failed
 			// However, the user should already be notified via normal script output.
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index fa3e31dd0..bab866c2b 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -267,6 +267,7 @@ void KviScriptManagementDialog::uninstallScript()
 
 void KviScriptManagementDialog::getMoreScripts()
 {
+	// If change this introducing not-fixed text, remember to escape this using KviQString::escapeKvs()!
 	KviKvsScript::run("openurl http://www.kvirc.net/?id=addons&version=" KVI_VERSION "." KVI_SOURCES_DATE,g_pActiveWindow);
 }
 
diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
index 578d009b5..d7b46ea48 100644
--- a/src/modules/avatar/libkviavatar.cpp
+++ b/src/modules/avatar/libkviavatar.cpp
@@ -128,8 +128,8 @@ void KviAsyncAvatarSelectionDialog::okClicked()
 	if(!m_szAvatarName.isEmpty())
 	{
 		QString tmp = m_szAvatarName;
-		tmp.replace("\\","\\\\",Qt::CaseInsensitive);
-		QString szBuffer=QString("avatar.set \"%1\"").arg(tmp);
+		KviQString::escapeKvs(&tmp, KviQString::EscapeSpace);
+		QString szBuffer=QString("avatar.set %1").arg(tmp);
 		KviKvsScript::run(szBuffer,m_pConnection->console());
 	}
 
@@ -237,8 +237,8 @@ static bool avatar_kvs_cmd_set(KviKvsModuleCommandCall * c)
 			g_pIconManager->urlToCachedFileName(szLocalFile);
 			g_pApp->getLocalKvircDirectory(szLocalFilePath,KviApp::Avatars,szLocalFile);
 
-			szLocalFilePath.replace("\\","\\\\",Qt::CaseInsensitive);
-
+			KviQString::escapeKvs(&szAvatar);
+			KviQString::escapeKvs(&szLocalFilePath);
 			QString szCommand = "http.get -w=nm ";
 				szCommand += szAvatar;
 				szCommand += " ";
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index 0b5919c85..eeef183fa 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -29,6 +29,7 @@
 #include "kvi_selectors.h"
 #include "kvi_app.h"
 #include "kvi_string.h"
+#include "kvi_qstring.h"
 #include "kvi_iconmanager.h"
 #include "kvi_console.h"
 #include "kvi_regchan.h"
@@ -301,6 +302,9 @@ void KviChannelsJoinWindow::joinClicked()
 	if(szTmp.isEmpty())
 		return;
 
+	KviQString::escapeKvs(&szTmp);
+	KviQString::escapeKvs(&szPass);
+
 	QString szCmd = "join ";
 	szCmd += szTmp;
 	szCmd += " ";
@@ -327,6 +331,7 @@ void KviChannelsJoinWindow::regClicked()
 	if(szTmp.isEmpty())
 		return;
 
+	KviQString::escapeKvs(&szTmp);
 	QString szCmd = "regchan.add ";
 	szCmd += szTmp;
 
diff --git a/src/modules/classeditor/classeditor.cpp b/src/modules/classeditor/classeditor.cpp
index 662b018a0..48d750dfa 100644
--- a/src/modules/classeditor/classeditor.cpp
+++ b/src/modules/classeditor/classeditor.cpp
@@ -1559,6 +1559,9 @@ void KviClassEditor::newClass()
 		return;
 	KviClassEditorTreeWidgetItem * pItem = newItem(szClassName,KviClassEditorTreeWidgetItem::Class);
 	
+	KviQString::escapeKvs(&szClassName, KviQString::EscapeSpace);
+	KviQString::escapeKvs(&szinheritsClassName, KviQString::EscapeSpace);
+
 	QString szClass = "class\(";
 	szClass += szClassName + "," + szinheritsClassName;
 	szClass += "){}\n";
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 4d2c1a10a..8d9c495c5 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -1238,7 +1238,10 @@ void KviDccFileTransfer::retryDCC()
 	QString szRemoteNick = m_pDescriptor->remoteNick();
 	QString szFileName = m_pDescriptor->localFileName();
 	QString szId = m_pDescriptor->idString();
-	QString szCommand = "dcc.send -r=$console($dcc.irccontext(" + szId + ")) " + szRemoteNick + " " + "\"" + szFileName + "\"";
+	KviQString::escapeKvs(&szRemoteNick, KviQString::EscapeSpace);
+	KviQString::escapeKvs(&szFileName, KviQString::EscapeSpace);
+
+	QString szCommand = "dcc.send -r=$console($dcc.irccontext(" + szId + ")) " + szRemoteNick + " " + szFileName;
 	KviKvsScript::run(szCommand,g_pActiveWindow);
 }
 
@@ -1248,7 +1251,10 @@ void KviDccFileTransfer::retryTDCC()
 	QString szRemoteNick = m_pDescriptor->remoteNick();
 	QString szFileName = m_pDescriptor->localFileName();
 	QString szId = m_pDescriptor->idString();
-	QString szCommand = "dcc.send -r=$console($dcc.irccontext(" + szId + ")) -t " + szRemoteNick + " " + "\"" + szFileName + "\"";
+	KviQString::escapeKvs(&szRemoteNick, KviQString::EscapeSpace);
+	KviQString::escapeKvs(&szFileName, KviQString::EscapeSpace);
+
+	QString szCommand = "dcc.send -r=$console($dcc.irccontext(" + szId + ")) -t " + szRemoteNick + " " + szFileName;
 	KviKvsScript::run(szCommand,g_pActiveWindow);
 }
 
@@ -1258,7 +1264,10 @@ void KviDccFileTransfer::retryRevDCC()
 	QString szRemoteNick = m_pDescriptor->remoteNick();
 	QString szFileName = m_pDescriptor->localFileName();
 	QString szId = m_pDescriptor->idString();
-	QString szCommand = "dcc.rsend -z -r=$console($dcc.irccontext(" + szId + ")) " + szRemoteNick + " " + "\"" + szFileName + "\"";
+	KviQString::escapeKvs(&szRemoteNick, KviQString::EscapeSpace);
+	KviQString::escapeKvs(&szFileName, KviQString::EscapeSpace);
+
+	QString szCommand = "dcc.rsend -z -r=$console($dcc.irccontext(" + szId + ")) " + szRemoteNick + " " + szFileName;
 	KviKvsScript::run(szCommand,g_pActiveWindow);
 }
 
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 5c6b1ef5d..e1bbdec03 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -39,6 +39,7 @@
 #include "kvi_tal_popupmenu.h"
 #include "kvi_window.h"
 #include "kvi_options.h"
+#include "kvi_qstring.h"
 #include "kvi_out.h"
 
 #include <QFileDialog>
@@ -307,7 +308,9 @@ void UrlDialog::findtext()
 void UrlDialog::dblclk_url(QTreeWidgetItem *item, int)
 {
 	QString cmd="openurl ";
-	cmd.append(item->text(0));
+	QString szUrl = item->text(0);
+	KviQString::escapeKvs(&szUrl);
+	cmd.append(szUrl);
 	KviKvsScript::run(cmd,this);
 }
 
@@ -344,12 +347,18 @@ void UrlDialog::contextMenu(const QPoint &point)
 void UrlDialog::sayToWin(QAction * act)
 {
 	KviWindow *wnd = g_pApp->findWindowByCaption(act->text());
-	QString say=QString("PRIVMSG %1 %2").arg(wnd->windowName(), m_szUrl);
 	if(wnd)
 	{
+		QString szUrl = m_szUrl;
+		QString szWindow = wnd->windowName();
+		KviQString::escapeKvs(&szUrl);
+		KviQString::escapeKvs(&szWindow);
+		QString say=QString("PRIVMSG %1 %2").arg(szWindow, szUrl);
 		KviKvsScript::run(say,wnd);
 		g_pFrame->setActiveWindow(wnd);
-	} else QMessageBox::warning(0,__tr2qs("Warning - KVIrc"),__tr2qs("Window not found."),QMessageBox::Ok,QMessageBox::NoButton,QMessageBox::NoButton);
+	} else {
+		QMessageBox::warning(0,__tr2qs("Warning - KVIrc"),__tr2qs("Window not found."),QMessageBox::Ok,QMessageBox::NoButton,QMessageBox::NoButton);
+	}
 }
 
 QPixmap *UrlDialog::myIconPtr()