diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-20 18:40:42 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-23 15:42:44 +0100 |
commit | d1e672c47fd9cfa60f646554db6cba9de08a044f (patch) | |
tree | 2f03309668e86c747d55ff56839901144d1d8708 /examples/designer | |
parent | f9bf4575514eff5079da3b5c479fe122f636f699 (diff) | |
download | qttools-d1e672c47fd9cfa60f646554db6cba9de08a044f.tar.gz |
Polish the Qt Designer examples
- Use new string literals
- Reorder includes
- Use some auto
- Minor fixes
Pick-to: 6.5 6.4
Fixes: QTBUG-110447
Change-Id: I5af23a662dffb3a01795d1f62c573f854e2ee103
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'examples/designer')
14 files changed, 72 insertions, 73 deletions
diff --git a/examples/designer/calculatorbuilder/calculatorform.cpp b/examples/designer/calculatorbuilder/calculatorform.cpp index 685bd4859..7af960f7e 100644 --- a/examples/designer/calculatorbuilder/calculatorform.cpp +++ b/examples/designer/calculatorbuilder/calculatorform.cpp @@ -1,15 +1,18 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +#include "calculatorform.h" + //! [0] #include <QtUiTools> //! [0] -#include <QSpinBox> #include <QLabel> +#include <QSpinBox> #include <QVBoxLayout> + #include <QFile> -#include "calculatorform.h" +using namespace Qt::StringLiterals; //! [1] CalculatorForm::CalculatorForm(QWidget *parent) @@ -17,16 +20,16 @@ CalculatorForm::CalculatorForm(QWidget *parent) { QUiLoader loader; - QFile file(":/forms/calculatorform.ui"); + QFile file(u":/forms/calculatorform.ui"_s); file.open(QFile::ReadOnly); QWidget *formWidget = loader.load(&file, this); file.close(); //! [1] //! [2] - ui_inputSpinBox1 = findChild<QSpinBox*>("inputSpinBox1"); - ui_inputSpinBox2 = findChild<QSpinBox*>("inputSpinBox2"); - ui_outputWidget = findChild<QLabel*>("outputWidget"); + ui_inputSpinBox1 = findChild<QSpinBox*>(u"inputSpinBox1"_s); + ui_inputSpinBox2 = findChild<QSpinBox*>(u"inputSpinBox2"_s); + ui_outputWidget = findChild<QLabel*>(u"outputWidget"_s); //! [2] //! [3] @@ -34,9 +37,8 @@ CalculatorForm::CalculatorForm(QWidget *parent) //! [3] //! [4] - QVBoxLayout *layout = new QVBoxLayout; + auto *layout = new QVBoxLayout(this); layout->addWidget(formWidget); - setLayout(layout); setWindowTitle(tr("Calculator Builder")); } diff --git a/examples/designer/calculatorbuilder/calculatorform.h b/examples/designer/calculatorbuilder/calculatorform.h index 61f013753..ca34f1acf 100644 --- a/examples/designer/calculatorbuilder/calculatorform.h +++ b/examples/designer/calculatorbuilder/calculatorform.h @@ -30,4 +30,4 @@ private: }; //! [0] -#endif +#endif // CALCULATORFORM_H diff --git a/examples/designer/calculatorbuilder/main.cpp b/examples/designer/calculatorbuilder/main.cpp index 9c19b284a..54f091438 100644 --- a/examples/designer/calculatorbuilder/main.cpp +++ b/examples/designer/calculatorbuilder/main.cpp @@ -1,10 +1,10 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -#include <QApplication> - #include "calculatorform.h" +#include <QApplication> + int main(int argc, char *argv[]) { Q_INIT_RESOURCE(calculatorbuilder); diff --git a/examples/designer/containerextension/multipagewidget.cpp b/examples/designer/containerextension/multipagewidget.cpp index 5139a2a63..c4131ba67 100644 --- a/examples/designer/containerextension/multipagewidget.cpp +++ b/examples/designer/containerextension/multipagewidget.cpp @@ -12,19 +12,19 @@ MultiPageWidget::MultiPageWidget(QWidget *parent) , stackWidget(new QStackedWidget) , comboBox(new QComboBox) { - comboBox->setObjectName(QStringLiteral("__qt__passive_comboBox")); + comboBox->setObjectName("__qt__passive_comboBox"); - connect(comboBox, QOverload<int>::of(&QComboBox::activated), + connect(comboBox, &QComboBox::activated, this, &MultiPageWidget::setCurrentIndex); - QVBoxLayout *layout = new QVBoxLayout(this); + auto *layout = new QVBoxLayout(this); layout->addWidget(comboBox); layout->addWidget(stackWidget); } QSize MultiPageWidget::sizeHint() const { - return QSize(200, 150); + return {200, 150}; } void MultiPageWidget::addPage(QWidget *page) @@ -34,7 +34,7 @@ void MultiPageWidget::addPage(QWidget *page) void MultiPageWidget::removePage(int index) { - QWidget *widget = stackWidget->widget(index); + auto *widget = stackWidget->widget(index); stackWidget->removeWidget(widget); comboBox->removeItem(index); @@ -91,10 +91,10 @@ QString MultiPageWidget::pageTitle() const { if (const QWidget *currentWidget = stackWidget->currentWidget()) return currentWidget->windowTitle(); - return QString(); + return {}; } -void MultiPageWidget::setPageTitle(QString const &newTitle) +void MultiPageWidget::setPageTitle(const QString &newTitle) { if (QWidget *currentWidget = stackWidget->currentWidget()) currentWidget->setWindowTitle(newTitle); diff --git a/examples/designer/containerextension/multipagewidget.h b/examples/designer/containerextension/multipagewidget.h index 0f899c91f..788aaa67e 100644 --- a/examples/designer/containerextension/multipagewidget.h +++ b/examples/designer/containerextension/multipagewidget.h @@ -32,7 +32,7 @@ public slots: void addPage(QWidget *page); void insertPage(int index, QWidget *page); void removePage(int index); - void setPageTitle(QString const &newTitle); + void setPageTitle(const QString &newTitle); void setCurrentIndex(int index); private slots: diff --git a/examples/designer/customwidgetplugin/analogclock.cpp b/examples/designer/customwidgetplugin/analogclock.cpp index 8d0f4e40d..23461edbf 100644 --- a/examples/designer/customwidgetplugin/analogclock.cpp +++ b/examples/designer/customwidgetplugin/analogclock.cpp @@ -5,6 +5,7 @@ #include <QMouseEvent> #include <QPainter> + #include <QTime> #include <QTimer> @@ -12,7 +13,7 @@ AnalogClock::AnalogClock(QWidget *parent) : QWidget(parent) { QTimer *timer = new QTimer(this); - connect(timer, &QTimer::timeout, this, QOverload<>::of(&QWidget::update)); + connect(timer, &QTimer::timeout, this, qOverload<>(&QWidget::update)); timer->start(1000); setWindowTitle(tr("Analog Clock")); @@ -21,21 +22,13 @@ AnalogClock::AnalogClock(QWidget *parent) void AnalogClock::paintEvent(QPaintEvent *) { - static const QPoint hourHand[3] = { - QPoint(7, 8), - QPoint(-7, 8), - QPoint(0, -40) - }; - static const QPoint minuteHand[3] = { - QPoint(7, 8), - QPoint(-7, 8), - QPoint(0, -70) - }; + static const QPoint hourHand[3] = {{7, 8}, {-7, 8}, {0, -40}}; + static const QPoint minuteHand[3] = {{7, 8}, {-7, 8}, {0, -70}}; QColor hourColor(127, 0, 127); QColor minuteColor(0, 127, 127, 191); - int side = qMin(width(), height()); + const int side = qMin(width(), height()); QTime time = QTime::currentTime(); QPainter painter(this); diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.cpp b/examples/designer/customwidgetplugin/customwidgetplugin.cpp index 11d8bd76c..b85bf4ca0 100644 --- a/examples/designer/customwidgetplugin/customwidgetplugin.cpp +++ b/examples/designer/customwidgetplugin/customwidgetplugin.cpp @@ -6,6 +6,8 @@ #include <QtPlugin> +using namespace Qt::StringLiterals; + //! [0] AnalogClockPlugin::AnalogClockPlugin(QObject *parent) : QObject(parent) @@ -40,35 +42,35 @@ QWidget *AnalogClockPlugin::createWidget(QWidget *parent) //! [4] QString AnalogClockPlugin::name() const { - return QStringLiteral("AnalogClock"); + return u"AnalogClock"_s; } //! [4] //! [5] QString AnalogClockPlugin::group() const { - return QStringLiteral("Display Widgets [Examples]"); + return u"Display Widgets [Examples]"_s; } //! [5] //! [6] QIcon AnalogClockPlugin::icon() const { - return QIcon(); + return {}; } //! [6] //! [7] QString AnalogClockPlugin::toolTip() const { - return QString(); + return {}; } //! [7] //! [8] QString AnalogClockPlugin::whatsThis() const { - return QString(); + return {}; } //! [8] @@ -82,7 +84,7 @@ bool AnalogClockPlugin::isContainer() const //! [10] QString AnalogClockPlugin::domXml() const { - return QLatin1String(R"( + return uR"( <ui language="c++"> <widget class="AnalogClock" name="analogClock"> )" @@ -107,13 +109,13 @@ R"( </property> </widget> </ui> -)"); +)"_s; } //! [10] //! [12] QString AnalogClockPlugin::includeFile() const { - return QStringLiteral("analogclock.h"); + return u"analogclock.h"_s; } //! [12] diff --git a/examples/designer/taskmenuextension/tictactoe.cpp b/examples/designer/taskmenuextension/tictactoe.cpp index deaa7c4a4..58bc359b3 100644 --- a/examples/designer/taskmenuextension/tictactoe.cpp +++ b/examples/designer/taskmenuextension/tictactoe.cpp @@ -6,7 +6,9 @@ #include <QMouseEvent> #include <QPainter> -static inline QString defaultState() { return QStringLiteral("---------"); } +using namespace Qt::StringLiterals; + +static inline QString defaultState() { return u"---------"_s; } TicTacToe::TicTacToe(QWidget *parent) : QWidget(parent), myState(defaultState()) diff --git a/examples/designer/taskmenuextension/tictactoedialog.cpp b/examples/designer/taskmenuextension/tictactoedialog.cpp index 6ead30c42..97a4e60df 100644 --- a/examples/designer/taskmenuextension/tictactoedialog.cpp +++ b/examples/designer/taskmenuextension/tictactoedialog.cpp @@ -38,7 +38,7 @@ TicTacToeDialog::TicTacToeDialog(TicTacToe *tic, QWidget *parent) //! [1] QSize TicTacToeDialog::sizeHint() const { - return QSize(250, 250); + return {250, 250}; } //! [1] diff --git a/examples/designer/taskmenuextension/tictactoeplugin.cpp b/examples/designer/taskmenuextension/tictactoeplugin.cpp index 75dd91d7a..87d311805 100644 --- a/examples/designer/taskmenuextension/tictactoeplugin.cpp +++ b/examples/designer/taskmenuextension/tictactoeplugin.cpp @@ -9,6 +9,8 @@ #include <QtDesigner/QExtensionManager> #include <QtPlugin> +using namespace Qt::StringLiterals; + //! [0] TicTacToePlugin::TicTacToePlugin(QObject *parent) : QObject(parent) @@ -17,32 +19,32 @@ TicTacToePlugin::TicTacToePlugin(QObject *parent) QString TicTacToePlugin::name() const { - return QStringLiteral("TicTacToe"); + return u"TicTacToe"_s; } QString TicTacToePlugin::group() const { - return QStringLiteral("Display Widgets [Examples]"); + return u"Display Widgets [Examples]"_s; } QString TicTacToePlugin::toolTip() const { - return QStringLiteral("Tic Tac Toe Example, demonstrating class QDesignerTaskMenuExtension (C++)"); + return u"Tic Tac Toe Example, demonstrating class QDesignerTaskMenuExtension (C++)"_s; } QString TicTacToePlugin::whatsThis() const { - return QString(); + return {}; } QString TicTacToePlugin::includeFile() const { - return QStringLiteral("tictactoe.h"); + return u"tictactoe.h"_s; } QIcon TicTacToePlugin::icon() const { - return QIcon(); + return {}; } bool TicTacToePlugin::isContainer() const @@ -52,8 +54,8 @@ bool TicTacToePlugin::isContainer() const QWidget *TicTacToePlugin::createWidget(QWidget *parent) { - TicTacToe *ticTacToe = new TicTacToe(parent); - ticTacToe->setState(QStringLiteral("-X-XO----")); + auto *ticTacToe = new TicTacToe(parent); + ticTacToe->setState(u"-X-XO----"_s); return ticTacToe; } @@ -70,7 +72,7 @@ void TicTacToePlugin::initialize(QDesignerFormEditorInterface *formEditor) return; QExtensionManager *manager = formEditor->extensionManager(); - Q_ASSERT(manager != 0); + Q_ASSERT(manager != nullptr); //! [2] //! [3] @@ -82,7 +84,7 @@ void TicTacToePlugin::initialize(QDesignerFormEditorInterface *formEditor) QString TicTacToePlugin::domXml() const { - return QLatin1String(R"( + return uR"( <ui language="c++"> <widget class="TicTacToe" name="ticTacToe"/> <customwidgets> @@ -95,7 +97,7 @@ QString TicTacToePlugin::domXml() const </customwidget> </customwidgets> </ui> -)"); +)"_s; } //! [3] diff --git a/examples/designer/taskmenuextension/tictactoetaskmenu.cpp b/examples/designer/taskmenuextension/tictactoetaskmenu.cpp index 967cb5920..b91994924 100644 --- a/examples/designer/taskmenuextension/tictactoetaskmenu.cpp +++ b/examples/designer/taskmenuextension/tictactoetaskmenu.cpp @@ -55,7 +55,7 @@ QObject *TicTacToeTaskMenuFactory::createExtension(QObject *object, if (iid != Q_TYPEID(QDesignerTaskMenuExtension)) return nullptr; - if (TicTacToe *tic = qobject_cast<TicTacToe*>(object)) + if (auto *tic = qobject_cast<TicTacToe*>(object)) return new TicTacToeTaskMenu(tic, parent); return nullptr; diff --git a/examples/designer/worldtimeclockbuilder/main.cpp b/examples/designer/worldtimeclockbuilder/main.cpp index 505222c04..18e879052 100644 --- a/examples/designer/worldtimeclockbuilder/main.cpp +++ b/examples/designer/worldtimeclockbuilder/main.cpp @@ -7,6 +7,9 @@ #include <QApplication> #include <QWidget> #include <QFile> + +using namespace Qt::StringLiterals; + //! [1] int main(int argc, char *argv[]) { @@ -18,7 +21,7 @@ int main(int argc, char *argv[]) //! [1] //! [2] - QFile file(":/forms/form.ui"); + QFile file(u":/forms/form.ui"_s); file.open(QFile::ReadOnly); QWidget *widget = loader.load(&file); diff --git a/examples/designer/worldtimeclockplugin/worldtimeclock.cpp b/examples/designer/worldtimeclockplugin/worldtimeclock.cpp index c9a19c196..c3190d275 100644 --- a/examples/designer/worldtimeclockplugin/worldtimeclock.cpp +++ b/examples/designer/worldtimeclockplugin/worldtimeclock.cpp @@ -5,13 +5,14 @@ #include <QMouseEvent> #include <QPainter> + #include <QTimer> WorldTimeClock::WorldTimeClock(QWidget *parent) : QWidget(parent) { QTimer *timer = new QTimer(this); - connect(timer, &QTimer::timeout, this, QOverload<>::of(&QWidget::update)); + connect(timer, &QTimer::timeout, this, qOverload<>(&QWidget::update)); timer->start(1000); setWindowTitle(tr("World Time Clock")); @@ -20,16 +21,8 @@ WorldTimeClock::WorldTimeClock(QWidget *parent) void WorldTimeClock::paintEvent(QPaintEvent *) { - static const QPoint hourHand[3] = { - QPoint(7, 8), - QPoint(-7, 8), - QPoint(0, -40) - }; - static const QPoint minuteHand[3] = { - QPoint(7, 8), - QPoint(-7, 8), - QPoint(0, -70) - }; + static const QPoint hourHand[3] = {{7, 8}, {-7, 8}, {0, -40}}; + static const QPoint minuteHand[3] = {{7, 8}, {-7, 8}, {0, -70}}; QColor hourColor(127, 0, 127); QColor minuteColor(0, 127, 127, 191); diff --git a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.cpp b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.cpp index 90d4a4fdf..4a52c3961 100644 --- a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.cpp +++ b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.cpp @@ -6,6 +6,8 @@ #include <QtPlugin> +using namespace Qt::StringLiterals; + WorldTimeClockPlugin::WorldTimeClockPlugin(QObject *parent) : QObject(parent) { @@ -31,27 +33,27 @@ QWidget *WorldTimeClockPlugin::createWidget(QWidget *parent) QString WorldTimeClockPlugin::name() const { - return QStringLiteral("WorldTimeClock"); + return u"WorldTimeClock"_s; } QString WorldTimeClockPlugin::group() const { - return QStringLiteral("Display Widgets [Examples]"); + return u"Display Widgets [Examples]"_s; } QIcon WorldTimeClockPlugin::icon() const { - return QIcon(); + return {}; } QString WorldTimeClockPlugin::toolTip() const { - return QString(); + return {}; } QString WorldTimeClockPlugin::whatsThis() const { - return QString(); + return {}; } bool WorldTimeClockPlugin::isContainer() const @@ -61,7 +63,7 @@ bool WorldTimeClockPlugin::isContainer() const QString WorldTimeClockPlugin::domXml() const { - return QLatin1String(R"( + return uR"( <ui language="c++"> <widget class="WorldTimeClock" name="worldTimeClock"> <property name="geometry"> @@ -74,10 +76,10 @@ QString WorldTimeClockPlugin::domXml() const </property> </widget> </ui> -)"); +)"_s; } QString WorldTimeClockPlugin::includeFile() const { - return QStringLiteral("worldtimeclock.h"); + return u"worldtimeclock.h"_s; } |