From ab143333746e25648b253f13c0539adff089b1b6 Mon Sep 17 00:00:00 2001
From: Krzysztof Kosi??ski <tweenk.pl@gmail.com>
Date: Fri, 24 Jun 2011 00:22:07 +0200
Subject: Remove more of libnr

(bzr r10347.1.2)
---
 src/graphlayout.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/graphlayout.cpp')

diff --git a/src/graphlayout.cpp b/src/graphlayout.cpp
index 4f536beb3..41e523b86 100644
--- a/src/graphlayout.cpp
+++ b/src/graphlayout.cpp
@@ -19,6 +19,7 @@
 #include <cstring>
 #include <cstdlib>
 #include <float.h>
+#include <2geom/transforms.h>
 
 #include "desktop.h"
 #include "inkscape.h"
-- 
cgit v1.2.3


From 353dc258f73b43bbd6b49d1c4331facd45bfd773 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 2 Jul 2011 12:08:37 +0000
Subject: compatibility for building with clang, this failed for 2 reasons. -
 redefining the variable 'i' - the comparison between iterators didn't work.

double checked this is the only use of shadowed 'i' so this has no functional changes.

(bzr r10398)
---
 src/graphlayout.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/graphlayout.cpp')

diff --git a/src/graphlayout.cpp b/src/graphlayout.cpp
index 4f536beb3..2717c376a 100644
--- a/src/graphlayout.cpp
+++ b/src/graphlayout.cpp
@@ -156,11 +156,12 @@ void graphlayout(GSList const *const items) {
          ++i)
     {
         SPItem *iu=*i;
-        map<string,unsigned>::iterator i=nodelookup.find(iu->getId());
-        if(i==nodelookup.end()) {
+        map<string,unsigned>::iterator i_iter=nodelookup.find(iu->getId());
+        map<string,unsigned>::iterator i_iter_end=nodelookup.end();
+        if(i_iter==i_iter_end) {
             continue;
         }
-        unsigned u=i->second;
+        unsigned u=i_iter->second;
         GSList *nlist=iu->avoidRef->getAttachedConnectors(Avoid::runningFrom);
         list<SPItem *> connectors;
 
-- 
cgit v1.2.3


From 72cc39b9f0b340548f395c7f61ca9662b34aea09 Mon Sep 17 00:00:00 2001
From: Krzysztof Kosi??ski <tweenk.pl@gmail.com>
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/graphlayout.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/graphlayout.cpp')

diff --git a/src/graphlayout.cpp b/src/graphlayout.cpp
index 57002bfb6..6197be9f7 100644
--- a/src/graphlayout.cpp
+++ b/src/graphlayout.cpp
@@ -128,7 +128,7 @@ void graphlayout(GSList const *const items) {
          ++i)
     {
         SPItem *u=*i;
-        Geom::OptRect const item_box(u->getBboxDesktop());
+        Geom::OptRect const item_box = u->desktopVisualBounds();
         if(item_box) {
             Geom::Point ll(item_box->min());
             Geom::Point ur(item_box->max());
@@ -231,8 +231,8 @@ void graphlayout(GSList const *const items) {
             map<string,unsigned>::iterator i=nodelookup.find(u->getId());
             if(i!=nodelookup.end()) {
                 Rectangle* r=rs[i->second];
-                Geom::OptRect item_box(u->getBboxDesktop());
-                if(item_box) {
+                Geom::OptRect item_box = u->desktopVisualBounds();
+                if (item_box) {
                     Geom::Point const curr(item_box->midpoint());
                     Geom::Point const dest(r->getCentreX(),r->getCentreY());
                     sp_item_move_rel(u, Geom::Translate(dest - curr));
-- 
cgit v1.2.3


From 20097d47e6945bceb57d2335d23fe764f493ab59 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Sun, 2 Oct 2011 20:44:17 -0700
Subject: Another minor pass of Doxygen cleanup.

(bzr r10659)
---
 src/graphlayout.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/graphlayout.cpp')

diff --git a/src/graphlayout.cpp b/src/graphlayout.cpp
index 6197be9f7..b0e00211a 100644
--- a/src/graphlayout.cpp
+++ b/src/graphlayout.cpp
@@ -1,5 +1,6 @@
-/** @file
- * @brief Interface between Inkscape code (SPItem) and graphlayout functions.
+/**
+ * @file
+ * Interface between Inkscape code (SPItem) and graphlayout functions.
  */
 /*
  * Authors:
-- 
cgit v1.2.3