Browse Source

Add warn-unused to the Qt interface

Ben Boeckel 15 years ago
parent
commit
786e2695cb

+ 12 - 0
Source/QtDialog/CMakeSetupDialog.cxx

@@ -120,6 +120,12 @@ CMakeSetupDialog::CMakeSetupDialog()
   this->WarnUninitializedAction =
     OptionsMenu->addAction(tr("&Warn Uninitialized (--warn-uninitialized)"));
   this->WarnUninitializedAction->setCheckable(true);
+  this->WarnUnusedAction =
+    OptionsMenu->addAction(tr("&Warn Unused (--warn-unused)"));
+  this->WarnUnusedAction->setCheckable(true);
+  this->WarnUnusedAllAction =
+    OptionsMenu->addAction(tr("&Warn Unused All (--warn-unused-all)"));
+  this->WarnUnusedAllAction->setCheckable(true);
 
   QAction* debugAction = OptionsMenu->addAction(tr("&Debug Output"));
   debugAction->setCheckable(true);
@@ -247,6 +253,12 @@ void CMakeSetupDialog::initialize()
   QObject::connect(this->WarnUninitializedAction, SIGNAL(triggered(bool)),
                    this->CMakeThread->cmakeInstance(),
                    SLOT(setWarnUninitializedMode(bool)));
+  QObject::connect(this->WarnUnusedAction, SIGNAL(triggered(bool)),
+                   this->CMakeThread->cmakeInstance(),
+                   SLOT(setWarnUnusedMode(bool)));
+  QObject::connect(this->WarnUnusedAllAction, SIGNAL(triggered(bool)),
+                   this->CMakeThread->cmakeInstance(),
+                   SLOT(setWarnUnusedAllMode(bool)));
   
   if(!this->SourceDirectory->text().isEmpty() ||
      !this->BinaryDirectory->lineEdit()->text().isEmpty())

+ 2 - 0
Source/QtDialog/CMakeSetupDialog.h

@@ -94,6 +94,8 @@ protected:
   QAction* GenerateAction;
   QAction* SuppressDevWarningsAction;
   QAction* WarnUninitializedAction;
+  QAction* WarnUnusedAction;
+  QAction* WarnUnusedAllAction;
   QAction* InstallForCommandLineAction;
   State CurrentState;
 

+ 14 - 0
Source/QtDialog/QCMake.cxx

@@ -29,6 +29,8 @@ QCMake::QCMake(QObject* p)
 {
   this->SuppressDevWarnings = false;
   this->WarnUninitializedMode = false;
+  this->WarnUnusedMode = false;
+  this->WarnUnusedAllMode = false;
   qRegisterMetaType<QCMakeProperty>();
   qRegisterMetaType<QCMakePropertyList>();
   
@@ -167,6 +169,8 @@ void QCMake::configure()
   this->CMakeInstance->SetSuppressDevWarnings(this->SuppressDevWarnings);
   std::cerr << "set warn uninitialized " << this->WarnUninitializedMode << "\n";
   this->CMakeInstance->SetWarnUninitialized(this->WarnUninitializedMode);
+  this->CMakeInstance->SetWarnUnused(this->WarnUnusedMode);
+  this->CMakeInstance->SetDefaultToUsed(!this->WarnUnusedAllMode);
   this->CMakeInstance->PreLoadCMakeFiles();
 
   cmSystemTools::ResetErrorOccuredFlag();
@@ -425,3 +429,13 @@ void QCMake::setWarnUninitializedMode(bool value)
 {
   this->WarnUninitializedMode = value;
 }
+
+void QCMake::setWarnUnusedMode(bool value)
+{
+  this->WarnUnusedMode = value;
+}
+
+void QCMake::setWarnUnusedAllMode(bool value)
+{
+  this->WarnUnusedAllMode = value;
+}

+ 6 - 0
Source/QtDialog/QCMake.h

@@ -90,6 +90,10 @@ public slots:
   void setSuppressDevWarnings(bool value);
   /// set whether to run cmake with warnings about uninitialized variables
   void setWarnUninitializedMode(bool value);
+  /// set whether to run cmake with warnings about unused variables
+  void setWarnUnusedMode(bool value);
+  /// set whether to run cmake with warnings about all unused variables
+  void setWarnUnusedAllMode(bool value);
 
 public:
   /// get the list of cache properties
@@ -136,6 +140,8 @@ protected:
                             bool&, void* cd);
   bool SuppressDevWarnings;
   bool WarnUninitializedMode;
+  bool WarnUnusedMode;
+  bool WarnUnusedAllMode;
   QString SourceDirectory;
   QString BinaryDirectory;
   QString Generator;