[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam/development/3.0.0] /: fix API
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2012-09-01 6:12:25
Message-ID: 20120901061225.A3266A6094 () git ! kde ! org
[Download RAW message or body]

Git commit 629db156e485a554db7b8abe136546c2b07a766a by Gilles Caulier.
Committed on 01/09/2012 at 08:12.
Pushed by cgilles into branch 'development/3.0.0'.

fix API

M  +4    -4    imageplugins/decorate/inserttextwidget.cpp
M  +1    -1    imageplugins/transform/imageselectionwidget.cpp
M  +8    -8    imageplugins/transform/perspectivewidget.cpp
M  +1    -1    utilities/imageeditor/editor/imageiface.cpp
M  +1    -1    utilities/imageeditor/editor/imageiface.h
M  +1    -1    utilities/imageeditor/widgets/imageguidewidget.cpp

http://commits.kde.org/digikam/629db156e485a554db7b8abe136546c2b07a766a

diff --git a/imageplugins/decorate/inserttextwidget.cpp b/imageplugins/decorate/inserttextwidget.cpp
index c62707f..16322ac 100644
--- a/imageplugins/decorate/inserttextwidget.cpp
+++ b/imageplugins/decorate/inserttextwidget.cpp
@@ -635,19 +635,19 @@ void InsertTextWidget::resizeEvent(QResizeEvent* e)
     blockSignals(true);
     delete d->pixmap;
 
-    int w = e->size().width();
-    int h = e->size().height();
+    int w     = e->size().width();
+    int h     = e->size().height();
 
     int textX = d->textRect.x() - d->rect.x();
     int textY = d->textRect.y() - d->rect.y();
     int old_w = d->w;
     int old_h = d->h;
-    d->iface->setPreviewImgSize(w, h);
+    d->iface->setPreviewSize(w, h);
     d->w      = d->iface->previewWidth();
     d->h      = d->iface->previewHeight();
 
     d->pixmap = new QPixmap(w, h);
-    d->rect = QRect(w/2-d->w/2, h/2-d->h/2, d->w, d->h);
+    d->rect   = QRect(w/2-d->w/2, h/2-d->h/2, d->w, d->h);
 
     if (d->textRect.isValid())
     {
diff --git a/imageplugins/transform/imageselectionwidget.cpp b/imageplugins/transform/imageselectionwidget.cpp
index 4cd2f0d..05fd90a 100644
--- a/imageplugins/transform/imageselectionwidget.cpp
+++ b/imageplugins/transform/imageselectionwidget.cpp
@@ -228,7 +228,7 @@ void ImageSelectionWidget::resizeEvent(QResizeEvent* e)
 
     int w      = e->size().width();
     int h      = e->size().height();
-    d->preview = d->iface->setPreviewImgSize(w, h);
+    d->preview = d->iface->setPreviewSize(w, h);
     d->preview.setIccProfile( d->iface->getOriginalImg()->getIccProfile() );
     d->preview.convertToEightBit();
 
diff --git a/imageplugins/transform/perspectivewidget.cpp b/imageplugins/transform/perspectivewidget.cpp
index 01f09b7..aba430c 100644
--- a/imageplugins/transform/perspectivewidget.cpp
+++ b/imageplugins/transform/perspectivewidget.cpp
@@ -148,7 +148,7 @@ PerspectiveWidget::PerspectiveWidget(int w, int h, QWidget* parent)
 
     d->bgColor  = palette().color(QPalette::Background);
     d->iface    = new ImageIface(w, h);
-    d->preview  = d->iface->setPreviewImgSize(w, h);
+    d->preview  = d->iface->setPreviewSize(w, h);
     d->width    = d->iface->previewWidth();
     d->height   = d->iface->previewHeight();
     d->origW    = d->iface->originalWidth();
@@ -171,15 +171,15 @@ PerspectiveWidget::~PerspectiveWidget()
 
 void PerspectiveWidget::resizeEvent(QResizeEvent* e)
 {
-    int old_w = d->width;
-    int old_h = d->height;
+    int old_w     = d->width;
+    int old_h     = d->height;
 
     delete d->pixmap;
-    int w       = e->size().width();
-    int h       = e->size().height();
-    d->preview  = d->iface->setPreviewImgSize(w, h);
-    d->width    = d->iface->previewWidth();
-    d->height   = d->iface->previewHeight();
+    int w         = e->size().width();
+    int h         = e->size().height();
+    d->preview    = d->iface->setPreviewSize(w, h);
+    d->width      = d->iface->previewWidth();
+    d->height     = d->iface->previewHeight();
     d->preview.setIccProfile( d->iface->getOriginalImg()->getIccProfile() );
 
     d->pixmap     = new QPixmap(w, h);
diff --git a/utilities/imageeditor/editor/imageiface.cpp b/utilities/imageeditor/editor/imageiface.cpp
index fc70c28..3bbc25d 100644
--- a/utilities/imageeditor/editor/imageiface.cpp
+++ b/utilities/imageeditor/editor/imageiface.cpp
@@ -226,7 +226,7 @@ DColor ImageIface::getColorInfoFromTargetPreviewImage(const QPoint& point) const
     return d->targetPreviewImage.getPixelColor(point.x(), point.y());
 }
 
-DImg ImageIface::setPreviewImgSize(int w, int h) const
+DImg ImageIface::setPreviewSize(int w, int h) const
 {
     d->previewImage.reset();
     d->targetPreviewImage.reset();
diff --git a/utilities/imageeditor/editor/imageiface.h b/utilities/imageeditor/editor/imageiface.h
index 3e7c715..52db59e 100644
--- a/utilities/imageeditor/editor/imageiface.h
+++ b/utilities/imageeditor/editor/imageiface.h
@@ -64,7 +64,7 @@ public:
      *  The parameters are only hints, previewWidth() and previewHeight()
      *  may differ from w and h.
      */
-    DImg setPreviewImgSize(int w, int h) const;
+    DImg setPreviewSize(int w, int h) const;
 
     /** Return 'true' if the preview is rendered using the current selection in editor.
      *  Return 'false' if the preview is rendered using the full image in editor.
diff --git a/utilities/imageeditor/widgets/imageguidewidget.cpp b/utilities/imageeditor/widgets/imageguidewidget.cpp
index ad8e57b..bd6a9bf 100644
--- a/utilities/imageeditor/widgets/imageguidewidget.cpp
+++ b/utilities/imageeditor/widgets/imageguidewidget.cpp
@@ -542,7 +542,7 @@ void ImageGuideWidget::resizeEvent(QResizeEvent* e)
     int h             = e->size().height();
     int old_w         = d->preview.width();
     int old_h         = d->preview.height();
-    d->preview        = d->iface->setPreviewImgSize(w, h);
+    d->preview        = d->iface->setPreviewSize(w, h);
     d->preview.setIccProfile(d->iface->getOriginalImg()->getIccProfile());
 
     d->pixmap         = new QPixmap(w, h);
[prev in list] [next in list] [prev in thread] [next in thread]