瀏覽代碼

Rename macro CTK_{GET,SET}_CXX into CTK_{GET,SET}_CPP

Jean-Christophe Fillion-Robin 14 年之前
父節點
當前提交
f63fe98803

+ 2 - 2
Libs/Core/Testing/Cpp/ctkExampleDerivedWorkflowStep.cpp

@@ -99,6 +99,6 @@ void ctkExampleDerivedWorkflowStep::onExit(
 }
 
 //-----------------------------------------------------------------------------
-CTK_GET_CXX(ctkExampleDerivedWorkflowStep, int, numberOfTimesRanOnEntry, numberOfTimesRanOnEntry);
-CTK_GET_CXX(ctkExampleDerivedWorkflowStep, int, numberOfTimesRanOnExit, numberOfTimesRanOnExit);
+CTK_GET_CPP(ctkExampleDerivedWorkflowStep, int, numberOfTimesRanOnEntry, numberOfTimesRanOnEntry);
+CTK_GET_CPP(ctkExampleDerivedWorkflowStep, int, numberOfTimesRanOnExit, numberOfTimesRanOnExit);
 

+ 2 - 2
Libs/Core/Testing/Cpp/ctkExampleWorkflowStepUsingSignalsAndSlots.cpp

@@ -108,6 +108,6 @@ void ctkExampleWorkflowStepUsingSignalsAndSlots::onExit(const ctkWorkflowStep* g
 }
 
 //-----------------------------------------------------------------------------
-CTK_GET_CXX(ctkExampleWorkflowStepUsingSignalsAndSlots, int, numberOfTimesRanOnEntry, numberOfTimesRanOnEntry);
-CTK_GET_CXX(ctkExampleWorkflowStepUsingSignalsAndSlots, int, numberOfTimesRanOnExit, numberOfTimesRanOnExit);
+CTK_GET_CPP(ctkExampleWorkflowStepUsingSignalsAndSlots, int, numberOfTimesRanOnEntry, numberOfTimesRanOnEntry);
+CTK_GET_CPP(ctkExampleWorkflowStepUsingSignalsAndSlots, int, numberOfTimesRanOnExit, numberOfTimesRanOnExit);
 

+ 2 - 2
Libs/Core/ctkBinaryFileDescriptor.cpp

@@ -160,8 +160,8 @@ ctkBinaryFileDescriptor::~ctkBinaryFileDescriptor()
 }
 
 // --------------------------------------------------------------------------
-CTK_GET_CXX(ctkBinaryFileDescriptor, QString, fileName, FileName);
-CTK_SET_CXX(ctkBinaryFileDescriptor, const QString&, setFileName, FileName);
+CTK_GET_CPP(ctkBinaryFileDescriptor, QString, fileName, FileName);
+CTK_SET_CPP(ctkBinaryFileDescriptor, const QString&, setFileName, FileName);
 
 // --------------------------------------------------------------------------
 bool ctkBinaryFileDescriptor::isLoaded() const

+ 2 - 2
Libs/Core/ctkPimpl.h

@@ -82,7 +82,7 @@ macro.
  * the name of the public class (PUB), the type of the argument to return (_TYPE),
  * the name of the getter(_NAME) and the name of the variable in the Private class(_VARNAME).
  */
-#define CTK_SET_CXX(PUB, _TYPE, _NAME, _VARNAME)    \
+#define CTK_SET_CPP(PUB, _TYPE, _NAME, _VARNAME)    \
   void PUB::_NAME(_TYPE var)                        \
   {                                                 \
     Q_D(PUB);                                       \
@@ -96,7 +96,7 @@ macro.
  * the name of the public class (PUB), the type of the argument to return (_TYPE),
  * the name of the setter(_NAME) and the name of the variable in the Private class(_VARNAME).
  */
-#define CTK_GET_CXX(PUB, _TYPE, _NAME, _VARNAME)   \
+#define CTK_GET_CPP(PUB, _TYPE, _NAME, _VARNAME)   \
   _TYPE PUB::_NAME()const                          \
   {                                                \
     Q_D(const PUB);                                \

+ 3 - 3
Libs/Core/ctkWorkflow.cpp

@@ -888,9 +888,9 @@ bool ctkWorkflow::hasStep(const QString& id)const
 }
 
 // --------------------------------------------------------------------------
-CTK_GET_CXX(ctkWorkflow, ctkWorkflowStep*, initialStep, InitialStep);
-CTK_SET_CXX(ctkWorkflow, ctkWorkflowStep*, setInitialStep, InitialStep);
-CTK_GET_CXX(ctkWorkflow, ctkWorkflowStep*, currentStep, CurrentStep);
+CTK_GET_CPP(ctkWorkflow, ctkWorkflowStep*, initialStep, InitialStep);
+CTK_SET_CPP(ctkWorkflow, ctkWorkflowStep*, setInitialStep, InitialStep);
+CTK_GET_CPP(ctkWorkflow, ctkWorkflowStep*, currentStep, CurrentStep);
 
 // --------------------------------------------------------------------------
 void ctkWorkflow::start()

+ 20 - 20
Libs/Core/ctkWorkflowStep.cpp

@@ -138,44 +138,44 @@ ctkWorkflowStep::~ctkWorkflowStep()
 }
 
 // --------------------------------------------------------------------------
-CTK_GET_CXX(ctkWorkflowStep, ctkWorkflow*, workflow, Workflow);
-CTK_SET_CXX(ctkWorkflowStep, ctkWorkflow*, setWorkflow, Workflow);
+CTK_GET_CPP(ctkWorkflowStep, ctkWorkflow*, workflow, Workflow);
+CTK_SET_CPP(ctkWorkflowStep, ctkWorkflow*, setWorkflow, Workflow);
 
 // --------------------------------------------------------------------------
-CTK_GET_CXX(ctkWorkflowStep, QString, id, Id);
-CTK_SET_CXX(ctkWorkflowStep, const QString&, setId, Id);
+CTK_GET_CPP(ctkWorkflowStep, QString, id, Id);
+CTK_SET_CPP(ctkWorkflowStep, const QString&, setId, Id);
 
 // --------------------------------------------------------------------------
-CTK_GET_CXX(ctkWorkflowStep, QString, name, Name);
-CTK_SET_CXX(ctkWorkflowStep, const QString&, setName, Name);
+CTK_GET_CPP(ctkWorkflowStep, QString, name, Name);
+CTK_SET_CPP(ctkWorkflowStep, const QString&, setName, Name);
 
 // --------------------------------------------------------------------------
-CTK_GET_CXX(ctkWorkflowStep, QString, description, Description);
-CTK_SET_CXX(ctkWorkflowStep, const QString&, setDescription, Description);
+CTK_GET_CPP(ctkWorkflowStep, QString, description, Description);
+CTK_SET_CPP(ctkWorkflowStep, const QString&, setDescription, Description);
 
 // --------------------------------------------------------------------------
-CTK_GET_CXX(ctkWorkflowStep, QString, statusText, StatusText);
-CTK_SET_CXX(ctkWorkflowStep, const QString&, setStatusText, StatusText);
+CTK_GET_CPP(ctkWorkflowStep, QString, statusText, StatusText);
+CTK_SET_CPP(ctkWorkflowStep, const QString&, setStatusText, StatusText);
 
 // --------------------------------------------------------------------------
-CTK_GET_CXX(ctkWorkflowStep, bool, hasValidateCommand, HasValidateCommand);
-CTK_SET_CXX(ctkWorkflowStep, bool, setHasValidateCommand, HasValidateCommand);
+CTK_GET_CPP(ctkWorkflowStep, bool, hasValidateCommand, HasValidateCommand);
+CTK_SET_CPP(ctkWorkflowStep, bool, setHasValidateCommand, HasValidateCommand);
 
 // --------------------------------------------------------------------------
-CTK_GET_CXX(ctkWorkflowStep, bool, hasOnEntryCommand, HasOnEntryCommand);
-CTK_SET_CXX(ctkWorkflowStep, bool, setHasOnEntryCommand, HasOnEntryCommand);
+CTK_GET_CPP(ctkWorkflowStep, bool, hasOnEntryCommand, HasOnEntryCommand);
+CTK_SET_CPP(ctkWorkflowStep, bool, setHasOnEntryCommand, HasOnEntryCommand);
 
 // --------------------------------------------------------------------------
-CTK_GET_CXX(ctkWorkflowStep, bool, hasOnExitCommand, HasOnExitCommand);
-CTK_SET_CXX(ctkWorkflowStep, bool, setHasOnExitCommand, HasOnExitCommand);
+CTK_GET_CPP(ctkWorkflowStep, bool, hasOnExitCommand, HasOnExitCommand);
+CTK_SET_CPP(ctkWorkflowStep, bool, setHasOnExitCommand, HasOnExitCommand);
 
 // --------------------------------------------------------------------------
-CTK_GET_CXX(ctkWorkflowStep, QState*, processingState, ProcessingState);
-CTK_GET_CXX(ctkWorkflowStep, QState*, validationState, ValidationState);
+CTK_GET_CPP(ctkWorkflowStep, QState*, processingState, ProcessingState);
+CTK_GET_CPP(ctkWorkflowStep, QState*, validationState, ValidationState);
 
 // --------------------------------------------------------------------------
-CTK_GET_CXX(ctkWorkflowStep, ctkWorkflowIntrastepTransition*, validationTransition, ValidationTransition);
-CTK_GET_CXX(ctkWorkflowStep, ctkWorkflowIntrastepTransition*,
+CTK_GET_CPP(ctkWorkflowStep, ctkWorkflowIntrastepTransition*, validationTransition, ValidationTransition);
+CTK_GET_CPP(ctkWorkflowStep, ctkWorkflowIntrastepTransition*,
             validationFailedTransition, ValidationFailedTransition);
 
 // --------------------------------------------------------------------------

+ 18 - 18
Libs/Visualization/VTK/Widgets/ctkVTKRenderView.cpp

@@ -278,10 +278,10 @@ void ctkVTKRenderView::forceRender()
 }
 
 //----------------------------------------------------------------------------
-CTK_GET_CXX(ctkVTKRenderView, vtkRenderWindow*, renderWindow, RenderWindow);
+CTK_GET_CPP(ctkVTKRenderView, vtkRenderWindow*, renderWindow, RenderWindow);
 
 //----------------------------------------------------------------------------
-CTK_GET_CXX(ctkVTKRenderView, vtkRenderWindowInteractor*, interactor, CurrentInteractor);
+CTK_GET_CPP(ctkVTKRenderView, vtkRenderWindowInteractor*, interactor, CurrentInteractor);
 
 //----------------------------------------------------------------------------
 void ctkVTKRenderView::setInteractor(vtkRenderWindowInteractor* newInteractor)
@@ -386,14 +386,14 @@ void ctkVTKRenderView::resetCamera()
 }
 
 //----------------------------------------------------------------------------
-CTK_GET_CXX(ctkVTKRenderView, vtkRenderer*, renderer, Renderer);
+CTK_GET_CPP(ctkVTKRenderView, vtkRenderer*, renderer, Renderer);
 
 //----------------------------------------------------------------------------
-CTK_SET_CXX(ctkVTKRenderView, bool, setRenderEnabled, RenderEnabled);
-CTK_GET_CXX(ctkVTKRenderView, bool, renderEnabled, RenderEnabled);
+CTK_SET_CPP(ctkVTKRenderView, bool, setRenderEnabled, RenderEnabled);
+CTK_GET_CPP(ctkVTKRenderView, bool, renderEnabled, RenderEnabled);
 
 //----------------------------------------------------------------------------
-CTK_GET_CXX(ctkVTKRenderView, int, pitchRollYawIncrement, PitchRollYawIncrement);
+CTK_GET_CPP(ctkVTKRenderView, int, pitchRollYawIncrement, PitchRollYawIncrement);
 
 //----------------------------------------------------------------------------
 void ctkVTKRenderView::setPitchRollYawIncrement(int newPitchRollYawIncrement)
@@ -403,7 +403,7 @@ void ctkVTKRenderView::setPitchRollYawIncrement(int newPitchRollYawIncrement)
 }
 
 //----------------------------------------------------------------------------
-CTK_GET_CXX(ctkVTKRenderView, ctkVTKRenderView::RotateDirection, pitchDirection, PitchDirection);
+CTK_GET_CPP(ctkVTKRenderView, ctkVTKRenderView::RotateDirection, pitchDirection, PitchDirection);
 
 //----------------------------------------------------------------------------
 void ctkVTKRenderView::setPitchDirection(ctkVTKRenderView::RotateDirection newPitchDirection)
@@ -418,7 +418,7 @@ void ctkVTKRenderView::setPitchDirection(ctkVTKRenderView::RotateDirection newPi
 }
 
 //----------------------------------------------------------------------------
-CTK_GET_CXX(ctkVTKRenderView, ctkVTKRenderView::RotateDirection, rollDirection, RollDirection);
+CTK_GET_CPP(ctkVTKRenderView, ctkVTKRenderView::RotateDirection, rollDirection, RollDirection);
 
 //----------------------------------------------------------------------------
 void ctkVTKRenderView::setRollDirection(ctkVTKRenderView::RotateDirection newRollDirection)
@@ -433,7 +433,7 @@ void ctkVTKRenderView::setRollDirection(ctkVTKRenderView::RotateDirection newRol
 }
 
 //----------------------------------------------------------------------------
-CTK_GET_CXX(ctkVTKRenderView, ctkVTKRenderView::RotateDirection, yawDirection, YawDirection);
+CTK_GET_CPP(ctkVTKRenderView, ctkVTKRenderView::RotateDirection, yawDirection, YawDirection);
 
 //----------------------------------------------------------------------------
 void ctkVTKRenderView::setYawDirection(ctkVTKRenderView::RotateDirection newYawDirection)
@@ -448,8 +448,8 @@ void ctkVTKRenderView::setYawDirection(ctkVTKRenderView::RotateDirection newYawD
 }
 
 //----------------------------------------------------------------------------
-CTK_GET_CXX(ctkVTKRenderView, ctkVTKRenderView::RotateDirection, spinDirection, SpinDirection);
-CTK_SET_CXX(ctkVTKRenderView, ctkVTKRenderView::RotateDirection, setSpinDirection, SpinDirection);
+CTK_GET_CPP(ctkVTKRenderView, ctkVTKRenderView::RotateDirection, spinDirection, SpinDirection);
+CTK_SET_CPP(ctkVTKRenderView, ctkVTKRenderView::RotateDirection, setSpinDirection, SpinDirection);
 
 //----------------------------------------------------------------------------
 void ctkVTKRenderView::pitch()
@@ -499,7 +499,7 @@ void ctkVTKRenderView::setSpinEnabled(bool enabled)
 }
 
 //----------------------------------------------------------------------------
-CTK_GET_CXX(ctkVTKRenderView, bool, spinEnabled, SpinEnabled);
+CTK_GET_CPP(ctkVTKRenderView, bool, spinEnabled, SpinEnabled);
 
 //----------------------------------------------------------------------------
 void ctkVTKRenderView::setSpinIncrement(int newSpinIncrement)
@@ -509,7 +509,7 @@ void ctkVTKRenderView::setSpinIncrement(int newSpinIncrement)
 }
 
 //----------------------------------------------------------------------------
-CTK_GET_CXX(ctkVTKRenderView, int, spinIncrement, SpinIncrement);
+CTK_GET_CPP(ctkVTKRenderView, int, spinIncrement, SpinIncrement);
 
 //----------------------------------------------------------------------------
 void ctkVTKRenderView::setAnimationIntervalMs(int newAnimationIntervalMs)
@@ -519,7 +519,7 @@ void ctkVTKRenderView::setAnimationIntervalMs(int newAnimationIntervalMs)
 }
 
 //----------------------------------------------------------------------------
-CTK_GET_CXX(ctkVTKRenderView, int, animationIntervalMs, AnimationIntervalMs);
+CTK_GET_CPP(ctkVTKRenderView, int, animationIntervalMs, AnimationIntervalMs);
 
 //----------------------------------------------------------------------------
 void ctkVTKRenderView::setRockEnabled(bool enabled)
@@ -536,7 +536,7 @@ void ctkVTKRenderView::setRockEnabled(bool enabled)
 }
 
 //----------------------------------------------------------------------------
-CTK_GET_CXX(ctkVTKRenderView, bool, rockEnabled, RockEnabled);
+CTK_GET_CPP(ctkVTKRenderView, bool, rockEnabled, RockEnabled);
 
 //----------------------------------------------------------------------------
 void ctkVTKRenderView::setRockLength(int newRockLength)
@@ -546,7 +546,7 @@ void ctkVTKRenderView::setRockLength(int newRockLength)
 }
 
 //----------------------------------------------------------------------------
-CTK_GET_CXX(ctkVTKRenderView, int, rockLength, RockLength);
+CTK_GET_CPP(ctkVTKRenderView, int, rockLength, RockLength);
 
 //----------------------------------------------------------------------------
 void ctkVTKRenderView::setRockIncrement(int newRockIncrement)
@@ -556,7 +556,7 @@ void ctkVTKRenderView::setRockIncrement(int newRockIncrement)
 }
 
 //----------------------------------------------------------------------------
-CTK_GET_CXX(ctkVTKRenderView, int, rockIncrement, RockIncrement);
+CTK_GET_CPP(ctkVTKRenderView, int, rockIncrement, RockIncrement);
 
 //----------------------------------------------------------------------------
 void ctkVTKRenderView::setZoomFactor(double newZoomFactor)
@@ -566,7 +566,7 @@ void ctkVTKRenderView::setZoomFactor(double newZoomFactor)
 }
 
 //----------------------------------------------------------------------------
-CTK_GET_CXX(ctkVTKRenderView, double, zoomFactor, ZoomFactor);
+CTK_GET_CPP(ctkVTKRenderView, double, zoomFactor, ZoomFactor);
 
 //----------------------------------------------------------------------------
 void ctkVTKRenderView::zoomIn()

+ 4 - 4
Libs/Visualization/VTK/Widgets/ctkVTKSliceView.cpp

@@ -130,15 +130,15 @@ void ctkVTKSliceView::forceRender()
 }
 
 //----------------------------------------------------------------------------
-CTK_GET_CXX(ctkVTKSliceView, vtkRenderWindow*, renderWindow, RenderWindow);
+CTK_GET_CPP(ctkVTKSliceView, vtkRenderWindow*, renderWindow, RenderWindow);
 
 //----------------------------------------------------------------------------
-CTK_GET_CXX(ctkVTKSliceView, vtkLightBoxRendererManager*,
+CTK_GET_CPP(ctkVTKSliceView, vtkLightBoxRendererManager*,
             lightBoxRendererManager, LightBoxRendererManager);
 
 //----------------------------------------------------------------------------
-CTK_SET_CXX(ctkVTKSliceView, bool, setRenderEnabled, RenderEnabled);
-CTK_GET_CXX(ctkVTKSliceView, bool, renderEnabled, RenderEnabled);
+CTK_SET_CPP(ctkVTKSliceView, bool, setRenderEnabled, RenderEnabled);
+CTK_GET_CPP(ctkVTKSliceView, bool, renderEnabled, RenderEnabled);
 
 //----------------------------------------------------------------------------
 vtkRenderWindowInteractor* ctkVTKSliceView::interactor() const

+ 6 - 6
Libs/Widgets/Testing/Cpp/ctkExampleDerivedWorkflowWidgetStep.cpp

@@ -80,12 +80,12 @@ ctkExampleDerivedWorkflowWidgetStep::~ctkExampleDerivedWorkflowWidgetStep()
 }
 
 //-----------------------------------------------------------------------------
-CTK_GET_CXX(ctkExampleDerivedWorkflowWidgetStep, QLabel*, label, label);
-CTK_SET_CXX(ctkExampleDerivedWorkflowWidgetStep, QLabel*, setLabel, label);
-CTK_GET_CXX(ctkExampleDerivedWorkflowWidgetStep, QLineEdit*, lineEdit, lineEdit);
-CTK_SET_CXX(ctkExampleDerivedWorkflowWidgetStep, QLineEdit*, setLineEdit, lineEdit);
-CTK_GET_CXX(ctkExampleDerivedWorkflowWidgetStep, int, numberOfTimesRanOnEntry, numberOfTimesRanOnEntry);
-CTK_GET_CXX(ctkExampleDerivedWorkflowWidgetStep, int, numberOfTimesRanOnExit, numberOfTimesRanOnExit);
+CTK_GET_CPP(ctkExampleDerivedWorkflowWidgetStep, QLabel*, label, label);
+CTK_SET_CPP(ctkExampleDerivedWorkflowWidgetStep, QLabel*, setLabel, label);
+CTK_GET_CPP(ctkExampleDerivedWorkflowWidgetStep, QLineEdit*, lineEdit, lineEdit);
+CTK_SET_CPP(ctkExampleDerivedWorkflowWidgetStep, QLineEdit*, setLineEdit, lineEdit);
+CTK_GET_CPP(ctkExampleDerivedWorkflowWidgetStep, int, numberOfTimesRanOnEntry, numberOfTimesRanOnEntry);
+CTK_GET_CPP(ctkExampleDerivedWorkflowWidgetStep, int, numberOfTimesRanOnExit, numberOfTimesRanOnExit);
 
 //-----------------------------------------------------------------------------
 void ctkExampleDerivedWorkflowWidgetStep::onEntry(const ctkWorkflowStep* comingFrom, const ctkWorkflowInterstepTransition::InterstepTransitionType transitionType)

+ 8 - 8
Libs/Widgets/Testing/Cpp/ctkExampleWorkflowWidgetStepUsingSignalsAndSlots.cpp

@@ -83,14 +83,14 @@ ctkExampleWorkflowWidgetStepUsingSignalsAndSlots::~ctkExampleWorkflowWidgetStepU
 }
 
 //-----------------------------------------------------------------------------
-CTK_GET_CXX(ctkExampleWorkflowWidgetStepUsingSignalsAndSlots, QWidget*, widget, widget);
-CTK_SET_CXX(ctkExampleWorkflowWidgetStepUsingSignalsAndSlots, QWidget*, setWidget, widget);
-CTK_GET_CXX(ctkExampleWorkflowWidgetStepUsingSignalsAndSlots, QLabel*, label, label);
-CTK_SET_CXX(ctkExampleWorkflowWidgetStepUsingSignalsAndSlots, QLabel*, setLabel, label);
-CTK_GET_CXX(ctkExampleWorkflowWidgetStepUsingSignalsAndSlots, QLineEdit*, lineEdit, lineEdit);
-CTK_SET_CXX(ctkExampleWorkflowWidgetStepUsingSignalsAndSlots, QLineEdit*, setLineEdit, lineEdit);
-CTK_GET_CXX(ctkExampleWorkflowWidgetStepUsingSignalsAndSlots, int, numberOfTimesRanOnEntry, numberOfTimesRanOnEntry);
-CTK_GET_CXX(ctkExampleWorkflowWidgetStepUsingSignalsAndSlots, int, numberOfTimesRanOnExit, numberOfTimesRanOnExit);
+CTK_GET_CPP(ctkExampleWorkflowWidgetStepUsingSignalsAndSlots, QWidget*, widget, widget);
+CTK_SET_CPP(ctkExampleWorkflowWidgetStepUsingSignalsAndSlots, QWidget*, setWidget, widget);
+CTK_GET_CPP(ctkExampleWorkflowWidgetStepUsingSignalsAndSlots, QLabel*, label, label);
+CTK_SET_CPP(ctkExampleWorkflowWidgetStepUsingSignalsAndSlots, QLabel*, setLabel, label);
+CTK_GET_CPP(ctkExampleWorkflowWidgetStepUsingSignalsAndSlots, QLineEdit*, lineEdit, lineEdit);
+CTK_SET_CPP(ctkExampleWorkflowWidgetStepUsingSignalsAndSlots, QLineEdit*, setLineEdit, lineEdit);
+CTK_GET_CPP(ctkExampleWorkflowWidgetStepUsingSignalsAndSlots, int, numberOfTimesRanOnEntry, numberOfTimesRanOnEntry);
+CTK_GET_CPP(ctkExampleWorkflowWidgetStepUsingSignalsAndSlots, int, numberOfTimesRanOnExit, numberOfTimesRanOnExit);
 
 //-----------------------------------------------------------------------------
 void ctkExampleWorkflowWidgetStepUsingSignalsAndSlots::onEntry(

+ 2 - 2
Libs/Widgets/ctkAddRemoveComboBox.cpp

@@ -200,7 +200,7 @@ void ctkAddRemoveComboBox::setEmptyText(const QString& text)
 }
 
 // --------------------------------------------------------------------------
-CTK_GET_CXX(ctkAddRemoveComboBox, QString, emptyText, EmptyText);
+CTK_GET_CPP(ctkAddRemoveComboBox, QString, emptyText, EmptyText);
 
 // --------------------------------------------------------------------------
 void ctkAddRemoveComboBox::onRowsInserted(const QModelIndex & _parent, int start, int end)
@@ -394,7 +394,7 @@ int ctkAddRemoveComboBox::count()const
 }
 
 // --------------------------------------------------------------------------
-CTK_GET_CXX(ctkAddRemoveComboBox, bool, empty, HasEmptyItem);
+CTK_GET_CPP(ctkAddRemoveComboBox, bool, empty, HasEmptyItem);
 
 // --------------------------------------------------------------------------
 void ctkAddRemoveComboBox::setCurrentIndex(int index)

+ 5 - 5
Libs/Widgets/ctkMatrixWidget.cpp

@@ -298,11 +298,11 @@ void ctkMatrixWidget::setEditable(bool newEditable)
 }
 
 // --------------------------------------------------------------------------
-CTK_GET_CXX(ctkMatrixWidget, double, minimum, Minimum);
-CTK_GET_CXX(ctkMatrixWidget, double, maximum, Maximum);
-CTK_GET_CXX(ctkMatrixWidget, double, singleStep, SingleStep);
-CTK_SET_CXX(ctkMatrixWidget, double, setSingleStep, SingleStep);
-CTK_GET_CXX(ctkMatrixWidget, int, decimals, Decimals);
+CTK_GET_CPP(ctkMatrixWidget, double, minimum, Minimum);
+CTK_GET_CPP(ctkMatrixWidget, double, maximum, Maximum);
+CTK_GET_CPP(ctkMatrixWidget, double, singleStep, SingleStep);
+CTK_SET_CPP(ctkMatrixWidget, double, setSingleStep, SingleStep);
+CTK_GET_CPP(ctkMatrixWidget, int, decimals, Decimals);
 
 // --------------------------------------------------------------------------
 void ctkMatrixWidget::setMinimum(double newMinimum)

+ 18 - 18
Libs/Widgets/ctkWorkflowAbstractWidgetStep.cpp

@@ -104,25 +104,25 @@ ctkWorkflowAbstractWidgetStep::~ctkWorkflowAbstractWidgetStep()
 }
 
 //-----------------------------------------------------------------------------
-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(ctkWorkflowAbstractWidgetStep, ctkWorkflowAbstractWidgetStep::ButtonBoxHints,
+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, QString, backButtonText, backButtonText);
+CTK_SET_CPP(ctkWorkflowAbstractWidgetStep, const QString&, setBackButtonText, backButtonText);
+CTK_GET_CPP(ctkWorkflowAbstractWidgetStep, QString, nextButtonText, nextButtonText);
+CTK_SET_CPP(ctkWorkflowAbstractWidgetStep, const QString&, setNextButtonText, nextButtonText);
+// CTK_GET_CPP(ctkWorkflowAbstractWidgetStep, QList<QString>, finishButtonTexts, finishButtonTexts);
+// CTK_SET_CPP(ctkWorkflowAbstractWidgetStep, QList<QString>, setFinishButtonTexts, finishButtonTexts);
+//CTK_GET_CPP(ctkWorkflowAbstractWidgetStep, bool, hasButtonBoxWidget, hasButtonBoxWidget);
+//CTK_SET_CPP(ctkWorkflowAbstractWidgetStep, bool, setHasButtonBoxWidget, hasButtonBoxWidget);
+CTK_GET_CPP(ctkWorkflowAbstractWidgetStep, QIcon, icon, icon);
+CTK_SET_CPP(ctkWorkflowAbstractWidgetStep, const QIcon&, setIcon, icon);
+
+//-----------------------------------------------------------------------------
+CTK_GET_CPP(ctkWorkflowAbstractWidgetStep, ctkWorkflowAbstractWidgetStep::ButtonBoxHints,
             buttonBoxHints, ButtonBoxHints);
-CTK_SET_CXX(ctkWorkflowAbstractWidgetStep, ctkWorkflowAbstractWidgetStep::ButtonBoxHints,
+CTK_SET_CPP(ctkWorkflowAbstractWidgetStep, ctkWorkflowAbstractWidgetStep::ButtonBoxHints,
             setButtonBoxHints, ButtonBoxHints);
 
 //-----------------------------------------------------------------------------

+ 7 - 7
Libs/Widgets/ctkWorkflowButtonBoxWidget.cpp

@@ -315,7 +315,7 @@ void ctkWorkflowButtonBoxWidget::setWorkflow(ctkWorkflow * newWorkflow)
 }
 
 //-----------------------------------------------------------------------------
-CTK_GET_CXX(ctkWorkflowButtonBoxWidget, QString, backButtonDefaultText,
+CTK_GET_CPP(ctkWorkflowButtonBoxWidget, QString, backButtonDefaultText,
             BackButtonDefaultText);
 
 //-----------------------------------------------------------------------------
@@ -334,7 +334,7 @@ void ctkWorkflowButtonBoxWidget::setBackButtonDefaultText(const QString& default
 }
 
 //-----------------------------------------------------------------------------
-CTK_GET_CXX(ctkWorkflowButtonBoxWidget, QString, nextButtonDefaultText,
+CTK_GET_CPP(ctkWorkflowButtonBoxWidget, QString, nextButtonDefaultText,
             NextButtonDefaultText);
 
 //-----------------------------------------------------------------------------
@@ -353,11 +353,11 @@ void ctkWorkflowButtonBoxWidget::setNextButtonDefaultText(const QString& default
 }
 
 //-----------------------------------------------------------------------------
-CTK_GET_CXX(ctkWorkflowButtonBoxWidget, ctkWorkflow*, workflow, Workflow);
-CTK_GET_CXX(ctkWorkflowButtonBoxWidget, QPushButton*, backButton, BackButton);
-CTK_GET_CXX(ctkWorkflowButtonBoxWidget, QBoxLayout::Direction, direction, Direction);
-CTK_GET_CXX(ctkWorkflowButtonBoxWidget, bool, hideInvalidButtons, HideInvalidButtons);
-CTK_SET_CXX(ctkWorkflowButtonBoxWidget, bool, setHideInvalidButtons, HideInvalidButtons);
+CTK_GET_CPP(ctkWorkflowButtonBoxWidget, ctkWorkflow*, workflow, Workflow);
+CTK_GET_CPP(ctkWorkflowButtonBoxWidget, QPushButton*, backButton, BackButton);
+CTK_GET_CPP(ctkWorkflowButtonBoxWidget, QBoxLayout::Direction, direction, Direction);
+CTK_GET_CPP(ctkWorkflowButtonBoxWidget, bool, hideInvalidButtons, HideInvalidButtons);
+CTK_SET_CPP(ctkWorkflowButtonBoxWidget, bool, setHideInvalidButtons, HideInvalidButtons);
 
 //-----------------------------------------------------------------------------
 // TODO will be list of next buttons for branching workflow

+ 3 - 3
Libs/Widgets/ctkWorkflowGroupBox.cpp

@@ -91,9 +91,9 @@ ctkWorkflowGroupBox::~ctkWorkflowGroupBox()
 }
 
 // --------------------------------------------------------------------------
-CTK_GET_CXX(ctkWorkflowGroupBox, bool, hideWidgetsOfNonCurrentSteps, HideWidgetsOfNonCurrentSteps);
-CTK_SET_CXX(ctkWorkflowGroupBox, bool, setHideWidgetsOfNonCurrentSteps, HideWidgetsOfNonCurrentSteps);
-CTK_GET_CXX(ctkWorkflowGroupBox, QLayout*, clientAreaLayout, ClientAreaLayout);
+CTK_GET_CPP(ctkWorkflowGroupBox, bool, hideWidgetsOfNonCurrentSteps, HideWidgetsOfNonCurrentSteps);
+CTK_SET_CPP(ctkWorkflowGroupBox, bool, setHideWidgetsOfNonCurrentSteps, HideWidgetsOfNonCurrentSteps);
+CTK_GET_CPP(ctkWorkflowGroupBox, QLayout*, clientAreaLayout, ClientAreaLayout);
 
 // --------------------------------------------------------------------------
 void ctkWorkflowGroupBox::updateGroupBox(ctkWorkflowStep* currentStep)

+ 5 - 5
Libs/Widgets/ctkWorkflowWidget.cpp

@@ -90,11 +90,11 @@ ctkWorkflowWidget::~ctkWorkflowWidget()
 }
 
 // --------------------------------------------------------------------------
-CTK_GET_CXX(ctkWorkflowWidget, ctkWorkflow*, workflow, Workflow);
-CTK_GET_CXX(ctkWorkflowWidget, ctkWorkflowGroupBox*, workflowGroupBox, WorkflowGroupBox);
-CTK_GET_CXX(ctkWorkflowWidget, bool, showButtonBoxWidget, ShowButtonBoxWidget);
-CTK_SET_CXX(ctkWorkflowWidget, bool, setShowButtonBoxWidget, ShowButtonBoxWidget);
-CTK_GET_CXX(ctkWorkflowWidget, ctkWorkflowButtonBoxWidget*, buttonBoxWidget, ButtonBoxWidget);
+CTK_GET_CPP(ctkWorkflowWidget, ctkWorkflow*, workflow, Workflow);
+CTK_GET_CPP(ctkWorkflowWidget, ctkWorkflowGroupBox*, workflowGroupBox, WorkflowGroupBox);
+CTK_GET_CPP(ctkWorkflowWidget, bool, showButtonBoxWidget, ShowButtonBoxWidget);
+CTK_SET_CPP(ctkWorkflowWidget, bool, setShowButtonBoxWidget, ShowButtonBoxWidget);
+CTK_GET_CPP(ctkWorkflowWidget, ctkWorkflowButtonBoxWidget*, buttonBoxWidget, ButtonBoxWidget);
 
 // --------------------------------------------------------------------------
 void ctkWorkflowWidget::setWorkflow(ctkWorkflow* newWorkflow)