diff options
| author | Ted Gould <ted@gould.cx> | 2008-10-11 15:16:23 +0000 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2008-10-11 15:16:23 +0000 |
| commit | 2f5eb047d9e05be5e68549ef6b75070d2faa7d2f (patch) | |
| tree | ca2e94164b6d7aaebfc17196ca46bfc825a7665a /src/selection.h | |
| parent | Merge from trunk. (diff) | |
| download | inkscape-2f5eb047d9e05be5e68549ef6b75070d2faa7d2f.tar.gz inkscape-2f5eb047d9e05be5e68549ef6b75070d2faa7d2f.zip | |
Merging from trunk
(bzr r6884)
Diffstat (limited to 'src/selection.h')
| -rw-r--r-- | src/selection.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/selection.h b/src/selection.h index 2e7bddf81..6ae462fc3 100644 --- a/src/selection.h +++ b/src/selection.h @@ -243,8 +243,7 @@ public: /** @brief Returns the bounding rectangle of the selection */ NRRect *bounds(NRRect *dest, SPItem::BBoxType type = SPItem::APPROXIMATE_BBOX) const; /** @brief Returns the bounding rectangle of the selection */ - boost::optional<NR::Rect> bounds(SPItem::BBoxType type = SPItem::APPROXIMATE_BBOX) const; - boost::optional<Geom::Rect> bounds_2geom(SPItem::BBoxType type = SPItem::APPROXIMATE_BBOX) const; + boost::optional<Geom::Rect> bounds(SPItem::BBoxType type = SPItem::APPROXIMATE_BBOX) const; /** * @brief Returns the bounding rectangle of the selection @@ -258,7 +257,7 @@ public: * * \todo how is this different from bounds()? */ - boost::optional<NR::Rect> boundsInDocument(SPItem::BBoxType type = SPItem::APPROXIMATE_BBOX) const; + boost::optional<Geom::Rect> boundsInDocument(SPItem::BBoxType type = SPItem::APPROXIMATE_BBOX) const; /** * @brief Returns the rotation/skew center of the selection @@ -269,13 +268,13 @@ public: * @brief Gets the selection's snap points. * @return Selection's snap points */ - std::vector<NR::Point> getSnapPoints(bool includeItemCenter) const; + std::vector<Geom::Point> getSnapPoints(bool includeItemCenter) const; /** * @brief Gets the snap points of a selection that form a convex hull. * @return Selection's convex hull points */ - std::vector<NR::Point> getSnapPointsConvexHull() const; + std::vector<Geom::Point> getSnapPointsConvexHull() const; /** * @brief Connects a slot to be notified of selection changes |