From 8867de5daf309e4cdd3fce177b408618490be4f3 Mon Sep 17 00:00:00 2001
From: Abhishek Sharma Public <spyzerdotabhishek0at-signgmaildotcom>
Date: Tue, 29 Jun 2010 23:35:42 +0530
Subject: This is the first c++ification commit from me. It handles sp-line,
 sp-polyline, sp-item and marks the onset of document c++ification as well.
 Users can check performace increase with [/usr/bin/time -v
 inkscape_binary_with_commandline_options].

(bzr r9546.1.1)
---
 src/ui/view/edit-widget.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/ui/view')

diff --git a/src/ui/view/edit-widget.cpp b/src/ui/view/edit-widget.cpp
index 770a9bf87..2c325a5ee 100644
--- a/src/ui/view/edit-widget.cpp
+++ b/src/ui/view/edit-widget.cpp
@@ -1219,12 +1219,12 @@ EditWidget::shutdown()
         switch (response)
         {
             case Gtk::RESPONSE_YES:
-                sp_document_ref(doc);
+                doc->doRef();
                 sp_namedview_document_from_window(_desktop);
                 if (sp_file_save_document(*this, doc)) {
-                    sp_document_unref(doc);
+                    doc->doUnref();
                 } else { // save dialog cancelled or save failed
-                    sp_document_unref(doc);
+                    doc->doUnref();
                     return TRUE;
                 }
                 break;
@@ -1270,11 +1270,11 @@ EditWidget::shutdown()
         switch (response)
         {
             case Gtk::RESPONSE_YES:
-                sp_document_ref(doc);
+                doc->doRef();
                 if (sp_file_save_document(*this, doc)) {
-                    sp_document_unref(doc);
+                    doc->doUnref();
                 } else { // save dialog cancelled or save failed
-                    sp_document_unref(doc);
+                    doc->doUnref();
                     return TRUE;
                 }
                 break;
@@ -1394,7 +1394,7 @@ EditWidget::updateScrollbars (double scale)
                      Geom::Point(2 * sp_document_width(doc), 2 * sp_document_height(doc))  );
     SPObject* root = doc->root;
     SPItem* item = SP_ITEM(root);
-    Geom::OptRect deskarea = Geom::unify(darea, sp_item_bbox_desktop(item));
+    Geom::OptRect deskarea = Geom::unify(darea, item->getBboxDesktop());
 
     /* Canvas region we always show unconditionally */
     Geom::Rect carea( Geom::Point(deskarea->min()[Geom::X] * scale - 64, deskarea->max()[Geom::Y] * -scale - 64),
-- 
cgit v1.2.3


From 121815791be2d24cb745663520b111ee914fbc09 Mon Sep 17 00:00:00 2001
From: Abhishek Sharma Public <spyzerdotabhishek0at-signgmaildotcom>
Date: Thu, 1 Jul 2010 15:36:56 +0530
Subject: C++fied SPDocument added

(bzr r9546.1.2)
---
 src/ui/view/edit-widget.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/ui/view')

diff --git a/src/ui/view/edit-widget.cpp b/src/ui/view/edit-widget.cpp
index 2c325a5ee..0248e73d5 100644
--- a/src/ui/view/edit-widget.cpp
+++ b/src/ui/view/edit-widget.cpp
@@ -1390,8 +1390,8 @@ EditWidget::updateScrollbars (double scale)
 
     /* The desktop region we always show unconditionally */
     SPDocument *doc = _desktop->doc();
-    Geom::Rect darea ( Geom::Point(-sp_document_width(doc), -sp_document_height(doc)),
-                     Geom::Point(2 * sp_document_width(doc), 2 * sp_document_height(doc))  );
+    Geom::Rect darea ( Geom::Point(-doc->getWidth(), -doc->getHeight()),
+                     Geom::Point(2 * doc->getWidth(), 2 * doc->getHeight())  );
     SPObject* root = doc->root;
     SPItem* item = SP_ITEM(root);
     Geom::OptRect deskarea = Geom::unify(darea, item->getBboxDesktop());
@@ -1654,12 +1654,12 @@ void
 EditWidget::onWindowRealize()
 {
 
-    if ( (sp_document_width(_desktop->doc()) < 1.0) || (sp_document_height(_desktop->doc()) < 1.0) ) {
+    if ( ((_desktop->doc())->getWidth() < 1.0) || ((_desktop->doc())->getHeight() < 1.0) ) {
         return;
     }
 
     Geom::Rect d( Geom::Point(0, 0),
-                  Geom::Point(sp_document_width(_desktop->doc()), sp_document_height(_desktop->doc())) );
+                  Geom::Point((_desktop->doc())->getWidth(), (_desktop->doc())->getHeight()) );
 
     _desktop->set_display_area(d.min()[Geom::X], d.min()[Geom::Y], d.max()[Geom::X], d.max()[Geom::Y], 10);
     _namedview_modified(_desktop->namedview, SP_OBJECT_MODIFIED_FLAG);
-- 
cgit v1.2.3