X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fexecwrapper.cpp;h=c44b69ce8004fd8e83304c2f255a367a20e1235b;hb=42ab7cc22c4702716db2b8bfa1d4545169f772e6;hp=28bffeaea2077da515b62059edfdc7458d2e5d8d;hpb=68878dc8366f2f4a0afe132847aad9a51a80cdbf;p=quassel.git

diff --git a/src/client/execwrapper.cpp b/src/client/execwrapper.cpp
index 28bffeae..c44b69ce 100644
--- a/src/client/execwrapper.cpp
+++ b/src/client/execwrapper.cpp
@@ -29,13 +29,13 @@
 
 ExecWrapper::ExecWrapper(QObject *parent) : QObject(parent)
 {
-    connect(&_process, SIGNAL(readyReadStandardOutput()), SLOT(processReadStdout()));
-    connect(&_process, SIGNAL(readyReadStandardError()), SLOT(processReadStderr()));
+    connect(&_process, &QProcess::readyReadStandardOutput, this, &ExecWrapper::processReadStdout);
+    connect(&_process, &QProcess::readyReadStandardError, this, &ExecWrapper::processReadStderr);
     connect(&_process, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(processFinished(int, QProcess::ExitStatus)));
     connect(&_process, SIGNAL(error(QProcess::ProcessError)), SLOT(processError(QProcess::ProcessError)));
 
-    connect(this, SIGNAL(output(QString)), SLOT(postStdout(QString)));
-    connect(this, SIGNAL(error(QString)), SLOT(postStderr(QString)));
+    connect(this, &ExecWrapper::output, this, &ExecWrapper::postStdout);
+    connect(this, &ExecWrapper::error, this, &ExecWrapper::postStderr);
 }
 
 
@@ -44,7 +44,7 @@ void ExecWrapper::start(const BufferInfo &info, const QString &command)
     _bufferInfo = info;
     QString params;
 
-    QRegExp rx("^\\s*(\\S+)(\\s+(.*))?$");
+    QRegExp rx(R"(^\s*(\S+)(\s+(.*))?$)");
     if (!rx.exactMatch(command)) {
         emit error(tr("Invalid command string for /exec: %1").arg(command));
     }
@@ -55,7 +55,7 @@ void ExecWrapper::start(const BufferInfo &info, const QString &command)
 
     // Make sure we don't execute something outside a script dir
     if (_scriptName.contains("../") || _scriptName.contains("..\\"))
-        emit error(tr("Name \"%1\" is invalid: ../ or ..\\ are not allowed!").arg(_scriptName));
+        emit error(tr(R"(Name "%1" is invalid: ../ or ..\ are not allowed!)").arg(_scriptName));
 
     else {
         foreach(QString scriptDir, Quassel::scriptDirPaths()) {