Use Qt 5 signals & slot syntax.

Change-Id: I548076eebc2c8f1204ef76bb4e6e09ed00352553
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

3 files changed, 24 insertions, 19 deletions

diff --git a/tests/manual/dwmfeatures/testwidget.cpp b/tests/manual/dwmfeatures/testwidget.cpp
index 78361de..29525f4 100644
--- a/tests/manual/dwmfeatures/testwidget.cpp
+++ b/tests/manual/dwmfeatures/testwidget.cpp
@@ -45,16 +45,21 @@ TestWidget::TestWidget(QWidget *parent) :
 {
     ui->setupUi(this);
 
-    connect(ui->btnPeekDisallow, SIGNAL(clicked()), SLOT(onDisallowPeekClicked()));
-    connect(ui->btnPeekExclude,  SIGNAL(clicked()), SLOT(onExcludeFromPeekClicked()));
-    connect(ui->radioFlipDefault, SIGNAL(clicked()), SLOT(onFlip3DPolicyChanged()));
-    connect(ui->radioFlipAbove,   SIGNAL(clicked()), SLOT(onFlip3DPolicyChanged()));
-    connect(ui->radioFlipBelow,   SIGNAL(clicked()), SLOT(onFlip3DPolicyChanged()));
-    connect(ui->btnFrameReset, SIGNAL(clicked()), SLOT(onResetGlassFrameClicked()));
-    connect(ui->frameTop,    SIGNAL(valueChanged(int)), SLOT(onGlassMarginsChanged()));
-    connect(ui->frameRight,  SIGNAL(valueChanged(int)), SLOT(onGlassMarginsChanged()));
-    connect(ui->frameBottom, SIGNAL(valueChanged(int)), SLOT(onGlassMarginsChanged()));
-    connect(ui->frameLeft,   SIGNAL(valueChanged(int)), SLOT(onGlassMarginsChanged()));
+    connect(ui->btnPeekDisallow,  &QAbstractButton::clicked, this, &TestWidget::onDisallowPeekClicked);
+    connect(ui->btnPeekExclude,   &QAbstractButton::clicked, this, &TestWidget::onExcludeFromPeekClicked);
+    connect(ui->radioFlipDefault, &QAbstractButton::clicked, this, &TestWidget::onFlip3DPolicyChanged);
+    connect(ui->radioFlipAbove,   &QAbstractButton::clicked, this, &TestWidget::onFlip3DPolicyChanged);
+    connect(ui->radioFlipBelow,   &QAbstractButton::clicked, this, &TestWidget::onFlip3DPolicyChanged);
+    connect(ui->btnFrameReset,    &QAbstractButton::clicked, this, &TestWidget::onResetGlassFrameClicked);
+    typedef void(QSpinBox::*IntSignal)(int);
+    connect(ui->frameTop, static_cast<IntSignal>(&QSpinBox::valueChanged),
+            this, &TestWidget::onGlassMarginsChanged);
+    connect(ui->frameRight, static_cast<IntSignal>(&QSpinBox::valueChanged),
+            this, &TestWidget::onGlassMarginsChanged);
+    connect(ui->frameBottom, static_cast<IntSignal>(&QSpinBox::valueChanged),
+            this, &TestWidget::onGlassMarginsChanged);
+    connect(ui->frameLeft, static_cast<IntSignal>(&QSpinBox::valueChanged),
+            this, &TestWidget::onGlassMarginsChanged);
 }
 
 TestWidget::~TestWidget()
diff --git a/tests/manual/jumplist/testwidget.cpp b/tests/manual/jumplist/testwidget.cpp
index 32ad81b..a493286 100644
--- a/tests/manual/jumplist/testwidget.cpp
+++ b/tests/manual/jumplist/testwidget.cpp
@@ -63,9 +63,9 @@ TestWidget::TestWidget(QWidget *parent) :
         }
     }
 
-    connect(ui->btnUpdate,   SIGNAL(clicked()), SLOT(updateJumpList()));
-    connect(ui->btnOpenFile, SIGNAL(clicked()), SLOT(openFile()));
-    connect(ui->btnClose, SIGNAL(clicked()), qApp, SLOT(quit()));
+    connect(ui->btnUpdate,   &QAbstractButton::clicked, this, &TestWidget::updateJumpList);
+    connect(ui->btnOpenFile, &QAbstractButton::clicked, this, &TestWidget::openFile);
+    connect(ui->btnClose, &QAbstractButton::clicked, QCoreApplication::quit);
 }
 
 TestWidget::~TestWidget()
diff --git a/tests/manual/thumbnail/main.cpp b/tests/manual/thumbnail/main.cpp
index 0dcab8b..96b10fd 100644
--- a/tests/manual/thumbnail/main.cpp
+++ b/tests/manual/thumbnail/main.cpp
@@ -92,7 +92,7 @@ MainWindow::MainWindow()
     QMenu *fileMenu = menuBar()->addMenu("&File");
     QAction *quitAction = fileMenu->addAction("&Quit");
     quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
-    connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+    connect(quitAction, &QAction::triggered, QCoreApplication::quit);
     setCentralWidget(m_logEdit);
 }
 
@@ -102,13 +102,13 @@ void MainWindow::initThumbnailToolBar()
     QWinThumbnailToolButton *testButton = new QWinThumbnailToolButton(m_thumbnailToolBar);
     testButton->setToolTip("Test");
     testButton->setIcon(style()->standardIcon(QStyle::SP_ComputerIcon));
-    connect(testButton, SIGNAL(clicked()), this, SLOT(testButtonClicked()));
+    connect(testButton, &QWinThumbnailToolButton::clicked, this, &MainWindow::testButtonClicked);
     m_thumbnailToolBar->addButton(testButton);
     m_thumbnailToolBar->setIconicPixmapNotificationsEnabled(true);
-    connect(m_thumbnailToolBar, SIGNAL(iconicLivePreviewPixmapRequested()),
-            this, SLOT(updateIconicLivePreviewPixmap()));
-    connect(m_thumbnailToolBar, SIGNAL(iconicThumbnailPixmapRequested()),
-            this, SLOT(updateIconicThumbnailPixmap()));
+    connect(m_thumbnailToolBar, &QWinThumbnailToolBar::iconicLivePreviewPixmapRequested,
+            this, &MainWindow::updateIconicLivePreviewPixmap);
+    connect(m_thumbnailToolBar, &QWinThumbnailToolBar::iconicThumbnailPixmapRequested,
+            this, &MainWindow::updateIconicThumbnailPixmap);
 }
 
 void MainWindow::logText(const QString &text)