From 588bd92228efa7ed3a92929e0eb90c22be189e04 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sun, 2 Dec 2018 14:17:21 +0100 Subject: Cleanup Widgets examples - parent ctor Cleanup the Widgets examples - add missing parent parameter Change-Id: I5cd7aa333dbb8e6e4b7b9e05c085120733da83ec Reviewed-by: Samuel Gaist Reviewed-by: Konstantin Shegunov Reviewed-by: Richard Moe Gustavsen Reviewed-by: Paul Wicking --- examples/widgets/widgets/icons/mainwindow.cpp | 3 ++- examples/widgets/widgets/icons/mainwindow.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'examples/widgets/widgets/icons') diff --git a/examples/widgets/widgets/icons/mainwindow.cpp b/examples/widgets/widgets/icons/mainwindow.cpp index f704b8306f..904245494c 100644 --- a/examples/widgets/widgets/icons/mainwindow.cpp +++ b/examples/widgets/widgets/icons/mainwindow.cpp @@ -60,7 +60,8 @@ enum { OtherSize = QStyle::PM_CustomBase }; //! [40] //! [0] -MainWindow::MainWindow() +MainWindow::MainWindow(QWidget *parent) + : QMainWindow(parent) { QWidget *centralWidget = new QWidget(this); setCentralWidget(centralWidget); diff --git a/examples/widgets/widgets/icons/mainwindow.h b/examples/widgets/widgets/icons/mainwindow.h index e3888e5fb1..1949bd235c 100644 --- a/examples/widgets/widgets/icons/mainwindow.h +++ b/examples/widgets/widgets/icons/mainwindow.h @@ -74,7 +74,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - MainWindow(); + MainWindow(QWidget *parent = nullptr); void loadImages(const QStringList &fileNames); -- cgit v1.2.3 From 64b2eb7490f502feececec314eb215bbb7832858 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Tue, 4 Dec 2018 17:27:16 +0100 Subject: Cleanup Widgets examples - replace foreach Cleanup the Widget examples - replace foreach with a standard for loop Change-Id: I59cb2bf4494201f9f0228b07a8bb936ce40da46f Reviewed-by: Samuel Gaist Reviewed-by: Konstantin Shegunov Reviewed-by: Edward Welbourne Reviewed-by: Paul Wicking --- examples/widgets/widgets/icons/mainwindow.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'examples/widgets/widgets/icons') diff --git a/examples/widgets/widgets/icons/mainwindow.cpp b/examples/widgets/widgets/icons/mainwindow.cpp index 904245494c..0cf11c978d 100644 --- a/examples/widgets/widgets/icons/mainwindow.cpp +++ b/examples/widgets/widgets/icons/mainwindow.cpp @@ -122,7 +122,8 @@ void MainWindow::changeStyle(bool checked) Q_ASSERT(style); QApplication::setStyle(style); - foreach (QAbstractButton *button, sizeButtonGroup->buttons()) { + const QList buttons = sizeButtonGroup->buttons(); + for (QAbstractButton *button : buttons) { const QStyle::PixelMetric metric = static_cast(sizeButtonGroup->id(button)); const int value = style->pixelMetric(metric); switch (metric) { @@ -230,7 +231,8 @@ void MainWindow::addImages(const QString &directory) { QFileDialog fileDialog(this, tr("Open Images"), directory); QStringList mimeTypeFilters; - foreach (const QByteArray &mimeTypeName, QImageReader::supportedMimeTypes()) + const QList mimeTypes = QImageReader::supportedMimeTypes(); + for (const QByteArray &mimeTypeName : mimeTypes) mimeTypeFilters.append(mimeTypeName); mimeTypeFilters.sort(); fileDialog.setMimeTypeFilters(mimeTypeFilters); @@ -246,7 +248,7 @@ void MainWindow::addImages(const QString &directory) void MainWindow::loadImages(const QStringList &fileNames) { - foreach (const QString &fileName, fileNames) { + for (const QString &fileName : fileNames) { const int row = imagesTable->rowCount(); imagesTable->setRowCount(row + 1); //! [13] @@ -469,7 +471,8 @@ void MainWindow::createActions() QMenu *viewMenu = menuBar()->addMenu(tr("&View")); styleActionGroup = new QActionGroup(this); - foreach (const QString &styleName, QStyleFactory::keys()) { + const QStringList styleKeys = QStyleFactory::keys(); + for (const QString &styleName : styleKeys) { QAction *action = new QAction(tr("%1 Style").arg(styleName), styleActionGroup); action->setData(styleName); action->setCheckable(true); @@ -508,8 +511,9 @@ void MainWindow::createContextMenu() //! [31] void MainWindow::checkCurrentStyle() { - foreach (QAction *action, styleActionGroup->actions()) { - QString styleName = action->data().toString(); + const QList actions = styleActionGroup->actions(); + for (QAction *action : actions) { + const QString styleName = action->data().toString(); QScopedPointer candidate(QStyleFactory::create(styleName)); Q_ASSERT(!candidate.isNull()); if (candidate->metaObject()->className() -- cgit v1.2.3 From 004d7168a335219b19805badae0590b0f5dcfad0 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sun, 2 Dec 2018 14:18:38 +0100 Subject: Cleanup Widgets examples - includes Cleanup the Widgets examples - adjust includes to Qt coding style and remove unused includes and formward declarations Change-Id: I9f2e513284ad631337ff52ec9c0b98645055dcca Reviewed-by: Konstantin Shegunov Reviewed-by: Paul Wicking --- examples/widgets/widgets/icons/iconpreviewarea.cpp | 4 ++-- examples/widgets/widgets/icons/iconsizespinbox.cpp | 4 ++-- examples/widgets/widgets/icons/imagedelegate.cpp | 4 ++-- examples/widgets/widgets/icons/mainwindow.h | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-) (limited to 'examples/widgets/widgets/icons') diff --git a/examples/widgets/widgets/icons/iconpreviewarea.cpp b/examples/widgets/widgets/icons/iconpreviewarea.cpp index 9cb54c47f6..1a2f514ba8 100644 --- a/examples/widgets/widgets/icons/iconpreviewarea.cpp +++ b/examples/widgets/widgets/icons/iconpreviewarea.cpp @@ -48,10 +48,10 @@ ** ****************************************************************************/ -#include - #include "iconpreviewarea.h" +#include + //! [0] IconPreviewArea::IconPreviewArea(QWidget *parent) : QWidget(parent) diff --git a/examples/widgets/widgets/icons/iconsizespinbox.cpp b/examples/widgets/widgets/icons/iconsizespinbox.cpp index 4c6a850858..e94d943993 100644 --- a/examples/widgets/widgets/icons/iconsizespinbox.cpp +++ b/examples/widgets/widgets/icons/iconsizespinbox.cpp @@ -48,10 +48,10 @@ ** ****************************************************************************/ -#include - #include "iconsizespinbox.h" +#include + //! [0] IconSizeSpinBox::IconSizeSpinBox(QWidget *parent) : QSpinBox(parent) diff --git a/examples/widgets/widgets/icons/imagedelegate.cpp b/examples/widgets/widgets/icons/imagedelegate.cpp index 3c873f1e24..786194bae7 100644 --- a/examples/widgets/widgets/icons/imagedelegate.cpp +++ b/examples/widgets/widgets/icons/imagedelegate.cpp @@ -48,11 +48,11 @@ ** ****************************************************************************/ -#include - #include "imagedelegate.h" #include "iconpreviewarea.h" +#include + //! [0] ImageDelegate::ImageDelegate(QObject *parent) : QItemDelegate(parent) diff --git a/examples/widgets/widgets/icons/mainwindow.h b/examples/widgets/widgets/icons/mainwindow.h index 1949bd235c..c67d828cab 100644 --- a/examples/widgets/widgets/icons/mainwindow.h +++ b/examples/widgets/widgets/icons/mainwindow.h @@ -60,8 +60,6 @@ QT_BEGIN_NAMESPACE class QAction; class QActionGroup; class QLabel; -class QMenu; -class QRadioButton; class QButtonGroup; class QTableWidget; QT_END_NAMESPACE -- cgit v1.2.3