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

[inkscape.git] / src / print.cpp

diff --git a/src/print.cpp b/src/print.cpp
index 43f0113a0cccde3e9e68ad2007f8d724f81e4c1d..e0601aa339eb930a9568868011416e79f08e9533 100644 (file)
--- a/src/print.cpp
+++ b/src/print.cpp
@@ -1,5 +1,3 @@
-#define __SP_PRINT_C__
-
 /** \file
  * Frontend to printing
  */
@@ -7,6 +5,8 @@
  * Author:
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *   Kees Cook <kees@outflux.net>
+ *   Jon A. Cruz <jon@joncruz.org>
+ *   Abhishek Sharma
  *
  * This code is in public domain
  */
@@ -90,7 +90,7 @@ sp_print_preview_document(SPDocument *doc)
     Inkscape::Extension::Print *mod;
     unsigned int ret;
 
-    doc->ensure_up_to_date();
+    doc->ensureUpToDate();
 
     mod = Inkscape::Extension::get_print(SP_MODULE_KEY_PRINT_DEFAULT);
 
@@ -102,7 +102,7 @@ sp_print_preview_document(SPDocument *doc)
 
         /* fixme: This has to go into module constructor somehow */
         /* Create new arena */
-        mod->base = SP_ITEM(sp_document_root(doc));
+        mod->base = SP_ITEM(doc->getRoot());
         mod->arena = NRArena::create();
         mod->dkey = SPItem::display_key_new(1);
         mod->root = (mod->base)->invoke_show(mod->arena, mod->dkey, SP_ITEM_SHOW_DISPLAY);
@@ -124,10 +124,10 @@ sp_print_preview_document(SPDocument *doc)
 void
 sp_print_document(Gtk::Window& parentWindow, SPDocument *doc)
 {
-    doc->ensure_up_to_date();
+    doc->ensureUpToDate();
 
     // Build arena
-    SPItem      *base = SP_ITEM(sp_document_root(doc));
+    SPItem      *base = SP_ITEM(doc->getRoot());
     NRArena    *arena = NRArena::create();
     unsigned int dkey = SPItem::display_key_new(1);
     // TODO investigate why we are grabbing root and then ignoring it.
@@ -152,7 +152,7 @@ sp_print_document_to_file(SPDocument *doc, gchar const *filename)
     gchar *oldoutput;
     unsigned int ret;
 
-    doc->ensure_up_to_date();
+    doc->ensureUpToDate();
 
     mod = Inkscape::Extension::get_print(SP_MODULE_KEY_PRINT_PS);
     oldconst = mod->get_param_string("destination");
@@ -163,7 +163,7 @@ sp_print_document_to_file(SPDocument *doc, gchar const *filename)
     context.module = mod;
     /* fixme: This has to go into module constructor somehow */
     /* Create new arena */
-    mod->base = SP_ITEM(sp_document_root(doc));
+    mod->base = SP_ITEM(doc->getRoot());
     mod->arena = NRArena::create();
     mod->dkey = SPItem::display_key_new(1);
     mod->root = (mod->base)->invoke_show(mod->arena, mod->dkey, SP_ITEM_SHOW_DISPLAY);
@@ -195,4 +195,4 @@ sp_print_document_to_file(SPDocument *doc, gchar const *filename)
   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 :