summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorMatthew Petroff <matthew@mpetroff.net>2013-06-25 00:53:34 +0000
committerMatthew Petroff <matthew@mpetroff.net>2013-06-25 00:53:34 +0000
commit08807d307231af4c69dd55794fb6c1bcc1df7b04 (patch)
treef0f44e0fd5b8ca5f6736235cdd098963f5fb08fa /src/ui
parentAdded length class. (diff)
parentCorrectly ignore symbolic link to ltmain.sh (diff)
downloadinkscape-08807d307231af4c69dd55794fb6c1bcc1df7b04.tar.gz
inkscape-08807d307231af4c69dd55794fb6c1bcc1df7b04.zip
Merge from trunk.
(bzr r12380.1.2)
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/dialog/align-and-distribute.cpp4
-rw-r--r--src/ui/dialog/transformation.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index dbd06d9e8..7f88824f7 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -195,7 +195,7 @@ void ActionAlign::do_action(SPDesktop *desktop, int index) {
//Move each item in the selected list separately
for (std::list<SPItem *>::iterator it(selected.begin());
it != selected.end();
- it++)
+ ++it)
{
sp_desktop_document (desktop)->ensureUpToDate();
if (!sel_as_group)
@@ -347,7 +347,7 @@ private :
float pos = sorted.front().bbox.min()[_orientation];
for ( std::vector<BBoxSort> ::iterator it (sorted.begin());
it < sorted.end();
- it ++ )
+ ++it )
{
if (!Geom::are_near(pos, it->bbox.min()[_orientation], 1e-6)) {
Geom::Point t(0.0, 0.0);
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 4aa972296..2ae98beda 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -762,7 +762,7 @@ void Transformation::applyPageMove(Inkscape::Selection *selection)
double move = x;
for ( std::vector<BBoxSort> ::iterator it (sorted.begin());
it < sorted.end();
- it ++ )
+ ++it )
{
sp_item_move_rel(it->item, Geom::Translate(move, 0));
// move each next object by x relative to previous
@@ -786,7 +786,7 @@ void Transformation::applyPageMove(Inkscape::Selection *selection)
double move = y;
for ( std::vector<BBoxSort> ::iterator it (sorted.begin());
it < sorted.end();
- it ++ )
+ ++it )
{
sp_item_move_rel(it->item, Geom::Translate(0, move));
// move each next object by x relative to previous