diff options
| author | Marc Jeanmougin <mc> | 2015-02-19 19:20:09 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <mc> | 2015-02-19 19:20:09 +0000 |
| commit | 7e4b6f793d31d3245bd8afbf6f10aa255ac3e7ae (patch) | |
| tree | 4d885b8aa45917ceba4f64f2fc2af74f2766adee /src/xml | |
| parent | Put a few std::vector<SPitem*> (diff) | |
| download | inkscape-7e4b6f793d31d3245bd8afbf6f10aa255ac3e7ae.tar.gz inkscape-7e4b6f793d31d3245bd8afbf6f10aa255ac3e7ae.zip | |
added a set to the Selection
(bzr r13922.1.6)
Diffstat (limited to 'src/xml')
| -rw-r--r-- | src/xml/repr-util.cpp | 12 | ||||
| -rw-r--r-- | src/xml/repr.h | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/xml/repr-util.cpp b/src/xml/repr-util.cpp index 12280ea5a..447f2ff40 100644 --- a/src/xml/repr-util.cpp +++ b/src/xml/repr-util.cpp @@ -259,7 +259,7 @@ gchar const *sp_xml_ns_prefix_uri(gchar const *prefix) * -1 first object's position is less than the second * @todo Rewrite this function's description to be understandable */ -int sp_repr_compare_position(Inkscape::XML::Node const *first, Inkscape::XML::Node const *second) +bool sp_repr_compare_position(Inkscape::XML::Node const *first, Inkscape::XML::Node const *second) { int p1, p2; if (first->parent() == second->parent()) { @@ -276,9 +276,9 @@ int sp_repr_compare_position(Inkscape::XML::Node const *first, Inkscape::XML::No g_assert(ancestor != NULL); if (ancestor == first) { - return 1; + return false; } else if (ancestor == second) { - return -1; + return true; } else { Inkscape::XML::Node const *to_first = AncetreFils(first, ancestor); Inkscape::XML::Node const *to_second = AncetreFils(second, ancestor); @@ -288,9 +288,9 @@ int sp_repr_compare_position(Inkscape::XML::Node const *first, Inkscape::XML::No } } - if (p1 > p2) return 1; - if (p1 < p2) return -1; - return 0; + if (p1 > p2) return false; + if (p1 < p2) return true; + return false; /* effic: Assuming that the parent--child relationship is consistent (i.e. that the parent really does contain first and second among diff --git a/src/xml/repr.h b/src/xml/repr.h index e1d7fdfd6..c96560a98 100644 --- a/src/xml/repr.h +++ b/src/xml/repr.h @@ -118,7 +118,8 @@ unsigned sp_repr_set_svg_double(Inkscape::XML::Node *repr, char const *key, doub unsigned sp_repr_set_point(Inkscape::XML::Node *repr, char const *key, Geom::Point const & val); unsigned sp_repr_get_point(Inkscape::XML::Node *repr, char const *key, Geom::Point *val); -int sp_repr_compare_position(Inkscape::XML::Node const *first, Inkscape::XML::Node const *second); +//c++-style comparison : returns (bool)(a<b) +bool sp_repr_compare_position(Inkscape::XML::Node const *first, Inkscape::XML::Node const *second); // Searching /** |