Merged Group and subclasses.

(bzr r11608.1.77)

1 files changed, 2 insertions, 31 deletions

diff --git a/src/sp-switch.h b/src/sp-switch.h
index f60834a95..24a2dbae6 100644
--- a/src/sp-switch.h
+++ b/src/sp-switch.h
@@ -17,21 +17,13 @@
 #include <stddef.h>
 #include <sigc++/connection.h>
 
-G_BEGIN_DECLS
-
-#define SP_TYPE_SWITCH            (sp_switch_get_type())
 #define SP_SWITCH(obj) ((SPSwitch*)obj)
-#define SP_IS_SWITCH(obj) (obj != NULL && static_cast<const SPObject*>(obj)->typeHierarchy.count(typeid(SPSwitch)))
-
-GType sp_switch_get_type() G_GNUC_CONST;
-class CSwitch;
+#define SP_IS_SWITCH(obj) (dynamic_cast<const SPSwitch*>((SPObject*)obj))
 
 class SPSwitch : public SPGroup {
 public:
 	SPSwitch();
-	CSwitch* cswitch;
-
-	static GType getType();
+	virtual ~SPSwitch();
 
     void resetChildEvaluated() { _reevaluate(); }
 
@@ -45,32 +37,11 @@ public:
 
     SPObject *_cached_item;
     sigc::connection _release_connection;
-};
-
-struct SPSwitchClass : public SPGroupClass {
-};
-
-
-/*
- * Virtual methods of SPSwitch
- */
-class CSwitch : public CGroup {
-public:
-    CSwitch(SPSwitch *sw);
-    virtual ~CSwitch();
-
-    friend class SPSwitch;
 
     virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref);
     virtual void remove_child(Inkscape::XML::Node *child);
     virtual void order_changed(Inkscape::XML::Node *child, Inkscape::XML::Node *old_ref, Inkscape::XML::Node *new_ref);
     virtual gchar *description();
-
-protected:
-    SPSwitch* spswitch;
 };
 
-
-G_END_DECLS
-
 #endif