aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/imageviewer/imageview.cpp
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2011-09-02 12:16:56 +0200
committerhjk <qthjk@ovi.com>2011-09-02 12:24:09 +0200
commitef9d9953c979fa7e1daa510359dad29d97f121b6 (patch)
tree491581f36d13781aeb27cf92cf362fe17f27237c /src/plugins/imageviewer/imageview.cpp
parentc34ca89826d86c3238dbbf5daa0245660c094c5c (diff)
ImageViewer: adjust to style guide
Change-Id: Id0f5a521199b9dc5b29fc3cb7b7bd82521bc00e6 Reviewed-on: http://codereview.qt.nokia.com/4130 Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/plugins/imageviewer/imageview.cpp')
-rw-r--r--src/plugins/imageviewer/imageview.cpp52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/plugins/imageviewer/imageview.cpp b/src/plugins/imageviewer/imageview.cpp
index 74141ea8ff..f862418b90 100644
--- a/src/plugins/imageviewer/imageview.cpp
+++ b/src/plugins/imageviewer/imageview.cpp
@@ -71,7 +71,7 @@ struct ImageViewPrivate
ImageView::ImageView(QWidget *parent)
: QGraphicsView(parent),
- d_ptr(new ImageViewPrivate())
+ d(new ImageViewPrivate())
{
setScene(new QGraphicsScene(this));
setTransformationAnchor(AnchorUnderMouse);
@@ -123,8 +123,8 @@ bool ImageView::openFile(QString fileName)
QGraphicsScene *s = scene();
- bool drawBackground = (d_ptr->backgroundItem ? d_ptr->backgroundItem->isVisible() : false);
- bool drawOutline = (d_ptr->outlineItem ? d_ptr->outlineItem->isVisible() : true);
+ bool drawBackground = (d->backgroundItem ? d->backgroundItem->isVisible() : false);
+ bool drawOutline = (d->outlineItem ? d->outlineItem->isVisible() : true);
s->clear();
resetTransform();
@@ -132,40 +132,40 @@ bool ImageView::openFile(QString fileName)
// image
#ifndef QT_NO_SVG
if (isSvg) {
- d_ptr->imageItem = new QGraphicsSvgItem(fileName);
+ d->imageItem = new QGraphicsSvgItem(fileName);
} else
#endif
{
QPixmap pixmap(fileName);
QGraphicsPixmapItem *pixmapItem = new QGraphicsPixmapItem(pixmap);
pixmapItem->setTransformationMode(Qt::SmoothTransformation);
- d_ptr->imageItem = pixmapItem;
+ d->imageItem = pixmapItem;
}
- d_ptr->imageItem->setCacheMode(QGraphicsItem::NoCache);
- d_ptr->imageItem->setZValue(0);
+ d->imageItem->setCacheMode(QGraphicsItem::NoCache);
+ d->imageItem->setZValue(0);
// background item
- d_ptr->backgroundItem = new QGraphicsRectItem(d_ptr->imageItem->boundingRect());
- d_ptr->backgroundItem->setBrush(Qt::white);
- d_ptr->backgroundItem->setPen(Qt::NoPen);
- d_ptr->backgroundItem->setVisible(drawBackground);
- d_ptr->backgroundItem->setZValue(-1);
+ d->backgroundItem = new QGraphicsRectItem(d->imageItem->boundingRect());
+ d->backgroundItem->setBrush(Qt::white);
+ d->backgroundItem->setPen(Qt::NoPen);
+ d->backgroundItem->setVisible(drawBackground);
+ d->backgroundItem->setZValue(-1);
// outline
- d_ptr->outlineItem = new QGraphicsRectItem(d_ptr->imageItem->boundingRect());
+ d->outlineItem = new QGraphicsRectItem(d->imageItem->boundingRect());
QPen outline(Qt::black, 1, Qt::DashLine);
outline.setCosmetic(true);
- d_ptr->outlineItem->setPen(outline);
- d_ptr->outlineItem->setBrush(Qt::NoBrush);
- d_ptr->outlineItem->setVisible(drawOutline);
- d_ptr->outlineItem->setZValue(1);
+ d->outlineItem->setPen(outline);
+ d->outlineItem->setBrush(Qt::NoBrush);
+ d->outlineItem->setVisible(drawOutline);
+ d->outlineItem->setZValue(1);
- s->addItem(d_ptr->backgroundItem);
- s->addItem(d_ptr->imageItem);
- s->addItem(d_ptr->outlineItem);
+ s->addItem(d->backgroundItem);
+ s->addItem(d->imageItem);
+ s->addItem(d->outlineItem);
// if image size is 0x0, then it is not loaded
- if (d_ptr->imageItem->boundingRect().height() == 0 && d_ptr->imageItem->boundingRect().width() == 0)
+ if (d->imageItem->boundingRect().height() == 0 && d->imageItem->boundingRect().width() == 0)
return false;
emitScaleFactor();
@@ -174,18 +174,18 @@ bool ImageView::openFile(QString fileName)
void ImageView::setViewBackground(bool enable)
{
- if (!d_ptr->backgroundItem)
+ if (!d->backgroundItem)
return;
- d_ptr->backgroundItem->setVisible(enable);
+ d->backgroundItem->setVisible(enable);
}
void ImageView::setViewOutline(bool enable)
{
- if (!d_ptr->outlineItem)
+ if (!d->outlineItem)
return;
- d_ptr->outlineItem->setVisible(enable);
+ d->outlineItem->setVisible(enable);
}
void ImageView::doScale(qreal factor)
@@ -219,7 +219,7 @@ void ImageView::resetToOriginalSize()
void ImageView::fitToScreen()
{
- fitInView(d_ptr->imageItem, Qt::KeepAspectRatio);
+ fitInView(d->imageItem, Qt::KeepAspectRatio);
emitScaleFactor();
}