Ver código fonte

Fix unused variable warnings by excluding code with "#ifndef QT_NO_DEBUG"

Jean-Christophe Fillion-Robin 14 anos atrás
pai
commit
e57b1a6703

+ 2 - 0
Libs/Core/ctkWorkflow.cpp

@@ -1016,8 +1016,10 @@ void ctkWorkflow::goToStep(const QString& targetId)
     return;
     }
 
+#ifndef QT_NO_DEBUG
   ctkWorkflowStep* step = d->stepFromId(targetId);
   Q_ASSERT(step);
+#endif
 
   logger.info(QString("goToStep - Attempting to go to finish step %1").arg(targetId));
 

+ 4 - 1
Libs/Widgets/Testing/Cpp/ctkWorkflowWidgetTest1.cpp

@@ -190,10 +190,13 @@ int userInteractionSimulator1(QApplication& app, ctkExampleDerivedWorkflowWidget
 {
   QPushButton* backButton = workflowWidget->buttonBoxWidget()->backButton();
   QPushButton* nextButton = workflowWidget->buttonBoxWidget()->nextButton();
-  QPushButton* finishButton = workflowWidget->buttonBoxWidget()->goToButtons().first();
   Q_ASSERT(backButton);
   Q_ASSERT(nextButton);
+
+#ifndef QT_NO_DEBUG
+  QPushButton* finishButton = workflowWidget->buttonBoxWidget()->goToButtons().first();
   Q_ASSERT(finishButton);
+#endif
 
   QList<derivedTestData*> tests;
 

+ 4 - 0
Libs/Widgets/ctkWorkflowButtonBoxWidget.cpp

@@ -111,10 +111,12 @@ void ctkWorkflowButtonBoxWidgetPrivate::setupUi(QWidget * newParent)
 //-----------------------------------------------------------------------------
 void ctkWorkflowButtonBoxWidgetPrivate::updateBackButton(ctkWorkflowStep* currentStep)
 {
+#ifndef QT_NO_DEBUG
   Q_Q(ctkWorkflowButtonBoxWidget);
 
   Q_ASSERT(this->Workflow);
   Q_ASSERT(q->layout());
+#endif
 
   ctkWorkflowAbstractWidgetStep* step = dynamic_cast<ctkWorkflowAbstractWidgetStep*>(currentStep);
 
@@ -153,10 +155,12 @@ void ctkWorkflowButtonBoxWidgetPrivate::updateBackButton(ctkWorkflowStep* curren
 // This will change for branching workflows, to look more like updateGoToButtons()
 void ctkWorkflowButtonBoxWidgetPrivate::updateNextButton(ctkWorkflowStep* currentStep)
 {
+#ifndef QT_NO_DEBUG
   Q_Q(ctkWorkflowButtonBoxWidget);
 
   Q_ASSERT(this->Workflow);
   Q_ASSERT(q->layout());
+#endif
 
   ctkWorkflowAbstractWidgetStep* step = dynamic_cast<ctkWorkflowAbstractWidgetStep*>(currentStep);