feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer/Valgrind: Disambiguate signal name

Browse Source 
error => processError

To make it easier to use Qt5-style connect

Change-Id: Idfa987512ebb7d1c1c02d3cd01b2d05088cbf38a
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-02-06 11:41:57 +02:00
committed by hjk
parent 250cc0640b
commit 5b22e292bc
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/applicationlauncher.cpp
View File

@@ -223,7 +223,7 @@ QString ApplicationLauncher::errorString() const
return d->m_consoleProcess.errorString(); return d->m_consoleProcess.errorString();
} }
QProcess::ProcessError ApplicationLauncher::error() const QProcess::ProcessError ApplicationLauncher::processError() const
{ {
if (d->m_currentMode == Gui) if (d->m_currentMode == Gui)
return d->m_guiProcess.error(); return d->m_guiProcess.error();

2
src/plugins/projectexplorer/applicationlauncher.h
View File

@@ -69,7 +69,7 @@ public:
qint64 applicationPID() const; qint64 applicationPID() const;
QString errorString() const; QString errorString() const;
QProcess::ProcessError error() const; QProcess::ProcessError processError() const;
static QString msgWinCannotRetrieveDebuggingOutput(); static QString msgWinCannotRetrieveDebuggingOutput();

4
src/plugins/valgrind/valgrindprocess.cpp
View File

@@ -180,10 +180,10 @@ QString ValgrindProcess::errorString() const
return m_remote.m_errorString; return m_remote.m_errorString;
} }
QProcess::ProcessError ValgrindProcess::error() const QProcess::ProcessError ValgrindProcess::processError() const
{ {
if (isLocal()) if (isLocal())
return m_localProcess.error(); return m_localProcess.processError();
else else
return m_remote.m_error; return m_remote.m_error;
} }

2
src/plugins/valgrind/valgrindprocess.h
View File

@@ -75,7 +75,7 @@ public:
void close(); void close();
QString errorString() const; QString errorString() const;
QProcess::ProcessError error() const; QProcess::ProcessError processError() const;
void setProcessChannelMode(QProcess::ProcessChannelMode mode); void setProcessChannelMode(QProcess::ProcessChannelMode mode);
void setWorkingDirectory(const QString &path); void setWorkingDirectory(const QString &path);

2
src/plugins/valgrind/valgrindrunner.cpp
View File

@@ -267,7 +267,7 @@ void ValgrindRunner::processFinished(int ret, QProcess::ExitStatus status)
emit finished(); emit finished();
if (ret != 0 || status == QProcess::CrashExit) if (ret != 0 || status == QProcess::CrashExit)
emit processErrorReceived(errorString(), d->process->error()); emit processErrorReceived(errorString(), d->process->processError());
} }
void ValgrindRunner::localHostAddressRetrieved(const QHostAddress &localHostAddress) void ValgrindRunner::localHostAddressRetrieved(const QHostAddress &localHostAddress)