diff options
author | Alessandro Portale <alessandro.portale@qt.io> | 2018-11-11 12:24:06 +0100 |
---|---|---|
committer | Alessandro Portale <alessandro.portale@qt.io> | 2018-11-12 17:10:11 +0000 |
commit | 7d56d89f255335511fb22ec43e047a0d2bb38a91 (patch) | |
tree | fcd9e84a4bd2372fbe1f6950524bf254daa26b9c /src/plugins/imageviewer | |
parent | 901b2be036618f562ecfc3bf48be58830609bfe7 (diff) | |
download | qt-creator-7d56d89f255335511fb22ec43e047a0d2bb38a91.tar.gz |
ImageView: Modernize
modernize-*
Change-Id: I7fcffa4b455355cbcdc91f7e671e0a88f1091042
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/imageviewer')
-rw-r--r-- | src/plugins/imageviewer/exportdialog.cpp | 12 | ||||
-rw-r--r-- | src/plugins/imageviewer/imageview.cpp | 10 | ||||
-rw-r--r-- | src/plugins/imageviewer/imageview.h | 16 | ||||
-rw-r--r-- | src/plugins/imageviewer/imageviewer.h | 4 | ||||
-rw-r--r-- | src/plugins/imageviewer/imageviewerconstants.h | 2 | ||||
-rw-r--r-- | src/plugins/imageviewer/imageviewerfactory.h | 4 | ||||
-rw-r--r-- | src/plugins/imageviewer/imageviewerfile.cpp | 16 | ||||
-rw-r--r-- | src/plugins/imageviewer/imageviewerfile.h | 6 | ||||
-rw-r--r-- | src/plugins/imageviewer/imageviewerplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/imageviewer/multiexportdialog.cpp | 26 |
10 files changed, 49 insertions, 49 deletions
diff --git a/src/plugins/imageviewer/exportdialog.cpp b/src/plugins/imageviewer/exportdialog.cpp index 1b64159131..f0c52aeebe 100644 --- a/src/plugins/imageviewer/exportdialog.cpp +++ b/src/plugins/imageviewer/exportdialog.cpp @@ -88,18 +88,18 @@ ExportDialog::ExportDialog(QWidget *parent) , m_heightSpinBox(new QSpinBox(this)) , m_aspectRatio(1) { - typedef void (QSpinBox::*QSpinBoxIntSignal)(int); + using QSpinBoxIntSignal = void (QSpinBox::*)(int); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - QFormLayout *formLayout = new QFormLayout(this); + auto formLayout = new QFormLayout(this); m_pathChooser->setMinimumWidth(QApplication::desktop()->availableGeometry(this).width() / 5); m_pathChooser->setExpectedKind(Utils::PathChooser::SaveFile); m_pathChooser->setPromptDialogFilter(imageNameFilterString()); formLayout->addRow(tr("File:"), m_pathChooser); - QHBoxLayout *sizeLayout = new QHBoxLayout; + auto sizeLayout = new QHBoxLayout; m_widthSpinBox->setMinimum(exportMinimumSize); m_widthSpinBox->setMaximum(exportMaximumSize); connect(m_widthSpinBox, static_cast<QSpinBoxIntSignal>(&QSpinBox::valueChanged), @@ -112,14 +112,14 @@ ExportDialog::ExportDialog(QWidget *parent) connect(m_heightSpinBox, static_cast<QSpinBoxIntSignal>(&QSpinBox::valueChanged), this, &ExportDialog::exportHeightChanged); sizeLayout->addWidget(m_heightSpinBox); - QToolButton *resetButton = new QToolButton(this); + auto resetButton = new QToolButton(this); resetButton->setIcon(QIcon(QStringLiteral(":/qt-project.org/styles/commonstyle/images/refresh-32.png"))); sizeLayout->addWidget(resetButton); sizeLayout->addStretch(); connect(resetButton, &QAbstractButton::clicked, this, &ExportDialog::resetExportSize); formLayout->addRow(tr("Size:"), sizeLayout); - QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); + auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); formLayout->addRow(buttonBox); @@ -143,7 +143,7 @@ void ExportDialog::accept() QSize ExportDialog::exportSize() const { - return QSize(m_widthSpinBox->value(), m_heightSpinBox->value()); + return {m_widthSpinBox->value(), m_heightSpinBox->value()}; } void ExportDialog::setExportSize(const QSize &size) diff --git a/src/plugins/imageviewer/imageview.cpp b/src/plugins/imageviewer/imageview.cpp index d377810c4e..dbdcd8fe02 100644 --- a/src/plugins/imageviewer/imageview.cpp +++ b/src/plugins/imageviewer/imageview.cpp @@ -107,9 +107,7 @@ ImageView::ImageView(ImageViewerFile *file) setBackgroundBrush(tilePixmap); } -ImageView::~ImageView() -{ -} +ImageView::~ImageView() = default; void ImageView::reset() { @@ -164,7 +162,7 @@ QImage ImageView::renderSvg(const QSize &imageSize) const QPainter painter; painter.begin(&image); #ifndef QT_NO_SVG - QGraphicsSvgItem *svgItem = qgraphicsitem_cast<QGraphicsSvgItem *>(m_imageItem); + auto svgItem = qgraphicsitem_cast<QGraphicsSvgItem *>(m_imageItem); QTC_ASSERT(svgItem, return image); svgItem->renderer()->render(&painter, QRectF(QPointF(), QSizeF(imageSize))); #endif @@ -209,7 +207,7 @@ QSize ImageView::svgSize() const void ImageView::exportImage() { #ifndef QT_NO_SVG - QGraphicsSvgItem *svgItem = qgraphicsitem_cast<QGraphicsSvgItem *>(m_imageItem); + auto svgItem = qgraphicsitem_cast<QGraphicsSvgItem *>(m_imageItem); QTC_ASSERT(svgItem, return); const QFileInfo origFi = m_file->filePath().toFileInfo(); @@ -280,7 +278,7 @@ void ImageView::doScale(qreal factor) scale(actualFactor, actualFactor); emitScaleFactor(); - if (QGraphicsPixmapItem *pixmapItem = dynamic_cast<QGraphicsPixmapItem *>(m_imageItem)) + if (auto pixmapItem = dynamic_cast<QGraphicsPixmapItem *>(m_imageItem)) pixmapItem->setTransformationMode( transform().m11() < 1 ? Qt::SmoothTransformation : Qt::FastTransformation); } diff --git a/src/plugins/imageviewer/imageview.h b/src/plugins/imageviewer/imageview.h index 76f4a38de6..ab5cee16cb 100644 --- a/src/plugins/imageviewer/imageview.h +++ b/src/plugins/imageviewer/imageview.h @@ -70,7 +70,7 @@ class ImageView : public QGraphicsView public: ImageView(ImageViewerFile *file); - ~ImageView(); + ~ImageView() override; void reset(); void createScene(); @@ -95,15 +95,15 @@ private: QImage renderSvg(const QSize &imageSize) const; bool exportSvg(const ExportData &ed); - void drawBackground(QPainter *p, const QRectF &rect); - void hideEvent(QHideEvent *event); - void showEvent(QShowEvent *event); - void wheelEvent(QWheelEvent *event); + void drawBackground(QPainter *p, const QRectF &rect) override; + void hideEvent(QHideEvent *event) override; + void showEvent(QShowEvent *event) override; + void wheelEvent(QWheelEvent *event) override; ImageViewerFile *m_file; - QGraphicsItem *m_imageItem = 0; - QGraphicsRectItem *m_backgroundItem = 0; - QGraphicsRectItem *m_outlineItem = 0; + QGraphicsItem *m_imageItem = nullptr; + QGraphicsRectItem *m_backgroundItem = nullptr; + QGraphicsRectItem *m_outlineItem = nullptr; bool m_showBackground = false; bool m_showOutline = true; }; diff --git a/src/plugins/imageviewer/imageviewer.h b/src/plugins/imageviewer/imageviewer.h index 8934d35c3f..29e568021e 100644 --- a/src/plugins/imageviewer/imageviewer.h +++ b/src/plugins/imageviewer/imageviewer.h @@ -46,7 +46,7 @@ class ImageViewer : public Core::IEditor Q_OBJECT public: - explicit ImageViewer(QWidget *parent = 0); + explicit ImageViewer(QWidget *parent = nullptr); ~ImageViewer() override; Core::IDocument *document() const override; @@ -69,7 +69,7 @@ public: void togglePlay(); private: - ImageViewer(const QSharedPointer<ImageViewerFile> &document, QWidget *parent = 0); + ImageViewer(const QSharedPointer<ImageViewerFile> &document, QWidget *parent = nullptr); void ctor(); void playToggled(); void updatePauseAction(); diff --git a/src/plugins/imageviewer/imageviewerconstants.h b/src/plugins/imageviewer/imageviewerconstants.h index d8d5536df1..8a72fd4678 100644 --- a/src/plugins/imageviewer/imageviewerconstants.h +++ b/src/plugins/imageviewer/imageviewerconstants.h @@ -26,6 +26,8 @@ #pragma once +#include <qglobal.h> + namespace ImageViewer { namespace Constants { diff --git a/src/plugins/imageviewer/imageviewerfactory.h b/src/plugins/imageviewer/imageviewerfactory.h index de307ebdfb..743030d63d 100644 --- a/src/plugins/imageviewer/imageviewerfactory.h +++ b/src/plugins/imageviewer/imageviewerfactory.h @@ -37,9 +37,9 @@ class ImageViewerFactory : public Core::IEditorFactory { Q_OBJECT public: - explicit ImageViewerFactory(QObject *parent = 0); + explicit ImageViewerFactory(QObject *parent = nullptr); - Core::IEditor *createEditor(); + Core::IEditor *createEditor() override; }; } // namespace Internal diff --git a/src/plugins/imageviewer/imageviewerfile.cpp b/src/plugins/imageviewer/imageviewerfile.cpp index bd0e1fa9eb..5909d92af0 100644 --- a/src/plugins/imageviewer/imageviewerfile.cpp +++ b/src/plugins/imageviewer/imageviewerfile.cpp @@ -58,7 +58,7 @@ public: }); } - void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) + void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) override { const bool smoothTransform = painter->worldTransform().m11() < 1; painter->setRenderHint(QPainter::SmoothPixmapTransform, smoothTransform); @@ -110,7 +110,7 @@ Core::IDocument::OpenResult ImageViewerFile::openImpl(QString *errorString, cons QRectF bound = m_tempSvgItem->boundingRect(); if (qFuzzyIsNull(bound.width()) && qFuzzyIsNull(bound.height())) { delete m_tempSvgItem; - m_tempSvgItem = 0; + m_tempSvgItem = nullptr; if (errorString) *errorString = tr("Failed to read SVG image."); return OpenResult::CannotHandle; @@ -134,7 +134,7 @@ Core::IDocument::OpenResult ImageViewerFile::openImpl(QString *errorString, cons if (errorString) *errorString = tr("Failed to read image."); delete m_pixmap; - m_pixmap = 0; + m_pixmap = nullptr; return OpenResult::CannotHandle; } m_type = TypePixmap; @@ -187,7 +187,7 @@ void ImageViewerFile::setPaused(bool paused) QGraphicsItem *ImageViewerFile::createGraphicsItem() const { - QGraphicsItem *val = 0; + QGraphicsItem *val = nullptr; switch (m_type) { case TypeInvalid: break; @@ -195,7 +195,7 @@ QGraphicsItem *ImageViewerFile::createGraphicsItem() const #ifndef QT_NO_SVG if (m_tempSvgItem) { val = m_tempSvgItem; - m_tempSvgItem = 0; + m_tempSvgItem = nullptr; } else { val = new QGraphicsSvgItem(filePath().toString()); } @@ -238,12 +238,12 @@ void ImageViewerFile::updateVisibility() void ImageViewerFile::cleanUp() { delete m_pixmap; - m_pixmap = 0; + m_pixmap = nullptr; delete m_movie; - m_movie = 0; + m_movie = nullptr; #ifndef QT_NO_SVG delete m_tempSvgItem; - m_tempSvgItem = 0; + m_tempSvgItem = nullptr; #endif m_type = TypeInvalid; } diff --git a/src/plugins/imageviewer/imageviewerfile.h b/src/plugins/imageviewer/imageviewerfile.h index 92a34d879a..cf8c29fc60 100644 --- a/src/plugins/imageviewer/imageviewerfile.h +++ b/src/plugins/imageviewer/imageviewerfile.h @@ -82,10 +82,10 @@ private: ImageType m_type = TypeInvalid; #ifndef QT_NO_SVG - mutable QGraphicsSvgItem *m_tempSvgItem = 0; + mutable QGraphicsSvgItem *m_tempSvgItem = nullptr; #endif - QMovie *m_movie = 0; - QPixmap *m_pixmap = 0; + QMovie *m_movie = nullptr; + QPixmap *m_pixmap = nullptr; bool m_isPaused = false; }; diff --git a/src/plugins/imageviewer/imageviewerplugin.cpp b/src/plugins/imageviewer/imageviewerplugin.cpp index 82f46964f8..0860864bb7 100644 --- a/src/plugins/imageviewer/imageviewerplugin.cpp +++ b/src/plugins/imageviewer/imageviewerplugin.cpp @@ -127,7 +127,7 @@ QAction *ImageViewerPlugin::registerNewAction(Core::Id id, const QString &title, const QKeySequence &key) { Core::Context context(Constants::IMAGEVIEWER_ID); - QAction *action = new QAction(title, this); + auto action = new QAction(title, this); Core::Command *command = Core::ActionManager::registerAction(action, id, context); if (!key.isEmpty()) command->setDefaultKeySequence(key); diff --git a/src/plugins/imageviewer/multiexportdialog.cpp b/src/plugins/imageviewer/multiexportdialog.cpp index fe3a66a84b..bdbcfc40bf 100644 --- a/src/plugins/imageviewer/multiexportdialog.cpp +++ b/src/plugins/imageviewer/multiexportdialog.cpp @@ -67,20 +67,20 @@ static const int standardIconSizesValues[] = {16, 24, 32, 48, 64, 128, 256}; static QSize sizeFromString(const QStringRef &r) { if (r.isEmpty()) - return QSize(); + return {}; const int xPos = r.indexOf('x'); bool ok; const int width = xPos < 0 ? r.toInt(&ok) : r.left(xPos).toInt(&ok); if (!ok || width <= 0) - return QSize(); + return {}; if (xPos < 0) - return QSize(width, width); + return {width, width}; const int height = r.mid(xPos + 1).toInt(&ok); if (!ok || height <= 0) - return QSize(); - return QSize(width, height); + return {}; + return {width, height}; } static void appendSizeSpec(const QSize &size, QString *target) @@ -119,7 +119,7 @@ static QVector<QSize> stringToSizes(const QString &s) for (const QStringRef &sizeSpec : sizes) { const QSize size = sizeFromString(sizeSpec); if (!size.isValid() || size.isEmpty()) - return QVector<QSize>(); + return {}; else result.append(size); } @@ -173,8 +173,8 @@ QVector<QSize> MultiExportDialog::standardIconSizes() QVector<QSize> result; const int size = int(sizeof(standardIconSizesValues) / sizeof(standardIconSizesValues[0])); result.reserve(size); - for (int i = 0; i < size; ++i) - result.append(QSize(standardIconSizesValues[i], standardIconSizesValues[i])); + for (int standardIconSizesValue : standardIconSizesValues) + result.append(QSize(standardIconSizesValue, standardIconSizesValue)); return result; } @@ -186,7 +186,7 @@ MultiExportDialog::MultiExportDialog(QWidget *parent) { setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - QFormLayout *formLayout = new QFormLayout(this); + auto formLayout = new QFormLayout(this); m_pathChooser->setMinimumWidth(QApplication::desktop()->availableGeometry(this).width() / 5); m_pathChooser->setExpectedKind(Utils::PathChooser::SaveFile); @@ -200,10 +200,10 @@ MultiExportDialog::MultiExportDialog(QWidget *parent) pathChooserLabel->setToolTip(pathChooserToolTip); formLayout->addRow(pathChooserLabel, m_pathChooser); - QToolButton *sizeEditButton = new QToolButton; + auto sizeEditButton = new QToolButton; sizeEditButton->setFocusPolicy(Qt::NoFocus); sizeEditButton->setIcon(Utils::Icons::ARROW_DOWN.icon()); - QMenu *sizeEditMenu = new QMenu(this); + auto sizeEditMenu = new QMenu(this); sizeEditMenu->addAction(tr("Clear"), m_sizesLineEdit, &QLineEdit::clear); sizeEditMenu->addAction(tr("Set Standard Icon Sizes"), this, @@ -215,11 +215,11 @@ MultiExportDialog::MultiExportDialog(QWidget *parent) const QString sizesToolTip = tr("A comma-separated list of size specifications of the form \"<width>x<height>\"."); - QLabel *sizesLabel = new QLabel(tr("Sizes:")); + auto sizesLabel = new QLabel(tr("Sizes:")); sizesLabel->setToolTip(sizesToolTip); formLayout->addRow(sizesLabel, m_sizesLineEdit); m_sizesLineEdit->setToolTip(sizesToolTip); - QWidgetAction *optionsAction = new QWidgetAction(this); + auto optionsAction = new QWidgetAction(this); optionsAction->setDefaultWidget(sizeEditButton); m_sizesLineEdit->addAction(optionsAction, QLineEdit::TrailingPosition); |