Merge and cleanup of GSoC C++-ification project.

[inkscape.git] / src / layer-fns.cpp

diff --git a/src/layer-fns.cpp b/src/layer-fns.cpp
index ca7c1c493f5d0dc4939d542df28f39bd332ce87f..84f21cd979b2377dc214c5e384a28a8294ea2ce7 100644 (file)
--- a/src/layer-fns.cpp
+++ b/src/layer-fns.cpp
@@ -3,6 +3,7 @@
  *
  * Authors:
  *   MenTaLguY <mental@rydia.net>
+ *   Jon A. Cruz <jon@joncruz.org>
  *
  * Copyright (C) 2004 MenTaLguY
  *
@@ -19,6 +20,8 @@
 #include "util/find-last-if.h"
 #include "layer-fns.h"
 
+// TODO move the documentation comments into the .h file
+
 namespace Inkscape {
 
 namespace {
@@ -36,7 +39,7 @@ SPObject *next_sibling_layer(SPObject *layer) {
     using std::find_if;
 
     return find_if<SPObject::SiblingIterator>(
-        SP_OBJECT_NEXT(layer), NULL, &is_layer
+        layer->getNext(), NULL, &is_layer
     );
 }
 
@@ -174,7 +177,7 @@ SPObject *create_layer(SPObject *root, SPObject *layer, LayerRelativePosition po
         id = g_strdup_printf("layer%d", layer_suffix++);
     } while (document->getObjectById(id));
     
-    Inkscape::XML::Document *xml_doc = sp_document_repr_doc(document);
+    Inkscape::XML::Document *xml_doc = document->getReprDoc();
     Inkscape::XML::Node *repr = xml_doc->createElement("svg:g");
     repr->setAttribute("inkscape:groupmode", "layer");
     repr->setAttribute("id", id);
@@ -213,4 +216,4 @@ SPObject *create_layer(SPObject *root, SPObject *layer, LayerRelativePosition po
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :