diff options
author | Ben Boeckel <ben.boeckel@kitware.com> | 2010-08-25 16:35:40 (GMT) |
---|---|---|
committer | Ben Boeckel <ben.boeckel@kitware.com> | 2010-09-01 17:08:14 (GMT) |
commit | d7999e9b294f93f68b5ec9e3efd8017fad3f05d9 (patch) | |
tree | d705db14b00d2b6a22a8335aff2511ed95764489 /Source/QtDialog | |
parent | e141bc950a1970c6bc96fa5f55fd60c6aedbb2d0 (diff) | |
download | CMake-d7999e9b294f93f68b5ec9e3efd8017fad3f05d9.zip CMake-d7999e9b294f93f68b5ec9e3efd8017fad3f05d9.tar.gz CMake-d7999e9b294f93f68b5ec9e3efd8017fad3f05d9.tar.bz2 |
Rename strict-mode to warn-uninitialized
Diffstat (limited to 'Source/QtDialog')
-rw-r--r-- | Source/QtDialog/CMakeSetupDialog.cxx | 10 | ||||
-rw-r--r-- | Source/QtDialog/CMakeSetupDialog.h | 2 | ||||
-rw-r--r-- | Source/QtDialog/QCMake.cxx | 10 | ||||
-rw-r--r-- | Source/QtDialog/QCMake.h | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx index 7600897..a5510af 100644 --- a/Source/QtDialog/CMakeSetupDialog.cxx +++ b/Source/QtDialog/CMakeSetupDialog.cxx @@ -117,9 +117,9 @@ CMakeSetupDialog::CMakeSetupDialog() this->SuppressDevWarningsAction = OptionsMenu->addAction(tr("&Suppress dev Warnings (-Wno-dev)")); this->SuppressDevWarningsAction->setCheckable(true); - this->StrictModeAction = - OptionsMenu->addAction(tr("&Strict Mode (--strict-mode)")); - this->StrictModeAction->setCheckable(true); + this->WarnUninitializedAction = + OptionsMenu->addAction(tr("&Warn Uninitialized (--warn-uninitialized)")); + this->WarnUninitializedAction->setCheckable(true); QAction* debugAction = OptionsMenu->addAction(tr("&Debug Output")); debugAction->setCheckable(true); @@ -244,9 +244,9 @@ void CMakeSetupDialog::initialize() QObject::connect(this->SuppressDevWarningsAction, SIGNAL(triggered(bool)), this->CMakeThread->cmakeInstance(), SLOT(setSuppressDevWarnings(bool))); - QObject::connect(this->StrictModeAction, SIGNAL(triggered(bool)), + QObject::connect(this->WarnUninitializedAction, SIGNAL(triggered(bool)), this->CMakeThread->cmakeInstance(), - SLOT(setStrictMode(bool))); + SLOT(setWarnUninitializedMode(bool))); if(!this->SourceDirectory->text().isEmpty() || !this->BinaryDirectory->lineEdit()->text().isEmpty()) diff --git a/Source/QtDialog/CMakeSetupDialog.h b/Source/QtDialog/CMakeSetupDialog.h index cd2be6e..4c161d9 100644 --- a/Source/QtDialog/CMakeSetupDialog.h +++ b/Source/QtDialog/CMakeSetupDialog.h @@ -93,7 +93,7 @@ protected: QAction* ConfigureAction; QAction* GenerateAction; QAction* SuppressDevWarningsAction; - QAction* StrictModeAction; + QAction* WarnUninitializedAction; QAction* InstallForCommandLineAction; State CurrentState; diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx index 31daf3c..8d24c1c2 100644 --- a/Source/QtDialog/QCMake.cxx +++ b/Source/QtDialog/QCMake.cxx @@ -28,7 +28,7 @@ QCMake::QCMake(QObject* p) : QObject(p) { this->SuppressDevWarnings = false; - this->StrictMode = false; + this->WarnUninitializedMode = false; qRegisterMetaType<QCMakeProperty>(); qRegisterMetaType<QCMakePropertyList>(); @@ -165,8 +165,8 @@ void QCMake::configure() this->CMakeInstance->CreateGlobalGenerator(this->Generator.toAscii().data())); this->CMakeInstance->LoadCache(); this->CMakeInstance->SetSuppressDevWarnings(this->SuppressDevWarnings); - std::cerr << "set strict " << this->StrictMode << "\n"; - this->CMakeInstance->SetStrictMode(this->StrictMode); + std::cerr << "set warn uninitialized " << this->WarnUninitializedMode << "\n"; + this->CMakeInstance->SetWarnUninitialized(this->WarnUninitializedMode); this->CMakeInstance->PreLoadCMakeFiles(); cmSystemTools::ResetErrorOccuredFlag(); @@ -421,7 +421,7 @@ void QCMake::setSuppressDevWarnings(bool value) this->SuppressDevWarnings = value; } -void QCMake::setStrictMode(bool value) +void QCMake::setWarnUninitializedMode(bool value) { - this->StrictMode = value; + this->WarnUninitializedMode = value; } diff --git a/Source/QtDialog/QCMake.h b/Source/QtDialog/QCMake.h index f20893f..6d2b2ff 100644 --- a/Source/QtDialog/QCMake.h +++ b/Source/QtDialog/QCMake.h @@ -88,8 +88,8 @@ public slots: void setDebugOutput(bool); /// set whether to do suppress dev warnings void setSuppressDevWarnings(bool value); - /// set whether to run cmake in strict mode - void setStrictMode(bool value); + /// set whether to run cmake with warnings about uninitialized variables + void setWarnUninitializedMode(bool value); public: /// get the list of cache properties @@ -135,7 +135,7 @@ protected: static void errorCallback(const char* msg, const char* title, bool&, void* cd); bool SuppressDevWarnings; - bool StrictMode; + bool WarnUninitializedMode; QString SourceDirectory; QString BinaryDirectory; QString Generator; |