diff options
author | Brad King <brad.king@kitware.com> | 2014-05-15 13:38:30 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-05-15 14:24:21 (GMT) |
commit | 73b13f56413cac74d90a2ab1938add3bbe740ecb (patch) | |
tree | 9cfad78062b4804f73d5efab6cce30f5fe836504 /Source/QtDialog | |
parent | 7577a542dfa0aac045b97bfe4440241583c62e3a (diff) | |
download | CMake-73b13f56413cac74d90a2ab1938add3bbe740ecb.zip CMake-73b13f56413cac74d90a2ab1938add3bbe740ecb.tar.gz CMake-73b13f56413cac74d90a2ab1938add3bbe740ecb.tar.bz2 |
cmSystemTools: Rename ErrorCallback to MessageCallback
Clarify that it is the callback for the cmSystemTools::Message API.
Rename callback clients too.
Diffstat (limited to 'Source/QtDialog')
-rw-r--r-- | Source/QtDialog/QCMake.cxx | 6 | ||||
-rw-r--r-- | Source/QtDialog/QCMake.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx index 5f9ebaf..f2a23bb 100644 --- a/Source/QtDialog/QCMake.cxx +++ b/Source/QtDialog/QCMake.cxx @@ -35,7 +35,7 @@ QCMake::QCMake(QObject* p) cmSystemTools::DisableRunCommandOutput(); cmSystemTools::SetRunCommandHideConsole(true); - cmSystemTools::SetErrorCallback(QCMake::errorCallback, this); + cmSystemTools::SetMessageCallback(QCMake::messageCallback, this); this->CMakeInstance = new cmake; this->CMakeInstance->SetCMakeEditCommand( @@ -348,8 +348,8 @@ void QCMake::progressCallback(const char* msg, float percent, void* cd) QCoreApplication::processEvents(); } -void QCMake::errorCallback(const char* msg, const char* /*title*/, - bool& /*stop*/, void* cd) +void QCMake::messageCallback(const char* msg, const char* /*title*/, + bool& /*stop*/, void* cd) { QCMake* self = reinterpret_cast<QCMake*>(cd); emit self->errorMessage(QString::fromLocal8Bit(msg)); diff --git a/Source/QtDialog/QCMake.h b/Source/QtDialog/QCMake.h index 93ac8ab..8e71ea5 100644 --- a/Source/QtDialog/QCMake.h +++ b/Source/QtDialog/QCMake.h @@ -136,8 +136,8 @@ protected: static bool interruptCallback(void*); static void progressCallback(const char* msg, float percent, void* cd); - static void errorCallback(const char* msg, const char* title, - bool&, void* cd); + static void messageCallback(const char* msg, const char* title, + bool&, void* cd); bool SuppressDevWarnings; bool WarnUninitializedMode; bool WarnUnusedMode; |