qdbusviewer: Port to Qt 5 signals & slot connection syntax

Change-Id: I23eb27bbca316fa4149983a239e38443b03647f1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

4 files changed, 19 insertions, 23 deletions

diff --git a/src/qdbus/qdbusviewer/logviewer.cpp b/src/qdbus/qdbusviewer/logviewer.cpp
index 190d41112..7dd1ba6d6 100644
--- a/src/qdbus/qdbusviewer/logviewer.cpp
+++ b/src/qdbus/qdbusviewer/logviewer.cpp
@@ -40,7 +40,7 @@ void LogViewer::contextMenuEvent(QContextMenuEvent *event)
 {
     QMenu *menu = createStandardContextMenu();
     QAction *action = menu->addAction(tr("Clear"));
-    connect(action, SIGNAL(triggered()), this, SLOT(clear()));
+    connect(action, &QAction::triggered, this, &QTextEdit::clear);
     menu->exec(event->globalPos());
     delete menu;
 }
diff --git a/src/qdbus/qdbusviewer/mainwindow.cpp b/src/qdbus/qdbusviewer/mainwindow.cpp
index 4f4484581..f1935d605 100644
--- a/src/qdbus/qdbusviewer/mainwindow.cpp
+++ b/src/qdbus/qdbusviewer/mainwindow.cpp
@@ -44,18 +44,18 @@ MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
 {
     QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
-    QAction *quitAction = fileMenu->addAction(tr("&Quit"), this, SLOT(close()));
+    QAction *quitAction = fileMenu->addAction(tr("&Quit"), this, &QWidget::close);
     quitAction->setShortcut(QKeySequence::Quit);
     quitAction->setMenuRole(QAction::QuitRole);
 
     QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
     QAction *aboutAction = helpMenu->addAction(tr("&About"));
     aboutAction->setMenuRole(QAction::AboutRole);
-    QObject::connect(aboutAction, SIGNAL(triggered()), this, SLOT(about()));
+    QObject::connect(aboutAction, &QAction::triggered, this, &MainWindow::about);
 
     QAction *aboutQtAction = helpMenu->addAction(tr("About &Qt"));
     aboutQtAction->setMenuRole(QAction::AboutQtRole);
-    QObject::connect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+    QObject::connect(aboutQtAction, &QAction::triggered, qApp, &QApplication::aboutQt);
 
     tabWidget = new QTabWidget;
     setCentralWidget(tabWidget);
diff --git a/src/qdbus/qdbusviewer/propertydialog.cpp b/src/qdbus/qdbusviewer/propertydialog.cpp
index 8595babc1..d9c7837f3 100644
--- a/src/qdbus/qdbusviewer/propertydialog.cpp
+++ b/src/qdbus/qdbusviewer/propertydialog.cpp
@@ -46,8 +46,8 @@ PropertyDialog::PropertyDialog(QWidget *parent, Qt::WindowFlags f)
     propertyTable->horizontalHeader()->setStretchLastSection(true);
     propertyTable->setEditTriggers(QAbstractItemView::AllEditTriggers);
 
-    connect(buttonBox, SIGNAL(accepted()), SLOT(accept()), Qt::QueuedConnection);
-    connect(buttonBox, SIGNAL(rejected()), SLOT(reject()), Qt::QueuedConnection);
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept, Qt::QueuedConnection);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject, Qt::QueuedConnection);
 
     QVBoxLayout *layout = new QVBoxLayout(this);
     layout->addWidget(label);
diff --git a/src/qdbus/qdbusviewer/qdbusviewer.cpp b/src/qdbus/qdbusviewer/qdbusviewer.cpp
index 00de97891..7800ff3ad 100644
--- a/src/qdbus/qdbusviewer/qdbusviewer.cpp
+++ b/src/qdbus/qdbusviewer/qdbusviewer.cpp
@@ -96,27 +96,27 @@ QDBusViewer::QDBusViewer(const QDBusConnection &connection, QWidget *parent)  :
     servicesView->setSortingEnabled(true);
     servicesView->sortByColumn(0, Qt::AscendingOrder);
 
-    connect(serviceFilterLine, SIGNAL(textChanged(QString)), servicesProxyModel, SLOT(setFilterFixedString(QString)));
+    connect(serviceFilterLine, &QLineEdit::textChanged, servicesProxyModel, &QSortFilterProxyModel::setFilterFixedString);
 
     tree = new QTreeView;
     tree->setContextMenuPolicy(Qt::CustomContextMenu);
 
-    connect(tree, SIGNAL(activated(QModelIndex)), this, SLOT(activate(QModelIndex)));
+    connect(tree, &QAbstractItemView::activated, this, &QDBusViewer::activate);
 
     refreshAction = new QAction(tr("&Refresh"), tree);
     refreshAction->setData(42); // increase the amount of 42 used as magic number by one
     refreshAction->setShortcut(QKeySequence::Refresh);
-    connect(refreshAction, SIGNAL(triggered()), this, SLOT(refreshChildren()));
+    connect(refreshAction, &QAction::triggered, this, &QDBusViewer::refreshChildren);
 
     QShortcut *refreshShortcut = new QShortcut(QKeySequence::Refresh, tree);
-    connect(refreshShortcut, SIGNAL(activated()), this, SLOT(refreshChildren()));
+    connect(refreshShortcut, &QShortcut::activated, this, &QDBusViewer::refreshChildren);
 
     QVBoxLayout *layout = new QVBoxLayout(this);
     topSplitter = new QSplitter(Qt::Vertical, this);
     layout->addWidget(topSplitter);
 
     log = new LogViewer;
-    connect(log, SIGNAL(anchorClicked(QUrl)), this, SLOT(anchorClicked(QUrl)));
+    connect(log, &QTextBrowser::anchorClicked, this, &QDBusViewer::anchorClicked);
 
     splitter = new QSplitter(topSplitter);
     splitter->addWidget(servicesView);
@@ -131,22 +131,17 @@ QDBusViewer::QDBusViewer(const QDBusConnection &connection, QWidget *parent)  :
     topSplitter->addWidget(splitter);
     topSplitter->addWidget(log);
 
-    connect(servicesView->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)),
-            this, SLOT(serviceChanged(QModelIndex)));
-    connect(tree, SIGNAL(customContextMenuRequested(QPoint)),
-            this, SLOT(showContextMenu(QPoint)));
+    connect(servicesView->selectionModel(), &QItemSelectionModel::currentChanged, this, &QDBusViewer::serviceChanged);
+    connect(tree, &QWidget::customContextMenuRequested, this, &QDBusViewer::showContextMenu);
 
     QMetaObject::invokeMethod(this, "refresh", Qt::QueuedConnection);
 
     if (c.isConnected()) {
         logMessage(QLatin1String("Connected to D-Bus."));
         QDBusConnectionInterface *iface = c.interface();
-        connect(iface, SIGNAL(serviceRegistered(QString)),
-                this, SLOT(serviceRegistered(QString)));
-        connect(iface, SIGNAL(serviceUnregistered(QString)),
-                this, SLOT(serviceUnregistered(QString)));
-        connect(iface, SIGNAL(serviceOwnerChanged(QString,QString,QString)),
-                this, SLOT(serviceOwnerChanged(QString,QString,QString)));
+        connect(iface, &QDBusConnectionInterface::serviceRegistered, this, &QDBusViewer::serviceRegistered);
+        connect(iface, &QDBusConnectionInterface::serviceUnregistered, this, &QDBusViewer::serviceUnregistered);
+        connect(iface, &QDBusConnectionInterface::serviceOwnerChanged, this, &QDBusViewer::serviceOwnerChanged);
     } else {
         logError(QLatin1String("Cannot connect to D-Bus: ") + c.lastError().message());
     }
@@ -460,8 +455,9 @@ void QDBusViewer::serviceChanged(const QModelIndex &index)
         return;
     currentService = index.data().toString();
 
-    tree->setModel(new QDBusViewModel(currentService, c));
-    connect(tree->model(), SIGNAL(busError(QString)), this, SLOT(logError(QString)));
+    QDBusViewModel *model = new QDBusViewModel(currentService, c);
+    tree->setModel(model);
+    connect(model, &QDBusModel::busError, this, &QDBusViewer::logError);
 }
 
 void QDBusViewer::serviceRegistered(const QString &service)