summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--process.cpp4
-rw-r--r--process.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/process.cpp b/process.cpp
index 954cc12..4df8270 100644
--- a/process.cpp
+++ b/process.cpp
@@ -100,7 +100,7 @@ Process::Process()
connect(mProcess, &QProcess::readyReadStandardError, this, &Process::readyReadStandardError);
connect(mProcess, &QProcess::readyReadStandardOutput, this, &Process::readyReadStandardOutput);
connect(mProcess, (void (QProcess::*)(int, QProcess::ExitStatus))&QProcess::finished, this, &Process::finished);
- connect(mProcess, (void (QProcess::*)(QProcess::ProcessError))&QProcess::error, this, &Process::error);
+ connect(mProcess, (void (QProcess::*)(QProcess::ProcessError))&QProcess::errorOccurred, this, &Process::errorOccurred);
if (pipe2(pipefd, O_CLOEXEC) != 0)
qWarning("Could not create pipe");
@@ -172,7 +172,7 @@ void Process::setDebug()
mDebug = true;
}
-void Process::error(QProcess::ProcessError error)
+void Process::errorOccurred(QProcess::ProcessError error)
{
switch (error) {
case QProcess::FailedToStart:
diff --git a/process.h b/process.h
index 8b84779..4c073a5 100644
--- a/process.h
+++ b/process.h
@@ -64,7 +64,7 @@ private slots:
void readyReadStandardError();
void readyReadStandardOutput();
void finished(int, QProcess::ExitStatus);
- void error(QProcess::ProcessError);
+ void errorOccurred(QProcess::ProcessError);
void incomingConnection(int);
private:
void forwardProcessOutput(qintptr fd, const QByteArray &data);