Move classes derived from SPObject to own directory.

A lot of header clean-up.

3 files changed, 6 insertions, 8 deletions

diff --git a/src/libnrtype/Layout-TNG-Compute.cpp b/src/libnrtype/Layout-TNG-Compute.cpp
index dfbb84793..2ef689a88 100644
--- a/src/libnrtype/Layout-TNG-Compute.cpp
+++ b/src/libnrtype/Layout-TNG-Compute.cpp
@@ -12,7 +12,7 @@
 #include "style.h"
 #include "font-instance.h"
 #include "svg/svg-length.h"
-#include "sp-object.h"
+#include "object/sp-object.h"
 #include "Layout-TNG-Scanline-Maker.h"
 #include <limits>
 
diff --git a/src/libnrtype/Layout-TNG-Input.cpp b/src/libnrtype/Layout-TNG-Input.cpp
index 98ce7d526..6ad3bc23b 100644
--- a/src/libnrtype/Layout-TNG-Input.cpp
+++ b/src/libnrtype/Layout-TNG-Input.cpp
@@ -21,8 +21,6 @@
 #include "Layout-TNG.h"
 #include "style.h"
 #include "svg/svg-length.h"
-#include "sp-object.h"
-#include "sp-string.h"
 #include "FontFactory.h"
 
 
diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp
index 1b75f70af..ca15baa81 100644
--- a/src/libnrtype/font-lister.cpp
+++ b/src/libnrtype/font-lister.cpp
@@ -15,8 +15,8 @@
 #include "document.h"
 #include "inkscape.h"
 #include "preferences.h"
-#include "sp-object.h"
-#include "sp-root.h"
+#include "object/sp-object.h"
+#include "object/sp-root.h"
 #include "xml/repr.h"
 
 #include <glibmm/regex.h>
@@ -183,8 +183,8 @@ void FontLister::insert_font_family(Glib::ustring new_family)
 
 void FontLister::update_font_list(SPDocument *document)
 {
-    SPObject *r = document->getRoot();
-    if (!r) {
+    SPObject *root = document->getRoot();
+    if (!root) {
         return;
     }
 
@@ -217,7 +217,7 @@ void FontLister::update_font_list(SPDocument *document)
 
     /* Get "font-family"s used in document. */
     std::list<Glib::ustring> fontfamilies;
-    update_font_list_recursive(r, &fontfamilies);
+    update_font_list_recursive(root, &fontfamilies);
 
     fontfamilies.sort();
     fontfamilies.unique();