summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2021-11-13 20:39:20 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2021-11-16 17:30:54 +0000
commit154e6f50ca1d3efaecd40ff232ca7dd4678dde79 (patch)
treed1b981cadc9a8ad5c7bd24991f4163ecdf4d50ba
parentc1af290c995ef9791731fa59fdb7d24443c6b035 (diff)
downloadqbs-154e6f50ca1d3efaecd40ff232ca7dd4678dde79.tar.gz
Fix Clang-Tidy & Clazy 'clazy-overloaded-signal' warnings
This patch fixes the "signal error is overloaded [clazy-overloaded-signal]" warnings. Change-Id: Ibf822da6eb34c781696ea5e0839afd8cc408af74 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--src/lib/corelib/buildgraph/processcommandexecutor.cpp2
-rw-r--r--src/lib/corelib/tools/qbsprocess.cpp8
-rw-r--r--src/lib/corelib/tools/qbsprocess.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/corelib/buildgraph/processcommandexecutor.cpp b/src/lib/corelib/buildgraph/processcommandexecutor.cpp
index 1026586f7..57d69ac0b 100644
--- a/src/lib/corelib/buildgraph/processcommandexecutor.cpp
+++ b/src/lib/corelib/buildgraph/processcommandexecutor.cpp
@@ -73,7 +73,7 @@ namespace Internal {
ProcessCommandExecutor::ProcessCommandExecutor(const Logger &logger, QObject *parent)
: AbstractCommandExecutor(logger, parent)
{
- connect(&m_process, static_cast<void (QbsProcess::*)(QProcess::ProcessError)>(&QbsProcess::error),
+ connect(&m_process, &QbsProcess::errorOccurred,
this, &ProcessCommandExecutor::onProcessError);
connect(&m_process, static_cast<void (QbsProcess::*)(int)>(&QbsProcess::finished),
this, &ProcessCommandExecutor::onProcessFinished);
diff --git a/src/lib/corelib/tools/qbsprocess.cpp b/src/lib/corelib/tools/qbsprocess.cpp
index 52ce3f25a..de2590e8a 100644
--- a/src/lib/corelib/tools/qbsprocess.cpp
+++ b/src/lib/corelib/tools/qbsprocess.cpp
@@ -65,7 +65,7 @@ void QbsProcess::start(const QString &command, const QStringList &arguments)
{
if (m_socketError) {
m_error = QProcess::FailedToStart;
- emit error(m_error);
+ emit errorOccurred(m_error);
return;
}
m_command = command;
@@ -95,7 +95,7 @@ void QbsProcess::cancel()
m_errorString = Tr::tr("Process canceled before it was started.");
m_error = QProcess::FailedToStart;
m_state = QProcess::NotRunning;
- emit error(m_error);
+ emit errorOccurred(m_error);
break;
case QProcess::Running:
sendPacket(StopProcessPacket(token()));
@@ -155,7 +155,7 @@ void QbsProcess::handleSocketError(const QString &message)
if (m_state != QProcess::NotRunning) {
m_state = QProcess::NotRunning;
m_error = QProcess::FailedToStart;
- emit error(m_error);
+ emit errorOccurred(m_error);
}
}
@@ -166,7 +166,7 @@ void QbsProcess::handleErrorPacket(const QByteArray &packetData)
m_error = packet.error;
m_errorString = packet.errorString;
m_state = QProcess::NotRunning;
- emit error(m_error);
+ emit errorOccurred(m_error);
}
void QbsProcess::handleFinishedPacket(const QByteArray &packetData)
diff --git a/src/lib/corelib/tools/qbsprocess.h b/src/lib/corelib/tools/qbsprocess.h
index 2181818f0..3314e3d3c 100644
--- a/src/lib/corelib/tools/qbsprocess.h
+++ b/src/lib/corelib/tools/qbsprocess.h
@@ -69,7 +69,7 @@ public:
QString errorString() const { return m_errorString; }
signals:
- void error(QProcess::ProcessError error);
+ void errorOccurred(QProcess::ProcessError error);
void finished(int exitCode);
private: