diff --git a/examples/widgets/dialogs/standarddialogs/dialog.cpp b/examples/widgets/dialogs/standarddialogs/dialog.cpp index 67fb615794d..45b45699386 100644 --- a/examples/widgets/dialogs/standarddialogs/dialog.cpp +++ b/examples/widgets/dialogs/standarddialogs/dialog.cpp @@ -1,10 +1,25 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -#include - #include "dialog.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + class DialogOptionsWidget : public QGroupBox { public: @@ -15,7 +30,7 @@ public: int value() const; private: - typedef QPair CheckBoxEntry; + using CheckBoxEntry = QPair; QVBoxLayout *layout; QList checkBoxEntries; }; @@ -29,7 +44,7 @@ DialogOptionsWidget::DialogOptionsWidget(QWidget *parent) : void DialogOptionsWidget::addCheckBox(const QString &text, int value) { - QCheckBox *checkBox = new QCheckBox(text); + auto *checkBox = new QCheckBox(text); layout->addWidget(checkBox); checkBoxEntries.append(CheckBoxEntry(checkBox, value)); } @@ -52,17 +67,17 @@ int DialogOptionsWidget::value() const Dialog::Dialog(QWidget *parent) : QWidget(parent) { - QVBoxLayout *verticalLayout; + QVBoxLayout *verticalLayout{}; if (QGuiApplication::styleHints()->showIsFullScreen() || QGuiApplication::styleHints()->showIsMaximized()) { - QHBoxLayout *horizontalLayout = new QHBoxLayout(this); - QGroupBox *groupBox = new QGroupBox(QGuiApplication::applicationDisplayName(), this); + auto *horizontalLayout = new QHBoxLayout(this); + auto *groupBox = new QGroupBox(QGuiApplication::applicationDisplayName(), this); horizontalLayout->addWidget(groupBox); verticalLayout = new QVBoxLayout(groupBox); } else { verticalLayout = new QVBoxLayout(this); } - QToolBox *toolbox = new QToolBox; + auto *toolbox = new QToolBox; verticalLayout->addWidget(toolbox); errorMessageDialog = new QErrorMessage(this); @@ -71,58 +86,51 @@ Dialog::Dialog(QWidget *parent) integerLabel = new QLabel; integerLabel->setFrameStyle(frameStyle); - QPushButton *integerButton = - new QPushButton(tr("QInputDialog::get&Int()")); + auto *integerButton = new QPushButton(tr("QInputDialog::get&Int()")); doubleLabel = new QLabel; doubleLabel->setFrameStyle(frameStyle); - QPushButton *doubleButton = - new QPushButton(tr("QInputDialog::get&Double()")); + auto *doubleButton = new QPushButton(tr("QInputDialog::get&Double()")); itemLabel = new QLabel; itemLabel->setFrameStyle(frameStyle); - QPushButton *itemButton = new QPushButton(tr("QInputDialog::getIte&m()")); + auto *itemButton = new QPushButton(tr("QInputDialog::getIte&m()")); textLabel = new QLabel; textLabel->setFrameStyle(frameStyle); - QPushButton *textButton = new QPushButton(tr("QInputDialog::get&Text()")); + auto *textButton = new QPushButton(tr("QInputDialog::get&Text()")); multiLineTextLabel = new QLabel; multiLineTextLabel->setFrameStyle(frameStyle); - QPushButton *multiLineTextButton = new QPushButton(tr("QInputDialog::get&MultiLineText()")); + auto *multiLineTextButton = new QPushButton(tr("QInputDialog::get&MultiLineText()")); colorLabel = new QLabel; colorLabel->setFrameStyle(frameStyle); - QPushButton *colorButton = new QPushButton(tr("QColorDialog::get&Color()")); + auto *colorButton = new QPushButton(tr("QColorDialog::get&Color()")); fontLabel = new QLabel; fontLabel->setFrameStyle(frameStyle); - QPushButton *fontButton = new QPushButton(tr("QFontDialog::get&Font()")); + auto *fontButton = new QPushButton(tr("QFontDialog::get&Font()")); directoryLabel = new QLabel; directoryLabel->setFrameStyle(frameStyle); - QPushButton *directoryButton = - new QPushButton(tr("QFileDialog::getE&xistingDirectory()")); + auto *directoryButton = new QPushButton(tr("QFileDialog::getE&xistingDirectory()")); openFileNameLabel = new QLabel; openFileNameLabel->setFrameStyle(frameStyle); - QPushButton *openFileNameButton = - new QPushButton(tr("QFileDialog::get&OpenFileName()")); + auto *openFileNameButton = new QPushButton(tr("QFileDialog::get&OpenFileName()")); openFileNamesLabel = new QLabel; openFileNamesLabel->setFrameStyle(frameStyle); - QPushButton *openFileNamesButton = - new QPushButton(tr("QFileDialog::&getOpenFileNames()")); + auto *openFileNamesButton = new QPushButton(tr("QFileDialog::&getOpenFileNames()")); saveFileNameLabel = new QLabel; saveFileNameLabel->setFrameStyle(frameStyle); - QPushButton *saveFileNameButton = - new QPushButton(tr("QFileDialog::get&SaveFileName()")); + auto *saveFileNameButton = new QPushButton(tr("QFileDialog::get&SaveFileName()")); criticalLabel = new QLabel; criticalLabel->setFrameStyle(frameStyle); - QPushButton *criticalButton = - new QPushButton(tr("QMessageBox::critica&l()")); + auto *criticalButton = new QPushButton(tr("QMessageBox::critica&l()")); informationLabel = new QLabel; informationLabel->setFrameStyle(frameStyle); @@ -131,15 +139,13 @@ Dialog::Dialog(QWidget *parent) questionLabel = new QLabel; questionLabel->setFrameStyle(frameStyle); - QPushButton *questionButton = - new QPushButton(tr("QMessageBox::&question()")); + auto *questionButton = new QPushButton(tr("QMessageBox::&question()")); warningLabel = new QLabel; warningLabel->setFrameStyle(frameStyle); - QPushButton *warningButton = new QPushButton(tr("QMessageBox::&warning()")); + auto *warningButton = new QPushButton(tr("QMessageBox::&warning()")); - QPushButton *errorButton = - new QPushButton(tr("QErrorMessage::showM&essage()")); + auto *errorButton = new QPushButton(tr("QErrorMessage::showM&essage()")); connect(integerButton, &QAbstractButton::clicked, this, &Dialog::setInteger); connect(doubleButton, &QAbstractButton::clicked, this, &Dialog::setDouble); @@ -163,8 +169,8 @@ Dialog::Dialog(QWidget *parent) connect(warningButton, &QAbstractButton::clicked, this, &Dialog::warningMessage); connect(errorButton, &QAbstractButton::clicked, this, &Dialog::errorMessage); - QWidget *page = new QWidget; - QGridLayout *layout = new QGridLayout(page); + auto *page = new QWidget; + auto *layout = new QGridLayout(page); layout->setColumnStretch(1, 1); layout->setColumnMinimumWidth(1, 250); layout->addWidget(integerButton, 0, 0); @@ -268,7 +274,7 @@ void Dialog::setInteger() void Dialog::setDouble() { //! [1] - bool ok; + bool ok{}; double d = QInputDialog::getDouble(this, tr("QInputDialog::getDouble()"), tr("Amount:"), 37.56, -10000, 10000, 2, &ok, Qt::WindowFlags(), 1); @@ -280,10 +286,9 @@ void Dialog::setDouble() void Dialog::setItem() { //! [2] - QStringList items; - items << tr("Spring") << tr("Summer") << tr("Fall") << tr("Winter"); + const QStringList items{tr("Spring"), tr("Summer"), tr("Fall"), tr("Winter")}; - bool ok; + bool ok{}; QString item = QInputDialog::getItem(this, tr("QInputDialog::getItem()"), tr("Season:"), items, 0, false, &ok); if (ok && !item.isEmpty()) @@ -294,7 +299,7 @@ void Dialog::setItem() void Dialog::setText() { //! [3] - bool ok; + bool ok{}; QString text = QInputDialog::getText(this, tr("QInputDialog::getText()"), tr("User name:"), QLineEdit::Normal, QDir::home().dirName(), &ok); @@ -306,7 +311,7 @@ void Dialog::setText() void Dialog::setMultiLineText() { //! [4] - bool ok; + bool ok{}; QString text = QInputDialog::getMultiLineText(this, tr("QInputDialog::getMultiLineText()"), tr("Address:"), "John Doe\nFreedom Street", &ok); if (ok && !text.isEmpty()) @@ -335,7 +340,7 @@ void Dialog::setFont() if (!description.isEmpty()) defaultFont.fromString(description); - bool ok; + bool ok{}; QFont font = QFontDialog::getFont(&ok, defaultFont, this, "Select Font", options); if (ok) { fontLabel->setText(font.key()); @@ -379,8 +384,8 @@ void Dialog::setOpenFileNames() tr("All Files (*);;Text Files (*.txt)"), &selectedFilter, options); - if (files.count()) { - openFilesPath = files[0]; + if (!files.isEmpty()) { + openFilesPath = files.constFirst(); openFileNamesLabel->setText(QString("[%1]").arg(files.join(", "))); } } diff --git a/examples/widgets/dialogs/standarddialogs/main.cpp b/examples/widgets/dialogs/standarddialogs/main.cpp index c982ef36c5a..bd6e25d77e5 100644 --- a/examples/widgets/dialogs/standarddialogs/main.cpp +++ b/examples/widgets/dialogs/standarddialogs/main.cpp @@ -20,7 +20,7 @@ int main(int argc, char *argv[]) QTranslator translator; if (translator.load(QLocale::system(), u"qtbase"_s, u"_"_s, QLibraryInfo::path(QLibraryInfo::TranslationsPath))) { - app.installTranslator(&translator); + QCoreApplication::installTranslator(&translator); } #endif @@ -35,5 +35,5 @@ int main(int argc, char *argv[]) } dialog.show(); - return app.exec(); + return QCoreApplication::exec(); }