[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kipi-plugins] /: use KP prefix for libkipiplugins classes
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2012-02-24 14:51:51
Message-ID: 20120224145151.0630CA60A6 () git ! kde ! org
[Download RAW message or body]
Git commit ecda9cf9101391b622a90bfa894b37b4f6404a80 by Gilles Caulier.
Committed on 24/02/2012 at 15:50.
Pushed by cgilles into branch 'master'.
use KP prefix for libkipiplugins classes
M +2 -2 common/libkipiplugins/CMakeLists.txt
R +133 -119 common/libkipiplugins/widgets/kppreviewimage.cpp [from: \
common/libkipiplugins/widgets/previewimage.cpp - 082% similarity] R +28 -20 \
common/libkipiplugins/widgets/kppreviewimage.h [from: \
common/libkipiplugins/widgets/previewimage.h - 081% similarity] R +20 -20 \
common/libkipiplugins/widgets/kppreviewmanager.cpp [from: \
common/libkipiplugins/widgets/previewmanager.cpp - 083% similarity] R +9 -9 \
common/libkipiplugins/widgets/kppreviewmanager.h [from: \
common/libkipiplugins/widgets/previewmanager.h - 082% similarity] M +7 -7 \
expoblending/blendingdlg/expoblendingdlg.cpp M +2 -2 \
expoblending/blendingdlg/expoblendingdlg.h M +4 -4 gpssync/gpsimagedetails.cpp
M +1 -1 gpssync/gpsimagedetails.h
M +12 -7 panorama/importwizard/previewpage.cpp
M +4 -2 panorama/importwizard/previewpage.h
M +9 -9 rawconverter/dialogs/singledialog.cpp
M +3 -1 rawconverter/dialogs/singledialog.h
http://commits.kde.org/kipi-plugins/ecda9cf9101391b622a90bfa894b37b4f6404a80
diff --git a/common/libkipiplugins/CMakeLists.txt \
b/common/libkipiplugins/CMakeLists.txt index b505d82..a566712 100644
--- a/common/libkipiplugins/CMakeLists.txt
+++ b/common/libkipiplugins/CMakeLists.txt
@@ -22,9 +22,9 @@ SET(kipiplugins_LIB_SRCS \
${CMAKE_CURRENT_SOURCE_DIR}/tools/kpaboutdata.cpp
${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpbinarysearch.cpp
${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpprogresswidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpimageslist.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/kppreviewimage.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/kppreviewmanager.cpp
${CMAKE_CURRENT_SOURCE_DIR}/widgets/savesettingswidget.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/previewmanager.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/previewimage.cpp
)
KDE4_ADD_LIBRARY(kipiplugins SHARED ${kipiplugins_LIB_SRCS})
diff --git a/common/libkipiplugins/widgets/previewimage.cpp \
b/common/libkipiplugins/widgets/kppreviewimage.cpp similarity index 82%
rename from common/libkipiplugins/widgets/previewimage.cpp
rename to common/libkipiplugins/widgets/kppreviewimage.cpp
index 1cf9d09..3c4bbad 100644
--- a/common/libkipiplugins/widgets/previewimage.cpp
+++ b/common/libkipiplugins/widgets/kppreviewimage.cpp
@@ -6,9 +6,9 @@
* Date : 2009-12-13
* Description : a widget to preview image effect.
*
- * Copyright (C) 2009-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
- * Copyright (C) 2008 by Kare Sars <kare dot sars at iki dot fi>
- * Copyright (C) 2012 by Benjamin Girault <benjamin dot girault at gmail dot com>
+ * Copyright (C) 2009-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2008 by Kare Sars <kare dot sars at iki dot fi>
+ * Copyright (C) 2012 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -23,7 +23,7 @@
*
* ============================================================ */
-#include "previewimage.moc"
+#include "kppreviewimage.moc"
// Qt includes
@@ -50,10 +50,11 @@
namespace KIPIPlugins
{
-static const qreal selMargin = 8.0;
-static const QPointF boundMargin(selMargin,selMargin);
+static const qreal selMargin = 8.0;
+static const QPointF boundMargin(selMargin,selMargin);
-struct SelectionItem::SelectionItemPriv {
+struct KPSelectionItem::KPSelectionItemPriv
+{
QPen penDark;
QPen penLight;
QPen penAnchors;
@@ -76,12 +77,12 @@ struct SelectionItem::SelectionItemPriv {
bool showAnchors;
};
-SelectionItem::SelectionItem(QRectF rect)
- : QGraphicsItem(), d(new SelectionItemPriv)
+KPSelectionItem::KPSelectionItem(const QRectF& rect)
+ : QGraphicsItem(), d(new KPSelectionItemPriv)
{
d->hasMaxX = false;
d->hasMaxY = false;
- d->hasMax = false;
+ d->hasMax = false;
setRect(rect);
d->penDark.setColor(Qt::black);
@@ -92,16 +93,16 @@ SelectionItem::SelectionItem(QRectF rect)
d->penAnchors.setStyle(Qt::SolidLine);
// FIXME We should probably use some standard KDE color here and not hard code \
it
- d->invZoom = 1;
+ d->invZoom = 1;
d->selMargin = selMargin;
}
-SelectionItem::~SelectionItem()
+KPSelectionItem::~KPSelectionItem()
{
delete d;
}
-void SelectionItem::saveZoom(qreal zoom)
+void KPSelectionItem::saveZoom(qreal zoom)
{
if (zoom < 0.00001)
{
@@ -114,7 +115,7 @@ void SelectionItem::saveZoom(qreal zoom)
updateAnchors();
}
-void SelectionItem::setMaxRight(qreal maxX)
+void KPSelectionItem::setMaxRight(qreal maxX)
{
d->maxX = maxX;
d->hasMaxX = true;
@@ -124,7 +125,7 @@ void SelectionItem::setMaxRight(qreal maxX)
}
}
-void SelectionItem::setMaxBottom(qreal maxY)
+void KPSelectionItem::setMaxBottom(qreal maxY)
{
d->maxY = maxY;
d->hasMaxY = true;
@@ -134,7 +135,7 @@ void SelectionItem::setMaxBottom(qreal maxY)
}
}
-SelectionItem::Intersects SelectionItem::intersects(QPointF point)
+KPSelectionItem::Intersects KPSelectionItem::intersects(QPointF& point)
{
if ((point.x() < (d->rect.left() - d->selMargin)) ||
@@ -182,11 +183,12 @@ SelectionItem::Intersects SelectionItem::intersects(QPointF \
point) return Move;
}
-void SelectionItem::setRect(QRectF rect)
+void KPSelectionItem::setRect(const QRectF& rect)
{
prepareGeometryChange();
d->rect = rect;
d->rect = d->rect.normalized();
+
if (d->hasMax)
{
if (d->rect.top() < 0)
@@ -206,10 +208,11 @@ void SelectionItem::setRect(QRectF rect)
d->rect.setBottom(d->maxY);
}
}
+
updateAnchors();
}
-QPointF SelectionItem::fixTranslation(QPointF dp)
+QPointF KPSelectionItem::fixTranslation(QPointF dp) const
{
if ((d->rect.left() + dp.x()) < 0)
{
@@ -227,20 +230,21 @@ QPointF SelectionItem::fixTranslation(QPointF dp)
{
dp.setY(d->maxY - d->rect.bottom());
}
+
return dp;
}
-QRectF SelectionItem::rect()
+QRectF KPSelectionItem::rect() const
{
return d->rect;
}
-QRectF SelectionItem::boundingRect() const
+QRectF KPSelectionItem::boundingRect() const
{
return QRectF(d->rect.topLeft() - boundMargin, d->rect.bottomRight() + \
boundMargin); }
-void SelectionItem::paint(QPainter* painter, const QStyleOptionGraphicsItem*, \
QWidget*) +void KPSelectionItem::paint(QPainter* painter, const \
QStyleOptionGraphicsItem*, QWidget*) {
painter->setPen(d->penDark);
painter->drawRect(d->rect);
@@ -288,12 +292,13 @@ void SelectionItem::paint(QPainter* painter, const \
QStyleOptionGraphicsItem*, QW }
}
-void SelectionItem::updateAnchors()
+void KPSelectionItem::updateAnchors()
{
QPointF moveDown(0.0, d->selMargin);
QPointF moveRight(d->selMargin, 0.0);
bool verticalCondition = (d->rect.height() - 3 * d->selMargin) > 0;
bool horizontalCondition = (d->rect.width() - 3 * d->selMargin) > 0;
+
if (verticalCondition)
{
if (horizontalCondition)
@@ -370,16 +375,26 @@ void SelectionItem::updateAnchors()
}
}
+// -------------------------------------------------------------------------------------------------
+class KPPreviewImage::KPPreviewImagePriv
+{
-// -------------------------------------------------------------
+public:
-class PreviewImage::PreviewImagePriv
-{
+ enum
+ {
+ NONE,
+ LOOKAROUND,
+ DRAWSELECTION,
+ EXPANDORSHRINK,
+ MOVESELECTION
+ }
+ mouseDragAction;
public:
- PreviewImagePriv()
+ KPPreviewImagePriv()
{
pixmapItem = 0;
scene = 0;
@@ -394,12 +409,10 @@ public:
QGraphicsScene* scene;
QGraphicsPixmapItem* pixmapItem;
- SelectionItem* selection;
+ KPSelectionItem* selection;
bool enableSelection;
- SelectionItem::Intersects mouseZone;
+ KPSelectionItem::Intersects mouseZone;
QPointF lastMousePoint;
- enum {NONE, LOOKAROUND, DRAWSELECTION, EXPANDORSHRINK, MOVESELECTION}
- mouseDragAction;
QAction* zoomInAction;
QAction* zoomOutAction;
@@ -414,8 +427,8 @@ public:
QGraphicsRectItem* highLightArea;
};
-PreviewImage::PreviewImage(QWidget* parent)
- : QGraphicsView(parent), d(new PreviewImagePriv)
+KPPreviewImage::KPPreviewImage(QWidget* const parent)
+ : QGraphicsView(parent), d(new KPPreviewImagePriv)
{
setAttribute(Qt::WA_DeleteOnClose);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
@@ -425,7 +438,7 @@ PreviewImage::PreviewImage(QWidget* parent)
d->scene = new QGraphicsScene;
d->pixmapItem = new QGraphicsPixmapItem;
- d->selection = new SelectionItem(QRectF());
+ d->selection = new KPSelectionItem(QRectF());
d->selection->setZValue(10);
d->selection->setVisible(false);
d->enableSelection = false;
@@ -433,11 +446,11 @@ PreviewImage::PreviewImage(QWidget* parent)
d->scene->addItem(d->pixmapItem);
setScene(d->scene);
- d->highLightTop = new QGraphicsRectItem;
+ d->highLightTop = new QGraphicsRectItem;
d->highLightBottom = new QGraphicsRectItem;
- d->highLightRight = new QGraphicsRectItem;
- d->highLightLeft = new QGraphicsRectItem;
- d->highLightArea = new QGraphicsRectItem;
+ d->highLightRight = new QGraphicsRectItem;
+ d->highLightLeft = new QGraphicsRectItem;
+ d->highLightArea = new QGraphicsRectItem;
d->highLightTop->setOpacity(0.4);
d->highLightBottom->setOpacity(0.4);
@@ -463,7 +476,7 @@ PreviewImage::PreviewImage(QWidget* parent)
d->scene->addItem(d->highLightLeft);
d->scene->addItem(d->highLightArea);
- d->mouseZone = SelectionItem::None;
+ d->mouseZone = KPSelectionItem::None;
// create context menu
@@ -503,12 +516,12 @@ PreviewImage::PreviewImage(QWidget* parent)
verticalScrollBar()->installEventFilter(this);
}
-PreviewImage::~PreviewImage()
+KPPreviewImage::~KPPreviewImage()
{
delete d;
}
-bool PreviewImage::setImage(const QImage& img) const
+bool KPPreviewImage::setImage(const QImage& img) const
{
if (!img.isNull())
{
@@ -521,12 +534,12 @@ bool PreviewImage::setImage(const QImage& img) const
return false;
}
-void PreviewImage::enableSelectionArea(bool b)
+void KPPreviewImage::enableSelectionArea(bool b)
{
d->enableSelection = b;
}
-bool PreviewImage::load(const QString& file) const
+bool KPPreviewImage::load(const QString& file) const
{
QImage image(file);
bool ret = setImage(image);
@@ -539,28 +552,28 @@ bool PreviewImage::load(const QString& file) const
return ret;
}
-void PreviewImage::slotZoomIn()
+void KPPreviewImage::slotZoomIn()
{
scale(1.5, 1.5);
d->selection->saveZoom(transform().m11());
d->zoom2FitAction->setDisabled(false);
}
-void PreviewImage::slotZoomOut()
+void KPPreviewImage::slotZoomOut()
{
scale(1.0 / 1.5, 1.0 / 1.5);
d->selection->saveZoom(transform().m11());
d->zoom2FitAction->setDisabled(false);
}
-void PreviewImage::slotZoom2Fit()
+void KPPreviewImage::slotZoom2Fit()
{
fitInView(d->pixmapItem->boundingRect(), Qt::KeepAspectRatio);
d->selection->saveZoom(transform().m11());
d->zoom2FitAction->setDisabled(true);
}
-void PreviewImage::slotSetTLX(float ratio)
+void KPPreviewImage::slotSetTLX(float ratio)
{
if (!d->selection->isVisible())
return; // only correct the selection if it is visible
@@ -571,7 +584,7 @@ void PreviewImage::slotSetTLX(float ratio)
updateSelVisibility();
}
-void PreviewImage::slotSetTLY(float ratio)
+void KPPreviewImage::slotSetTLY(float ratio)
{
if (!d->selection->isVisible())
return; // only correct the selection if it is visible
@@ -582,7 +595,7 @@ void PreviewImage::slotSetTLY(float ratio)
updateSelVisibility();
}
-void PreviewImage::slotSetBRX(float ratio)
+void KPPreviewImage::slotSetBRX(float ratio)
{
if (!d->selection->isVisible())
return; // only correct the selection if it is visible
@@ -593,7 +606,7 @@ void PreviewImage::slotSetBRX(float ratio)
updateSelVisibility();
}
-void PreviewImage::slotSetBRY(float ratio)
+void KPPreviewImage::slotSetBRY(float ratio)
{
if (!d->selection->isVisible())
return; // only correct the selection if it is visible
@@ -604,7 +617,7 @@ void PreviewImage::slotSetBRY(float ratio)
updateSelVisibility();
}
-void PreviewImage::slotSetSelection(float tl_x, float tl_y, float br_x, float br_y)
+void KPPreviewImage::slotSetSelection(float tl_x, float tl_y, float br_x, float \
br_y) {
QRectF rect;
rect.setCoords(tl_x * d->scene->width(),
@@ -616,13 +629,13 @@ void PreviewImage::slotSetSelection(float tl_x, float tl_y, \
float br_x, float br updateSelVisibility();
}
-void PreviewImage::slotClearActiveSelection()
+void KPPreviewImage::slotClearActiveSelection()
{
- d->selection->setRect(QRectF(0,0,0,0));
+ d->selection->setRect(QRectF(0, 0, 0, 0));
d->selection->setVisible(false);
}
-void PreviewImage::slotSetHighlightArea(float tl_x, float tl_y, float br_x, float \
br_y) +void KPPreviewImage::slotSetHighlightArea(float tl_x, float tl_y, float br_x, \
float br_y) {
QRectF rect;
@@ -670,7 +683,7 @@ void PreviewImage::slotSetHighlightArea(float tl_x, float tl_y, \
float br_x, floa d->highLightArea->hide();
}
-void PreviewImage::slotSetHighlightShown(int percentage, QColor highLightColor)
+void KPPreviewImage::slotSetHighlightShown(int percentage, QColor highLightColor)
{
if (percentage >= 100)
{
@@ -691,7 +704,7 @@ void PreviewImage::slotSetHighlightShown(int percentage, QColor \
highLightColor) d->highLightArea->show();
}
-void PreviewImage::slotClearHighlight()
+void KPPreviewImage::slotClearHighlight()
{
d->highLightLeft->hide();
d->highLightRight->hide();
@@ -700,7 +713,7 @@ void PreviewImage::slotClearHighlight()
d->highLightArea->hide();
}
-void PreviewImage::wheelEvent(QWheelEvent *e)
+void KPPreviewImage::wheelEvent(QWheelEvent* e)
{
if (e->modifiers() == Qt::ControlModifier)
{
@@ -719,7 +732,7 @@ void PreviewImage::wheelEvent(QWheelEvent *e)
}
}
-void PreviewImage::mousePressEvent(QMouseEvent* e)
+void KPPreviewImage::mousePressEvent(QMouseEvent* e)
{
if (e->button() & Qt::LeftButton)
{
@@ -732,40 +745,40 @@ void PreviewImage::mousePressEvent(QMouseEvent* e)
if (!d->selection->isVisible() || !d->selection->contains(scenePoint))
{
// Beginning of a selection area change
- d->mouseDragAction = PreviewImagePriv::DRAWSELECTION;
+ d->mouseDragAction = KPPreviewImagePriv::DRAWSELECTION;
d->selection->setVisible(true);
d->selection->setRect(QRectF(scenePoint, QSizeF(0,0)));
- d->mouseZone = SelectionItem::BottomRight;
+ d->mouseZone = KPSelectionItem::BottomRight;
}
else if (d->selection->isVisible() &&
- d->mouseZone != SelectionItem::None &&
- d->mouseZone != SelectionItem::Move)
+ d->mouseZone != KPSelectionItem::None &&
+ d->mouseZone != KPSelectionItem::Move)
{
// Modification of the selection area
- d->mouseDragAction = PreviewImagePriv::EXPANDORSHRINK;
+ d->mouseDragAction = KPPreviewImagePriv::EXPANDORSHRINK;
}
else
{
// Selection movement called by QGraphicsView
- d->mouseDragAction = PreviewImagePriv::MOVESELECTION;
+ d->mouseDragAction = KPPreviewImagePriv::MOVESELECTION;
}
updateHighlight();
}
else
{
// Beginning of moving around the picture
- d->mouseDragAction = PreviewImagePriv::LOOKAROUND;
+ d->mouseDragAction = KPPreviewImagePriv::LOOKAROUND;
setCursor(Qt::ClosedHandCursor);
}
}
QGraphicsView::mousePressEvent(e);
}
-void PreviewImage::mouseReleaseEvent(QMouseEvent* e)
+void KPPreviewImage::mouseReleaseEvent(QMouseEvent* e)
{
if (e->button() & Qt::LeftButton)
{
- if (d->mouseDragAction == PreviewImagePriv::DRAWSELECTION)
+ if (d->mouseDragAction == KPPreviewImagePriv::DRAWSELECTION)
{
// Stop and setup the selection area
// Only one case: small rectangle that we drop
@@ -780,18 +793,18 @@ void PreviewImage::mouseReleaseEvent(QMouseEvent* e)
setCursor(Qt::CrossCursor);
}
}
- d->mouseDragAction = PreviewImagePriv::NONE;
+ d->mouseDragAction = KPPreviewImagePriv::NONE;
updateHighlight();
QGraphicsView::mouseReleaseEvent(e);
}
-void PreviewImage::mouseMoveEvent(QMouseEvent* e)
+void KPPreviewImage::mouseMoveEvent(QMouseEvent* e)
{
QPointF scenePoint = mapToScene(e->pos());
if (e->buttons() & Qt::LeftButton)
{
- if (d->mouseDragAction == PreviewImagePriv::LOOKAROUND)
+ if (d->mouseDragAction == KPPreviewImagePriv::LOOKAROUND)
{
int dx = e->x() - d->lastdx;
int dy = e->y() - d->lastdy;
@@ -800,36 +813,36 @@ void PreviewImage::mouseMoveEvent(QMouseEvent* e)
d->lastdx = e->x();
d->lastdy = e->y();
}
- else if (d->mouseDragAction == PreviewImagePriv::DRAWSELECTION ||
- d->mouseDragAction == PreviewImagePriv::EXPANDORSHRINK ||
- d->mouseDragAction == PreviewImagePriv::MOVESELECTION)
+ else if (d->mouseDragAction == KPPreviewImagePriv::DRAWSELECTION ||
+ d->mouseDragAction == KPPreviewImagePriv::EXPANDORSHRINK ||
+ d->mouseDragAction == KPPreviewImagePriv::MOVESELECTION)
{
ensureVisible(QRectF(scenePoint, QSizeF(0,0)), 1, 1);
QRectF rect = d->selection->rect();
switch (d->mouseZone)
{
- case SelectionItem::None:
+ case KPSelectionItem::None:
// should not be here :)
break;
- case SelectionItem::Top:
+ case KPSelectionItem::Top:
if (scenePoint.y() < rect.bottom())
{
rect.setTop(scenePoint.y());
}
else
{
- d->mouseZone = SelectionItem::Bottom;
+ d->mouseZone = KPSelectionItem::Bottom;
rect.setTop(rect.bottom());
}
break;
- case SelectionItem::TopRight:
+ case KPSelectionItem::TopRight:
if (scenePoint.x() > rect.left())
{
rect.setRight(scenePoint.x());
}
else
{
- d->mouseZone = SelectionItem::TopLeft;
+ d->mouseZone = KPSelectionItem::TopLeft;
setCursor(Qt::SizeFDiagCursor);
rect.setRight(rect.left());
}
@@ -839,38 +852,38 @@ void PreviewImage::mouseMoveEvent(QMouseEvent* e)
}
else
{
- if (d->mouseZone != SelectionItem::TopLeft)
+ if (d->mouseZone != KPSelectionItem::TopLeft)
{
- d->mouseZone = SelectionItem::BottomRight;
+ d->mouseZone = KPSelectionItem::BottomRight;
setCursor(Qt::SizeFDiagCursor);
}
else
{
- d->mouseZone = SelectionItem::BottomLeft;
+ d->mouseZone = KPSelectionItem::BottomLeft;
setCursor(Qt::SizeBDiagCursor);
}
rect.setTop(rect.bottom());
}
break;
- case SelectionItem::Right:
+ case KPSelectionItem::Right:
if (scenePoint.x() > rect.left())
{
rect.setRight(scenePoint.x());
}
else
{
- d->mouseZone = SelectionItem::Left;
+ d->mouseZone = KPSelectionItem::Left;
rect.setRight(rect.left());
}
break;
- case SelectionItem::BottomRight:
+ case KPSelectionItem::BottomRight:
if (scenePoint.x() > rect.left())
{
rect.setRight(scenePoint.x());
}
else
{
- d->mouseZone = SelectionItem::BottomLeft;
+ d->mouseZone = KPSelectionItem::BottomLeft;
setCursor(Qt::SizeBDiagCursor);
rect.setRight(rect.left());
}
@@ -880,38 +893,38 @@ void PreviewImage::mouseMoveEvent(QMouseEvent* e)
}
else
{
- if (d->mouseZone != SelectionItem::BottomLeft)
+ if (d->mouseZone != KPSelectionItem::BottomLeft)
{
- d->mouseZone = SelectionItem::TopRight;
+ d->mouseZone = KPSelectionItem::TopRight;
setCursor(Qt::SizeBDiagCursor);
}
else
{
- d->mouseZone = SelectionItem::TopLeft;
+ d->mouseZone = KPSelectionItem::TopLeft;
setCursor(Qt::SizeFDiagCursor);
}
rect.setBottom(rect.top());
}
break;
- case SelectionItem::Bottom:
+ case KPSelectionItem::Bottom:
if (scenePoint.y() > rect.top())
{
rect.setBottom(scenePoint.y());
}
else
{
- d->mouseZone = SelectionItem::Top;
+ d->mouseZone = KPSelectionItem::Top;
rect.setBottom(rect.top());
}
break;
- case SelectionItem::BottomLeft:
+ case KPSelectionItem::BottomLeft:
if (scenePoint.x() < rect.right())
{
rect.setLeft(scenePoint.x());
}
else
{
- d->mouseZone = SelectionItem::BottomRight;
+ d->mouseZone = KPSelectionItem::BottomRight;
setCursor(Qt::SizeFDiagCursor);
rect.setLeft(rect.right());
}
@@ -921,38 +934,38 @@ void PreviewImage::mouseMoveEvent(QMouseEvent* e)
}
else
{
- if (d->mouseZone != SelectionItem::BottomRight)
+ if (d->mouseZone != KPSelectionItem::BottomRight)
{
- d->mouseZone = SelectionItem::TopLeft;
+ d->mouseZone = KPSelectionItem::TopLeft;
setCursor(Qt::SizeFDiagCursor);
}
else
{
- d->mouseZone = SelectionItem::TopRight;
+ d->mouseZone = KPSelectionItem::TopRight;
setCursor(Qt::SizeBDiagCursor);
}
rect.setBottom(rect.top());
}
break;
- case SelectionItem::Left:
+ case KPSelectionItem::Left:
if (scenePoint.x() < rect.right())
{
rect.setLeft(scenePoint.x());
}
else
{
- d->mouseZone = SelectionItem::Right;
+ d->mouseZone = KPSelectionItem::Right;
rect.setLeft(rect.right());
}
break;
- case SelectionItem::TopLeft:
+ case KPSelectionItem::TopLeft:
if (scenePoint.x() < rect.right())
{
rect.setLeft(scenePoint.x());
}
else
{
- d->mouseZone = SelectionItem::TopRight;
+ d->mouseZone = KPSelectionItem::TopRight;
setCursor(Qt::SizeBDiagCursor);
rect.setLeft(rect.right());
}
@@ -962,20 +975,20 @@ void PreviewImage::mouseMoveEvent(QMouseEvent* e)
}
else
{
- if (d->mouseZone != SelectionItem::TopRight)
+ if (d->mouseZone != KPSelectionItem::TopRight)
{
- d->mouseZone = SelectionItem::BottomLeft;
+ d->mouseZone = KPSelectionItem::BottomLeft;
setCursor(Qt::SizeBDiagCursor);
}
else
{
- d->mouseZone = SelectionItem::BottomRight;
+ d->mouseZone = KPSelectionItem::BottomRight;
setCursor(Qt::SizeFDiagCursor);
}
rect.setTop(rect.bottom());
}
break;
- case SelectionItem::Move:
+ case KPSelectionItem::Move:
rect.translate(d->selection->fixTranslation(scenePoint - \
d->lastMousePoint)); break;
}
@@ -988,34 +1001,34 @@ void PreviewImage::mouseMoveEvent(QMouseEvent* e)
switch (d->mouseZone)
{
- case SelectionItem::None:
+ case KPSelectionItem::None:
setCursor(Qt::CrossCursor);
break;
- case SelectionItem::Top:
+ case KPSelectionItem::Top:
setCursor(Qt::SizeVerCursor);
break;
- case SelectionItem::TopRight:
+ case KPSelectionItem::TopRight:
setCursor(Qt::SizeBDiagCursor);
break;
- case SelectionItem::Right:
+ case KPSelectionItem::Right:
setCursor(Qt::SizeHorCursor);
break;
- case SelectionItem::BottomRight:
+ case KPSelectionItem::BottomRight:
setCursor(Qt::SizeFDiagCursor);
break;
- case SelectionItem::Bottom:
+ case KPSelectionItem::Bottom:
setCursor(Qt::SizeVerCursor);
break;
- case SelectionItem::BottomLeft:
+ case KPSelectionItem::BottomLeft:
setCursor(Qt::SizeBDiagCursor);
break;
- case SelectionItem::Left:
+ case KPSelectionItem::Left:
setCursor(Qt::SizeHorCursor);
break;
- case SelectionItem::TopLeft:
+ case KPSelectionItem::TopLeft:
setCursor(Qt::SizeFDiagCursor);
break;
- case SelectionItem::Move:
+ case KPSelectionItem::Move:
setCursor(Qt::SizeAllCursor);
break;
}
@@ -1029,17 +1042,17 @@ void PreviewImage::mouseMoveEvent(QMouseEvent* e)
QGraphicsView::mouseMoveEvent(e);
}
-void PreviewImage::enterEvent(QEvent*)
+void KPPreviewImage::enterEvent(QEvent*)
{
d->toolBar->show();
}
-void PreviewImage::leaveEvent(QEvent*)
+void KPPreviewImage::leaveEvent(QEvent*)
{
d->toolBar->hide();
}
-bool PreviewImage::eventFilter(QObject *obj, QEvent *ev)
+bool KPPreviewImage::eventFilter(QObject* obj, QEvent* ev)
{
if ( obj == d->toolBar )
{
@@ -1072,7 +1085,7 @@ bool PreviewImage::eventFilter(QObject *obj, QEvent *ev)
return QGraphicsView::eventFilter(obj, ev);
}
-void PreviewImage::resizeEvent(QResizeEvent* e)
+void KPPreviewImage::resizeEvent(QResizeEvent* e)
{
if (!d->zoom2FitAction->isEnabled())
{
@@ -1083,7 +1096,7 @@ void PreviewImage::resizeEvent(QResizeEvent* e)
QGraphicsView::resizeEvent(e);
}
-void PreviewImage::updateSelVisibility()
+void KPPreviewImage::updateSelVisibility()
{
if ((d->selection->rect().width() > 0.001) &&
(d->selection->rect().height() > 0.001) &&
@@ -1098,9 +1111,10 @@ void PreviewImage::updateSelVisibility()
updateHighlight();
}
-void PreviewImage::updateHighlight()
+void KPPreviewImage::updateHighlight()
{
- if (d->selection->isVisible()) {
+ if (d->selection->isVisible())
+ {
QRectF rect;
// Left
rect.setCoords(0,
diff --git a/common/libkipiplugins/widgets/previewimage.h \
b/common/libkipiplugins/widgets/kppreviewimage.h similarity index 81%
rename from common/libkipiplugins/widgets/previewimage.h
rename to common/libkipiplugins/widgets/kppreviewimage.h
index d33ae44..e21b4c7 100644
--- a/common/libkipiplugins/widgets/previewimage.h
+++ b/common/libkipiplugins/widgets/kppreviewimage.h
@@ -6,9 +6,9 @@
* Date : 2009-12-13
* Description : a widget to preview image effect.
*
- * Copyright (C) 2009-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
- * Copyright (C) 2008 by Kare Sars <kare dot sars at iki dot fi>
- * Copyright (C) 2012 by Benjamin Girault <benjamin dot girault at gmail dot com>
+ * Copyright (C) 2009-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2008 by Kare Sars <kare dot sars at iki dot fi>
+ * Copyright (C) 2012 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -23,8 +23,8 @@
*
* ============================================================ */
-#ifndef PREVIEW_IMAGE_H
-#define PREVIEW_IMAGE_H
+#ifndef KPPREVIEW_IMAGE_H
+#define KPPREVIEW_IMAGE_H
// Qt includes
@@ -45,9 +45,10 @@ class QEvent;
namespace KIPIPlugins
{
-class KIPIPLUGINS_EXPORT SelectionItem : public QGraphicsItem
+class KIPIPLUGINS_EXPORT KPSelectionItem : public QGraphicsItem
{
public:
+
typedef enum
{
None,
@@ -62,41 +63,48 @@ public:
Move
} Intersects;
- explicit SelectionItem(QRectF rect);
- ~SelectionItem();
+public:
+
+ explicit KPSelectionItem(const QRectF& rect);
+ ~KPSelectionItem();
void setMaxRight(qreal maxRight);
void setMaxBottom(qreal maxBottom);
- Intersects intersects(QPointF point);
+ Intersects intersects(QPointF& point);
void saveZoom(qreal zoom);
- void setRect(QRectF rect);
- QPointF fixTranslation(QPointF dp);
- QRectF rect();
+ void setRect(const QRectF& rect);
+ QPointF fixTranslation(QPointF dp) const;
+ QRectF rect() const;
public:
+
// Graphics Item methods
QRectF boundingRect() const;
void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* \
widget);
private:
+
void updateAnchors();
private:
- struct SelectionItemPriv;
- SelectionItemPriv* const d;
+
+ struct KPSelectionItemPriv;
+ KPSelectionItemPriv* const d;
};
-class KIPIPLUGINS_EXPORT PreviewImage : public QGraphicsView
+// -----------------------------------------------------------------------------------------
+
+class KIPIPLUGINS_EXPORT KPPreviewImage : public QGraphicsView
{
Q_OBJECT
public:
- PreviewImage(QWidget* parent);
- ~PreviewImage();
+ KPPreviewImage(QWidget* const parent);
+ ~KPPreviewImage();
bool load(const QString& file) const;
bool setImage(const QImage& img) const;
@@ -157,10 +165,10 @@ protected:
private:
- class PreviewImagePriv;
- PreviewImagePriv* const d;
+ class KPPreviewImagePriv;
+ KPPreviewImagePriv* const d;
};
} // namespace KIPIPlugins
-#endif /* PREVIEW_IMAGE_H */
+#endif /* KPPREVIEW_IMAGE_H */
diff --git a/common/libkipiplugins/widgets/previewmanager.cpp \
b/common/libkipiplugins/widgets/kppreviewmanager.cpp similarity index 83%
rename from common/libkipiplugins/widgets/previewmanager.cpp
rename to common/libkipiplugins/widgets/kppreviewmanager.cpp
index 7eae162..29006e3 100644
--- a/common/libkipiplugins/widgets/previewmanager.cpp
+++ b/common/libkipiplugins/widgets/kppreviewmanager.cpp
@@ -6,7 +6,7 @@
* Date : 2009-12-23
* Description : a widget to manage preview.
*
- * Copyright (C) 2009-2010 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2009-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -21,7 +21,7 @@
*
* ============================================================ */
-#include "previewmanager.moc"
+#include "kppreviewmanager.moc"
// Qt includes
@@ -43,16 +43,16 @@
// Local includes
-#include "previewimage.h"
+#include "kppreviewimage.h"
namespace KIPIPlugins
{
-class PreviewManager::PreviewManagerPriv
+class KPPreviewManager::KPPreviewManagerPriv
{
public:
- PreviewManagerPriv()
+ KPPreviewManagerPriv()
{
progressPix = KPixmapSequence("process-working", \
KIconLoader::SizeSmallMedium); progressCount = 0;
@@ -77,11 +77,11 @@ public:
QTimer* progressTimer;
QLabel* progressLabel;
- PreviewImage* preview;
+ KPPreviewImage* preview;
};
-PreviewManager::PreviewManager(QWidget* parent)
- : QStackedWidget(parent), d(new PreviewManagerPriv)
+KPPreviewManager::KPPreviewManager(QWidget* const parent)
+ : QStackedWidget(parent), d(new KPPreviewManagerPriv)
{
setAttribute(Qt::WA_DeleteOnClose);
setMinimumSize(QSize(400, 300));
@@ -119,7 +119,7 @@ PreviewManager::PreviewManager(QWidget* parent)
vbox->setFrameStyle( QFrame::StyledPanel | QFrame::Sunken );
vbox->setLineWidth( style()->pixelMetric(QStyle::PM_DefaultFrameWidth) );
- d->preview = new PreviewImage(this);
+ d->preview = new KPPreviewImage(this);
insertWidget(MessageMode, vbox);
insertWidget(PreviewMode, d->preview);
@@ -133,17 +133,17 @@ PreviewManager::PreviewManager(QWidget* parent)
this, SIGNAL(signalButtonClicked()));
}
-PreviewManager::~PreviewManager()
+KPPreviewManager::~KPPreviewManager()
{
delete d;
}
-void PreviewManager::slotLoad(const KUrl& url)
+void KPPreviewManager::slotLoad(const KUrl& url)
{
load(url.path());
}
-void PreviewManager::setImage(const QImage& img, bool fit)
+void KPPreviewManager::setImage(const QImage& img, bool fit)
{
setBusy(false);
@@ -160,7 +160,7 @@ void PreviewManager::setImage(const QImage& img, bool fit)
}
}
-void PreviewManager::load(const QString& file, bool fit)
+void KPPreviewManager::load(const QString& file, bool fit)
{
setBusy(false);
@@ -177,34 +177,34 @@ void PreviewManager::load(const QString& file, bool fit)
}
}
-void PreviewManager::setThumbnail(const QPixmap& thumbnail)
+void KPPreviewManager::setThumbnail(const QPixmap& thumbnail)
{
d->thumbLabel->setPixmap(thumbnail);
setCurrentIndex(MessageMode);
}
-void PreviewManager::setButtonText(const QString& text)
+void KPPreviewManager::setButtonText(const QString& text)
{
d->button->setText(text);
}
-void PreviewManager::setButtonVisible(bool b)
+void KPPreviewManager::setButtonVisible(bool b)
{
d->button->setVisible(b);
}
-void PreviewManager::setSelectionAreaPossible(bool b)
+void KPPreviewManager::setSelectionAreaPossible(bool b)
{
d->preview->enableSelectionArea(b);
}
-void PreviewManager::setText(const QString& text, const QColor& color)
+void KPPreviewManager::setText(const QString& text, const QColor& color)
{
d->textLabel->setText(QString("<qt \
text=\"%1\">%2</qt>").arg(color.name()).arg(text)); setCurrentIndex(MessageMode);
}
-void PreviewManager::setBusy(bool b, const QString& text)
+void KPPreviewManager::setBusy(bool b, const QString& text)
{
d->busy = b;
@@ -223,7 +223,7 @@ void PreviewManager::setBusy(bool b, const QString& text)
}
}
-void PreviewManager::slotProgressTimerDone()
+void KPPreviewManager::slotProgressTimerDone()
{
d->progressLabel->setPixmap(d->progressPix.frameAt(d->progressCount));
d->progressCount++;
diff --git a/common/libkipiplugins/widgets/previewmanager.h \
b/common/libkipiplugins/widgets/kppreviewmanager.h similarity index 82%
rename from common/libkipiplugins/widgets/previewmanager.h
rename to common/libkipiplugins/widgets/kppreviewmanager.h
index 02bd99d..3670281 100644
--- a/common/libkipiplugins/widgets/previewmanager.h
+++ b/common/libkipiplugins/widgets/kppreviewmanager.h
@@ -6,7 +6,7 @@
* Date : 2009-12-23
* Description : a widget to manage preview.
*
- * Copyright (C) 2009-2010 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2009-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -21,8 +21,8 @@
*
* ============================================================ */
-#ifndef PREVIEW_MANAGER_H
-#define PREVIEW_MANAGER_H
+#ifndef KPPREVIEW_MANAGER_H
+#define KPPREVIEW_MANAGER_H
// Qt includes
@@ -42,7 +42,7 @@
namespace KIPIPlugins
{
-class KIPIPLUGINS_EXPORT PreviewManager : public QStackedWidget
+class KIPIPLUGINS_EXPORT KPPreviewManager : public QStackedWidget
{
Q_OBJECT
@@ -56,8 +56,8 @@ public:
public:
- PreviewManager(QWidget* parent);
- ~PreviewManager();
+ KPPreviewManager(QWidget* const parent);
+ ~KPPreviewManager();
void load(const QString& file, bool fit = true);
void setImage(const QImage& img, bool fit = true);
@@ -82,10 +82,10 @@ private Q_SLOTS:
private:
- class PreviewManagerPriv;
- PreviewManagerPriv* const d;
+ class KPPreviewManagerPriv;
+ KPPreviewManagerPriv* const d;
};
} // namespace KIPIPlugins
-#endif /* PREVIEW_MANAGER_H */
+#endif /* KPPREVIEW_MANAGER_H */
diff --git a/expoblending/blendingdlg/expoblendingdlg.cpp \
b/expoblending/blendingdlg/expoblendingdlg.cpp index 50a1059..e827037 100644
--- a/expoblending/blendingdlg/expoblendingdlg.cpp
+++ b/expoblending/blendingdlg/expoblendingdlg.cpp
@@ -6,7 +6,7 @@
* Date : 2009-12-13
* Description : a tool to blend bracketed images.
*
- * Copyright (C) 2009-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2009-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -84,11 +84,11 @@ extern "C"
#include "enfusestack.h"
#include "savesettingswidget.h"
#include "aboutdata.h"
-#include "kpversion.h"
-#include "previewmanager.h"
#include "actionthread.h"
#include "bracketstack.h"
#include "outputdialog.h"
+#include "kpversion.h"
+#include "kppreviewmanager.h"
using namespace KIPIPlugins;
using namespace KDcrawIface;
@@ -118,7 +118,7 @@ public:
KLineEdit* templateFileName;
- PreviewManager* previewWidget;
+ KPPreviewManager* previewWidget;
RExpanderBox* settingsExpander;
@@ -134,7 +134,7 @@ public:
bool firstImageDisplayed;
};
-ExpoBlendingDlg::ExpoBlendingDlg(Manager* mngr, QWidget* parent)
+ExpoBlendingDlg::ExpoBlendingDlg(Manager* const mngr, QWidget* const parent)
: KDialog(parent), d(new ExpoBlendingDlgPriv)
{
d->mngr = mngr;
@@ -165,12 +165,12 @@ ExpoBlendingDlg::ExpoBlendingDlg(Manager* mngr, QWidget* \
parent) QGridLayout *grid = new QGridLayout(page);
setMainWidget(page);
- d->previewWidget = new PreviewManager(page);
+ d->previewWidget = new KPPreviewManager(page);
d->previewWidget->setButtonText(i18n("Details..."));
// ---------------------------------------------------------------
- QScrollArea *sv = new QScrollArea(page);
+ QScrollArea* sv = new QScrollArea(page);
KVBox *panel = new KVBox(sv->viewport());
panel->setAutoFillBackground(false);
sv->setWidget(panel);
diff --git a/expoblending/blendingdlg/expoblendingdlg.h \
b/expoblending/blendingdlg/expoblendingdlg.h index 7b03a59..8fd41fc 100644
--- a/expoblending/blendingdlg/expoblendingdlg.h
+++ b/expoblending/blendingdlg/expoblendingdlg.h
@@ -6,7 +6,7 @@
* Date : 2009-12-13
* Description : a tool to blend bracketed images.
*
- * Copyright (C) 2009-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2009-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -60,7 +60,7 @@ class ExpoBlendingDlg : public KDialog
public:
- explicit ExpoBlendingDlg(Manager* mngr, QWidget* parent=0);
+ explicit ExpoBlendingDlg(Manager* const mngr, QWidget* const parent=0);
~ExpoBlendingDlg();
void loadItems(const KUrl::List& urls);
diff --git a/gpssync/gpsimagedetails.cpp b/gpssync/gpsimagedetails.cpp
index 8a5c5fe..a5c016a 100644
--- a/gpssync/gpsimagedetails.cpp
+++ b/gpssync/gpsimagedetails.cpp
@@ -49,7 +49,7 @@
// local includes
-#include "previewmanager.h"
+#include "kppreviewmanager.h"
#include "kipiimagemodel.h"
#include "gpsundocommand.h"
@@ -77,7 +77,7 @@ public:
}
KipiImageModel* imageModel;
- KIPIPlugins::PreviewManager* previewManager;
+ KPPreviewManager* previewManager;
QCheckBox* cbCoordinates;
KLineEdit* leLatitude;
@@ -168,7 +168,7 @@ GPSImageDetails::GPSImageDetails(QWidget* const parent, \
KipiImageModel* const im
/* *** *** *** */
- d->previewManager = new KIPIPlugins::PreviewManager(this);
+ d->previewManager = new KPPreviewManager(this);
d->previewManager->setMinimumSize(QSize(200, 200));
layout1->addWidget(d->previewManager);
@@ -448,4 +448,4 @@ void GPSImageDetails::slotSetActive(const bool state)
}
}
-} /* KIPIGPSSyncPlugin */
+} // namespace KIPIGPSSyncPlugin
diff --git a/gpssync/gpsimagedetails.h b/gpssync/gpsimagedetails.h
index 47cebe8..a8ca9ad 100644
--- a/gpssync/gpsimagedetails.h
+++ b/gpssync/gpsimagedetails.h
@@ -83,6 +83,6 @@ private:
GPSImageDetailsPrivate* const d;
};
-} /* KIPIGPSSyncPlugin */
+} // namespace KIPIGPSSyncPlugin
#endif /* GPSIMAGEDETAILS_H */
diff --git a/panorama/importwizard/previewpage.cpp \
b/panorama/importwizard/previewpage.cpp index ac73b74..3a20d77 100644
--- a/panorama/importwizard/previewpage.cpp
+++ b/panorama/importwizard/previewpage.cpp
@@ -44,7 +44,7 @@
#include "batchprogressdialog.h"
#include "savesettingswidget.h"
#include "manager.h"
-#include "previewmanager.h"
+#include "kppreviewmanager.h"
#include "enblendbinary.h"
#include "makebinary.h"
#include "nonabinary.h"
@@ -56,13 +56,18 @@ namespace KIPIPanoramaPlugin
struct PreviewPage::PreviewPagePriv
{
PreviewPagePriv(Manager *m)
- : title(0), previewWidget(0), previewBusy(false), stitchingBusy(false),
- postProcessing(0), canceled(false), mngr(m)
+ : title(0),
+ previewWidget(0),
+ previewBusy(false),
+ stitchingBusy(false),
+ postProcessing(0),
+ canceled(false),
+ mngr(m)
{}
QLabel* title;
QUrl previewUrl;
- PreviewManager* previewWidget;
+ KPPreviewManager* previewWidget;
bool previewBusy;
bool stitchingBusy;
BatchProgressWidget* postProcessing;
@@ -75,8 +80,8 @@ struct PreviewPage::PreviewPagePriv
Manager* mngr;
};
-PreviewPage::PreviewPage(Manager* mngr, KAssistantDialog* dlg)
- : KIPIPlugins::WizardPage(dlg, i18n("<b>Preview and Post-Processing</b>")),
+PreviewPage::PreviewPage(Manager* const mngr, KAssistantDialog* const dlg)
+ : WizardPage(dlg, i18n("<b>Preview and Post-Processing</b>")),
d(new PreviewPagePriv(mngr))
{
KVBox* vbox = new KVBox(this);
@@ -84,7 +89,7 @@ PreviewPage::PreviewPage(Manager* mngr, KAssistantDialog* dlg)
d->title->setOpenExternalLinks(true);
d->title->setWordWrap(true);
- d->previewWidget = new PreviewManager(vbox);
+ d->previewWidget = new KPPreviewManager(vbox);
d->previewWidget->setButtonText(i18n("Details..."));
d->previewWidget->show();
diff --git a/panorama/importwizard/previewpage.h \
b/panorama/importwizard/previewpage.h index 6a52d2a..77adba3 100644
--- a/panorama/importwizard/previewpage.h
+++ b/panorama/importwizard/previewpage.h
@@ -28,18 +28,20 @@
#include "wizardpage.h"
#include "actions.h"
+using namespace KIPIPlugins;
+
namespace KIPIPanoramaPlugin
{
class Manager;
-class PreviewPage : public KIPIPlugins::WizardPage
+class PreviewPage : public WizardPage
{
Q_OBJECT
public:
- PreviewPage(Manager* mngr, KAssistantDialog* dlg);
+ PreviewPage(Manager* const mngr, KAssistantDialog* const dlg);
~PreviewPage();
bool cancel();
diff --git a/rawconverter/dialogs/singledialog.cpp \
b/rawconverter/dialogs/singledialog.cpp index 405b792..0876c0b 100644
--- a/rawconverter/dialogs/singledialog.cpp
+++ b/rawconverter/dialogs/singledialog.cpp
@@ -72,15 +72,15 @@ extern "C"
// Local includes
-#include "actions.h"
-#include "actionthread.h"
#include "kpaboutdata.h"
#include "kpversion.h"
#include "kpimageinfo.h"
#include "kphostsettings.h"
-#include "previewmanager.h"
+#include "kppreviewmanager.h"
#include "rawdecodingiface.h"
#include "savesettingswidget.h"
+#include "actions.h"
+#include "actionthread.h"
using namespace KDcrawIface;
using namespace KIPIPlugins;
@@ -106,7 +106,7 @@ public:
KUrl inputFile;
- PreviewManager* previewWidget;
+ KPPreviewManager* previewWidget;
ActionThread* thread;
@@ -116,10 +116,10 @@ public:
KPAboutData* about;
- KIPI::Interface* iface;
+ Interface* iface;
};
-SingleDialog::SingleDialog(const QString& file, KIPI::Interface* iface)
+SingleDialog::SingleDialog(const QString& file, Interface* const iface)
: KDialog(0), d(new SingleDialogPriv)
{
d->iface = iface;
@@ -135,7 +135,7 @@ SingleDialog::SingleDialog(const QString& file, KIPI::Interface* \
iface) setMainWidget( page );
QGridLayout* mainLayout = new QGridLayout(page);
- d->previewWidget = new PreviewManager(page);
+ d->previewWidget = new KPPreviewManager(page);
// ---------------------------------------------------------------
@@ -164,7 +164,7 @@ SingleDialog::SingleDialog(const QString& file, KIPI::Interface* \
iface) // ---------------------------------------------------------------
// About data and help button.
- d->about = new KIPIPlugins::KPAboutData(ki18n("RAW Image Converter"),
+ d->about = new KPAboutData(ki18n("RAW Image Converter"),
0,
KAboutData::License_GPL,
ki18n("A Kipi plugin to convert RAW images"),
@@ -341,7 +341,7 @@ void SingleDialog::slotUser3()
void SingleDialog::slotIdentify()
{
- if (!d->iface->hasFeature(KIPI::HostSupportsThumbnails))
+ if (!d->iface->hasFeature(HostSupportsThumbnails))
{
d->thread->thumbRawFile(KUrl(d->inputFile));
}
diff --git a/rawconverter/dialogs/singledialog.h \
b/rawconverter/dialogs/singledialog.h index b506ebf..cf6f54f 100644
--- a/rawconverter/dialogs/singledialog.h
+++ b/rawconverter/dialogs/singledialog.h
@@ -41,6 +41,8 @@ namespace KIPI
class Interface;
}
+using namespace KIPI;
+
namespace KIPIRawConverterPlugin
{
@@ -52,7 +54,7 @@ class SingleDialog : public KDialog
public:
- SingleDialog(const QString& file, KIPI::Interface* iface);
+ SingleDialog(const QString& file, Interface* const iface);
~SingleDialog();
void setFile(const QString& file);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic