[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/graphics/kipi-plugins/printimages
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2010-12-06 14:10:29
Message-ID: 20101206141029.65705AC8A4 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1204253 by cgilles:
sync with branch
M +4 -4 cropframe.cpp
M +4 -4 cropframe.h
M +2 -2 customdlg.cpp
U customdlg.h
--- trunk/extragear/graphics/kipi-plugins/printimages/cropframe.cpp #1204252:1204253
@@ -141,7 +141,7 @@
//repaint(m_cropRegion);
}
-QRect CropFrame::_screenToPhotoRect(QRect r)
+QRect CropFrame::_screenToPhotoRect(const QRect& r) const
{
// r is given in screen coordinates, and we want to convert that
// to photo coordinates
@@ -180,7 +180,7 @@
return result;
}
-QRect CropFrame::_photoToScreenRect(QRect r)
+QRect CropFrame::_photoToScreenRect(const QRect& r) const
{
// r is given in photo coordinates, and we want to convert that
// to screen coordinates
@@ -319,14 +319,14 @@
//repaint(m_cropRegion);
}
-void CropFrame::setColor(QColor c)
+void CropFrame::setColor(const QColor& c)
{
m_color = c;
update();
//repaint();
}
-QColor CropFrame::color()
+QColor CropFrame::color() const
{
return m_color;
}
--- trunk/extragear/graphics/kipi-plugins/printimages/cropframe.h #1204252:1204253
@@ -46,8 +46,8 @@
CropFrame(QWidget* parent);
~CropFrame();
void init(TPhoto* photo, int width, int height, bool autoRotate, bool paint = true);
- void setColor(QColor);
- QColor color();
+ void setColor(const QColor&);
+ QColor color() const;
void drawCropRectangle(bool draw=true) { m_drawRec=draw; };
protected:
@@ -60,8 +60,8 @@
private:
- QRect _screenToPhotoRect(QRect r);
- QRect _photoToScreenRect(QRect r);
+ QRect _screenToPhotoRect(const QRect& r) const;
+ QRect _photoToScreenRect(const QRect& r) const;
private:
--- trunk/extragear/graphics/kipi-plugins/printimages/customdlg.cpp #1204252:1204253
@@ -28,7 +28,8 @@
namespace KIPIPrintImagesPlugin
{
-enum CustomChoice {
+enum CustomChoice
+{
PHOTO_GRID=1,
FIT_AS_MANY_AS_POSSIBLE=2,
PHOTOS_PER_PAGE = 3
@@ -95,7 +96,6 @@
{
m_photoGridCheck->setChecked(true);
}
-
}
void CustomLayoutDlg::saveSettings()
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic