Revamp SQL examples to C++11

Changed signals and slots to new syntax, used nullptr and replaced
foreach with new C++11 range based for loops.
Also fixed a few minor flaws.

Task-number: QTBUG-60633
Change-Id: Ice4030133971912f96752d9d84c638c70fd73e35
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

1 files changed, 8 insertions, 6 deletions

diff --git a/examples/sql/sqlbrowser/main.cpp b/examples/sql/sqlbrowser/main.cpp
index 002dbc3242..ea4649b68d 100644
--- a/examples/sql/sqlbrowser/main.cpp
+++ b/examples/sql/sqlbrowser/main.cpp
@@ -80,16 +80,18 @@ int main(int argc, char *argv[])
     mainWin.setCentralWidget(&browser);
 
     QMenu *fileMenu = mainWin.menuBar()->addMenu(QObject::tr("&File"));
-    fileMenu->addAction(QObject::tr("Add &Connection..."), &browser, SLOT(addConnection()));
+    fileMenu->addAction(QObject::tr("Add &Connection..."),
+            [&]() { browser.addConnection(); });
     fileMenu->addSeparator();
-    fileMenu->addAction(QObject::tr("&Quit"), &app, SLOT(quit()));
+    fileMenu->addAction(QObject::tr("&Quit"), []() { qApp->quit(); });
 
     QMenu *helpMenu = mainWin.menuBar()->addMenu(QObject::tr("&Help"));
-    helpMenu->addAction(QObject::tr("About"), &browser, SLOT(about()));
-    helpMenu->addAction(QObject::tr("About Qt"), qApp, SLOT(aboutQt()));
+    helpMenu->addAction(QObject::tr("About"), [&]() { browser.about(); });
+    helpMenu->addAction(QObject::tr("About Qt"), []() { qApp->aboutQt(); });
 
-    QObject::connect(&browser, SIGNAL(statusMessage(QString)),
-                     mainWin.statusBar(), SLOT(showMessage(QString)));
+    QObject::connect(&browser, &Browser::statusMessage, [&mainWin](const QString &text) {
+        mainWin.statusBar()->showMessage(text);
+    });
 
     addConnectionsFromCommandline(app.arguments(), &browser);
     mainWin.show();