diff options
Diffstat (limited to 'examples/widgets/widgets/imageviewer')
-rw-r--r-- | examples/widgets/widgets/imageviewer/imageviewer.cpp | 13 | ||||
-rw-r--r-- | examples/widgets/widgets/imageviewer/imageviewer.h | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/examples/widgets/widgets/imageviewer/imageviewer.cpp b/examples/widgets/widgets/imageviewer/imageviewer.cpp index 327abf7e43..fed551dade 100644 --- a/examples/widgets/widgets/imageviewer/imageviewer.cpp +++ b/examples/widgets/widgets/imageviewer/imageviewer.cpp @@ -48,6 +48,8 @@ ** ****************************************************************************/ +#include "imageviewer.h" + #include <QtWidgets> #if defined(QT_PRINTSUPPORT_LIB) #include <QtPrintSupport/qtprintsupportglobal.h> @@ -56,13 +58,10 @@ #endif #endif -#include "imageviewer.h" - //! [0] -ImageViewer::ImageViewer() - : imageLabel(new QLabel) - , scrollArea(new QScrollArea) - , scaleFactor(1) +ImageViewer::ImageViewer(QWidget *parent) + : QMainWindow(parent), imageLabel(new QLabel), + scrollArea(new QScrollArea), scaleFactor(1) { imageLabel->setBackgroundRole(QPalette::Base); imageLabel->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored); @@ -152,7 +151,7 @@ static void initializeImageFileDialog(QFileDialog &dialog, QFileDialog::AcceptMo QStringList mimeTypeFilters; const QByteArrayList supportedMimeTypes = acceptMode == QFileDialog::AcceptOpen ? QImageReader::supportedMimeTypes() : QImageWriter::supportedMimeTypes(); - foreach (const QByteArray &mimeTypeName, supportedMimeTypes) + for (const QByteArray &mimeTypeName : supportedMimeTypes) mimeTypeFilters.append(mimeTypeName); mimeTypeFilters.sort(); dialog.setMimeTypeFilters(mimeTypeFilters); diff --git a/examples/widgets/widgets/imageviewer/imageviewer.h b/examples/widgets/widgets/imageviewer/imageviewer.h index f4a62cafe9..7e53105b33 100644 --- a/examples/widgets/widgets/imageviewer/imageviewer.h +++ b/examples/widgets/widgets/imageviewer/imageviewer.h @@ -71,7 +71,7 @@ class ImageViewer : public QMainWindow Q_OBJECT public: - ImageViewer(); + ImageViewer(QWidget *parent = nullptr); bool loadFile(const QString &); private slots: |