summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2015-05-06 23:18:59 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2015-05-06 23:18:59 +0000
commitc8aad8eba683cd12ddfde4acca3870e859216f21 (patch)
treeb8fe88dcc9665981e6a2eef42a2605b58ce09d80 /src
parent"select same..." no longer returns groups. (diff)
downloadinkscape-c8aad8eba683cd12ddfde4acca3870e859216f21.tar.gz
inkscape-c8aad8eba683cd12ddfde4acca3870e859216f21.zip
fix sorts
(bzr r14119)
Diffstat (limited to 'src')
-rw-r--r--src/selection-chemistry.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index 7a5c2c2d5..8bc62d4b9 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -927,7 +927,7 @@ static SPObject *prev_sibling(SPObject *child)
return prev;
}
-int sp_item_repr_compare_position_obj(SPObject const *first, SPObject const *second)
+bool sp_item_repr_compare_position_bool(SPObject const *first, SPObject const *second)
{
return sp_repr_compare_position(((SPItem*)first)->getRepr(),
((SPItem*)second)->getRepr())<0;
@@ -952,7 +952,7 @@ sp_selection_raise(Inkscape::Selection *selection, SPDesktop *desktop)
/* Construct reverse-ordered list of selected children. */
std::vector<SPItem*> rev(items);
- sort(rev.begin(),rev.end(),sp_item_repr_compare_position);
+ sort(rev.begin(),rev.end(),sp_item_repr_compare_position_bool);
// Determine the common bbox of the selected items.
Geom::OptRect selected = enclose_items(items);
@@ -1034,7 +1034,7 @@ void sp_selection_lower(Inkscape::Selection *selection, SPDesktop *desktop)
/* Construct direct-ordered list of selected children. */
std::vector<SPItem*> rev(items);
- sort(rev.begin(),rev.end(),sp_item_repr_compare_position);
+ sort(rev.begin(),rev.end(),sp_item_repr_compare_position_bool);
// Iterate over all objects in the selection (starting from top).
if (selected) {
@@ -3518,7 +3518,7 @@ void sp_selection_create_bitmap_copy(SPDesktop *desktop)
std::vector<SPItem*> items(selection->itemList());
// Sort items so that the topmost comes last
- sort(items.begin(),items.end(),sp_item_repr_compare_position);
+ sort(items.begin(),items.end(),sp_item_repr_compare_position_bool);
// Generate a random value from the current time (you may create bitmap from the same object(s)
// multiple times, and this is done so that they don't clash)