浏览代码

ctkWorkflowAbstractWidgetStep - has{Show, Create}UICommand are boolean

Jean-Christophe Fillion-Robin 14 年之前
父节点
当前提交
553984f2fa

+ 6 - 6
Libs/Widgets/ctkWorkflowAbstractWidgetStep.cpp

@@ -93,8 +93,8 @@ ctkWorkflowAbstractWidgetStep::ctkWorkflowAbstractWidgetStep(ctkWorkflow* newWor
   , d_ptr(new ctkWorkflowAbstractWidgetStepPrivate(*this))
 {
   Q_D(ctkWorkflowAbstractWidgetStep);
-  d->hasShowUserInterfaceCommand = 0;
-  d->hasCreateUserInterfaceCommand = 0;
+  d->hasShowUserInterfaceCommand = false;
+  d->hasCreateUserInterfaceCommand = false;
   d->ButtonBoxHints = ctkWorkflowAbstractWidgetStep::NoHints;
 }
 
@@ -104,10 +104,10 @@ ctkWorkflowAbstractWidgetStep::~ctkWorkflowAbstractWidgetStep()
 }
 
 //-----------------------------------------------------------------------------
-CTK_GET_CPP(ctkWorkflowAbstractWidgetStep, int, hasShowUserInterfaceCommand, hasShowUserInterfaceCommand);
-CTK_SET_CPP(ctkWorkflowAbstractWidgetStep, int, setHasShowUserInterfaceCommand, hasShowUserInterfaceCommand);
-CTK_GET_CPP(ctkWorkflowAbstractWidgetStep, int, hasCreateUserInterfaceCommand, hasCreateUserInterfaceCommand);
-CTK_SET_CPP(ctkWorkflowAbstractWidgetStep, int, setHasCreateUserInterfaceCommand, hasCreateUserInterfaceCommand);
+CTK_GET_CPP(ctkWorkflowAbstractWidgetStep, bool, hasShowUserInterfaceCommand, hasShowUserInterfaceCommand);
+CTK_SET_CPP(ctkWorkflowAbstractWidgetStep, bool, setHasShowUserInterfaceCommand, hasShowUserInterfaceCommand);
+CTK_GET_CPP(ctkWorkflowAbstractWidgetStep, bool, hasCreateUserInterfaceCommand, hasCreateUserInterfaceCommand);
+CTK_SET_CPP(ctkWorkflowAbstractWidgetStep, bool, setHasCreateUserInterfaceCommand, hasCreateUserInterfaceCommand);
 CTK_GET_CPP(ctkWorkflowAbstractWidgetStep, QString, backButtonText, backButtonText);
 CTK_SET_CPP(ctkWorkflowAbstractWidgetStep, const QString&, setBackButtonText, backButtonText);
 CTK_GET_CPP(ctkWorkflowAbstractWidgetStep, QString, nextButtonText, nextButtonText);

+ 4 - 4
Libs/Widgets/ctkWorkflowAbstractWidgetStep.h

@@ -103,14 +103,14 @@ public:
   /// Set/get whether a showUserInterfaceCommand has been provided in
   /// a separate QObject (see method 2 described for
   /// showUserInterface())
-  virtual int hasShowUserInterfaceCommand()const;
-  virtual void setHasShowUserInterfaceCommand(int flag);
+  virtual bool hasShowUserInterfaceCommand()const;
+  virtual void setHasShowUserInterfaceCommand(bool flag);
 
   /// Set/get whether a createUserInterfaceCommand has been provided in
   /// a separate QObject (see method 2 described for
   /// createUserInterface())
-  virtual int hasCreateUserInterfaceCommand()const;
-  virtual void setHasCreateUserInterfaceCommand(int flag);
+  virtual bool hasCreateUserInterfaceCommand()const;
+  virtual void setHasCreateUserInterfaceCommand(bool flag);
 
 protected:
 

+ 2 - 2
Libs/Widgets/ctkWorkflowAbstractWidgetStep_p.h

@@ -49,8 +49,8 @@ protected:
   QList<ctkWorkflowStep*> finishStepsToHaveButtonsInStepArea;
 
   // int hasPopulateStepWidgetsListCommand;
-  int hasShowUserInterfaceCommand;
-  int hasCreateUserInterfaceCommand;
+  bool hasShowUserInterfaceCommand;
+  bool hasCreateUserInterfaceCommand;
 
   // names for the buttons
   QString backButtonText;