From 8867de5daf309e4cdd3fce177b408618490be4f3 Mon Sep 17 00:00:00 2001 From: Abhishek Sharma Public 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/trace/trace.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/trace/trace.cpp') diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp index e2bd0e9f5..0c7f075b9 100644 --- a/src/trace/trace.cpp +++ b/src/trace/trace.cpp @@ -246,7 +246,7 @@ Tracer::sioxProcessImage(SPImage *img, return Glib::RefPtr(NULL); } - NRArenaItem *aImg = sp_item_get_arenaitem(img, desktop->dkey); + NRArenaItem *aImg = img->get_arenaitem(desktop->dkey); //g_message("img: %d %d %d %d\n", aImg->bbox.x0, aImg->bbox.y0, // aImg->bbox.x1, aImg->bbox.y1); @@ -264,7 +264,7 @@ Tracer::sioxProcessImage(SPImage *img, for (iter = sioxShapes.begin() ; iter!=sioxShapes.end() ; iter++) { SPItem *item = *iter; - NRArenaItem *aItem = sp_item_get_arenaitem(item, desktop->dkey); + NRArenaItem *aItem = item->get_arenaitem(desktop->dkey); arenaItems.push_back(aItem); } @@ -549,7 +549,7 @@ void Tracer::traceThread() if (reprobj) { SPItem *newItem = SP_ITEM(reprobj); - sp_item_write_transform(newItem, pathRepr, tf, NULL); + newItem->doWriteTransform(pathRepr, tf, NULL); } if (nrPaths == 1) { -- cgit v1.2.3 From 121815791be2d24cb745663520b111ee914fbc09 Mon Sep 17 00:00:00 2001 From: Abhishek Sharma Public Date: Thu, 1 Jul 2010 15:36:56 +0530 Subject: C++fied SPDocument added (bzr r9546.1.2) --- src/trace/trace.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/trace/trace.cpp') diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp index 0c7f075b9..a2b0cd790 100644 --- a/src/trace/trace.cpp +++ b/src/trace/trace.cpp @@ -443,7 +443,7 @@ void Tracer::traceThread() return; } SPDocument *doc = SP_ACTIVE_DOCUMENT; - sp_document_ensure_up_to_date(doc); + doc->ensure_up_to_date(); SPImage *img = getSelectedSPImage(); -- cgit v1.2.3 From d25a9a072143eafa4a9823b84e977c4b85d45efe Mon Sep 17 00:00:00 2001 From: Abhishek Sharma Public Date: Fri, 2 Jul 2010 18:05:42 +0530 Subject: New Class SPDocumentUndo created which takes care of c++fying some non SPDocument based methods (bzr r9546.1.3) --- src/trace/trace.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/trace/trace.cpp') diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp index a2b0cd790..e9bc48372 100644 --- a/src/trace/trace.cpp +++ b/src/trace/trace.cpp @@ -568,7 +568,7 @@ void Tracer::traceThread() } //## inform the document, so we can undo - sp_document_done(doc, SP_VERB_SELECTION_TRACE, _("Trace bitmap")); + SPDocumentUndo::done(doc, SP_VERB_SELECTION_TRACE, _("Trace bitmap")); engine = NULL; -- cgit v1.2.3 From 1aaf9a0ee3da28012bf43cfa61e2e5fa933edd2e Mon Sep 17 00:00:00 2001 From: Abhishek Sharma Public Date: Tue, 6 Jul 2010 12:52:32 +0530 Subject: C++ification of SPObject continued along with the onset of XML Privatisation. Users may checkout [grep -Ir XML Tree *] in the source code and all the places where the XML node/Tree is being used shall be reflected. (bzr r9546.1.5) --- src/trace/trace.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/trace/trace.cpp') diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp index e9bc48372..cff464e9f 100644 --- a/src/trace/trace.cpp +++ b/src/trace/trace.cpp @@ -482,7 +482,8 @@ void Tracer::traceThread() } //### Get pointers to the and its parent - Inkscape::XML::Node *imgRepr = SP_OBJECT(img)->repr; + //XML Tree being used directly here while it shouldn't be. + Inkscape::XML::Node *imgRepr = SP_OBJECT(img)->getRepr(); Inkscape::XML::Node *par = sp_repr_parent(imgRepr); //### Get some information for the new transform() -- cgit v1.2.3