Debugger: De-slot

Most Qt4 connects are gone.

Change-Id: Ie74cfb11fc4b4c531f9e22c95a4d18336e1c29e8
Reviewed-by: hjk <hjk@theqtcompany.com>

16 files changed, 43 insertions, 60 deletions

diff --git a/src/plugins/debugger/analyzer/analyzerrunconfigwidget.h b/src/plugins/debugger/analyzer/analyzerrunconfigwidget.h
index 23d028ff95..df13971da6 100644
--- a/src/plugins/debugger/analyzer/analyzerrunconfigwidget.h
+++ b/src/plugins/debugger/analyzer/analyzerrunconfigwidget.h
@@ -48,11 +48,10 @@ public:
 
     QString displayName() const;
 
-private slots:
+private:
     void chooseSettings(int setting);
     void restoreGlobal();
 
-private:
     QWidget *m_configWidget;
     ProjectExplorer::IRunConfigurationAspect *m_aspect;
     ProjectExplorer::ISettingsAspect *m_config;
diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp
index 54e20e72f6..6fdffcea4a 100644
--- a/src/plugins/debugger/breakwindow.cpp
+++ b/src/plugins/debugger/breakwindow.cpp
@@ -96,7 +96,6 @@ public:
     void setParameters(const BreakpointParameters &data);
     BreakpointParameters parameters() const;
 
-public slots:
     void typeChanged(int index);
 
 private:
diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h
index 9214cef1f2..264bf9ec25 100644
--- a/src/plugins/debugger/cdb/cdbengine.h
+++ b/src/plugins/debugger/cdb/cdbengine.h
@@ -116,7 +116,7 @@ public:
 
     static QString extensionLibraryName(bool is64Bit);
 
-private slots:
+private:
     void readyReadStandardOut();
     void readyReadStandardError();
     void processError();
@@ -132,7 +132,6 @@ private slots:
 
     void handleDoInterruptInferior(const QString &errorMessage);
 
-private:
     typedef QHash<BreakpointModelId, BreakpointResponse> PendingBreakPointMap;
     typedef QPair<QString, QString> SourcePathMapping;
     struct NormalizedSourceFileName // Struct for caching mapped/normalized source files.
diff --git a/src/plugins/debugger/console/consoleitemdelegate.h b/src/plugins/debugger/console/consoleitemdelegate.h
index f846bfbe32..0cf6889bfe 100644
--- a/src/plugins/debugger/console/consoleitemdelegate.h
+++ b/src/plugins/debugger/console/consoleitemdelegate.h
@@ -44,8 +44,6 @@ public:
     void emitSizeHintChanged(const QModelIndex &index);
     QColor drawBackground(QPainter *painter, const QRect &rect, const QModelIndex &index,
                           bool selected) const;
-
-public slots:
     void currentChanged(const QModelIndex &current, const QModelIndex &previous);
 
 protected:
diff --git a/src/plugins/debugger/console/consoleitemmodel.h b/src/plugins/debugger/console/consoleitemmodel.h
index c0c7c8485b..03f0203f01 100644
--- a/src/plugins/debugger/console/consoleitemmodel.h
+++ b/src/plugins/debugger/console/consoleitemmodel.h
@@ -51,7 +51,6 @@ public:
     int sizeOfFile(const QFont &font);
     int sizeOfLineNumber(const QFont &font);
 
-public slots:
     void clear();
 
 signals:
diff --git a/src/plugins/debugger/console/consoleproxymodel.h b/src/plugins/debugger/console/consoleproxymodel.h
index f02346f66c..d75114d3e6 100644
--- a/src/plugins/debugger/console/consoleproxymodel.h
+++ b/src/plugins/debugger/console/consoleproxymodel.h
@@ -39,7 +39,6 @@ class ConsoleProxyModel : public QSortFilterProxyModel
 public:
     explicit ConsoleProxyModel(QObject *parent);
 
-public slots:
     void setShowLogs(bool show);
     void setShowWarnings(bool show);
     void setShowErrors(bool show);
diff --git a/src/plugins/debugger/console/consoleview.h b/src/plugins/debugger/console/consoleview.h
index 3aedd125e1..89a5943918 100644
--- a/src/plugins/debugger/console/consoleview.h
+++ b/src/plugins/debugger/console/consoleview.h
@@ -39,7 +39,6 @@ class ConsoleView : public Utils::TreeView
 public:
     ConsoleView(ConsoleItemModel *model, QWidget *parent);
 
-public slots:
     void onScrollToBottom();
 
 protected:
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 2d41ec65dd..c8213bed9f 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -3076,9 +3076,7 @@ void showModuleSections(const QString &moduleName, const Sections &sections)
 
 void DebuggerPluginPrivate::aboutToShutdown()
 {
-    disconnect(SessionManager::instance(),
-        SIGNAL(startupProjectChanged(ProjectExplorer::Project*)),
-        this, 0);
+    disconnect(SessionManager::instance(), &SessionManager::startupProjectChanged, this, nullptr);
 
     m_mainWindow->saveCurrentPerspective();
     delete m_mainWindow;
diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.h b/src/plugins/debugger/debuggersourcepathmappingwidget.h
index 0ae147b15b..ec587a2007 100644
--- a/src/plugins/debugger/debuggersourcepathmappingwidget.h
+++ b/src/plugins/debugger/debuggersourcepathmappingwidget.h
@@ -62,7 +62,7 @@ public:
     static SourcePathMap mergePlatformQtPath(const DebuggerRunParameters &sp,
                                              const SourcePathMap &in);
 
-private slots:
+private:
     void slotAdd();
     void slotAddQt();
     void slotRemove();
@@ -70,7 +70,6 @@ private slots:
     void slotEditSourceFieldChanged();
     void slotEditTargetFieldChanged();
 
-private:
     void resizeColumns();
     void updateEnabled();
     QString editSourceField() const;
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index e718771e8f..25184fd12c 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -122,7 +122,7 @@ protected: ////////// Gdb Process Management //////////
     // Make sure to clean up everything before emitting this signal.
     void handleAdapterCrashed(const QString &msg);
 
-private slots:
+private:
     friend class GdbPlainEngine;
     friend class GdbCoreEngine;
     void handleInterruptDeviceInferior(const QString &error);
@@ -132,7 +132,6 @@ private slots:
     void readGdbStandardError();
     void readDebuggeeOutput(const QByteArray &ba);
 
-private:
     QTextCodec *m_gdbOutputCodec;
     QTextCodec::ConverterState m_gdbOutputCodecState;
     QTextCodec *m_inferiorOutputCodec;
diff --git a/src/plugins/debugger/gdb/startgdbserverdialog.h b/src/plugins/debugger/gdb/startgdbserverdialog.h
index df2630e4bc..c90cefe7ab 100644
--- a/src/plugins/debugger/gdb/startgdbserverdialog.h
+++ b/src/plugins/debugger/gdb/startgdbserverdialog.h
@@ -45,7 +45,7 @@ public:
 
     void run();
 
-private slots:
+private:
     void handleRemoteError(const QString &errorMessage);
     void portGathererError(const QString &errorMessage);
     void portListReady();
@@ -56,7 +56,6 @@ private slots:
     void handleProcessStarted();
     void handleConnectionError();
 
-private:
     void attach(int port);
     void logMessage(const QString &line);
     StartGdbServerDialogPrivate *d;
diff --git a/src/plugins/debugger/logwindow.cpp b/src/plugins/debugger/logwindow.cpp
index e30d05c2ca..9bbd5033ac 100644
--- a/src/plugins/debugger/logwindow.cpp
+++ b/src/plugins/debugger/logwindow.cpp
@@ -310,7 +310,6 @@ public:
         (void) new OutputHighlighter(this);
     }
 
-public slots:
     void gotoResult(int i)
     {
         QString needle = QString::number(i) + QLatin1Char('^');
diff --git a/src/plugins/debugger/logwindow.h b/src/plugins/debugger/logwindow.h
index 71bfedccd3..adced53832 100644
--- a/src/plugins/debugger/logwindow.h
+++ b/src/plugins/debugger/logwindow.h
@@ -64,7 +64,6 @@ public:
     static QChar charForChannel(int channel);
     static LogChannel channelForChar(QChar c);
 
-public slots:
     void clearContents();
     void sendCommand();
     void executeLine();
diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h
index cf65daecf2..ab469638fa 100644
--- a/src/plugins/debugger/qml/qmlengine.h
+++ b/src/plugins/debugger/qml/qmlengine.h
@@ -55,7 +55,7 @@ public:
 
     void expressionEvaluated(quint32 queryId, const QVariant &result);
 
-private slots:
+private:
     void disconnected();
     void errorMessageBoxFinished(int result);
     void updateCurrentContext();
@@ -67,7 +67,6 @@ private slots:
     void appStartupFailed(const QString &errorMessage);
     void appendMessage(const QString &msg, Utils::OutputFormat);
 
-private:
     void notifyEngineRemoteServerRunning(const QString &, int pid) override;
     void notifyEngineRemoteSetupFinished(const RemoteSetupResult &result) override;
 
diff --git a/src/plugins/debugger/registerwindow.h b/src/plugins/debugger/registerwindow.h
index 13a6f91c02..160890ad34 100644
--- a/src/plugins/debugger/registerwindow.h
+++ b/src/plugins/debugger/registerwindow.h
@@ -37,7 +37,6 @@ class RegisterTreeView : public Utils::BaseTreeView
 public:
     RegisterTreeView();
 
-public slots:
     void reloadRegisters();
 
 private:
diff --git a/src/shared/modeltest/modeltest.cpp b/src/shared/modeltest/modeltest.cpp
index 3e3f5bf723..bb4089278e 100644
--- a/src/shared/modeltest/modeltest.cpp
+++ b/src/shared/modeltest/modeltest.cpp
@@ -37,44 +37,44 @@ ModelTest::ModelTest(QAbstractItemModel *_model, QObject *parent) : QObject(pare
 {
     Q_ASSERT(model);
 
-    connect(model, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
-            this, SLOT(runAllTests()));
-    connect(model, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
-            this, SLOT(runAllTests()));
-    connect(model, SIGNAL(columnsInserted(QModelIndex,int,int)),
-            this, SLOT(runAllTests()));
-    connect(model, SIGNAL(columnsRemoved(QModelIndex,int,int)),
-            this, SLOT(runAllTests()));
-    connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
-            this, SLOT(runAllTests()));
-    connect(model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)),
-            this, SLOT(runAllTests()));
-    connect(model, SIGNAL(layoutAboutToBeChanged()), this, SLOT(runAllTests()));
-    connect(model, SIGNAL(layoutChanged()), this, SLOT(runAllTests()));
-    connect(model, SIGNAL(modelReset()), this, SLOT(runAllTests()));
-    connect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
-            this, SLOT(runAllTests()));
-    connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
-            this, SLOT(runAllTests()));
-    connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)),
-            this, SLOT(runAllTests()));
-    connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
-            this, SLOT(runAllTests()));
+    connect(model, &QAbstractItemModel::columnsAboutToBeInserted,
+            this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::columnsAboutToBeRemoved,
+            this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::columnsInserted,
+            this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::columnsRemoved,
+            this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::dataChanged,
+            this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::headerDataChanged,
+            this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::layoutAboutToBeChanged, this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::layoutChanged, this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::modelReset, this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::rowsAboutToBeInserted,
+            this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::rowsAboutToBeRemoved,
+            this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::rowsInserted,
+            this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::rowsRemoved,
+            this, &ModelTest::runAllTests);
 
     // Special checks for inserting/removing
-    connect(model, SIGNAL(layoutAboutToBeChanged()),
-            this, SLOT(layoutAboutToBeChanged()));
-    connect(model, SIGNAL(layoutChanged()),
-            this, SLOT(layoutChanged()));
-
-    connect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
-            this, SLOT(rowsAboutToBeInserted(QModelIndex,int,int)));
-    connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
-            this, SLOT(rowsAboutToBeRemoved(QModelIndex,int,int)));
-    connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)),
-            this, SLOT(rowsInserted(QModelIndex,int,int)));
-    connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
-            this, SLOT(rowsRemoved(QModelIndex,int,int)));
+    connect(model, &QAbstractItemModel::layoutAboutToBeChanged,
+            this, &ModelTest::layoutAboutToBeChanged);
+    connect(model, &QAbstractItemModel::layoutChanged,
+            this, &ModelTest::layoutChanged);
+
+    connect(model, &QAbstractItemModel::rowsAboutToBeInserted,
+            this, &ModelTest::rowsAboutToBeInserted);
+    connect(model, &QAbstractItemModel::rowsAboutToBeRemoved,
+            this, &ModelTest::rowsAboutToBeRemoved);
+    connect(model, &QAbstractItemModel::rowsInserted,
+            this, &ModelTest::rowsInserted);
+    connect(model, &QAbstractItemModel::rowsRemoved,
+            this, &ModelTest::rowsRemoved);
 
     runAllTests();
 }