From d0397d78191419e6e8b55009a7a932a07f9e4eb4 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 21 Aug 2012 02:31:46 +0200 Subject: Added "virtual pad" to SPScript. (bzr r11608.1.34) --- src/sp-script.h | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'src/sp-script.h') diff --git a/src/sp-script.h b/src/sp-script.h index 976603b65..6365591ca 100644 --- a/src/sp-script.h +++ b/src/sp-script.h @@ -22,7 +22,12 @@ /* SPScript */ -struct SPScript : public SPObject { +class CScript; + +class SPScript : public SPObject { +public: + CScript* cscript; + gchar *xlinkhref; }; @@ -30,6 +35,24 @@ struct SPScriptClass { SPObjectClass parent_class; }; + +class CScript : public CObject { +public: + CScript(SPScript* script); + virtual ~CScript(); + + virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr); + virtual void onRelease(); + virtual void onSet(unsigned int key, const gchar* value); + virtual void onUpdate(SPCtx* ctx, unsigned int flags); + virtual void onModified(unsigned int flags); + virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + +protected: + SPScript* spscript; +}; + + GType sp_script_get_type(); #endif -- cgit v1.2.3 From 7df6616da5ea2debb86838366ddf746841549cdb Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 30 Mar 2013 00:56:13 +0100 Subject: Renamed virtual function names. (bzr r11608.1.57) --- src/sp-script.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/sp-script.h') diff --git a/src/sp-script.h b/src/sp-script.h index 6365591ca..a8ec05db7 100644 --- a/src/sp-script.h +++ b/src/sp-script.h @@ -41,12 +41,12 @@ public: CScript(SPScript* script); virtual ~CScript(); - virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void onRelease(); - virtual void onSet(unsigned int key, const gchar* value); - virtual void onUpdate(SPCtx* ctx, unsigned int flags); - virtual void onModified(unsigned int flags); - virtual Inkscape::XML::Node* onWrite(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); + virtual void release(); + virtual void set(unsigned int key, const gchar* value); + virtual void update(SPCtx* ctx, unsigned int flags); + virtual void modified(unsigned int flags); + virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); protected: SPScript* spscript; -- cgit v1.2.3 From 25078fc60b120e877a7b79bc6f08fe2a0f45c3d7 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Mon, 1 Apr 2013 02:14:53 +0200 Subject: Replaced all casting macros with glib-independent ones. (bzr r11608.1.64) --- src/sp-script.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/sp-script.h') diff --git a/src/sp-script.h b/src/sp-script.h index a8ec05db7..b62ae22fc 100644 --- a/src/sp-script.h +++ b/src/sp-script.h @@ -15,10 +15,8 @@ #include "sp-item.h" #define SP_TYPE_SCRIPT (sp_script_get_type()) -#define SP_SCRIPT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SP_TYPE_SCRIPT, SPScript)) -#define SP_SCRIPT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), SP_TYPE_SCRIPT, SPScriptClass)) -#define SP_IS_SCRIPT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_SCRIPT)) -#define SP_IS_SCRIPT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_SCRIPT)) +#define SP_SCRIPT(obj) ((SPScript*)obj) +#define SP_IS_SCRIPT(obj) (obj != NULL && static_cast(obj)->typeHierarchy.count(typeid(SPScript))) /* SPScript */ -- cgit v1.2.3 From 69f3b6f1abb2bb422935d43262e1e99aab359954 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 2 Apr 2013 01:41:30 +0200 Subject: Added constructors to SP classes. (bzr r11608.1.67) --- src/sp-script.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/sp-script.h') diff --git a/src/sp-script.h b/src/sp-script.h index b62ae22fc..5bb7bfbc6 100644 --- a/src/sp-script.h +++ b/src/sp-script.h @@ -24,6 +24,7 @@ class CScript; class SPScript : public SPObject { public: + SPScript(); CScript* cscript; gchar *xlinkhref; -- cgit v1.2.3 From 7b7e0294b0c06a8d3ec19b73486a91e12cf67adf Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 6 Apr 2013 22:16:05 +0200 Subject: Merged more classes. (bzr r11608.1.84) --- src/sp-script.h | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) (limited to 'src/sp-script.h') diff --git a/src/sp-script.h b/src/sp-script.h index 5bb7bfbc6..8194cb48a 100644 --- a/src/sp-script.h +++ b/src/sp-script.h @@ -14,31 +14,16 @@ #include "sp-item.h" -#define SP_TYPE_SCRIPT (sp_script_get_type()) #define SP_SCRIPT(obj) ((SPScript*)obj) -#define SP_IS_SCRIPT(obj) (obj != NULL && static_cast(obj)->typeHierarchy.count(typeid(SPScript))) +#define SP_IS_SCRIPT(obj) (dynamic_cast((SPObject*)obj)) /* SPScript */ - -class CScript; - -class SPScript : public SPObject { +class SPScript : public SPObject, public CObject { public: SPScript(); - CScript* cscript; + virtual ~SPScript(); gchar *xlinkhref; -}; - -struct SPScriptClass { - SPObjectClass parent_class; -}; - - -class CScript : public CObject { -public: - CScript(SPScript* script); - virtual ~CScript(); virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); virtual void release(); @@ -46,14 +31,8 @@ public: virtual void update(SPCtx* ctx, unsigned int flags); virtual void modified(unsigned int flags); virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); - -protected: - SPScript* spscript; }; - -GType sp_script_get_type(); - #endif /* -- cgit v1.2.3 From 27e2102f96a5554bcd5310ec11435d155773b279 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 7 Apr 2013 18:28:22 +0200 Subject: Merge Object and subclasses. Merging of SP- and C-classes complete. (bzr r11608.1.86) --- src/sp-script.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sp-script.h') diff --git a/src/sp-script.h b/src/sp-script.h index 8194cb48a..7355cd124 100644 --- a/src/sp-script.h +++ b/src/sp-script.h @@ -18,7 +18,7 @@ #define SP_IS_SCRIPT(obj) (dynamic_cast((SPObject*)obj)) /* SPScript */ -class SPScript : public SPObject, public CObject { +class SPScript : public SPObject { public: SPScript(); virtual ~SPScript(); -- cgit v1.2.3 From bf4a1d2d49850170b936c30cfe2b30e798716406 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 3 Aug 2013 03:03:43 +0200 Subject: Cleaned up. (bzr r11608.1.117) --- src/sp-script.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/sp-script.h') diff --git a/src/sp-script.h b/src/sp-script.h index 7355cd124..62d6eba7a 100644 --- a/src/sp-script.h +++ b/src/sp-script.h @@ -25,6 +25,7 @@ public: gchar *xlinkhref; +protected: virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); virtual void release(); virtual void set(unsigned int key, const gchar* value); -- cgit v1.2.3 From bb4246887ab6a0833cc4d2263b31f951ce314061 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 14 Sep 2013 22:43:15 +0200 Subject: Modified SP_IS_ macros. (bzr r11608.1.122) --- src/sp-script.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sp-script.h') diff --git a/src/sp-script.h b/src/sp-script.h index 62d6eba7a..f6ef9d5fd 100644 --- a/src/sp-script.h +++ b/src/sp-script.h @@ -15,7 +15,7 @@ #include "sp-item.h" #define SP_SCRIPT(obj) ((SPScript*)obj) -#define SP_IS_SCRIPT(obj) (dynamic_cast((SPObject*)obj)) +#define SP_IS_SCRIPT(obj) (dynamic_cast((SPObject*)obj) != NULL) /* SPScript */ class SPScript : public SPObject { -- cgit v1.2.3 From 5cf6efefbfd06d723973b6517b442f0ee64416b7 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 15 Sep 2013 02:43:49 +0200 Subject: Added runtime check in SP_-cast macros. (bzr r11608.1.123) --- src/sp-script.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sp-script.h') diff --git a/src/sp-script.h b/src/sp-script.h index f6ef9d5fd..95b56e79c 100644 --- a/src/sp-script.h +++ b/src/sp-script.h @@ -14,7 +14,7 @@ #include "sp-item.h" -#define SP_SCRIPT(obj) ((SPScript*)obj) +#define SP_SCRIPT(obj) (dynamic_cast((SPObject*)obj)) #define SP_IS_SCRIPT(obj) (dynamic_cast((SPObject*)obj) != NULL) /* SPScript */ -- cgit v1.2.3