Use Q_EMIT/Q_SLOTS/Q_SIGNALS

filters/exporter.h

@@ -36,7 +36,7 @@ class ExporterAction : public QAction
 
 public:
     ExporterAction(const KigPart *doc, KigWidget *w, KActionCollection *parent, KigExporter *exp);
-private slots:
+private Q_SLOTS:
     void slotActivated();
 };
 

filters/imageexporteroptions.h

@@ -39,7 +39,7 @@ public:
     void setImageSize(const QSize &size);
     QSize imageSize() const;
 
-protected slots:
+protected Q_SLOTS:
     void slotWidthChanged(double);
     void slotHeightChanged(double);
     void slotUnitChanged(int);

kig/kig.h

@@ -28,7 +28,7 @@ public:
      */
     virtual ~Kig();
 
-public slots:
+public Q_SLOTS:
     /**
      * Open file in this window
      * \param file file to open
@@ -77,7 +77,7 @@ protected:
      */
     void readProperties(const KConfigGroup &) override;
 
-private slots:
+private Q_SLOTS:
     void fileNew();
     void fileOpen();
     void optionsConfigureToolbars();

kig/kig_part.cpp

@@ -421,7 +421,7 @@ bool KigPart::openFile()
     std::vector<ObjectCalcer *> tmp = calcPath(getAllParents(getAllCalcers(document().objects())));
     for (std::vector<ObjectCalcer *>::iterator i = tmp.begin(); i != tmp.end(); ++i)
         (*i)->calc(document());
-    emit recenterScreen();
+    Q_EMIT recenterScreen();
 
     redrawScreen();
 
@@ -678,7 +678,7 @@ void KigPart::plugActionLists()
 
 void KigPart::emitStatusBarText(const QString &text)
 {
-    emit setStatusBarText(text);
+    Q_EMIT setStatusBarText(text);
 }
 
 void KigPart::fileSaveAs()

kig/kig_part.h

@@ -37,7 +37,7 @@ class SetCoordinateSystemAction : public KSelectAction
 
 public:
     SetCoordinateSystemAction(KigPart &d, KActionCollection *parent);
-private slots:
+private Q_SLOTS:
     void slotActivated(int index);
 };
 
@@ -88,7 +88,7 @@ public:
     void redrawScreen();
     void redrawScreen(KigWidget *w);
 
-public slots:
+public Q_SLOTS:
     void fileSaveAs();
     void fileSave();
 
@@ -134,7 +134,7 @@ public:
     void rememberConstruction(ConstructibleAction *);
     void coordSystemChanged(int);
 
-signals: // these signals are for telling KigView it should do something...
+Q_SIGNALS: // these signals are for telling KigView it should do something...
     /**
      * emitted when we want to suggest a new size for the view
      * ( basically after loading a file, and on startup... )

kig/kig_view.h

@@ -238,7 +238,7 @@ public:
     void scrollHorizontal(int delta);
     void scrollVertical(int delta);
 
-public slots:
+public Q_SLOTS:
     void updateScrollBars();
     void slotZoomIn();
     void slotZoomOut();
@@ -248,7 +248,7 @@ public slots:
     void slotRecenterScreen();
     void toggleFullScreen();
 
-private slots:
+private Q_SLOTS:
     void slotRightScrollValueChanged(int);
     void slotBottomScrollValueChanged(int);
 };

misc/guiaction.h

@@ -29,7 +29,7 @@ public:
     GUIAction *guiAction();
 
     void plug(KigPart *doc);
-private slots:
+private Q_SLOTS:
     void slotActivated();
 };
 

misc/kigcoordinateprecisiondialog.h

@@ -24,7 +24,7 @@ public:
 private:
     Ui::KigCoordinatePrecisionDialog *ui;
 
-private slots:
+private Q_SLOTS:
     void toggleCoordinateControls(int state);
 };
 

misc/kigfiledialog.h

@@ -57,6 +57,6 @@ public:
      */
     QString selectedFile();
 
-protected slots:
+protected Q_SLOTS:
     void accept() override;
 };

misc/kiginputdialog.h

@@ -40,7 +40,7 @@ private:
     Coordinate coordinateSecond() const;
     Goniometry goniometry() const;
 
-private slots:
+private Q_SLOTS:
     void slotCoordsChanged(const QString &);
     void slotGonioSystemChanged(int index);
     void slotGonioTextChanged(const QString &txt);

modes/edittype.h

@@ -31,7 +31,7 @@ public:
     QString description() const;
     QString icon() const;
 
-private slots:
+private Q_SLOTS:
     void slotHelp();
     void slotOk();
     void slotCancel();

modes/historydialog.h

@@ -25,7 +25,7 @@ public:
     HistoryDialog(QUndoStack *kch, QWidget *parent);
     virtual ~HistoryDialog();
 
-private slots:
+private Q_SLOTS:
     void updateWidgets();
 
     void goToFirst();

modes/linkslabel.cpp

@@ -52,7 +52,7 @@ void LinksLabel::urlClicked()
     const QObject *o = sender();
     std::vector<KUrlLabel *>::iterator i = std::find(p->urllabels.begin(), p->urllabels.end(), static_cast<const KUrlLabel *>(o));
     assert(i != p->urllabels.end());
-    emit linkClicked(i - p->urllabels.begin());
+    Q_EMIT linkClicked(i - p->urllabels.begin());
 }
 
 LinksLabel::LinksLabelEditBuf LinksLabel::startEdit()
@@ -113,5 +113,5 @@ void LinksLabel::applyEdit(LinksLabelEditBuf &buf)
     std::for_each(p->urllabels.begin(), p->urllabels.end(), mem_fun(&QWidget::show));
     std::for_each(p->labels.begin(), p->labels.end(), mem_fun(&QWidget::show));
 
-    emit changed();
+    Q_EMIT changed();
 }

modes/linkslabel.h

@@ -56,7 +56,7 @@ public:
      */
     void applyEdit(LinksLabelEditBuf &buf);
 
-signals:
+Q_SIGNALS:
     /**
      * the user clicked on a link.  The index is the order in which it
      * was added.  E.g. this signal is emitted with arg 0 if the link
@@ -69,7 +69,7 @@ signals:
      */
     void changed();
 
-private slots:
+private Q_SLOTS:
     void urlClicked();
 
 private:

modes/macrowizard.cc

@@ -52,7 +52,7 @@ bool GivenArgsPage::isComplete() const
 
 void GivenArgsPage::setChanged()
 {
-    emit completeChanged();
+    Q_EMIT completeChanged();
 }
 
 class FinalArgsPage : public QWizardPage
@@ -96,7 +96,7 @@ bool FinalArgsPage::validatePage()
 
 void FinalArgsPage::setChanged()
 {
-    emit completeChanged();
+    Q_EMIT completeChanged();
 }
 
 class MacroInfoPage : public QWizardPage

modes/macrowizard.h

@@ -24,11 +24,11 @@ public:
     void givenArgsChanged();
     void finalArgsChanged();
 
-public slots:
+public Q_SLOTS:
     void reject() override;
     void accept() override;
 
-private slots:
+private Q_SLOTS:
     void currentIdChanged(int id);
     void slotHelpClicked();
 

modes/popup/objectchooserpopup.h

@@ -41,7 +41,7 @@ protected:
     ObjectChooserPopup(const QPoint &p, KigWidget &view, const std::vector<ObjectHolder *> &objs);
     ~ObjectChooserPopup();
 
-protected slots:
+protected Q_SLOTS:
     void actionActivatedSlot(QAction *);
 
 protected:

modes/popup/popup.h

@@ -84,7 +84,7 @@ public:
 protected:
     void activateAction(int menu, int action);
 
-private slots:
+private Q_SLOTS:
     void toplevelMenuSlot(QAction *);
 
 protected:

modes/textlabelwizard.h

@@ -25,11 +25,11 @@ public:
     QString text() const;
     void setText(const QString &newtext);
 
-public slots:
+public Q_SLOTS:
     void reject() override;
     void accept() override;
 
-private slots:
+private Q_SLOTS:
     void textChanged();
     void linkClicked(int which);
     void currentIdChanged(int id);

modes/typesdialog.cpp

@@ -206,7 +206,7 @@ void TypesModel::elementChanged(const QModelIndex &index)
 
     QModelIndex left = createIndex(index.row(), 1);
     QModelIndex right = createIndex(index.row(), 2);
-    emit dataChanged(left, right);
+    Q_EMIT dataChanged(left, right);
 }
 
 bool TypesModel::isMacro(const QModelIndex &index) const