diff options
| author | Ahmad Samir <a.samirh78@gmail.com> | 2023-07-21 01:04:40 +0300 |
|---|---|---|
| committer | Ahmad Samir <a.samirh78@gmail.com> | 2023-09-08 19:17:36 +0300 |
| commit | 09b852b1d8519db1b614a1a6438ff59a928f3b9f (patch) | |
| tree | 4f1afedb79fbb7e9bbf3c2df491c41b3fbfec05e /examples/sql/sqlbrowser | |
| parent | 9016def4dc75e35509cc1a5f5168514b0d88af56 (diff) | |
examples/: compile with QT_NO_CONTEXTLESS_CONNECT
Examples are usually a good way to get to know a new codebase, do not
teach developers who are new to Qt about the 3-arg connect() to begin
with.
Drive-by changes:
- `this` can't be implicitly captured with [=] in a lambda, instead
capture by reference
- Update docs related to the sqlbrowser example; the overloaded signal
it mentions has been removed in Qt6
- In the sqlbrowser example, rename addConnection() (no-arg) overload to
openNewConnectionDialog, suggested in code review
Change-Id: I30c9f35bda4ac2f460d767ab7f84422ae3ed09f7
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'examples/sql/sqlbrowser')
| -rw-r--r-- | examples/sql/sqlbrowser/browser.cpp | 2 | ||||
| -rw-r--r-- | examples/sql/sqlbrowser/browser.h | 2 | ||||
| -rw-r--r-- | examples/sql/sqlbrowser/main.cpp | 15 |
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(); |