From 96dc57c06861922b9dde830e3bcc07e43ed11cf7 Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 5 Jan 2017 14:27:19 +0100 Subject: [PATCH] replace Qt keyword slots with Q_SLOTS --- src/Gui/OnlineDocumentation.h | 2 +- src/Gui/Quarter/ContextMenu.h | 2 +- src/Gui/Quarter/SensorManager.h | 2 +- src/Mod/Part/Gui/TaskCheckGeometry.h | 2 +- src/Mod/Part/Gui/TaskDimension.h | 8 ++++---- src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Gui/OnlineDocumentation.h b/src/Gui/OnlineDocumentation.h index b4ec736e76f7..3a7cf5744776 100644 --- a/src/Gui/OnlineDocumentation.h +++ b/src/Gui/OnlineDocumentation.h @@ -69,7 +69,7 @@ class HttpServer : public QTcpServer void pause(); void resume(); -private slots: +private Q_SLOTS: void readClient(); void discardClient(); diff --git a/src/Gui/Quarter/ContextMenu.h b/src/Gui/Quarter/ContextMenu.h index ac44f98ddf48..a9965001e3ae 100644 --- a/src/Gui/Quarter/ContextMenu.h +++ b/src/Gui/Quarter/ContextMenu.h @@ -50,7 +50,7 @@ class ContextMenu : public QObject { QMenu * getMenu(void) const; -public slots: +public Q_SLOTS: void changeRenderMode(QAction * action); void changeStereoMode(QAction * action); void changeTransparencyType(QAction * action); diff --git a/src/Gui/Quarter/SensorManager.h b/src/Gui/Quarter/SensorManager.h index 4b3fb7d0d04c..6344cf93e61c 100644 --- a/src/Gui/Quarter/SensorManager.h +++ b/src/Gui/Quarter/SensorManager.h @@ -48,7 +48,7 @@ class SensorManager : public QObject { SensorManager(void); ~SensorManager(); -public slots: +public Q_SLOTS: void idleTimeout(void); void delayTimeout(void); void timerQueueTimeout(void); diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.h b/src/Mod/Part/Gui/TaskCheckGeometry.h index 4910412b5ad3..30822e6085b5 100644 --- a/src/Mod/Part/Gui/TaskCheckGeometry.h +++ b/src/Mod/Part/Gui/TaskCheckGeometry.h @@ -99,7 +99,7 @@ class TaskCheckGeometryResults : public QWidget ~TaskCheckGeometryResults(); QString getShapeContentString(); -private slots: +private Q_SLOTS: void currentRowChanged (const QModelIndex ¤t, const QModelIndex &previous); private: diff --git a/src/Mod/Part/Gui/TaskDimension.h b/src/Mod/Part/Gui/TaskDimension.h index 15f766c0b1b7..6e05179f52c0 100644 --- a/src/Mod/Part/Gui/TaskDimension.h +++ b/src/Mod/Part/Gui/TaskDimension.h @@ -198,7 +198,7 @@ class SteppedSelection : public QWidget QPixmap *stepActive; QPixmap *stepDone; -private slots: +private Q_SLOTS: void selectionSlot(bool checked); void buildPixmaps(); @@ -229,7 +229,7 @@ class DimensionControl : public QWidget public: explicit DimensionControl(QWidget* parent); QPushButton *resetButton; -public slots: +public Q_SLOTS: void toggle3dSlot(bool); void toggleDeltaSlot(bool); void clearAllSlot(bool); @@ -250,7 +250,7 @@ class TaskMeasureLinear : public Gui::TaskView::TaskDialog, public Gui::Selectio protected: virtual void onSelectionChanged(const Gui::SelectionChanges& msg); -protected slots: +protected Q_SLOTS: void selection1Slot(bool checked); void selection2Slot(bool checked); void resetDialogSlot(bool); @@ -326,7 +326,7 @@ class TaskMeasureAngular : public Gui::TaskView::TaskDialog, public Gui::Selecti protected: virtual void onSelectionChanged(const Gui::SelectionChanges& msg); -protected slots: +protected Q_SLOTS: void selection1Slot(bool checked); void selection2Slot(bool checked); void resetDialogSlot(bool); diff --git a/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp b/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp index ea222095c534..b2b4d781bbbb 100644 --- a/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp +++ b/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp @@ -181,7 +181,7 @@ class ColorPickerItem : public QFrame void clicked(); void selected(); -public slots: +public Q_SLOTS: void setColor(const QColor &color, const QString &text = QString()); protected: @@ -224,10 +224,10 @@ class ColorPickerPopup : public QFrame void selected(const QColor &); void hid(); -public slots: +public Q_SLOTS: void getColorFromDialog(); -protected slots: +protected Q_SLOTS: void updateSelected(); protected: