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

[inkscape.git] / src / inkview.cpp

diff --git a/src/inkview.cpp b/src/inkview.cpp
index 35f150707d16b1c8713bb712f0734e5f918f113f..09adb8c2d3c684c763004bfa175fe272e4821a3b 100644 (file)
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -1,5 +1,3 @@
-#define __SPSVGVIEW_C__
-
 /*
  * Inkscape - an ambitious vector drawing program
  *
@@ -14,6 +12,7 @@
  *   Chema Celorio <chema@celorio.com>
  *   Pawel Palucha
  * ... and various people who have worked with various projects
+ *   Abhishek Sharma
  *
  * Copyright (C) 1999-2002 authors
  * Copyright (C) 2001-2002 Ximian, Inc.
@@ -167,7 +166,7 @@ sp_svgview_main_key_press (GtkWidget */*widget*/, GdkEventKey *event, struct SPS
     default:
        break;
     }
-    gtk_window_set_title(GTK_WINDOW(ss->window), SP_DOCUMENT_NAME(ss->doc));
+    gtk_window_set_title(GTK_WINDOW(ss->window), ss->doc->getName());
     return TRUE;
 }
 
@@ -313,7 +312,7 @@ main (int argc, const char **argv)
        return 1; /* none of the slides loadable */
 
     w = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_title (GTK_WINDOW (w), SP_DOCUMENT_NAME (ss.doc));
+    gtk_window_set_title( GTK_WINDOW(w), ss.doc->getName() );
     gtk_window_set_default_size (GTK_WINDOW (w),
                                 MIN ((int)(ss.doc)->getWidth (), (int)gdk_screen_width () - 64),
                                 MIN ((int)(ss.doc)->getHeight (), (int)gdk_screen_height () - 64));
@@ -323,7 +322,7 @@ main (int argc, const char **argv)
     g_signal_connect (G_OBJECT (w), "delete_event", (GCallback) sp_svgview_main_delete, &ss);
     g_signal_connect (G_OBJECT (w), "key_press_event", (GCallback) sp_svgview_main_key_press, &ss);
 
-    (ss.doc)->ensure_up_to_date ();
+    (ss.doc)->ensureUpToDate();
     ss.view = sp_svg_view_widget_new (ss.doc);
     (ss.doc)->doUnref ();
     sp_svg_view_widget_set_resize (SP_SVG_VIEW_WIDGET (ss.view), FALSE,
@@ -444,7 +443,7 @@ static void
 sp_svgview_set_document(struct SPSlideShow *ss, SPDocument *doc, int current)
 {
     if (doc && doc != ss->doc) {
-        doc->ensure_up_to_date ();
+        doc->ensureUpToDate();
         reinterpret_cast<SPSVGView*>(SP_VIEW_WIDGET_VIEW (ss->view))->setDocument (doc);
         ss->doc = doc;
         ss->current = current;