X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fexecwrapper.cpp;h=ee0e864a478ec90fb70fd5026342c239f8bef431;hb=082cb8c8eb6db90cbb2166a0098874e76d5c6ad9;hp=7c9ce12d4deebc99a51de4d92b5ad217f5eb228c;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce;p=quassel.git diff --git a/src/client/execwrapper.cpp b/src/client/execwrapper.cpp index 7c9ce12d..ee0e864a 100644 --- a/src/client/execwrapper.cpp +++ b/src/client/execwrapper.cpp @@ -1,50 +1,55 @@ /*************************************************************************** -* Copyright (C) 2005-09 by the Quassel Project * -* devel@quassel-irc.org * -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) version 3. * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU General Public License for more details. * -* * -* You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * -* Free Software Foundation, Inc., * -* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * -***************************************************************************/ + * Copyright (C) 2005-2020 by the Quassel Project * + * devel@quassel-irc.org * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) version 3. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + +#include "execwrapper.h" #include #include -#include "execwrapper.h" - #include "client.h" #include "messagemodel.h" #include "quassel.h" +#include "util.h" -ExecWrapper::ExecWrapper(QObject *parent) : QObject(parent) +ExecWrapper::ExecWrapper(QObject* parent) + : QObject(parent) { - connect(&_process, SIGNAL(readyReadStandardOutput()), SLOT(processReadStdout())); - connect(&_process, SIGNAL(readyReadStandardError()), SLOT(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(&_process, &QProcess::readyReadStandardOutput, this, &ExecWrapper::processReadStdout); + connect(&_process, &QProcess::readyReadStandardError, this, &ExecWrapper::processReadStderr); + connect(&_process, selectOverload(&QProcess::finished), this, &ExecWrapper::processFinished); +#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0) + connect(&_process, selectOverload(&QProcess::error), this, &ExecWrapper::processError); +#else + connect(&_process, &QProcess::errorOccurred, this, &ExecWrapper::processError); +#endif + + connect(this, &ExecWrapper::output, this, &ExecWrapper::postStdout); + connect(this, &ExecWrapper::error, this, &ExecWrapper::postStderr); } - -void ExecWrapper::start(const BufferInfo &info, const QString &command) +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,10 +60,10 @@ 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()) { + foreach (QString scriptDir, Quassel::scriptDirPaths()) { QString fileName = scriptDir + _scriptName; if (!QFile::exists(fileName)) continue; @@ -69,24 +74,21 @@ void ExecWrapper::start(const BufferInfo &info, const QString &command) emit error(tr("Could not find script \"%1\"").arg(_scriptName)); } - deleteLater(); // self-destruct + deleteLater(); // self-destruct } - -void ExecWrapper::postStdout(const QString &msg) +void ExecWrapper::postStdout(const QString& msg) { if (_bufferInfo.isValid()) Client::userInput(_bufferInfo, msg); } - -void ExecWrapper::postStderr(const QString &msg) +void ExecWrapper::postStderr(const QString& msg) { if (_bufferInfo.isValid()) Client::messageModel()->insertErrorMessage(_bufferInfo, msg); } - void ExecWrapper::processFinished(int exitCode, QProcess::ExitStatus status) { if (status == QProcess::CrashExit) { @@ -95,16 +97,15 @@ void ExecWrapper::processFinished(int exitCode, QProcess::ExitStatus status) // empty buffers if (!_stdoutBuffer.isEmpty()) - foreach(QString msg, _stdoutBuffer.split('\n')) - emit output(msg); + foreach (QString msg, _stdoutBuffer.split('\n')) + emit output(msg); if (!_stderrBuffer.isEmpty()) - foreach(QString msg, _stderrBuffer.split('\n')) - emit error(msg); + foreach (QString msg, _stderrBuffer.split('\n')) + emit error(msg); deleteLater(); } - void ExecWrapper::processError(QProcess::ProcessError err) { if (err == QProcess::FailedToStart) @@ -116,7 +117,6 @@ void ExecWrapper::processError(QProcess::ProcessError err) deleteLater(); } - void ExecWrapper::processReadStdout() { QString str = QTextCodec::codecForLocale()->toUnicode(_process.readAllStandardOutput()); @@ -129,7 +129,6 @@ void ExecWrapper::processReadStdout() } } - void ExecWrapper::processReadStderr() { QString str = QTextCodec::codecForLocale()->toUnicode(_process.readAllStandardError());