summaryrefslogtreecommitdiffstats
path: root/examples/sql/sqlbrowser
diff options
context:
space:
mode:
Diffstat (limited to 'examples/sql/sqlbrowser')
-rw-r--r--examples/sql/sqlbrowser/browser.cpp2
-rw-r--r--examples/sql/sqlbrowser/browser.h2
-rw-r--r--examples/sql/sqlbrowser/main.cpp15
3 files changed, 9 insertions, 10 deletions
diff --git a/examples/sql/sqlbrowser/browser.cpp b/examples/sql/sqlbrowser/browser.cpp
index 98270fd5b5b..077e8df51c4 100644
--- a/examples/sql/sqlbrowser/browser.cpp
+++ b/examples/sql/sqlbrowser/browser.cpp
@@ -71,7 +71,7 @@ QSqlError Browser::addConnection(const QString &driver, const QString &dbName, c
return err;
}
-void Browser::addConnection()
+void Browser::openNewConnectionDialog()
{
QSqlConnectionDialog dialog(this);
if (dialog.exec() != QDialog::Accepted)
diff --git a/examples/sql/sqlbrowser/browser.h b/examples/sql/sqlbrowser/browser.h
index cf959703b3e..82702b2ae3c 100644
--- a/examples/sql/sqlbrowser/browser.h
+++ b/examples/sql/sqlbrowser/browser.h
@@ -32,7 +32,7 @@ public slots:
void exec();
void showTable(const QString &table);
void showMetaData(const QString &table);
- void addConnection();
+ void openNewConnectionDialog();
void currentChanged() { updateActions(); }
void about();
diff --git a/examples/sql/sqlbrowser/main.cpp b/examples/sql/sqlbrowser/main.cpp
index c6babea96fb..445c04637ec 100644
--- a/examples/sql/sqlbrowser/main.cpp
+++ b/examples/sql/sqlbrowser/main.cpp
@@ -33,18 +33,17 @@ int main(int argc, char *argv[])
mainWin.setCentralWidget(&browser);
QMenu *fileMenu = mainWin.menuBar()->addMenu(QObject::tr("&File"));
- fileMenu->addAction(QObject::tr("Add &Connection..."),
- [&]() { browser.addConnection(); });
+ fileMenu->addAction(QObject::tr("Add &Connection..."), &browser,
+ &Browser::openNewConnectionDialog);
fileMenu->addSeparator();
- fileMenu->addAction(QObject::tr("&Quit"), []() { qApp->quit(); });
+ fileMenu->addAction(QObject::tr("&Quit"), qApp, &QApplication::quit);
QMenu *helpMenu = mainWin.menuBar()->addMenu(QObject::tr("&Help"));
- helpMenu->addAction(QObject::tr("About"), [&]() { browser.about(); });
- helpMenu->addAction(QObject::tr("About Qt"), []() { qApp->aboutQt(); });
+ helpMenu->addAction(QObject::tr("About"), &browser, &Browser::about);
+ helpMenu->addAction(QObject::tr("About Qt"), qApp, &QApplication::aboutQt);
- QObject::connect(&browser, &Browser::statusMessage, [&mainWin](const QString &text) {
- mainWin.statusBar()->showMessage(text);
- });
+ QObject::connect(&browser, &Browser::statusMessage, &mainWin,
+ [&mainWin](const QString &text) { mainWin.statusBar()->showMessage(text); });
addConnectionsFromCommandline(app.arguments(), &browser);
mainWin.show();