diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2024-01-12 22:25:23 +0100 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2024-01-19 17:27:25 +0100 |
commit | 2690822428deec4f0c08f4d118d69a7c6036369e (patch) | |
tree | db42e9c2e4b0013a96504521cdf2d679ef28c407 /examples/sql/sqlbrowser/main.cpp | |
parent | dc4159286b8571a3f3543e457fe1b51b9f5965b7 (diff) |
Examples/sqlbrowser: improve coding style
Fix the coding style to match the current Qt style.
Pick-to: 6.7
Fixes: QTBUG-68661
Fixes: QTBUG-120909
Change-Id: I314ca9da8a03727e3e0336a23fce1ce9d065d3a4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Diffstat (limited to 'examples/sql/sqlbrowser/main.cpp')
-rw-r--r-- | examples/sql/sqlbrowser/main.cpp | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/examples/sql/sqlbrowser/main.cpp b/examples/sql/sqlbrowser/main.cpp index d57a59173b..b3fa8af142 100644 --- a/examples/sql/sqlbrowser/main.cpp +++ b/examples/sql/sqlbrowser/main.cpp @@ -3,16 +3,21 @@ #include "browser.h" -#include <QtCore> -#include <QtWidgets> -#include <QtSql> +#include <QApplication> +#include <QMainWindow> +#include <QMenu> +#include <QMenuBar> +#include <QSqlError> +#include <QStatusBar> +#include <QUrl> void addConnectionsFromCommandline(const QStringList &args, Browser *browser) { - for (int i = 1; i < args.count(); ++i) { - QUrl url(args.at(i), QUrl::TolerantMode); + for (qsizetype i = 1; i < args.count(); ++i) { + const auto &arg = args.at(i); + const QUrl url(arg, QUrl::TolerantMode); if (!url.isValid()) { - qWarning("Invalid URL: %s", qPrintable(args.at(i))); + qWarning("Invalid URL: %s", qPrintable(arg)); continue; } QSqlError err = browser->addConnection(url.scheme(), url.path().mid(1), url.host(), @@ -27,23 +32,26 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); QMainWindow mainWin; - mainWin.setWindowTitle(QObject::tr("Qt SQL Browser")); + mainWin.setWindowTitle(QApplication::translate("MainWindow", "Qt SQL Browser")); Browser browser(&mainWin); mainWin.setCentralWidget(&browser); QMenu *fileMenu = mainWin.menuBar()->addMenu(QObject::tr("&File")); - fileMenu->addAction(QObject::tr("Add &Connection..."), &browser, - &Browser::openNewConnectionDialog); + fileMenu->addAction(QApplication::translate("MainWindow", "Add &Connection..."), + &browser, &Browser::openNewConnectionDialog); fileMenu->addSeparator(); - fileMenu->addAction(QObject::tr("&Quit"), qApp, &QApplication::quit); + fileMenu->addAction(QApplication::translate("MainWindow", "&Quit"), + qApp, &QApplication::quit); QMenu *helpMenu = mainWin.menuBar()->addMenu(QObject::tr("&Help")); - helpMenu->addAction(QObject::tr("About"), &browser, &Browser::about); - helpMenu->addAction(QObject::tr("About Qt"), qApp, &QApplication::aboutQt); + helpMenu->addAction(QApplication::translate("MainWindow", "About"), + &browser, &Browser::about); + helpMenu->addAction(QApplication::translate("MainWindow", "About Qt"), + qApp, &QApplication::aboutQt); - QObject::connect(&browser, &Browser::statusMessage, &mainWin, - [&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(); |