feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ImageView: Modernize

Browse Source 
modernize-*

Change-Id: I7fcffa4b455355cbcdc91f7e671e0a88f1091042
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Alessandro Portale
2018-11-11 12:24:06 +01:00
parent 901b2be036
commit 7d56d89f25
10 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/imageviewer/imageviewerfile.cpp
View File

@@ -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;
}