Merge topic 'workflow_widget'

  COMP: Rename ctkAbstractWorkflowWidgetStep into ctkWorkflowAbstractWidgetStep

Libs/Widgets/CMakeLists.txt

@@ -12,9 +12,9 @@ SET(KIT_include_directories
 
 # Source files
 SET(KIT_SRCS
-  ctkAbstractWorkflowWidgetStep.cpp
-  ctkAbstractWorkflowWidgetStep.h
-  ctkAbstractWorkflowWidgetStep_p.h
+  ctkWorkflowAbstractWidgetStep.cpp
+  ctkWorkflowAbstractWidgetStep.h
+  ctkWorkflowAbstractWidgetStep_p.h
   ctkActionsWidget.cpp
   ctkActionsWidget.h
   ctkAddRemoveComboBox.cpp
@@ -99,7 +99,7 @@ SET(KIT_SRCS
 
 # Headers that should run through moc
 SET(KIT_MOC_SRCS
-  ctkAbstractWorkflowWidgetStep_p.h
+  ctkWorkflowAbstractWidgetStep_p.h
   ctkActionsWidget.h
   ctkAddRemoveComboBox.h
   ctkButtonGroup.h

Libs/Widgets/Testing/Cpp/ctkExampleUseOfWorkflowWidgetUsingSignalsAndSlots.cpp

@@ -126,12 +126,12 @@ int ctkExampleUseOfWorkflowWidgetUsingSignalsAndSlots(int argc, char * argv [] )
   QObject::connect(qObject3, SIGNAL(onExitComplete()), workflow, SLOT(processingAfterOnExit()));
 
   // use the qObjects for populating the stepWidgetsList
-  QObject::connect(testStep1->ctkAbstractWorkflowWidgetStepQObject(), SIGNAL(invokeCreateUserInterfaceCommand()), qObject1, SLOT(createUserInterface()));
-  QObject::connect(qObject1, SIGNAL(createUserInterfaceComplete()), testStep1->ctkAbstractWorkflowWidgetStepQObject(), SIGNAL(showUserInterfaceComplete()));
-  QObject::connect(testStep2->ctkAbstractWorkflowWidgetStepQObject(), SIGNAL(invokeCreateUserInterfaceCommand()), qObject2, SLOT(createUserInterface()));
-  QObject::connect(qObject2, SIGNAL(createUserInterfaceComplete()), testStep2->ctkAbstractWorkflowWidgetStepQObject(), SIGNAL(showUserInterfaceComplete()));
-  QObject::connect(testStep3->ctkAbstractWorkflowWidgetStepQObject(), SIGNAL(invokeCreateUserInterfaceCommand()), qObject3, SLOT(createUserInterface()));
-  QObject::connect(qObject3, SIGNAL(createUserInterfaceComplete()), testStep3->ctkAbstractWorkflowWidgetStepQObject(), SIGNAL(showUserInterfaceComplete()));
+  QObject::connect(testStep1->ctkWorkflowAbstractWidgetStepQObject(), SIGNAL(invokeCreateUserInterfaceCommand()), qObject1, SLOT(createUserInterface()));
+  QObject::connect(qObject1, SIGNAL(createUserInterfaceComplete()), testStep1->ctkWorkflowAbstractWidgetStepQObject(), SIGNAL(showUserInterfaceComplete()));
+  QObject::connect(testStep2->ctkWorkflowAbstractWidgetStepQObject(), SIGNAL(invokeCreateUserInterfaceCommand()), qObject2, SLOT(createUserInterface()));
+  QObject::connect(qObject2, SIGNAL(createUserInterfaceComplete()), testStep2->ctkWorkflowAbstractWidgetStepQObject(), SIGNAL(showUserInterfaceComplete()));
+  QObject::connect(testStep3->ctkWorkflowAbstractWidgetStepQObject(), SIGNAL(invokeCreateUserInterfaceCommand()), qObject3, SLOT(createUserInterface()));
+  QObject::connect(qObject3, SIGNAL(createUserInterfaceComplete()), testStep3->ctkWorkflowAbstractWidgetStepQObject(), SIGNAL(showUserInterfaceComplete()));
 
   testStep1->setHasValidateCommand(1);
   testStep1->setHasOnEntryCommand(1);

Libs/Widgets/Testing/Cpp/ctkWorkflowWidgetTest1.cpp

@@ -43,7 +43,7 @@
 #include <iostream>
 
 //-----------------------------------------------------------------------------
-bool buttonClickTest(QApplication& app, int defaultTime, ctkAbstractWorkflowWidgetStep* currentStep, QWidget* shownStepArea, QLineEdit* shownLineEdit, QLabel* shownLabel, QWidget* hiddenStepArea, QLineEdit* hiddenLineEdit, QLabel* hiddenLabel, ctkWorkflow* workflow, ctkWorkflowWidget* workflowWidget, QPushButton* backButton, QPushButton* nextButton, QPushButton* finishButton1=0, QPushButton* finishButton2=0)
+bool buttonClickTest(QApplication& app, int defaultTime, ctkWorkflowAbstractWidgetStep* currentStep, QWidget* shownStepArea, QLineEdit* shownLineEdit, QLabel* shownLabel, QWidget* hiddenStepArea, QLineEdit* hiddenLineEdit, QLabel* hiddenLabel, ctkWorkflow* workflow, ctkWorkflowWidget* workflowWidget, QPushButton* backButton, QPushButton* nextButton, QPushButton* finishButton1=0, QPushButton* finishButton2=0)
 {
   QTimer::singleShot(defaultTime, &app, SLOT(quit()));
   app.exec();

Libs/Widgets/Testing/Cpp/ctkWorkflowWidgetTest2.cpp

@@ -43,7 +43,7 @@
 #include <iostream>
 
 //-----------------------------------------------------------------------------
-bool buttonClickTestSignalSlot(QApplication& app, int defaultTime, ctkAbstractWorkflowWidgetStep* currentStep, QWidget* shownStepArea, QLineEdit* shownLineEdit, QLabel* shownLabel, QWidget* hiddenStepArea, QLineEdit* hiddenLineEdit, QLabel* hiddenLabel, ctkWorkflow* workflow, ctkWorkflowWidget* workflowWidget, QPushButton* backButton, QPushButton* nextButton, QPushButton* finishButton1=0, QPushButton* finishButton2=0)
+bool buttonClickTestSignalSlot(QApplication& app, int defaultTime, ctkWorkflowAbstractWidgetStep* currentStep, QWidget* shownStepArea, QLineEdit* shownLineEdit, QLabel* shownLabel, QWidget* hiddenStepArea, QLineEdit* hiddenLineEdit, QLabel* hiddenLabel, ctkWorkflow* workflow, ctkWorkflowWidget* workflowWidget, QPushButton* backButton, QPushButton* nextButton, QPushButton* finishButton1=0, QPushButton* finishButton2=0)
 {
   QTimer::singleShot(defaultTime, &app, SLOT(quit()));
   app.exec();
@@ -611,10 +611,10 @@ int ctkWorkflowWidgetTest2(int argc, char * argv [] )
   QObject::connect(qObject2, SIGNAL(onExitComplete()), workflow, SLOT(processingAfterOnExit()));
 
   // use the qObjects for populating the stepWidgetsList
-  QObject::connect(step1->ctkAbstractWorkflowWidgetStepQObject(), SIGNAL(invokeCreateUserInterfaceCommand()), qObject1, SLOT(createUserInterface()));
-  QObject::connect(qObject1, SIGNAL(createUserInterfaceComplete()), step1->ctkAbstractWorkflowWidgetStepQObject(), SIGNAL(showUserInterfaceComplete()));
-  QObject::connect(step2->ctkAbstractWorkflowWidgetStepQObject(), SIGNAL(invokeCreateUserInterfaceCommand()), qObject2, SLOT(createUserInterface()));
-  QObject::connect(qObject2, SIGNAL(createUserInterfaceComplete()), step2->ctkAbstractWorkflowWidgetStepQObject(), SIGNAL(showUserInterfaceComplete()));
+  QObject::connect(step1->ctkWorkflowAbstractWidgetStepQObject(), SIGNAL(invokeCreateUserInterfaceCommand()), qObject1, SLOT(createUserInterface()));
+  QObject::connect(qObject1, SIGNAL(createUserInterfaceComplete()), step1->ctkWorkflowAbstractWidgetStepQObject(), SIGNAL(showUserInterfaceComplete()));
+  QObject::connect(step2->ctkWorkflowAbstractWidgetStepQObject(), SIGNAL(invokeCreateUserInterfaceCommand()), qObject2, SLOT(createUserInterface()));
+  QObject::connect(qObject2, SIGNAL(createUserInterfaceComplete()), step2->ctkWorkflowAbstractWidgetStepQObject(), SIGNAL(showUserInterfaceComplete()));
 
   step1->setHasValidateCommand(1);
   step2->setHasValidateCommand(1);
@@ -682,8 +682,8 @@ int ctkWorkflowWidgetTest2(int argc, char * argv [] )
   QObject::connect(qObject3, SIGNAL(onExitComplete()), workflow, SLOT(processingAfterOnExit()));
 
   // use the qObjects for populating the stepWidgetsList
-  QObject::connect(step3->ctkAbstractWorkflowWidgetStepQObject(), SIGNAL(invokeCreateUserInterfaceCommand()), qObject3, SLOT(createUserInterface()));
-  QObject::connect(qObject3, SIGNAL(createUserInterfaceComplete()), step3->ctkAbstractWorkflowWidgetStepQObject(), SIGNAL(createUserInterfaceComplete()));
+  QObject::connect(step3->ctkWorkflowAbstractWidgetStepQObject(), SIGNAL(invokeCreateUserInterfaceCommand()), qObject3, SLOT(createUserInterface()));
+  QObject::connect(qObject3, SIGNAL(createUserInterfaceComplete()), step3->ctkWorkflowAbstractWidgetStepQObject(), SIGNAL(createUserInterfaceComplete()));
 
   step3->setHasValidateCommand(1);
   step3->setHasOnEntryCommand(1);

Libs/Widgets/ctkAbstractWorkflowWidgetStep.cpp

@@ -26,8 +26,8 @@
 #include <QIcon>
 
 // CTK includes
-#include "ctkAbstractWorkflowWidgetStep.h"
-#include "ctkAbstractWorkflowWidgetStep_p.h"
+#include "ctkWorkflowAbstractWidgetStep.h"
+#include "ctkWorkflowAbstractWidgetStep_p.h"
 #include "ctkWorkflowWidget.h"
 #include "ctkWorkflow.h"
 //#include "ctkWorkflowButtonBoxWidget.h"
@@ -37,14 +37,14 @@
 #include <iostream>
 
 //-----------------------------------------------------------------------------
-static ctkLogger logger("org.commontk.libs.widgets.ctkAbstractWorkflowWidgetStep");
+static ctkLogger logger("org.commontk.libs.widgets.ctkWorkflowAbstractWidgetStep");
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-// ctkAbstractWorkflowWidgetStepPrivate methods
+// ctkWorkflowAbstractWidgetStepPrivate methods
 
 //-----------------------------------------------------------------------------
-ctkAbstractWorkflowWidgetStepPrivate::ctkAbstractWorkflowWidgetStepPrivate()
+ctkWorkflowAbstractWidgetStepPrivate::ctkWorkflowAbstractWidgetStepPrivate()
 {
 //  this->buttonBoxWidget = 0;
 //  this->hasButtonBoxWidget = false;
@@ -54,73 +54,73 @@ ctkAbstractWorkflowWidgetStepPrivate::ctkAbstractWorkflowWidgetStepPrivate()
 }
 
 //-----------------------------------------------------------------------------
-void ctkAbstractWorkflowWidgetStepPrivate::invokeShowUserInterfaceCommandInternal()const
+void ctkWorkflowAbstractWidgetStepPrivate::invokeShowUserInterfaceCommandInternal()const
 {
   emit invokeShowUserInterfaceCommand();
 }
 
 //-----------------------------------------------------------------------------
-void ctkAbstractWorkflowWidgetStepPrivate::showUserInterfaceCompleteInternal()const
+void ctkWorkflowAbstractWidgetStepPrivate::showUserInterfaceCompleteInternal()const
 {
   emit showUserInterfaceComplete();
 }
 
 //-----------------------------------------------------------------------------
-void ctkAbstractWorkflowWidgetStepPrivate::showUserInterface()
+void ctkWorkflowAbstractWidgetStepPrivate::showUserInterface()
 {
-  CTK_P(ctkAbstractWorkflowWidgetStep);
+  CTK_P(ctkWorkflowAbstractWidgetStep);
   p->showUserInterface();
 }
 
 //-----------------------------------------------------------------------------
-void ctkAbstractWorkflowWidgetStepPrivate::invokeCreateUserInterfaceCommandInternal()const
+void ctkWorkflowAbstractWidgetStepPrivate::invokeCreateUserInterfaceCommandInternal()const
 {
   emit invokeCreateUserInterfaceCommand();
 }
 
 //-----------------------------------------------------------------------------
-void ctkAbstractWorkflowWidgetStepPrivate::createUserInterfaceCompleteInternal()const
+void ctkWorkflowAbstractWidgetStepPrivate::createUserInterfaceCompleteInternal()const
 {
   emit createUserInterfaceComplete();
 }
 
 //-----------------------------------------------------------------------------
-// ctkAbstractWorkflowWidgetStep methods
+// ctkWorkflowAbstractWidgetStep methods
 
 //-----------------------------------------------------------------------------
-ctkAbstractWorkflowWidgetStep::ctkAbstractWorkflowWidgetStep(ctkWorkflow* newWorkflow, const QString& newId) : Superclass(newWorkflow, newId)
+ctkWorkflowAbstractWidgetStep::ctkWorkflowAbstractWidgetStep(ctkWorkflow* newWorkflow, const QString& newId) : Superclass(newWorkflow, newId)
 {
-  CTK_INIT_PRIVATE(ctkAbstractWorkflowWidgetStep);
-  CTK_D(ctkAbstractWorkflowWidgetStep);
+  CTK_INIT_PRIVATE(ctkWorkflowAbstractWidgetStep);
+  CTK_D(ctkWorkflowAbstractWidgetStep);
   d->hasShowUserInterfaceCommand = 0;
   d->hasCreateUserInterfaceCommand = 0;
   d->ButtonBoxHints = Self::NoHints;
 }
 
 //-----------------------------------------------------------------------------
-CTK_GET_CXX(ctkAbstractWorkflowWidgetStep, int, hasShowUserInterfaceCommand, hasShowUserInterfaceCommand);
-CTK_SET_CXX(ctkAbstractWorkflowWidgetStep, int, setHasShowUserInterfaceCommand, hasShowUserInterfaceCommand);
-CTK_GET_CXX(ctkAbstractWorkflowWidgetStep, int, hasCreateUserInterfaceCommand, hasCreateUserInterfaceCommand);
-CTK_SET_CXX(ctkAbstractWorkflowWidgetStep, int, setHasCreateUserInterfaceCommand, hasCreateUserInterfaceCommand);
-CTK_GET_CXX(ctkAbstractWorkflowWidgetStep, QString, backButtonText, backButtonText);
-CTK_SET_CXX(ctkAbstractWorkflowWidgetStep, const QString&, setBackButtonText, backButtonText);
-CTK_GET_CXX(ctkAbstractWorkflowWidgetStep, QString, nextButtonText, nextButtonText);
-CTK_SET_CXX(ctkAbstractWorkflowWidgetStep, const QString&, setNextButtonText, nextButtonText);
-// CTK_GET_CXX(ctkAbstractWorkflowWidgetStep, QList<QString>, finishButtonTexts, finishButtonTexts);
-// CTK_SET_CXX(ctkAbstractWorkflowWidgetStep, QList<QString>, setFinishButtonTexts, finishButtonTexts);
-//CTK_GET_CXX(ctkAbstractWorkflowWidgetStep, bool, hasButtonBoxWidget, hasButtonBoxWidget);
-//CTK_SET_CXX(ctkAbstractWorkflowWidgetStep, bool, setHasButtonBoxWidget, hasButtonBoxWidget);
-CTK_GET_CXX(ctkAbstractWorkflowWidgetStep, QIcon, icon, icon);
-CTK_SET_CXX(ctkAbstractWorkflowWidgetStep, const QIcon&, setIcon, icon);
+CTK_GET_CXX(ctkWorkflowAbstractWidgetStep, int, hasShowUserInterfaceCommand, hasShowUserInterfaceCommand);
+CTK_SET_CXX(ctkWorkflowAbstractWidgetStep, int, setHasShowUserInterfaceCommand, hasShowUserInterfaceCommand);
+CTK_GET_CXX(ctkWorkflowAbstractWidgetStep, int, hasCreateUserInterfaceCommand, hasCreateUserInterfaceCommand);
+CTK_SET_CXX(ctkWorkflowAbstractWidgetStep, int, setHasCreateUserInterfaceCommand, hasCreateUserInterfaceCommand);
+CTK_GET_CXX(ctkWorkflowAbstractWidgetStep, QString, backButtonText, backButtonText);
+CTK_SET_CXX(ctkWorkflowAbstractWidgetStep, const QString&, setBackButtonText, backButtonText);
+CTK_GET_CXX(ctkWorkflowAbstractWidgetStep, QString, nextButtonText, nextButtonText);
+CTK_SET_CXX(ctkWorkflowAbstractWidgetStep, const QString&, setNextButtonText, nextButtonText);
+// CTK_GET_CXX(ctkWorkflowAbstractWidgetStep, QList<QString>, finishButtonTexts, finishButtonTexts);
+// CTK_SET_CXX(ctkWorkflowAbstractWidgetStep, QList<QString>, setFinishButtonTexts, finishButtonTexts);
+//CTK_GET_CXX(ctkWorkflowAbstractWidgetStep, bool, hasButtonBoxWidget, hasButtonBoxWidget);
+//CTK_SET_CXX(ctkWorkflowAbstractWidgetStep, bool, setHasButtonBoxWidget, hasButtonBoxWidget);
+CTK_GET_CXX(ctkWorkflowAbstractWidgetStep, QIcon, icon, icon);
+CTK_SET_CXX(ctkWorkflowAbstractWidgetStep, const QIcon&, setIcon, icon);
 
 //-----------------------------------------------------------------------------
-CTK_GET_CXX(ctkAbstractWorkflowWidgetStep, ctkAbstractWorkflowWidgetStep::ButtonBoxHints,
+CTK_GET_CXX(ctkWorkflowAbstractWidgetStep, ctkWorkflowAbstractWidgetStep::ButtonBoxHints,
             buttonBoxHints, ButtonBoxHints);
-CTK_SET_CXX(ctkAbstractWorkflowWidgetStep, ctkAbstractWorkflowWidgetStep::ButtonBoxHints,
+CTK_SET_CXX(ctkWorkflowAbstractWidgetStep, ctkWorkflowAbstractWidgetStep::ButtonBoxHints,
             setButtonBoxHints, ButtonBoxHints);
 
 //-----------------------------------------------------------------------------
-// void ctkAbstractWorkflowWidgetStep::setFinishButtonText(const QString& name)
+// void ctkWorkflowAbstractWidgetStep::setFinishButtonText(const QString& name)
 // {
 //   QList<QString> names;
 //   names << name;
@@ -128,9 +128,9 @@ CTK_SET_CXX(ctkAbstractWorkflowWidgetStep, ctkAbstractWorkflowWidgetStep::Button
 // }
 
 // //-----------------------------------------------------------------------------
-// ctkWorkflowButtonBoxWidget* ctkAbstractWorkflowWidgetStep::buttonBoxWidget()
+// ctkWorkflowButtonBoxWidget* ctkWorkflowAbstractWidgetStep::buttonBoxWidget()
 // {
-//   CTK_D(ctkAbstractWorkflowWidgetStep);
+//   CTK_D(ctkWorkflowAbstractWidgetStep);
 
 //   if (!d->hasButtonBoxWidget)
 //     {
@@ -150,9 +150,9 @@ CTK_SET_CXX(ctkAbstractWorkflowWidgetStep, ctkAbstractWorkflowWidgetStep::Button
 // }
 
 //-----------------------------------------------------------------------------
-void ctkAbstractWorkflowWidgetStep::showUserInterface()
+void ctkWorkflowAbstractWidgetStep::showUserInterface()
 {
-  CTK_D(ctkAbstractWorkflowWidgetStep);
+  CTK_D(ctkWorkflowAbstractWidgetStep);
 
   // use the user's showUserInterfaceCommand if given
   if (d->hasShowUserInterfaceCommand)
@@ -182,36 +182,36 @@ void ctkAbstractWorkflowWidgetStep::showUserInterface()
 }
 
 // --------------------------------------------------------------------------
-QObject* ctkAbstractWorkflowWidgetStep::ctkAbstractWorkflowWidgetStepQObject()
+QObject* ctkWorkflowAbstractWidgetStep::ctkWorkflowAbstractWidgetStepQObject()
 {
-  CTK_D(ctkAbstractWorkflowWidgetStep);
+  CTK_D(ctkWorkflowAbstractWidgetStep);
   return d;
 }
 
 //-----------------------------------------------------------------------------
-void ctkAbstractWorkflowWidgetStep::invokeShowUserInterfaceCommand()const
+void ctkWorkflowAbstractWidgetStep::invokeShowUserInterfaceCommand()const
 {
-  CTK_D(const ctkAbstractWorkflowWidgetStep);
+  CTK_D(const ctkWorkflowAbstractWidgetStep);
   d->invokeShowUserInterfaceCommandInternal();
 }
 
 //-----------------------------------------------------------------------------
-void ctkAbstractWorkflowWidgetStep::showUserInterfaceComplete()const
+void ctkWorkflowAbstractWidgetStep::showUserInterfaceComplete()const
 {
-  CTK_D(const ctkAbstractWorkflowWidgetStep);
+  CTK_D(const ctkWorkflowAbstractWidgetStep);
   d->showUserInterfaceCompleteInternal();
 }
 
 //-----------------------------------------------------------------------------
-void ctkAbstractWorkflowWidgetStep::invokeCreateUserInterfaceCommand()const
+void ctkWorkflowAbstractWidgetStep::invokeCreateUserInterfaceCommand()const
 {
-  CTK_D(const ctkAbstractWorkflowWidgetStep);
+  CTK_D(const ctkWorkflowAbstractWidgetStep);
   d->invokeCreateUserInterfaceCommandInternal();
 }
 
 //-----------------------------------------------------------------------------
-void ctkAbstractWorkflowWidgetStep::createUserInterfaceComplete()const
+void ctkWorkflowAbstractWidgetStep::createUserInterfaceComplete()const
 {
-  CTK_D(const ctkAbstractWorkflowWidgetStep);
+  CTK_D(const ctkWorkflowAbstractWidgetStep);
   d->createUserInterfaceCompleteInternal();
 }

Libs/Widgets/ctkAbstractWorkflowWidgetStep.h

@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __ctkAbstractWorkflowWidgetStep_h
-#define __ctkAbstractWorkflowWidgetStep_h 
+#ifndef __ctkWorkflowAbstractWidgetStep_h
+#define __ctkWorkflowAbstractWidgetStep_h 
 
 // QT includes
 class QObject;
@@ -36,10 +36,10 @@ class QIcon;
 //class ctkWorkflowButtonBoxWidget;
 class ctkWorkflowGroupBox;
 
-class ctkAbstractWorkflowWidgetStepPrivate;
+class ctkWorkflowAbstractWidgetStepPrivate;
 
 ///
-/// \brief ctkAbstractWorkflowWidgetStep is a convienience class to quickly
+/// \brief ctkWorkflowAbstractWidgetStep is a convienience class to quickly
 /// construct a ctkWorkflowStep with a user interface.
 ///
 /// It embeds a QWidget* stepArea, onto which step-specific widgets can be placed.
@@ -48,15 +48,15 @@ class ctkAbstractWorkflowWidgetStepPrivate;
 /// added with the appropriate signals and slots.
 /// To create a custom step, you can derive from this class and
 /// implement only two functions:
-/// 1) ctkAbstractWorkflowWidgetStep::populateStepWidgetsList(), to define the
+/// 1) ctkWorkflowAbstractWidgetStep::populateStepWidgetsList(), to define the
 /// step-specific widgets;
-/// 2) ctkAbstractWorkflowWidgetStep::validate(const QString&), to validate the processing
+/// 2) ctkWorkflowAbstractWidgetStep::validate(const QString&), to validate the processing
 /// state associated with this step.
 /// For additional customization, you can reimplement
 /// showUserInterface() and hideUserInterface() in derived classes.
 /// \sa showUserInterface() hideUserInterface()
 
-class CTK_WIDGETS_EXPORT ctkAbstractWorkflowWidgetStep : public ctkWorkflowStep
+class CTK_WIDGETS_EXPORT ctkWorkflowAbstractWidgetStep : public ctkWorkflowStep
 {
 public:
 
@@ -71,8 +71,8 @@ public:
   Q_DECLARE_FLAGS(ButtonBoxHints, ButtonBoxHint)
 
   typedef ctkWorkflowStep Superclass;
-  explicit ctkAbstractWorkflowWidgetStep(ctkWorkflow* newWorkflow, const QString& newId);
-  virtual ~ctkAbstractWorkflowWidgetStep(){}
+  explicit ctkWorkflowAbstractWidgetStep(ctkWorkflow* newWorkflow, const QString& newId);
+  virtual ~ctkWorkflowAbstractWidgetStep(){}
 
   /// \brief Override the back button text of any ctkWorkflowButtonBox when this step
   /// is the current step
@@ -95,7 +95,7 @@ public:
   void setIcon(const QIcon& newIcon);
 
   /// Get the QObject associated with this step, to connect signals/slots
-  QObject* ctkAbstractWorkflowWidgetStepQObject();
+  QObject* ctkWorkflowAbstractWidgetStepQObject();
 
   /// Returns the QWidget onto which this step's user interface elements are placed.
   virtual QWidget* stepArea() = 0;
@@ -147,11 +147,11 @@ protected:
   void showUserInterfaceComplete()const;
 
 private:
-  CTK_DECLARE_PRIVATE(ctkAbstractWorkflowWidgetStep);
+  CTK_DECLARE_PRIVATE(ctkWorkflowAbstractWidgetStep);
   friend class ctkWorkflowGroupBox; // For access to showUserInterface()
 };
 
- Q_DECLARE_OPERATORS_FOR_FLAGS(ctkAbstractWorkflowWidgetStep::ButtonBoxHints)
+ Q_DECLARE_OPERATORS_FOR_FLAGS(ctkWorkflowAbstractWidgetStep::ButtonBoxHints)
 
 #endif
 

Libs/Widgets/ctkAbstractWorkflowWidgetStep_p.h

@@ -18,8 +18,8 @@
  
   =========================================================================*/
 
-#ifndef __ctkAbstractWorkflowWidgetStep_p_h
-#define __ctkAbstractWorkflowWidgetStep_p_h
+#ifndef __ctkWorkflowAbstractWidgetStep_p_h
+#define __ctkWorkflowAbstractWidgetStep_p_h
 
 // Qt includes
 #include <QObject>
@@ -28,20 +28,20 @@
 class QWidget;
 
 // CTK includes
-#include "ctkAbstractWorkflowWidgetStep.h"
+#include "ctkWorkflowAbstractWidgetStep.h"
 #include "ctkWorkflowStep_p.h"
 //class ctkWorkflowButtonBoxWidget;
 
 //-----------------------------------------------------------------------------
-class ctkAbstractWorkflowWidgetStepPrivate : public QObject,
-                                             public ctkPrivate<ctkAbstractWorkflowWidgetStep>
+class ctkWorkflowAbstractWidgetStepPrivate : public QObject,
+                                             public ctkPrivate<ctkWorkflowAbstractWidgetStep>
 {
   Q_OBJECT
-  CTK_DECLARE_PUBLIC(ctkAbstractWorkflowWidgetStep);
+  CTK_DECLARE_PUBLIC(ctkWorkflowAbstractWidgetStep);
 
 public:
-  ctkAbstractWorkflowWidgetStepPrivate();
-  ~ctkAbstractWorkflowWidgetStepPrivate(){}
+  ctkWorkflowAbstractWidgetStepPrivate();
+  ~ctkWorkflowAbstractWidgetStepPrivate(){}
 
 protected:
 
@@ -55,7 +55,7 @@ protected:
   QString backButtonText;
   QString nextButtonText;
 
-  ctkAbstractWorkflowWidgetStep::ButtonBoxHints  ButtonBoxHints;
+  ctkWorkflowAbstractWidgetStep::ButtonBoxHints  ButtonBoxHints;
 
   QIcon icon;
 

Libs/Widgets/ctkWorkflowButtonBoxWidget.cpp

@@ -30,7 +30,7 @@
 // CTK includes
 #include "ctkWorkflowButtonBoxWidget.h"
 #include "ctkWorkflowStep.h"
-#include "ctkAbstractWorkflowWidgetStep.h"
+#include "ctkWorkflowAbstractWidgetStep.h"
 #include "ctkWorkflow.h"
 
 // STD includes
@@ -113,7 +113,7 @@ void ctkWorkflowButtonBoxWidgetPrivate::updateBackButton(ctkWorkflowStep* curren
   Q_ASSERT(this->Workflow);
   Q_ASSERT(p->layout());
 
-  ctkAbstractWorkflowWidgetStep* step = dynamic_cast<ctkAbstractWorkflowWidgetStep*>(currentStep);
+  ctkWorkflowAbstractWidgetStep* step = dynamic_cast<ctkWorkflowAbstractWidgetStep*>(currentStep);
 
   // Set the back button text
   QString backButtonText = this->BackButtonDefaultText;
@@ -133,9 +133,9 @@ void ctkWorkflowButtonBoxWidgetPrivate::updateBackButton(ctkWorkflowStep* curren
     if (step)
       {
       this->BackButton->setDisabled(
-          step->buttonBoxHints() & ctkAbstractWorkflowWidgetStep::BackButtonDisabled);
+          step->buttonBoxHints() & ctkWorkflowAbstractWidgetStep::BackButtonDisabled);
       this->BackButton->setHidden(
-          step->buttonBoxHints() & ctkAbstractWorkflowWidgetStep::BackButtonHidden);
+          step->buttonBoxHints() & ctkWorkflowAbstractWidgetStep::BackButtonHidden);
       }
     }
   // Disable the back button if we can't go backward, and optionally hide it
@@ -155,7 +155,7 @@ void ctkWorkflowButtonBoxWidgetPrivate::updateNextButton(ctkWorkflowStep* curren
   Q_ASSERT(this->Workflow);
   Q_ASSERT(p->layout());
 
-  ctkAbstractWorkflowWidgetStep* step = dynamic_cast<ctkAbstractWorkflowWidgetStep*>(currentStep);
+  ctkWorkflowAbstractWidgetStep* step = dynamic_cast<ctkWorkflowAbstractWidgetStep*>(currentStep);
 
   // Set the next button text
   QString nextButtonText = this->NextButtonDefaultText;
@@ -175,9 +175,9 @@ void ctkWorkflowButtonBoxWidgetPrivate::updateNextButton(ctkWorkflowStep* curren
     if (step)
       {
       this->NextButton->setDisabled(
-          step->buttonBoxHints() & ctkAbstractWorkflowWidgetStep::NextButtonDisabled);
+          step->buttonBoxHints() & ctkWorkflowAbstractWidgetStep::NextButtonDisabled);
       this->NextButton->setHidden(
-          step->buttonBoxHints() & ctkAbstractWorkflowWidgetStep::NextButtonHidden);
+          step->buttonBoxHints() & ctkWorkflowAbstractWidgetStep::NextButtonHidden);
       }
     }
   // Disable the next button if we can't go forward, and optionally hide it
@@ -223,7 +223,7 @@ void ctkWorkflowButtonBoxWidgetPrivate::updateGoToButtons(ctkWorkflowStep* curre
       QObject::connect(goToButton, SIGNAL(clicked()), p, SLOT(prepareGoToStep()));
       this->GoToButtonToStepMap[goToButton] = step;
       // if the goTo step has an icon associated with it, then add it to the button
-      if (ctkAbstractWorkflowWidgetStep* wwStep = dynamic_cast<ctkAbstractWorkflowWidgetStep*>(step))
+      if (ctkWorkflowAbstractWidgetStep* wwStep = dynamic_cast<ctkWorkflowAbstractWidgetStep*>(step))
         {
         goToButton->setIcon(wwStep->icon());
         }
@@ -381,9 +381,9 @@ void ctkWorkflowButtonBoxWidget::updateButtons(ctkWorkflowStep* currentStep)
   CTK_D(ctkWorkflowButtonBoxWidget);
 
   // hide aspects of the button bar if specified by the current step
-  if(ctkAbstractWorkflowWidgetStep* currentWidgetStep = dynamic_cast<ctkAbstractWorkflowWidgetStep*>(currentStep))
+  if(ctkWorkflowAbstractWidgetStep* currentWidgetStep = dynamic_cast<ctkWorkflowAbstractWidgetStep*>(currentStep))
     {
-    bool hideButtonBar = currentWidgetStep->buttonBoxHints() & ctkAbstractWorkflowWidgetStep::ButtonBoxHidden;
+    bool hideButtonBar = currentWidgetStep->buttonBoxHints() & ctkWorkflowAbstractWidgetStep::ButtonBoxHidden;
     this->setHidden(hideButtonBar);
     }
 

Libs/Widgets/ctkWorkflowGroupBox.cpp

@@ -26,7 +26,7 @@
 
 // CTK includes
 #include "ctkWorkflowGroupBox.h"
-#include "ctkAbstractWorkflowWidgetStep.h"
+#include "ctkWorkflowAbstractWidgetStep.h"
 #include "ctkFittedTextBrowser.h"
 #include "ui_ctkWorkflowGroupBox.h"
 #include "ctkLogger.h"
@@ -119,7 +119,7 @@ void ctkWorkflowGroupBox::updateGroupBox(ctkWorkflowStep* currentStep)
     }
 
   // disable/hide the previously shown step
-  if (ctkAbstractWorkflowWidgetStep* prevStep = dynamic_cast<ctkAbstractWorkflowWidgetStep*>(d->StepShownPreviously))
+  if (ctkWorkflowAbstractWidgetStep* prevStep = dynamic_cast<ctkWorkflowAbstractWidgetStep*>(d->StepShownPreviously))
     {
     logger.debug(QString("updateClientArea - hiding %1").arg(prevStep->name()));
     if (QWidget* stepArea = prevStep->stepArea())
@@ -132,7 +132,7 @@ void ctkWorkflowGroupBox::updateGroupBox(ctkWorkflowStep* currentStep)
       }
     }
   
-  ctkAbstractWorkflowWidgetStep* currentWidgetStep = dynamic_cast<ctkAbstractWorkflowWidgetStep*>(currentStep);
+  ctkWorkflowAbstractWidgetStep* currentWidgetStep = dynamic_cast<ctkWorkflowAbstractWidgetStep*>(currentStep);
   // show/enable the current step
   if (currentWidgetStep)
     {

Libs/Widgets/ctkWorkflowWidgetStep.cpp

@@ -62,7 +62,7 @@ ctkWorkflowWidgetStepPrivate::ctkWorkflowWidgetStepPrivate()
 
 //-----------------------------------------------------------------------------
 ctkWorkflowWidgetStep::ctkWorkflowWidgetStep(ctkWorkflow* newWorkflow, 
-  const QString& newId, QWidget* newParent) : QWidget(newParent), ctkAbstractWorkflowWidgetStep(newWorkflow, newId)
+  const QString& newId, QWidget* newParent) : QWidget(newParent), ctkWorkflowAbstractWidgetStep(newWorkflow, newId)
 {
   CTK_INIT_PRIVATE(ctkWorkflowWidgetStep);
   CTK_D(ctkWorkflowWidgetStep);
@@ -70,7 +70,7 @@ ctkWorkflowWidgetStep::ctkWorkflowWidgetStep(ctkWorkflow* newWorkflow,
 }
 
 //-----------------------------------------------------------------------------
-ctkWorkflowWidgetStep::ctkWorkflowWidgetStep(QWidget* newParent) : QWidget(newParent), ctkAbstractWorkflowWidgetStep(0, QString())
+ctkWorkflowWidgetStep::ctkWorkflowWidgetStep(QWidget* newParent) : QWidget(newParent), ctkWorkflowAbstractWidgetStep(0, QString())
 {
   CTK_INIT_PRIVATE(ctkWorkflowWidgetStep);
   CTK_D(ctkWorkflowWidgetStep);

Libs/Widgets/ctkWorkflowWidgetStep.h

@@ -31,7 +31,7 @@
 #include "ctkPimpl.h"
 #include "ctkWorkflowStep.h"
 #include "ctkWorkflowTransitions.h"
-#include "ctkAbstractWorkflowWidgetStep.h"
+#include "ctkWorkflowAbstractWidgetStep.h"
 #include "CTKWidgetsExport.h"
 
 class ctkWorkflowWidgetStepPrivate;
@@ -40,12 +40,12 @@ class ctkWorkflowGroupBox;
 class ctkWorkflow;
 
 ///
-/// \brief A concrete implementation of ctkAbstractWorkflowWidgetStep that derives from QWidget.
+/// \brief A concrete implementation of ctkWorkflowAbstractWidgetStep that derives from QWidget.
 
 class ctkWorkflowWidgetStepPlugin;
 
 class CTK_WIDGETS_EXPORT ctkWorkflowWidgetStep : public QWidget,
-                                                 public ctkAbstractWorkflowWidgetStep
+                                                 public ctkWorkflowAbstractWidgetStep
 { 
   Q_OBJECT
   Q_PROPERTY(QString id READ id WRITE setId)
@@ -57,7 +57,7 @@ class CTK_WIDGETS_EXPORT ctkWorkflowWidgetStep : public QWidget,
 
 public:
 
-  typedef ctkAbstractWorkflowWidgetStep Superclass;
+  typedef ctkWorkflowAbstractWidgetStep Superclass;
   explicit ctkWorkflowWidgetStep(ctkWorkflow* newWorkflow, const QString& newId, QWidget* newParent = 0);
   explicit ctkWorkflowWidgetStep(QWidget* newParent = 0);
   virtual ~ctkWorkflowWidgetStep(){};
@@ -66,9 +66,9 @@ public:
 
   //-----------------------------------------------------------------------------
   // To have ButtonBoxHints displayed as a propery in QtDesigner ... 
-  // Since ctkAbstractWorkflowWidgetStep is not a QObject, there is no way to 
-  // add ctkAbstractWorkflowWidgetStep::ButtonBoxHints to the meta object system using 
-  // the QFLAGS(ctkAbstractWorkflowWidgetStep::ButtonBoxHints)
+  // Since ctkWorkflowAbstractWidgetStep is not a QObject, there is no way to 
+  // add ctkWorkflowAbstractWidgetStep::ButtonBoxHints to the meta object system using 
+  // the QFLAGS(ctkWorkflowAbstractWidgetStep::ButtonBoxHints)
   // The following enums, setter and getter serve as proxy for qtdesigner plugin
   // TODO Ideally, the following code should be private ..
   enum ButtonBoxHintForPlugin {