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>

1 files changed, 31 insertions, 14 deletions

diff --git a/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp b/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp
index e3ab2b9c10..2b85e95805 100644
--- a/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp
+++ b/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp
@@ -2,69 +2,86 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 #include "qsqlconnectiondialog.h"
-#include "ui_qsqlconnectiondialog.h"
+#include <ui_qsqlconnectiondialog.h>
 
+#include <QCheckBox>
+#include <QMessageBox>
+#include <QPushButton>
 #include <QSqlDatabase>
 
 QSqlConnectionDialog::QSqlConnectionDialog(QWidget *parent)
     : QDialog(parent)
+    , m_ui(new Ui::QSqlConnectionDialogUi)
 {
-    ui.setupUi(this);
+    m_ui->setupUi(this);
 
     QStringList drivers = QSqlDatabase::drivers();
 
     if (!drivers.contains("QSQLITE"))
-        ui.dbCheckBox->setEnabled(false);
+        m_ui->dbCheckBox->setEnabled(false);
 
-    ui.comboDriver->addItems(drivers);
+    m_ui->comboDriver->addItems(drivers);
+
+    connect(m_ui->okButton, &QPushButton::clicked,
+            this, &QSqlConnectionDialog::onOkButton);
+    connect(m_ui->cancelButton, &QPushButton::clicked,
+            this, &QSqlConnectionDialog::reject);
+    connect(m_ui->dbCheckBox, &QCheckBox::stateChanged,
+            this, &QSqlConnectionDialog::onDbCheckBox);
 }
 
 QSqlConnectionDialog::~QSqlConnectionDialog()
 {
+    delete m_ui;
 }
 
 QString QSqlConnectionDialog::driverName() const
 {
-    return ui.comboDriver->currentText();
+    return m_ui->comboDriver->currentText();
 }
 
 QString QSqlConnectionDialog::databaseName() const
 {
-    return ui.editDatabase->text();
+    return m_ui->editDatabase->text();
 }
 
 QString QSqlConnectionDialog::userName() const
 {
-    return ui.editUsername->text();
+    return m_ui->editUsername->text();
 }
 
 QString QSqlConnectionDialog::password() const
 {
-    return ui.editPassword->text();
+    return m_ui->editPassword->text();
 }
 
 QString QSqlConnectionDialog::hostName() const
 {
-    return ui.editHostname->text();
+    return m_ui->editHostname->text();
 }
 
 int QSqlConnectionDialog::port() const
 {
-    return ui.portSpinBox->value();
+    return m_ui->portSpinBox->value();
 }
 
 bool QSqlConnectionDialog::useInMemoryDatabase() const
 {
-    return ui.dbCheckBox->isChecked();
+    return m_ui->dbCheckBox->isChecked();
 }
 
-void QSqlConnectionDialog::on_okButton_clicked()
+void QSqlConnectionDialog::onOkButton()
 {
-    if (ui.comboDriver->currentText().isEmpty()) {
+    if (m_ui->comboDriver->currentText().isEmpty()) {
         QMessageBox::information(this, tr("No database driver selected"),
                                  tr("Please select a database driver"));
-        ui.comboDriver->setFocus();
+        m_ui->comboDriver->setFocus();
     } else {
         accept();
     }
 }
+
+void QSqlConnectionDialog::onDbCheckBox()
+{
+    m_ui->connGroupBox->setEnabled(!m_ui->dbCheckBox->isChecked());
+}