From efd39893a4f5e629a9df2d0674222aea1be14199 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Sun, 5 Oct 2014 12:38:15 -0400
Subject: Move obvious ui component to ui/

(bzr r13341.1.247)
---
 src/helper/pixbuf-ops.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/helper/pixbuf-ops.cpp')

diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp
index d44b2207b..acb2be4da 100644
--- a/src/helper/pixbuf-ops.cpp
+++ b/src/helper/pixbuf-ops.cpp
@@ -19,7 +19,7 @@
 #include <boost/scoped_ptr.hpp>
 #include <2geom/transforms.h>
 
-#include "interface.h"
+#include "ui/interface.h"
 #include "helper/png-write.h"
 #include "display/cairo-utils.h"
 #include "display/drawing.h"
-- 
cgit v1.2.3


From e179290f049d5c34ae2b9c05fdfeab830b7c39e7 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Mon, 10 Nov 2014 09:39:33 -0800
Subject: Removed SP_USE/SP_IS_USE Gtk-ish macros and cleaned affected files.

(bzr r13700)
---
 src/helper/pixbuf-ops.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/helper/pixbuf-ops.cpp')

diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp
index acb2be4da..9639096fb 100644
--- a/src/helper/pixbuf-ops.cpp
+++ b/src/helper/pixbuf-ops.cpp
@@ -34,20 +34,21 @@
 
 #include "helper/pixbuf-ops.h"
 
-// TODO look for copy-n-past duplication of this function:
+// TODO look for copy-n-paste duplication of this function:
 /**
  * Hide all items that are not listed in list, recursively, skipping groups and defs.
  */
 static void hide_other_items_recursively(SPObject *o, GSList *list, unsigned dkey)
 {
-    if ( SP_IS_ITEM(o)
-         && !SP_IS_DEFS(o)
-         && !SP_IS_ROOT(o)
-         && !SP_IS_GROUP(o)
-         && !SP_IS_USE(o)
+    SPItem *item = dynamic_cast<SPItem *>(o);
+    if ( item
+         && !dynamic_cast<SPDefs *>(item)
+         && !dynamic_cast<SPRoot *>(item)
+         && !dynamic_cast<SPGroup *>(item)
+         && !dynamic_cast<SPUse *>(item)
          && !g_slist_find(list, o) )
     {
-        SP_ITEM(o)->invoke_hide(dkey);
+        item->invoke_hide(dkey);
     }
 
     // recurse
-- 
cgit v1.2.3