Utils: De-slot and complete Qt5 connects

The only Qt4-style [dis]connects left are in BaseTreeView::setModel.

Change-Id: I53bb715750c65827005cc96939a6714606e60f81
Reviewed-by: Tobias Hunger <[email protected]>

18 files changed, 21 insertions, 44 deletions

diff --git a/src/libs/utils/consoleprocess.h b/src/libs/utils/consoleprocess.h
index 59a51d98cf1..4e9de860fd1 100644
--- a/src/libs/utils/consoleprocess.h
+++ b/src/libs/utils/consoleprocess.h
@@ -103,7 +103,7 @@ signals:
     void stubStarted();
     void stubStopped();
 
-private slots:
+private:
     void stubConnectionAvailable();
     void readStubOutput();
     void stubExited();
@@ -111,7 +111,6 @@ private slots:
     void inferiorExited();
 #endif
 
-private:
     static QString modeOption(Mode m);
     static QString msgCommChannelFailed(const QString &error);
     static QString msgPromptToClose();
diff --git a/src/libs/utils/crumblepath.h b/src/libs/utils/crumblepath.h
index d3d1962535b..434252ae37b 100644
--- a/src/libs/utils/crumblepath.h
+++ b/src/libs/utils/crumblepath.h
@@ -60,10 +60,8 @@ signals:
 protected:
     void resizeEvent(QResizeEvent *);
 
-private slots:
-    void emitElementClicked();
-
 private:
+    void emitElementClicked();
     void resizeButtons();
     void setBackgroundStyle();
 
diff --git a/src/libs/utils/detailswidget.h b/src/libs/utils/detailswidget.h
index 5ce8c04f5d2..0c69d6f3f08 100644
--- a/src/libs/utils/detailswidget.h
+++ b/src/libs/utils/detailswidget.h
@@ -87,7 +87,7 @@ signals:
     void linkActivated(const QString &link);
     void expanded(bool);
 
-private slots:
+private:
     void setExpanded(bool);
 
 protected:
diff --git a/src/libs/utils/dropsupport.cpp b/src/libs/utils/dropsupport.cpp
index 805a20c0546..9527a2f1e40 100644
--- a/src/libs/utils/dropsupport.cpp
+++ b/src/libs/utils/dropsupport.cpp
@@ -140,7 +140,7 @@ bool DropSupport::eventFilter(QObject *obj, QEvent *event)
                     // after the drag operation.
                     // If we do not do this, e.g. dragging from Outline view crashes if the editor and
                     // the selected item changes
-                    QTimer::singleShot(100, this, SLOT(emitFilesDropped()));
+                    QTimer::singleShot(100, this, &DropSupport::emitFilesDropped);
                 }
             }
             if (fileDropMimeData && !fileDropMimeData->values().isEmpty()) {
@@ -150,7 +150,7 @@ bool DropSupport::eventFilter(QObject *obj, QEvent *event)
                 m_values.append(fileDropMimeData->values());
                 m_dropPos = de->pos();
                 if (needToScheduleEmit)
-                    QTimer::singleShot(100, this, SLOT(emitValuesDropped()));
+                    QTimer::singleShot(100, this, &DropSupport::emitValuesDropped);
             }
         }
         if (!accepted) {
diff --git a/src/libs/utils/dropsupport.h b/src/libs/utils/dropsupport.h
index c91f2c5c8ae..979089f0908 100644
--- a/src/libs/utils/dropsupport.h
+++ b/src/libs/utils/dropsupport.h
@@ -68,11 +68,10 @@ public:
 protected:
     bool eventFilter(QObject *obj, QEvent *event);
 
-private slots:
+private:
     void emitFilesDropped();
     void emitValuesDropped();
 
-private:
     DropFilterFunction m_filterFunction;
     QList<FileSpec> m_files;
     QList<QVariant> m_values;
diff --git a/src/libs/utils/fadingindicator.cpp b/src/libs/utils/fadingindicator.cpp
index 0910aa3c850..6799465829d 100644
--- a/src/libs/utils/fadingindicator.cpp
+++ b/src/libs/utils/fadingindicator.cpp
@@ -87,7 +87,7 @@ public:
     {
         show();
         raise();
-        QTimer::singleShot(ms, this, SLOT(runInternal()));
+        QTimer::singleShot(ms, this, &FadingIndicatorPrivate::runInternal);
     }
 
 protected:
@@ -104,7 +104,7 @@ protected:
         }
     }
 
-private slots:
+private:
     void runInternal()
     {
         QPropertyAnimation *anim = new QPropertyAnimation(m_effect, "opacity", this);
@@ -114,7 +114,6 @@ private slots:
         anim->start(QAbstractAnimation::DeleteWhenStopped);
     }
 
-private:
     QGraphicsOpacityEffect *m_effect;
     QLabel *m_label;
     QPixmap m_pixmap;
diff --git a/src/libs/utils/fancymainwindow.h b/src/libs/utils/fancymainwindow.h
index 1960bea3842..f66287e6cf1 100644
--- a/src/libs/utils/fancymainwindow.h
+++ b/src/libs/utils/fancymainwindow.h
@@ -79,10 +79,9 @@ protected:
     void showEvent(QShowEvent *event);
     void contextMenuEvent(QContextMenuEvent *event);
 
-private slots:
+private:
     void onDockActionTriggered();
 
-private:
     void handleVisibilityChanged(bool visible);
 
     FancyMainWindowPrivate *d;
diff --git a/src/libs/utils/filesystemwatcher.h b/src/libs/utils/filesystemwatcher.h
index 59f5938204b..c40c6dae800 100644
--- a/src/libs/utils/filesystemwatcher.h
+++ b/src/libs/utils/filesystemwatcher.h
@@ -66,16 +66,14 @@ public:
     bool watchesDirectory(const QString &file) const;
     QStringList directories() const;
 
-private slots:
-    void slotFileChanged(const QString &path);
-    void slotDirectoryChanged(const QString &path);
-
 signals:
     void fileChanged(const QString &path);
     void directoryChanged(const QString &path);
 
 private:
     void init();
+    void slotFileChanged(const QString &path);
+    void slotDirectoryChanged(const QString &path);
 
     FileSystemWatcherPrivate *d;
 };
diff --git a/src/libs/utils/filewizardpage.h b/src/libs/utils/filewizardpage.h
index e0f19d03db4..12897e782da 100644
--- a/src/libs/utils/filewizardpage.h
+++ b/src/libs/utils/filewizardpage.h
@@ -65,11 +65,10 @@ public slots:
     void setPath(const QString &path);
     void setFileName(const QString &name);
 
-private slots:
+private:
     void slotValidChanged();
     void slotActivated();
 
-private:
     FileWizardPagePrivate *d;
 };
 
diff --git a/src/libs/utils/newclasswidget.h b/src/libs/utils/newclasswidget.h
index 18a5029f5bc..e91ff6a13af 100644
--- a/src/libs/utils/newclasswidget.h
+++ b/src/libs/utils/newclasswidget.h
@@ -149,15 +149,13 @@ public slots:
      */
     void suggestClassNameFromBase();
 
-private slots:
+private:
     void slotUpdateFileNames(const QString &t);
     void slotValidChanged();
     void slotActivated();
     void classNameEdited();
     void slotFormInputChecked();
     void slotBaseClassEdited(const QString &);
-
-private:
     void setFormInputCheckable(bool checkable, bool force);
 
     QString fixSuffix(const QString &suffix);
diff --git a/src/libs/utils/projectintropage.h b/src/libs/utils/projectintropage.h
index eb26a839c20..da34f550e30 100644
--- a/src/libs/utils/projectintropage.h
+++ b/src/libs/utils/projectintropage.h
@@ -73,11 +73,10 @@ public slots:
     void setUseAsDefaultPath(bool u);
     void setProjectNameRegularExpression(const QRegularExpression &regEx);
 
-private slots:
+private:
     void slotChanged();
     void slotActivated();
 
-private:
     enum StatusLabelMode { Error, Warning, Hint };
 
     bool validate();
diff --git a/src/libs/utils/proxyaction.h b/src/libs/utils/proxyaction.h
index 3307a0c0ae8..a5c423098ef 100644
--- a/src/libs/utils/proxyaction.h
+++ b/src/libs/utils/proxyaction.h
@@ -60,12 +60,10 @@ public:
     static QString stringWithAppendedShortcut(const QString &str, const QKeySequence &shortcut);
     static ProxyAction *proxyActionWithIcon(QAction *original, const QIcon &newIcon);
 
-private slots:
+private:
     void actionChanged();
     void updateState();
     void updateToolTipWithKeySequence();
-
-private:
     void disconnectAction();
     void connectAction();
     void update(QAction *action, bool initialize);
diff --git a/src/libs/utils/settingsselector.h b/src/libs/utils/settingsselector.h
index 6df875a6e4a..7c5220afadc 100644
--- a/src/libs/utils/settingsselector.h
+++ b/src/libs/utils/settingsselector.h
@@ -67,12 +67,11 @@ signals:
     void rename(int index, const QString &newName);
     void currentChanged(int index);
 
-private slots:
+private:
     void removeButtonClicked();
     void renameButtonClicked();
     void updateButtonState();
 
-private:
     QLabel *m_label;
     QComboBox *m_configurationCombo;
     QPushButton *m_addButton;
diff --git a/src/libs/utils/statuslabel.h b/src/libs/utils/statuslabel.h
index 8531a66d1b7..8a2ffc22328 100644
--- a/src/libs/utils/statuslabel.h
+++ b/src/libs/utils/statuslabel.h
@@ -43,10 +43,8 @@ public slots:
     void showStatusMessage(const QString &message, int timeoutMS = 5000);
     void clearStatusMessage();
 
-private slots:
-    void slotTimeout();
-
 private:
+    void slotTimeout();
     void stopTimer();
 
     QTimer *m_timer;
diff --git a/src/libs/utils/synchronousprocess.h b/src/libs/utils/synchronousprocess.h
index 40c6aea5bf8..5c4f8bc7608 100644
--- a/src/libs/utils/synchronousprocess.h
+++ b/src/libs/utils/synchronousprocess.h
@@ -155,14 +155,12 @@ signals:
 public slots:
     bool terminate();
 
-private slots:
+private:
     void slotTimeout();
     void finished(int exitCode, QProcess::ExitStatus e);
     void error(QProcess::ProcessError);
     void stdOutReady();
     void stdErrReady();
-
-private:
     void processStdOut(bool emitSignals);
     void processStdErr(bool emitSignals);
     QString convertOutput(const QByteArray &, QTextCodec::ConverterState *state) const;
diff --git a/src/libs/utils/textfieldcheckbox.h b/src/libs/utils/textfieldcheckbox.h
index 456e156370d..9bcc17c9ad6 100644
--- a/src/libs/utils/textfieldcheckbox.h
+++ b/src/libs/utils/textfieldcheckbox.h
@@ -51,10 +51,9 @@ public:
 signals:
     void textChanged(const QString &);
 
-private slots:
+private:
     void slotStateChanged(int);
 
-private:
     QString m_trueText;
     QString m_falseText;
 };
diff --git a/src/libs/utils/textfieldcombobox.h b/src/libs/utils/textfieldcombobox.h
index 943e7a677c2..136b85de3c7 100644
--- a/src/libs/utils/textfieldcombobox.h
+++ b/src/libs/utils/textfieldcombobox.h
@@ -46,10 +46,9 @@ public:
 signals:
     void text4Changed(const QString &); // Do not conflict with Qt 3 compat signal.
 
-private slots:
+private:
     void slotCurrentIndexChanged(int);
 
-private:
     inline QString valueAt(int) const;
 };
 
diff --git a/src/libs/utils/wizard.cpp b/src/libs/utils/wizard.cpp
index 81fc5a18478..8e747ab0b1d 100644
--- a/src/libs/utils/wizard.cpp
+++ b/src/libs/utils/wizard.cpp
@@ -99,7 +99,7 @@ class LinearProgressWidget : public QWidget
 public:
     LinearProgressWidget(WizardProgress *progress, QWidget *parent = 0);
 
-private slots:
+private:
     void slotItemAdded(WizardProgressItem *item);
     void slotItemRemoved(WizardProgressItem *item);
     void slotItemChanged(WizardProgressItem *item);
@@ -107,8 +107,6 @@ private slots:
     void slotNextShownItemChanged(WizardProgressItem *item, WizardProgressItem *nextItem);
     void slotStartItemChanged(WizardProgressItem *item);
     void slotCurrentItemChanged(WizardProgressItem *item);
-
-private:
     void recreateLayout();
     void updateProgress();
     void disableUpdates();