Replaced signals with Q_SIGNALS and slots with Q_SLOTS. Fixes #73.

Applications/ctkEventBusDemo/MainWindow.h

@@ -13,11 +13,11 @@ namespace Ui {
 class ctkEventDemo : public QObject {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void receiveEventSignal(QVariantList l);
     void updateMessageSignal(QString message);
 
-public slots:
+public Q_SLOTS:
     void receiveEvent(QVariantList l);
 };
 
@@ -28,7 +28,7 @@ public:
     MainWindow(ctkEventAdminBus *bus, QWidget *parent = 0);
     ~MainWindow();
 
-public slots:
+public Q_SLOTS:
     void sendEvent();
     void updateMessage(QString message);
     void connectClient();

Applications/ctkExampleHost/ctkHostAppExampleWidget.h

@@ -44,7 +44,7 @@ public:
 
   virtual ~ctkHostAppExampleWidget();
 
-public slots:
+public Q_SLOTS:
 
   void loadButtonClicked();
   void startButtonClicked();

Applications/ctkPluginBrowser/ctkPluginBrowser.h

@@ -44,7 +44,7 @@ public:
 
   ctkPluginBrowser(ctkPluginFramework* framework);
 
-private slots:
+private Q_SLOTS:
 
   void pluginSelected(const QModelIndex& index);
   void pluginDoubleClicked(const QModelIndex& index);

Applications/ctkPluginBrowser/ctkPluginBrowserEditors.h

@@ -41,7 +41,7 @@ private:
 
   QTabWidget tabWidget;
 
-private slots:
+private Q_SLOTS:
 
   void tabCloseRequested(int index);
 };

Applications/ctkPluginBrowser/ctkPluginTableModel.h

@@ -47,7 +47,7 @@ public:
   int columnCount(const QModelIndex& parent = QModelIndex()) const;
   int rowCount(const QModelIndex& parent = QModelIndex()) const;
 
-protected slots:
+protected Q_SLOTS:
 
   void pluginChanged(const ctkPluginEvent& event);
 

Applications/ctkPluginGenerator/ctkPluginGenerator_p.h

@@ -46,7 +46,7 @@ public:
     explicit ctkPluginGenerator(ctkPluginFramework* framework, QWidget *parent = 0);
     ~ctkPluginGenerator();
 
-protected slots:
+protected Q_SLOTS:
 
     void previewClicked();
     void generateClicked();

Applications/ctkSimplePythonShell/ctkSimplePythonQtDecorators.h

@@ -45,7 +45,7 @@ public:
     Q_UNUSED(pythonManager);
     }
 
-public slots:
+public Q_SLOTS:
 
 };
 

Applications/ctkSimplePythonShell/ctkTestWrappedSlot.h

@@ -35,7 +35,7 @@ public:
     this->Value = 0;
     }
 
-public slots:
+public Q_SLOTS:
 
   int value() const { return this->Value; }
   void setValue(int newValue){ this->Value = newValue; }

Applications/ctkSimplePythonShell/ctkTestWrappedVTKSlot.h

@@ -42,7 +42,7 @@ public:
     this->MyTable->Delete();
     }
 
-public slots:
+public Q_SLOTS:
 
   /// Example of slot returning a VTK object
   vtkTable* getTable() const

CMake/ctkScriptWrapPythonQt_Light.cmake

@@ -182,7 +182,7 @@ class PythonQtWrapper_${className} : public QObject
 {
 Q_OBJECT
 public:
-public slots:
+public Q_SLOTS:
   ${className}* new_${className}(${parentClassName}*  parent = 0)
     {
     return new ${className}(parent);
@@ -200,7 +200,7 @@ class Q_DECL_EXPORT PythonQtWrapper_${className} : public QObject
 {
 Q_OBJECT
 public:
-public slots:
+public Q_SLOTS:
   ${className}* new_${className}()
     {
     return new ${className}();

Libs/Core/Testing/Cpp/ctkExampleWorkflowStepUsingSignalsAndSlots.h

@@ -83,7 +83,7 @@ public:
   virtual int numberOfTimesRanOnEntry()const;
   virtual int numberOfTimesRanOnExit()const;
 
-protected slots:
+protected Q_SLOTS:
 
   /// Always returns 1 (validation successful)
   virtual void validate(const QString& desiredBranchId = QString())const;
@@ -98,7 +98,7 @@ protected slots:
   /// Increments the counter numberOfTimesRanOnExit
   virtual void onExit(const ctkWorkflowStep* goingTo, const ctkWorkflowInterstepTransition::InterstepTransitionType transitionType);
 
-signals:
+Q_SIGNALS:
   ///
   /// Signals indicating to the workflow that these processes have
   /// completed

Libs/Core/ctkCallback.h

@@ -67,7 +67,7 @@ public:
   /// Set callback data
   void setCallbackData(void * data);
   
-public slots:
+public Q_SLOTS:
   /// Internally calls the pointer function \a callback.
   virtual void invoke();
   

Libs/Core/ctkCheckableModelHelper.h

@@ -126,7 +126,7 @@ public:
   Qt::CheckState defaultCheckState()const;
   void setDefaultCheckState(Qt::CheckState);
 
-public slots:
+public Q_SLOTS:
   void setCheckState(const QModelIndex& modelIndex, Qt::CheckState checkState);
   ///
   /// Warning, setting the check state automatically set the
@@ -137,7 +137,7 @@ public slots:
   void toggleCheckState(const QModelIndex& modelIndex);
   void toggleHeaderCheckState(int section);
 
-private slots:
+private Q_SLOTS:
   void onHeaderDataChanged(Qt::Orientation orient, int first, int last);
 
   void onDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);

Libs/Core/ctkCorePythonQtDecorators.h

@@ -47,7 +47,7 @@ public:
     PythonQt::self()->registerClass(&ctkWorkflowInterstepTransition::staticMetaObject, "CTKCore");
     }
 
-public slots:
+public Q_SLOTS:
 
   //
   // ctkWorkflowStep

Libs/Core/ctkErrorLogModel.h

@@ -166,11 +166,11 @@ public:
   bool asynchronousLogging()const;
   void setAsynchronousLogging(bool value);
 
-public slots:
+public Q_SLOTS:
   void addEntry(const QDateTime& currentDateTime, const QString& threadId,
                 ctkErrorLogLevel::LogLevel logLevel, const QString& origin, const QString& text);
 
-signals:
+Q_SIGNALS:
   void logLevelFilterChanged();
 
 protected:
@@ -209,7 +209,7 @@ public:
   void setTerminalOutput(ctkErrorLogModel::TerminalOutput terminalOutputType,
                          ctkErrorLogTerminalOutput * terminalOutput);
 
-signals:
+Q_SIGNALS:
   void messageHandled(const QDateTime& currentDateTime, const QString& threadId,
                       ctkErrorLogLevel::LogLevel logLevel, const QString& origin,
                       const QString& text);

Libs/Core/ctkModelTester.h

@@ -123,7 +123,7 @@ public:
   /// Test a persistent model index
   virtual void testPersistentModelIndex(const QPersistentModelIndex& index)const;
 
-protected slots:
+protected Q_SLOTS:
   void onColumnsAboutToBeInserted(const QModelIndex & parent, int start, int end);
   void onColumnsAboutToBeRemoved(const QModelIndex & parent, int start, int end);
   void onColumnsInserted(const QModelIndex & parent, int start, int end);

Libs/Core/ctkTransferFunction.h

@@ -118,7 +118,7 @@ public:
   virtual void setControlPointValue(int index, const QVariant& value)=0;
 
   ctkTransferFunctionRepresentation* representation()const;
-signals:
+Q_SIGNALS:
   void changed();
 protected:
   QScopedPointer<ctkTransferFunctionPrivate> d_ptr;

Libs/Core/ctkTransferFunctionRepresentation.h

@@ -86,7 +86,7 @@ public:
   QColor verticalGradientColor()const;
   void setVerticalGradientColor(QColor verticalGradientColor);
 
-protected slots:
+protected Q_SLOTS:
   virtual void onTransferFunctionChanged();
 
 protected:

Libs/Core/ctkWorkflow.h

@@ -169,7 +169,7 @@ public:
   bool goBackToOriginStepUponSuccess()const;
   void setGoBackToOriginStepUponSuccess(bool flag);
 
-public slots:
+public Q_SLOTS:
 
   /// Use this to trigger evaluation of the processing state of the current step, and subsequent
   /// conditional transition to the next step.
@@ -201,7 +201,7 @@ protected:
   /// \brief Goes to the step from which the attempt to go to the 'goTo' step was initiated
   void goFromGoToStepToStartingStep();
 
-protected slots:
+protected Q_SLOTS:
 
   /// On an attempt to go to the next step, calls the current step's
   /// validate(const QString&) function to validate the processing step.
@@ -214,7 +214,7 @@ protected slots:
   /// \note Must be sent by a ctkWorkflowTransition.
   void performTransitionBetweenSteps();
 
-signals:
+Q_SIGNALS:
   /// Emitted when the current step has changed, after the step's onEntry() has completed.
   /// \note This signal is not emitted in the process of going to a goToStep
   void currentStepChanged(ctkWorkflowStep* currentStep);

Libs/Core/ctkWorkflowStep_p.h

@@ -84,7 +84,7 @@ protected:
   void onExitCompleteInternal()const;
 
 
-signals:
+Q_SIGNALS:
   void invokeValidateCommand(const QString& desiredBranchId)const;
 
   void validationComplete(bool validationSuceeded, const QString& branchId)const;

Libs/Core/ctkWorkflow_p.h

@@ -246,7 +246,7 @@ public:
   /// branchId) to the step with the given goalId
   bool pathExistsFromNextStep(const QString& goalId, const QString& branchId)const;
 
-public slots:
+public Q_SLOTS:
 
   /// \brief Workflow processing executed after a step's onEntry function is run.
   void processingAfterOnEntry();

Libs/DICOM/Core/ctkDICOMCorePythonQtDecorators.h

@@ -43,7 +43,7 @@ public:
     {
     }
 
-public slots:
+public Q_SLOTS:
 
   //
   // None yet - refer to other libs for examples

Libs/DICOM/Core/ctkDICOMDatabase.h

@@ -142,7 +142,7 @@ public:
   ///
   QString pathForDataset( DcmDataset *dataset);
 
-signals:
+Q_SIGNALS:
   void databaseChanged();
 
 protected:

Libs/DICOM/Core/ctkDICOMFilterProxyModel.h

@@ -45,7 +45,7 @@ private:
     Q_DECLARE_PRIVATE(ctkDICOMFilterProxyModel);
     Q_DISABLE_COPY(ctkDICOMFilterProxyModel);
 
-public slots:
+public Q_SLOTS:
     void setNameSearchText(const QString& text);
     void setStudySearchText(const QString& text);
     void setSeriesSearchText(const QString& text);

Libs/DICOM/Core/ctkDICOMIndexer.h

@@ -80,7 +80,7 @@ public:
   /// get thumbnail genrator object
   ctkDICOMAbstractThumbnailGenerator* thumbnailGenerator();
 
-signals:
+Q_SIGNALS:
   void foundFilesToIndex(int);
   void indexingFileNumber(int);
   void indexingFilePath(QString);

Libs/DICOM/Core/ctkDICOMModel.h

@@ -73,7 +73,7 @@ public:
   virtual bool setHeaderData ( int section, Qt::Orientation orientation, const QVariant & value, int role = Qt::EditRole );
   // Sorting resets the model because fetched/unfetched items could disappear/appear respectively.
   virtual void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
-public slots:
+public Q_SLOTS:
   virtual void reset();
 protected:
   QScopedPointer<ctkDICOMModelPrivate> d_ptr;

Libs/DICOM/Core/ctkDICOMQuery.h

@@ -89,7 +89,7 @@ public:
   void setFilters(const QMap<QString,QVariant>&);
   QMap<QString,QVariant> filters()const;
 
-signals:
+Q_SIGNALS:
   /// Signal is emitted inside the query() function. It ranges from 0 to 100.
   /// In case of an error, you are assured that the progress value 100 is fired
   void progress(int progress);

Libs/DICOM/Widgets/ctkDICOMAppWidget.h

@@ -49,7 +49,7 @@ public:
   void setSearchWidgetPopUpMode(bool flag);
   bool searchWidgetPopUpMode();
 
-public slots:
+public Q_SLOTS:
   void setDatabaseDirectory(const QString& directory);
   void onAddToDatabase();
 
@@ -61,13 +61,13 @@ public slots:
   void resumeModel();
   void resetModel();
 
-signals:
+Q_SIGNALS:
   /// Emited when directory is changed
   void databaseDirectoryChanged(const QString&);
 
 protected:
     QScopedPointer<ctkDICOMAppWidgetPrivate> d_ptr;
-protected slots:
+protected Q_SLOTS:
     void onImportDirectory(QString directory);
     void onModelSelected(const QModelIndex& index);
 
@@ -106,7 +106,7 @@ protected slots:
     /// To be called after image preview displayed an image
     void onImagePreviewDisplayed(int imageID, int count);
 
-private slots:
+private Q_SLOTS:
 
     void onSearchPopUpButtonClicked();
 

Libs/DICOM/Widgets/ctkDICOMDatasetView.h

@@ -57,14 +57,14 @@ public:
 
   QModelIndex currentImageIndex();
 
-signals:
+Q_SIGNALS:
 
   void requestNextImage();
   void requestPreviousImage();
 
   void imageDisplayed(int imageID, int count);
 
-public slots:
+public Q_SLOTS:
 
   void addImage( const QImage & image );
 

Libs/DICOM/Widgets/ctkDICOMDirectoryListWidget.h

@@ -42,12 +42,12 @@ public:
 
   void setDICOMDatabase(ctkDICOMDatabase*);
 
-public slots:
+public Q_SLOTS:
   void addDirectory();
   void addDirectory(const QString&);
   void removeDirectory();
 
-protected slots:
+protected Q_SLOTS:
   void directorySelectionChanged( const QItemSelection  & selected, const QItemSelection  & deselected );
 
 protected:

Libs/DICOM/Widgets/ctkDICOMImportWidget.h

@@ -40,10 +40,10 @@ public:
 
   void setDICOMDatabase(QSharedPointer<ctkDICOMDatabase> database);
 
-public slots:
+public Q_SLOTS:
   void setTopDirectory(const QString& path);
 
-protected slots:
+protected Q_SLOTS:
   void onTopDirectoryChanged(const QString& path);
 
 protected:

Libs/DICOM/Widgets/ctkDICOMQueryRetrieveWidget.h

@@ -42,13 +42,13 @@ public:
 
   QSharedPointer<ctkDICOMDatabase> retrieveDatabase()const;
 
-public slots:
+public Q_SLOTS:
   void setRetrieveDatabase(QSharedPointer<ctkDICOMDatabase> retrieveDatabase);
   void query();
   void retrieve();
   void cancel();
 
-signals:
+Q_SIGNALS:
   /// Signal emit when studies have been retrieved (user clicked on the
   /// "Retrieve" button) or when the widget is cancelled (user clicked on the
   /// "Cancel" button).
@@ -56,7 +56,7 @@ signals:
   /// Signal to emit when cancel button pressed (after studiesRetrieved is emitted)
   void canceled();
 
-protected slots:
+protected Q_SLOTS:
   void onQueryProgressChanged(int value);
   void updateRetrieveProgress(int value);
 

Libs/DICOM/Widgets/ctkDICOMQueryWidget.h

@@ -46,11 +46,11 @@ private:
   Q_DECLARE_PRIVATE(ctkDICOMQueryWidget);
   Q_DISABLE_COPY(ctkDICOMQueryWidget);
 
-signals:
+Q_SIGNALS:
   /// This signal is emitted when any of the search parameters changed.
   void parameterChanged();
 
-protected slots:
+protected Q_SLOTS:
   void startTimer();
 };
 

Libs/DICOM/Widgets/ctkDICOMServerNodeWidget.h

@@ -62,7 +62,7 @@ public:
   /// Return the row index added into the table
   int addServerNode(const QMap<QString, QVariant>& parameters);
 
-public slots:
+public Q_SLOTS:
   /// Add an empty server node and make it current
   /// Return the row index added into the table
   int addServerNode();
@@ -72,7 +72,7 @@ public slots:
   void readSettings();
   void saveSettings();
 
-protected slots:
+protected Q_SLOTS:
   void updateRemoveButtonEnableState();
 
 protected:

Libs/DICOM/Widgets/ctkDICOMThumbnailListWidget.h

@@ -44,7 +44,7 @@ private:
   Q_DECLARE_PRIVATE(ctkDICOMThumbnailListWidget);
   Q_DISABLE_COPY(ctkDICOMThumbnailListWidget);
 
-public slots:
+public Q_SLOTS:
   void onModelSelected(const QModelIndex& index);
 };
 

Libs/DICOM/Widgets/ctkDICOMWidgetsPythonQtDecorators.h

@@ -43,7 +43,7 @@ public:
     {
     }
 
-public slots:
+public Q_SLOTS:
 
   //
   // None yet - refer to other libs for examples

Libs/PluginFramework/Testing/ConfigAdminTest/ctkConfigurationAdminTestSuite_p.h

@@ -41,7 +41,7 @@ public:
 
   ctkConfigurationAdminTestSuite(ctkPluginContext* pc, long cmPluginId);
 
-private slots:
+private Q_SLOTS:
 
   void init();
   void cleanup();

Libs/PluginFramework/Testing/ConfigAdminTest/ctkConfigurationListenerTestSuite_p.h

@@ -61,7 +61,7 @@ public:
 
   ctkConfigurationListenerTestSuite(ctkPluginContext* pc, long cmPluginId);
 
-private slots:
+private Q_SLOTS:
 
   void init();
   void cleanup();

Libs/PluginFramework/Testing/ConfigAdminTest/ctkConfigurationPluginTestSuite_p.h

@@ -78,7 +78,7 @@ public:
   ctkConfigurationPluginTestSuite(ctkPluginContext* pc, long cmPluginId);
   ~ctkConfigurationPluginTestSuite();
 
-private slots:
+private Q_SLOTS:
 
   void init();
   void cleanup();

Libs/PluginFramework/Testing/ConfigAdminTest/ctkManagedServiceFactoryTestSuite_p.h

@@ -63,7 +63,7 @@ public:
 
   ctkManagedServiceFactoryTestSuite(ctkPluginContext* pc, long cmPluginId);
 
-private slots:
+private Q_SLOTS:
 
   void init();
   void cleanup();

Libs/PluginFramework/Testing/ConfigAdminTest/ctkManagedServiceTestSuite_p.h

@@ -60,7 +60,7 @@ public:
 
   ctkManagedServiceTestSuite(ctkPluginContext* pc, long cmPluginId);
 
-private slots:
+private Q_SLOTS:
 
   void init();
   void cleanup();

Libs/PluginFramework/Testing/EventAdminTest/ctkEAScenario1TestSuite_p.h

@@ -90,7 +90,7 @@ public:
   void cleanup();
   void reset();
 
-public slots:
+public Q_SLOTS:
 
   /**
    * This method takes events from the event admin service.
@@ -131,12 +131,12 @@ public:
 
   void runTest();
 
-protected slots:
+protected Q_SLOTS:
 
   void sendEvents();
   void postEvents();
 
-signals:
+Q_SIGNALS:
 
   void syncSignalEvent(const ctkDictionary&);
   void asyncSignalEvent(const ctkDictionary&);
@@ -179,7 +179,7 @@ public:
    */
   ctkEAScenario1TestSuite(ctkPluginContext* context, long eventPluginId, bool useSignalSlot);
 
-private slots:
+private Q_SLOTS:
 
   void initTestCase();
   void cleanupTestCase();

Libs/PluginFramework/Testing/EventAdminTest/ctkEAScenario2TestSuite_p.h

@@ -115,7 +115,7 @@ public:
 
   void runTest();
 
-protected slots:
+protected Q_SLOTS:
 
   void sendEvents();
   void postEvents();
@@ -154,7 +154,7 @@ public:
    */
   ctkEAScenario2TestSuite(ctkPluginContext* context, long eventPluginId);
 
-private slots:
+private Q_SLOTS:
 
   void initTestCase();
   void cleanupTestCase();

Libs/PluginFramework/Testing/EventAdminTest/ctkEAScenario3TestSuite_p.h

@@ -123,7 +123,7 @@ private:
 
   QThread thread;
 
-protected slots:
+protected Q_SLOTS:
 
   void sendEvents();
   void postEvents();
@@ -168,7 +168,7 @@ public:
    */
   ctkEAScenario3TestSuite(ctkPluginContext* context, long eventPluginId);
 
-private slots:
+private Q_SLOTS:
 
   void initTestCase();
   void cleanupTestCase();

Libs/PluginFramework/Testing/EventAdminTest/ctkEAScenario4TestSuite_p.h

@@ -129,7 +129,7 @@ private:
 
   QThread thread;
 
-protected slots:
+protected Q_SLOTS:
 
   void sendEvents();
   void postEvents();
@@ -176,7 +176,7 @@ public:
    */
   ctkEAScenario4TestSuite(ctkPluginContext* context, long eventPluginId);
 
-private slots:
+private Q_SLOTS:
 
   void initTestCase();
   void cleanupTestCase();

Libs/PluginFramework/Testing/EventAdminTest/ctkEATopicWildcardTestSuite_p.h

@@ -44,7 +44,7 @@ private:
   mutable QReadWriteLock rwlock;
   ctkEvent last;
 
-public slots:
+public Q_SLOTS:
 
   void handleEvent(const ctkEvent& event);
 
@@ -67,11 +67,11 @@ public:
 
   ctkEATopicWildcardTestSuite(ctkPluginContext* pc, long eventPluginId, bool useSignalSlot);
 
-signals:
+Q_SIGNALS:
 
   void syncSignal(const ctkDictionary& event);
 
-private slots:
+private Q_SLOTS:
 
   void initTestCase();
 

Libs/PluginFramework/Testing/FrameworkTest/ctkPluginFrameworkTestSuite_p.h

@@ -42,14 +42,14 @@ public:
 
   ctkPluginFrameworkTestSuite(ctkPluginContext* pc);
 
-protected slots:
+protected Q_SLOTS:
 
   void frameworkListener(const ctkPluginFrameworkEvent& fwEvent);
   void pluginListener(const ctkPluginEvent& event);
   void syncPluginListener(const ctkPluginEvent& event);
   void serviceListener(const ctkServiceEvent& event);
 
-private slots:
+private Q_SLOTS:
 
   void initTestCase();
   void cleanupTestCase();
@@ -126,7 +126,7 @@ public:
   QList<ctkServiceEvent> getEvents() const;
   void clearEvent();
 
-public slots:
+public Q_SLOTS:
 
   void serviceChanged(const ctkServiceEvent& evt);
 

Libs/PluginFramework/Testing/FrameworkTest/ctkServiceListenerTestSuite_p.h

@@ -40,7 +40,7 @@ class ctkServiceListenerTestSuite : public QObject,
 public:
     ctkServiceListenerTestSuite(ctkPluginContext* pc);
 
-private slots:
+private Q_SLOTS:
 
     void initTestCase();
     void cleanupTestCase();
@@ -102,7 +102,7 @@ public:
 
   bool checkEvents(const QList<ctkServiceEvent::Type>& eventTypes);
 
-protected slots:
+protected Q_SLOTS:
 
   void serviceChanged(const ctkServiceEvent& evt);
 

Libs/PluginFramework/Testing/FrameworkTest/ctkServiceTrackerTestSuite_p.h

@@ -41,7 +41,7 @@ class ctkServiceTrackerTestSuite : public QObject,
 public:
     ctkServiceTrackerTestSuite(ctkPluginContext* pc);
 
-private slots:
+private Q_SLOTS:
 
     void initTestCase();
     void cleanupTestCase();
@@ -54,7 +54,7 @@ private slots:
     // service in the stop()-method.
     void runTest();
 
-signals:
+Q_SIGNALS:
 
     void serviceControl(int service, const QString operation, long rank);
 

Libs/PluginFramework/Testing/FrameworkTestPlugins/pluginS_test/ctkTestPluginS_p.h

@@ -47,7 +47,7 @@ public:
 
   ctkTestPluginS(ctkPluginContext* pc);
   
-public slots:
+public Q_SLOTS:
 
   void controlService(int service, const QString& operation, long ranking);
 

Libs/PluginFramework/Testing/MetaTypeTest/ctkMTAttrPasswordTestSuite_p.h

@@ -41,7 +41,7 @@ public:
 
   ctkMTAttrPasswordTestSuite(ctkPluginContext* pc, long mtPluginId);
 
-private slots:
+private Q_SLOTS:
 
   void initTestCase();
   void cleanupTestCase();

Libs/PluginFramework/Testing/MetaTypeTest/ctkMTLocaleTestSuite_p.h

@@ -41,7 +41,7 @@ public:
 
   ctkMTLocaleTestSuite(ctkPluginContext* pc, long mtPluginId);
 
-private slots:
+private Q_SLOTS:
 
   void initTestCase();
   void cleanupTestCase();

Libs/PluginFramework/ctkPluginFrameworkListeners_p.h

@@ -98,14 +98,14 @@ public:
 
   void emitFrameworkEvent(const ctkPluginFrameworkEvent& event);
 
-signals:
+Q_SIGNALS:
 
   void pluginChangedDirect(const ctkPluginEvent& event);
   void pluginChangedQueued(const ctkPluginEvent& event);
 
   void frameworkEvent(const ctkPluginFrameworkEvent& event);
 
-private slots:
+private Q_SLOTS:
 
   void serviceListenerDestroyed(QObject* listener);
 

Libs/PluginFramework/ctkTrackedPluginListener_p.h

@@ -39,7 +39,7 @@ public:
     : QObject(parent)
   {}
 
-public slots:
+public Q_SLOTS:
 
   /**
    * Slot for the <code>ctkPluginTracker</code>

Libs/PluginFramework/ctkTrackedServiceListener_p.h

@@ -39,7 +39,7 @@ public:
     : QObject(parent)
   {}
 
-public slots:
+public Q_SLOTS:
 
   /**
    * Slot connected to service events for the

Libs/Scripting/Python/Core/ctkAbstractPythonManager.h

@@ -84,7 +84,7 @@ public:
   /// \sa pythonInitialized
   bool isPythonInitialized()const;
 
-signals:
+Q_SIGNALS:
 
   /// This signal is emitted after python is pre-initialized. Observers can listen
   /// for this signal to handle additional initialization steps.
@@ -96,7 +96,7 @@ signals:
   /// \sa executeScripts
   void pythonInitialized();
 
-protected slots:
+protected Q_SLOTS:
   void printStderr(const QString&);
   void printStdout(const QString&);
 

Libs/Scripting/Python/Widgets/ctkPythonConsole.h

@@ -90,7 +90,7 @@ public:
   /// Set the string used as secondary prompt
   virtual void setPs2(const QString& newPs2);
 
-public slots:
+public Q_SLOTS:
 
 //  void executeScript(const QString&);
 

Libs/Visualization/VTK/Core/Testing/Cpp/ctkVTKObjectTestHelper.h

@@ -49,17 +49,17 @@ public:
   void resetSlotCalls();
 
   void emitSignalEmitted();
-public slots:
+public Q_SLOTS:
   void onVTKObjectModifiedPublic();
   void deleteConnection();
 
-protected slots:
+protected Q_SLOTS:
   void onVTKObjectModifiedProtected();
 
-private slots:
+private Q_SLOTS:
   void onVTKObjectModifiedPrivate();
 
-signals:
+Q_SIGNALS:
   void signalEmitted();
 
 protected:

Libs/Visualization/VTK/Core/ctkVTKConnection.h

@@ -91,7 +91,7 @@ public:
   void observeDeletion(bool enable);
   bool deletionObserved()const;
   
-signals:
+Q_SIGNALS:
   /// 
   /// The qt signal emited by the VTK Callback
   /// The signal corresponding to the slot will be emited
@@ -108,7 +108,7 @@ signals:
   /// slot
   void isBroke();
 
-protected slots:
+protected Q_SLOTS:
   void vtkObjectDeleted();
   void qobjectDeleted();
 

Libs/Visualization/VTK/Widgets/ctkVTKAbstractMatrixWidget_p.h

@@ -49,7 +49,7 @@ public:
   void setMatrix(vtkMatrix4x4* matrix);
   vtkMatrix4x4* matrix()const;
 
-public slots:
+public Q_SLOTS:
   ///
   /// Triggered upon VTK transform modified event
   void updateMatrix();

Libs/Visualization/VTK/Widgets/ctkVTKAbstractView.h

@@ -52,7 +52,7 @@ public:
   explicit ctkVTKAbstractView(QWidget* parent = 0);
   virtual ~ctkVTKAbstractView();
 
-public slots:
+public Q_SLOTS:
   /// Notify QVTKWidget that the view needs to be rendered.
   /// scheduleRender() respects the desired framerate of the render window,
   /// it won't render the window more than what the current render window

Libs/Visualization/VTK/Widgets/ctkVTKChartView.h

@@ -74,7 +74,7 @@ public:
   virtual void setAxesToChartBounds();
   virtual void boundAxesToChartBounds();
 
-signals:
+Q_SIGNALS:
   void plotAdded(vtkPlot* plot);
   /// Fired anytime the bound of a plot modifies the overal bounds
   void boundsChanged();

Libs/Visualization/VTK/Widgets/ctkVTKDataSetArrayComboBox.h

@@ -49,17 +49,17 @@ public:
   QString currentArrayName()const;
   vtkDataSet* dataSet()const;
 
-public slots:
+public Q_SLOTS:
   void setDataSet(vtkDataSet* dataSet);
   /// The array must exist in the dataset
   void setCurrentArray(vtkDataArray* dataArray);
   /// the array must exist in the dataset
   void setCurrentArray(const QString& name);
 
-signals:
+Q_SIGNALS:
   void currentArrayChanged(vtkDataArray*);
   void currentArrayChanged(const QString& name);
-protected slots:
+protected Q_SLOTS:
   void onCurrentIndexChanged(int);
 protected:
   QScopedPointer<ctkVTKDataSetArrayComboBoxPrivate> d_ptr;

Libs/Visualization/VTK/Widgets/ctkVTKDataSetModel.h

@@ -65,7 +65,7 @@ public:
   QStandardItem* itemFromArray(vtkDataArray* dataArray, int column = 0)const;
   QModelIndexList indexes(vtkDataArray* dataArray)const;
 
-protected slots:
+protected Q_SLOTS:
   void onDataSetModified(vtkObject* dataSet);
   void onArrayModified(vtkObject* dataArray);
   void onItemChanged(QStandardItem * item);

Libs/Visualization/VTK/Widgets/ctkVTKMagnifyView.h

@@ -107,7 +107,7 @@ protected:
   /// enterEvent, leaveEvent and mouseMoveEvent).
   virtual bool eventFilter(QObject *obj, QEvent *event);
 
-signals:
+Q_SIGNALS:
   void enteredObservedWidget(QVTKWidget * widget);
   void leftObservedWidget(QVTKWidget * widget);
 

Libs/Visualization/VTK/Widgets/ctkVTKMagnifyView_p.h

@@ -72,7 +72,7 @@ protected:
     int TimerId;
     };
 
-public slots:
+public Q_SLOTS:
   void pushUpdatePixmapEvent();
   void pushUpdatePixmapEvent(QPointF pos);
   void pushRemovePixmapEvent();

Libs/Visualization/VTK/Widgets/ctkVTKMatrixWidget.h

@@ -37,7 +37,7 @@ public:
   /// Constructors
   ctkVTKMatrixWidget(QWidget* parent);
 
-public slots:
+public Q_SLOTS:
   void setMatrix(vtkMatrix4x4* matrix);
 };
 

Libs/Visualization/VTK/Widgets/ctkVTKRenderView.h

@@ -55,7 +55,7 @@ public:
   explicit ctkVTKRenderView(QWidget* parent = 0);
   virtual ~ctkVTKRenderView();
 
-public slots:
+public Q_SLOTS:
   /// Show/Hide Orientation widget
   void setOrientationWidgetVisible(bool visible);
 

Libs/Visualization/VTK/Widgets/ctkVTKRenderView_p.h

@@ -61,7 +61,7 @@ public:
   void roll(int rotateDegrees, ctkVTKRenderView::RotateDirection rollDirection);
   void yaw(int rotateDegrees, ctkVTKRenderView::RotateDirection yawDirection);
 
-public slots:
+public Q_SLOTS:
   void doSpin();
   void doRock();
 

Libs/Visualization/VTK/Widgets/ctkVTKScalarBarWidget.h

@@ -52,7 +52,7 @@ public:
   QString title()const;
   QString labelsFormat()const;
 
-public slots:
+public Q_SLOTS:
   void setScalarBarWidget(vtkScalarBarWidget* scalarBar);
 
   void setDisplay(bool visible);
@@ -61,10 +61,10 @@ public slots:
   void setTitle(const QString& title);
   void setLabelsFormat(const QString& format);
 
-signals:
+Q_SIGNALS:
   void modified();
 
-protected slots:
+protected Q_SLOTS:
   void onScalarBarModified();
 
 protected:

Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsView.h

@@ -93,7 +93,7 @@ public:
   /// Reimplemented to set the bounds to the plots as well
   virtual void boundAxesToChartBounds();
 
-public slots:
+public Q_SLOTS:
   void editPoint(vtkObject* plot, void * pointId);
 
   /// Move all the control points by a given offset.
@@ -108,7 +108,7 @@ public slots:
   void spreadAllPoints(double factor = 1.,
                        bool dontMoveFirstAndLast = false);
 
-protected slots:
+protected Q_SLOTS:
   void onBoundsChanged();
 
 protected:

Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsWidget.h

@@ -69,18 +69,18 @@ public:
   /// ctkVTKScalarsToColorsWidget takes ownership of the widget
   void addExtraWidget(QWidget* extraWidget);
 
-public slots:
+public Q_SLOTS:
   void setCurrentControlPointsItem(vtkControlPointsItem* item);
   void setCurrentPoint(int pointId);
   void setXRange(double min, double max);
   void setYRange(double min, double max);
 
-signals:
+Q_SIGNALS:
   /// Be carefull, axesModified() can be fired inside the Render() function
   /// of the view. You might want to connect the slot using Qt::QueuedConnection
   void axesModified();
 
-protected slots:
+protected Q_SLOTS:
   void onPlotAdded(vtkPlot*);
   void onBoundsChanged();
   void setCurrentPoint(vtkObject* controlPointsItem, void* pointId);

Libs/Visualization/VTK/Widgets/ctkVTKSliceView.h

@@ -90,7 +90,7 @@ public:
   /// \sa setColorWindow();
   double colorWindow()const;
 
-public slots:
+public Q_SLOTS:
 
   /// Reset cameras associated with all renderWindowItem
   /// \sa vtkLightBoxRendererManager::ResetCamera
@@ -126,7 +126,7 @@ public slots:
   /// \sa vtkLightBoxRendererManager::SetRenderWindowColumnCount
   void setLightBoxRendererManagerColumnCount(int newColumnCount);
   
-signals:
+Q_SIGNALS:
   void resized(const QSize& size);
 
 protected:

Libs/Visualization/VTK/Widgets/ctkVTKSurfaceMaterialPropertyWidget.h

@@ -44,10 +44,10 @@ public:
 
   vtkProperty* property()const;
 
-public slots:
+public Q_SLOTS:
   void setProperty(vtkProperty* property);
 
-protected slots:
+protected Q_SLOTS:
   void updateFromProperty();
 
 protected:

Libs/Visualization/VTK/Widgets/ctkVTKTextPropertyWidget.h

@@ -67,7 +67,7 @@ public:
   /// Has the text shadows
   bool hasShadow()const;
 
-public slots:
+public Q_SLOTS:
   void setTextProperty(vtkTextProperty* textProperty);
   void setText(const QString& text);
   void setTextLabel(const QString& label);
@@ -79,10 +79,10 @@ public slots:
   void setItalic(bool enable);
   void setShadow(bool enable);
 
-signals:
+Q_SIGNALS:
   void textChanged(const QString& text);
 
-protected slots:
+protected Q_SLOTS:
   void updateFromTextProperty();
 
 protected:

Libs/Visualization/VTK/Widgets/ctkVTKThresholdWidget.h

@@ -56,13 +56,13 @@ public:
   bool useSharpness()const;
   void setUseSharpness(bool use);
 
-public slots:
+public Q_SLOTS:
   void setPiecewiseFunction(vtkPiecewiseFunction* function);
   void setRange(double min, double max);
   void setThresholdValues(double min, double max);
   void setOpacity(double opacity);
 
-protected slots:
+protected Q_SLOTS:
   void updateFromPiecewiseFunction();
 
 protected:

Libs/Visualization/VTK/Widgets/ctkVTKThumbnailView.h

@@ -43,7 +43,7 @@ public:
 
   void setRendererToListen(vtkRenderer* renderer);
 
-protected slots:
+protected Q_SLOTS:
   void checkAbort();
   void updateBounds();
   void updateCamera();

Libs/Visualization/VTK/Widgets/ctkVTKVolumePropertyWidget.h

@@ -60,7 +60,7 @@ public:
 
   void chartsBounds(double bounds[4])const;
   void chartsExtent(double extent[4])const;
-public slots:
+public Q_SLOTS:
   void setVolumeProperty(vtkVolumeProperty* volumeProperty);
 
   /// Move all the control points of the opacity, colors and gradient
@@ -79,10 +79,10 @@ public slots:
 
   void showThreshold(bool enable);
 
-signals:
+Q_SIGNALS:
   void chartsExtentChanged();
 
-protected slots:
+protected Q_SLOTS:
   void updateFromVolumeProperty();
   void updateRange();
 

Libs/Widgets/Testing/Cpp/ctkExampleWorkflowWidgetStepUsingSignalsAndSlots.h

@@ -102,7 +102,7 @@ public:
   int numberOfTimesRanOnEntry()const;
   int numberOfTimesRanOnExit()const;
 
-public slots:
+public Q_SLOTS:
 
   /// Returns 1 (validation successful) if the step's lineEdit
   /// contains an integer whose value is greater than or equal to 10,
@@ -120,7 +120,7 @@ public slots:
   /// showUserInterface() function 
   virtual void createUserInterface();
 
-signals:
+Q_SIGNALS:
 
   /// Signals indicating to the workflow that these processes have
   /// completed

Libs/Widgets/Testing/Cpp/ctkSettingsPanelTest2Helper.h

@@ -32,9 +32,9 @@ class ctkSettingsPanelTest2Helper : public QObject
 public:
   ctkSettingsPanelTest2Helper(QObject * parent = 0) : QObject(parent){}
   QStringList list()const;
-public slots:
+public Q_SLOTS:
   void setList(const QStringList& alist);
-signals:
+Q_SIGNALS:
   void listChanged();
 private:
   QStringList List;

Libs/Widgets/ctkActionsWidget.h

@@ -86,7 +86,7 @@ public:
   /// return the view used to display the action model
   QTreeView* view()const;
 
-protected slots:
+protected Q_SLOTS:
   void updateAction();
 
 protected:

Libs/Widgets/ctkAddRemoveComboBox.h

@@ -125,7 +125,7 @@ public:
   /// Remove all the items
   void clear();
 
-signals:
+Q_SIGNALS:
   void currentIndexChanged(int index);
   void activated(int index);
 
@@ -137,12 +137,12 @@ signals:
   void itemAboutToBeRemoved(int index);
   void itemRemoved(int index);
     
-public slots:
+public Q_SLOTS:
   /// 
   /// Select the current index
   void setCurrentIndex(int index);
 
-protected slots:
+protected Q_SLOTS:
   /// 
   virtual void onAdd();
   virtual void onRemove();
@@ -155,7 +155,7 @@ protected:
   int modelColumn()const;
   QAbstractItemModel* model()const;
 
-private slots:
+private Q_SLOTS:
   //void onRowsAboutToBeInserted(const QModelIndex & parent, int start, int end );
   void onRowsAboutToBeRemoved(const QModelIndex & parent, int start, int end);
   void onRowsInserted(const QModelIndex & parent, int start, int end);

Libs/Widgets/ctkAxesWidget.h

@@ -62,7 +62,7 @@ public :
   /// False by default.
   bool autoReset() const;
 
-signals:
+Q_SIGNALS:
   void currentAxisChanged(ctkAxesWidget::Axis axis);
 
 public slots :

Libs/Widgets/ctkBasePopupWidget.h

@@ -119,7 +119,7 @@ public:
   Qt::LayoutDirection horizontalDirection()const;
   void setHorizontalDirection(Qt::LayoutDirection direction);
 
-public slots:
+public Q_SLOTS:
   /// Hide the popup if open or opening. It takes around 300ms 
   /// for the fading effect to hide the popup.
   virtual void hidePopup();
@@ -130,7 +130,7 @@ public slots:
   /// signal.
   inline void showPopup(bool show);
 
-signals:
+Q_SIGNALS:
   void popupOpened(bool open);
 
 protected:
@@ -147,7 +147,7 @@ protected:
   virtual bool event(QEvent* event);
   virtual void paintEvent(QPaintEvent*);
 
-protected slots:
+protected Q_SLOTS:
   virtual void onEffectFinished();
   void setEffectAlpha(double alpha);
   void setEffectGeometry(QRect geometry);

Libs/Widgets/ctkButtonGroup.h

@@ -52,7 +52,7 @@ public:
   explicit ctkButtonGroup(QObject *_parent = 0);
   virtual ~ctkButtonGroup();
 
-protected slots:
+protected Q_SLOTS:
   void onButtonClicked(int button);
   void onButtonPressed(int button);
 

Libs/Widgets/ctkCheckableComboBox.h

@@ -63,10 +63,10 @@ public:
   /// Reimplemented for internal reasons
   bool eventFilter(QObject *o, QEvent *e);
   
-signals:
+Q_SIGNALS:
   void checkedIndexesChanged();
 
-protected slots:
+protected Q_SLOTS:
   void onDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
 protected:

Libs/Widgets/ctkCheckableHeaderView.h

@@ -112,13 +112,13 @@ public:
   
   ctkCheckableModelHelper* checkableModelHelper()const;
 
-public slots:
+public Q_SLOTS:
   ///
   /// Warning, setting the check state automatically set the 
   /// header section checkable
   void setCheckState(int section, Qt::CheckState checkState);
 
-private slots:
+private Q_SLOTS:
   void onHeaderDataChanged(Qt::Orientation orient, int first, int last);
   void onHeaderSectionInserted();
   inline void updateHeaderPixmaps();

Libs/Widgets/ctkCheckablePushButton.h

@@ -83,7 +83,7 @@ public:
   virtual bool isCheckBoxUserCheckable()const;
   virtual void setCheckBoxUserCheckable(bool b);
 
-signals:
+Q_SIGNALS:
   /// Fired anytime the checkbox change of state
   void checkBoxToggled(bool);
   /// Fired anytime the checkbox change of state

Libs/Widgets/ctkCollapsibleButton.h

@@ -126,13 +126,13 @@ public:
   /// Don't process Show/Hide events of children when it is
   /// ctkCollapsibleButton that generate them.
   virtual void setVisible(bool);
-signals:
+Q_SIGNALS:
   /// 
   /// Signal emitted when the widget is collapsed or expanded.
   /// See signal toggled(bool) for the opposite.
   void contentsCollapsed(bool);
 
-protected slots:
+protected Q_SLOTS:
   /// 
   /// Perform the collapse.
   virtual void collapse(bool c);

Libs/Widgets/ctkCollapsibleGroupBox.h

@@ -58,7 +58,7 @@ public:
 
   /// Reimplemented for internal reasons
   virtual void setVisible(bool show);
-protected slots:
+protected Q_SLOTS:
   /// called when the arrow indicator is clicked
   /// users can call it programatically by calling setChecked(bool)
   virtual void expand(bool expand);

Libs/Widgets/ctkColorDialog.h

@@ -93,7 +93,7 @@ public:
   /// -1 for the "Basic Colors", it's the default behavior
   static void setDefaultTab(int index);
 
-public slots:
+public Q_SLOTS:
   /// Slotify QColorDialog::setCurrentColor(QColor)
   void setColor(const QColor& color);
 

Libs/Widgets/ctkColorPickerButton.h

@@ -81,7 +81,7 @@ public:
   /// in the button.
   virtual QSize sizeHint()const;
 
-public slots:
+public Q_SLOTS:
   ///
   /// Set a new current color without opening a dialog
   void setColor(const QColor& color);
@@ -95,12 +95,12 @@ public slots:
   /// By default, this is activated.
   void setDisplayColorName(bool displayColorName);
 
-signals:
+Q_SIGNALS:
   /// colorChanged is fired anytime a new color is set. Programatically or
   /// by the user when choosing a color from the color dialog
   void colorChanged(QColor);
 
-protected slots:
+protected Q_SLOTS:
   void onToggled(bool change = true);
 
 protected:

Libs/Widgets/ctkConfirmExitDialog.h

@@ -59,7 +59,7 @@ public:
   /// Reimplemented for internal reasons
   virtual void setVisible(bool visible);
 
-public slots:
+public Q_SLOTS:
   /// reimplemented for internal reasons
   virtual void accept();
 

Libs/Widgets/ctkConsole.h

@@ -168,12 +168,12 @@ public:
 
   static QString stdInRedirectCallBack(void * callData);
 
-signals:
+Q_SIGNALS:
 
   /// This signal emitted before and after a command is executed
   void executing(bool);
 
-public slots:
+public Q_SLOTS:
 
   /// Clears the contents of the console
   virtual void clear();

Libs/Widgets/ctkConsole_p.h

@@ -102,7 +102,7 @@ public:
   /// Print welcome message
   virtual void printWelcomeMessage();
 
-public slots:
+public Q_SLOTS:
 
   /// Inserts the given completion string at the cursor.  This will replace
   /// the current word that the cursor is touching with the given text.

Libs/Widgets/ctkCoordinatesWidget.h

@@ -90,14 +90,14 @@ public:
   void setCoordinates(double* pos);
   double const * coordinates()const;
 
-signals:
+Q_SIGNALS:
   ///
   /// valueChanged is fired anytime a coordinate is modified, the returned
   /// value is the point coordinates
   /// TODO: Don't fire the signal if the new values are not changed 
   void coordinatesChanged(double* pos);
 
-protected slots:
+protected Q_SLOTS:
   void updateCoordinate(double);
   void updateCoordinates();
 

Libs/Widgets/ctkDateRangeWidget.h

@@ -77,7 +77,7 @@ public:
   /// Returns true if any of the start or end date is invalid.
   bool isAnyDate()const;
 
-public slots:
+public Q_SLOTS:
   /// Set the start date.
   /// If the date is null or invalid, it will be automatically converted into
   /// a valid date (14 September 1752)
@@ -100,13 +100,13 @@ public slots:
   void setLastMonth();
   void setSelectRange();
 
-signals:
+Q_SIGNALS:
   /// Fired when the start date is changed
   void startDateTimeChanged(const QDateTime& value);
   /// Fired when the end date is changed
   void endDateTimeChanged(const QDateTime& value);
 
-protected slots:
+protected Q_SLOTS:
   void onDateTimeChanged();
 
 protected:

Libs/Widgets/ctkDirectoryButton.h

@@ -111,12 +111,12 @@ public:
   const Options& options()const;
 #endif
 
-public slots:
+public Q_SLOTS:
   /// browse() opens a pop up where the user can select a new directory for the
   /// button. browse() is automatically called when the button is clicked.
   void browse();
 
-signals:
+Q_SIGNALS:
   /// directoryChanged is emitted when the current directory changes.
   /// Programatically or by the user via the file dialog that pop up when 
   /// clicking on the button.

Libs/Widgets/ctkDoubleRangeSlider.h

@@ -160,7 +160,7 @@ public:
   bool symmetricMoves()const; 
   void setSymmetricMoves(bool symmetry);
 
-signals:
+Q_SIGNALS:
   ///
   /// This signal is emitted when the slider minimum value has changed, 
   /// with the new slider value as argument.
@@ -211,7 +211,7 @@ signals:
   /// \sa QAbstractSlider::rangeChanged()
   void rangeChanged(double min, double max);
 
-public slots:
+public Q_SLOTS:
   /// 
   /// This property holds the slider's current minimum value.
   /// The slider forces the minimum value to be within the legal range: 
@@ -230,7 +230,7 @@ public slots:
   /// Utility function that set the minimum value and maximum value at once.
   void setValues(double minVal, double maxVal);
 
-protected slots:
+protected Q_SLOTS:
   void onValuesChanged(int min, int max);
 
   void onMinPosChanged(int value);