QtGui documentation: cleanup

Cleanup the QtGui documentation:
 - use new signal/slot syntax
 - use range-based for loop instead foreach

Change-Id: Id49ff2cbe78f28a06ca0fb63e6ca6f7dc2736f7b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>

2 files changed, 11 insertions, 11 deletions

diff --git a/src/gui/doc/snippets/separations/screenwidget.cpp b/src/gui/doc/snippets/separations/screenwidget.cpp
index 6f8be49bfa..d562991d26 100644
--- a/src/gui/doc/snippets/separations/screenwidget.cpp
+++ b/src/gui/doc/snippets/separations/screenwidget.cpp
@@ -105,8 +105,8 @@ ScreenWidget::ScreenWidget(QWidget *parent, QColor initialColor,
     //invertButton->setOn(inverted);
     invertButton->setEnabled(false);
 
-    connect(colorButton, SIGNAL(clicked()), this, SLOT(setColor()));
-    connect(invertButton, SIGNAL(clicked()), this, SLOT(invertImage()));
+    connect(colorButton, &QPushButton::clicked, this, &ScreenWidget::setColor);
+    connect(invertButton, &QPushButton::clicked, this, &ScreenWidget::invertImage);
 
     QGridLayout *gridLayout = new QGridLayout;
     gridLayout->addWidget(imageLabel, 0, 0, 1, 2);
diff --git a/src/gui/doc/snippets/separations/viewer.cpp b/src/gui/doc/snippets/separations/viewer.cpp
index 641294ea35..018b397f1a 100644
--- a/src/gui/doc/snippets/separations/viewer.cpp
+++ b/src/gui/doc/snippets/separations/viewer.cpp
@@ -58,7 +58,7 @@ A main menu provides entries for selecting files, and adjusting the
 brightness of the separations.
 */
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "finalwidget.h"
 #include "screenwidget.h"
@@ -126,11 +126,11 @@ void Viewer::createMenus()
     menuBar()->addMenu(fileMenu);
     menuBar()->addMenu(brightnessMenu);
 
-    connect(openAction, SIGNAL(triggered()), this, SLOT(chooseFile()));
-    connect(saveAction, SIGNAL(triggered()), this, SLOT(saveImage()));
-    connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
-    connect(brightnessMenu, SIGNAL(triggered(QAction*)), this,
-            SLOT(setBrightness(QAction*)));
+    connect(openAction, &QAction::triggered, this, &Viewer::chooseFile);
+    connect(saveAction, &QAction::triggered, this, &Viewer::saveImage);
+    connect(quitAction, &QAction::triggered, qApp, QApplication::quit);
+    connect(brightnessMenu, &QMenu::triggered,
+            this, &Viewer::setBrightness);
 }
 
 /*
@@ -160,9 +160,9 @@ QFrame* Viewer::createCentralWidget()
     yellowWidget = new ScreenWidget(frame, Qt::yellow, tr("Yellow"),
                                     ScreenWidget::Yellow, labelSize);
 
-    connect(cyanWidget, SIGNAL(imageChanged()), this, SLOT(createImage()));
-    connect(magentaWidget, SIGNAL(imageChanged()), this, SLOT(createImage()));
-    connect(yellowWidget, SIGNAL(imageChanged()), this, SLOT(createImage()));
+    connect(cyanWidget, &ScreenWidget::imageChanged, this, &Viewer::createImage);
+    connect(magentaWidget, &ScreenWidget::imageChanged, this, &Viewer::createImage);
+    connect(yellowWidget, &ScreenWidget::imageChanged, this, &Viewer::createImage);
 
     grid->addWidget(finalWidget, 0, 0, Qt::AlignTop | Qt::AlignHCenter);
     grid->addWidget(cyanWidget, 0, 1, Qt::AlignTop | Qt::AlignHCenter);