From fc4b076593df6f406974dd502ca09c1b865e6f72 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Fri, 3 Jun 2016 09:50:21 +0200
Subject: Fix guide placement when guides are generated by a template with
 width/height/viewBox different from default SVG file.

(bzr r14947)
---
 src/sp-guide.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/sp-guide.cpp')

diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index c80fc7122..58a1a746e 100644
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -196,6 +196,7 @@ void SPGuide::set(unsigned int key, const gchar *value) {
     }
 }
 
+/* Only used internally and in sp-line.cpp */
 SPGuide *SPGuide::createSPGuide(SPDocument *doc, Geom::Point const &pt1, Geom::Point const &pt2)
 {
     Inkscape::XML::Document *xml_doc = doc->getReprDoc();
-- 
cgit v1.2.3


From f35bb1f74a0ffeb5c6477a25e3c4cde87a97bcf1 Mon Sep 17 00:00:00 2001
From: Adrian Boguszewski <adrbogus1@student.pg.gda.pl>
Date: Thu, 28 Jul 2016 12:06:06 +0200
Subject: Removed unused includes, decrease compilation time

(bzr r15025)
---
 src/sp-guide.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/sp-guide.cpp')

diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index 58a1a746e..ff0f6cadb 100644
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -16,7 +16,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include <algorithm>
@@ -31,8 +31,6 @@
 #include "attributes.h"
 #include "sp-guide.h"
 #include <sp-item-notify-moveto.h>
-#include <sp-item.h>
-#include <sp-guide-constraint.h>
 #include <glibmm/i18n.h>
 #include <xml/repr.h>
 #include <remove-last.h>
@@ -40,8 +38,6 @@
 #include "desktop.h"
 #include "sp-root.h"
 #include "sp-namedview.h"
-#include <2geom/angle.h>
-#include "document.h"
 #include "document-undo.h"
 #include "helper-fns.h"
 #include "verbs.h"
-- 
cgit v1.2.3


From 43b49e325db73cc19b1731db6c69545664ee8fbe Mon Sep 17 00:00:00 2001
From: Adrian Boguszewski <adrbogus1@student.pg.gda.pl>
Date: Thu, 28 Jul 2016 13:26:17 +0200
Subject: Reverted changes to r15024 after many building problems

(bzr r15027)
---
 src/sp-guide.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/sp-guide.cpp')

diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index ff0f6cadb..58a1a746e 100644
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -16,7 +16,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <algorithm>
@@ -31,6 +31,8 @@
 #include "attributes.h"
 #include "sp-guide.h"
 #include <sp-item-notify-moveto.h>
+#include <sp-item.h>
+#include <sp-guide-constraint.h>
 #include <glibmm/i18n.h>
 #include <xml/repr.h>
 #include <remove-last.h>
@@ -38,6 +40,8 @@
 #include "desktop.h"
 #include "sp-root.h"
 #include "sp-namedview.h"
+#include <2geom/angle.h>
+#include "document.h"
 #include "document-undo.h"
 #include "helper-fns.h"
 #include "verbs.h"
-- 
cgit v1.2.3


From 35830f456cadaecf8b8e3944e3031a1a93f6cb41 Mon Sep 17 00:00:00 2001
From: Adrian Boguszewski <adrbogus1@student.pg.gda.pl>
Date: Wed, 3 Aug 2016 15:29:38 +0200
Subject: Removed unused includes, decreased compilation time. Once again

(bzr r15034)
---
 src/sp-guide.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/sp-guide.cpp')

diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index 58a1a746e..ff0f6cadb 100644
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -16,7 +16,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include <algorithm>
@@ -31,8 +31,6 @@
 #include "attributes.h"
 #include "sp-guide.h"
 #include <sp-item-notify-moveto.h>
-#include <sp-item.h>
-#include <sp-guide-constraint.h>
 #include <glibmm/i18n.h>
 #include <xml/repr.h>
 #include <remove-last.h>
@@ -40,8 +38,6 @@
 #include "desktop.h"
 #include "sp-root.h"
 #include "sp-namedview.h"
-#include <2geom/angle.h>
-#include "document.h"
 #include "document-undo.h"
 #include "helper-fns.h"
 #include "verbs.h"
-- 
cgit v1.2.3