From ab143333746e25648b253f13c0539adff089b1b6 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Fri, 24 Jun 2011 00:22:07 +0200 Subject: Remove more of libnr (bzr r10347.1.2) --- src/removeoverlap.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/removeoverlap.cpp') diff --git a/src/removeoverlap.cpp b/src/removeoverlap.cpp index b01ae5228..a503fea35 100644 --- a/src/removeoverlap.cpp +++ b/src/removeoverlap.cpp @@ -10,12 +10,13 @@ * * Released under GNU LGPL. Read the file 'COPYING' for more information. */ +#include +#include <2geom/transforms.h> #include "util/glib-list-iterators.h" #include "sp-item.h" #include "sp-item-transform.h" #include "libvpsc/generate-constraints.h" #include "libvpsc/remove_rectangle_overlap.h" -#include using vpsc::Rectangle; -- cgit v1.2.3 From 72cc39b9f0b340548f395c7f61ca9662b34aea09 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sat, 27 Aug 2011 11:04:37 +0200 Subject: Refactor SPItem bounding box methods: remove NRRect usage and make code using them more obvious. Fix filter region computation. (bzr r10582.1.1) --- src/removeoverlap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/removeoverlap.cpp') diff --git a/src/removeoverlap.cpp b/src/removeoverlap.cpp index a503fea35..6dd8d6a79 100644 --- a/src/removeoverlap.cpp +++ b/src/removeoverlap.cpp @@ -50,7 +50,7 @@ void removeoverlap(GSList const *const items, double const xGap, double const yG ++it) { using Geom::X; using Geom::Y; - Geom::OptRect item_box((*it)->getBboxDesktop()); + Geom::OptRect item_box((*it)->desktopVisualBounds()); if (item_box) { Geom::Point min(item_box->min() - .5*gap); Geom::Point max(item_box->max() + .5*gap); -- cgit v1.2.3 From d7a3d42e527b4a7754b52640006d8eed01e71fc8 Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Sat, 29 Oct 2011 18:41:49 +0200 Subject: cppcheck: variable initialisation (bzr r10705) --- src/removeoverlap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/removeoverlap.cpp') diff --git a/src/removeoverlap.cpp b/src/removeoverlap.cpp index 6dd8d6a79..0c45e34a9 100644 --- a/src/removeoverlap.cpp +++ b/src/removeoverlap.cpp @@ -26,7 +26,7 @@ namespace { Geom::Point midpoint; Rectangle *vspc_rect; - Record() {} + Record() : item(0), vspc_rect(0) {} Record(SPItem *i, Geom::Point m, Rectangle *r) : item(i), midpoint(m), vspc_rect(r) {} }; -- cgit v1.2.3