diff options
| author |  Fabio Bas | 2010-10-10 20:03:21 +0000 |
|---|---|---|
| committer | Fabio Bas | 2010-10-10 20:03:21 +0000 |
| commit | c87e99c1f0ba253ccfffaff3319c121cc60ef741 (patch) | |
| tree | 883cfadabe694b01fb1594cbc9f0ac91b486c47e /src/modules/dcc/send.cpp | |
| parent | Rework /popup so it relays the parameters correctly to /popup.show. Replace t... (diff) | |
| download | KVIrc-c87e99c1f0ba253ccfffaff3319c121cc60ef741.tar.gz KVIrc-c87e99c1f0ba253ccfffaff3319c121cc60ef741.tar.bz2 KVIrc-c87e99c1f0ba253ccfffaff3319c121cc60ef741.zip | |
Reunited all the kvs-escape related functions is a single method supporting different flags;
small fixes to defscript and inputbar escaping in userfriendlymode
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5057 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/dcc/send.cpp')
| -rw-r--r-- | src/modules/dcc/send.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
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); } |