From 3e1740c0faeaac588ff5d3aaafe461f74ebcc7e2 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 21 Aug 2012 02:31:16 +0200 Subject: Added "virtual pad" to SPString. (bzr r11608.1.33) --- src/sp-string.h | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'src/sp-string.h') diff --git a/src/sp-string.h b/src/sp-string.h index 7242589c6..428e2c557 100644 --- a/src/sp-string.h +++ b/src/sp-string.h @@ -16,8 +16,12 @@ #define SP_IS_STRING(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_STRING)) #define SP_IS_STRING_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_STRING)) +class CString; + +class SPString : public SPObject { +public: + CString* cstring; -struct SPString : public SPObject { Glib::ustring string; }; @@ -25,6 +29,24 @@ struct SPStringClass { SPObjectClass parent_class; }; + +class CString : public CObject { +public: + CString(SPString* str); + virtual ~CString(); + + virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr); + virtual void onRelease(); + + virtual void onReadContent(); + + virtual void onUpdate(SPCtx* ctx, unsigned int flags); + +protected: + SPString* spstring; +}; + + GType sp_string_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-string.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/sp-string.h') diff --git a/src/sp-string.h b/src/sp-string.h index 428e2c557..790964214 100644 --- a/src/sp-string.h +++ b/src/sp-string.h @@ -35,12 +35,12 @@ public: CString(SPString* str); virtual ~CString(); - virtual void onBuild(SPDocument* doc, Inkscape::XML::Node* repr); - virtual void onRelease(); + virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); + virtual void release(); - virtual void onReadContent(); + virtual void read_content(); - virtual void onUpdate(SPCtx* ctx, unsigned int flags); + virtual void update(SPCtx* ctx, unsigned int flags); protected: SPString* spstring; -- 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-string.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/sp-string.h') diff --git a/src/sp-string.h b/src/sp-string.h index 790964214..9e12f8429 100644 --- a/src/sp-string.h +++ b/src/sp-string.h @@ -11,10 +11,8 @@ #include "sp-object.h" #define SP_TYPE_STRING (sp_string_get_type ()) -#define SP_STRING(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_STRING, SPString)) -#define SP_STRING_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SP_TYPE_STRING, SPStringClass)) -#define SP_IS_STRING(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_STRING)) -#define SP_IS_STRING_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_STRING)) +#define SP_STRING(obj) ((SPString*)obj) +#define SP_IS_STRING(obj) (obj != NULL && static_cast(obj)->typeHierarchy.count(typeid(SPString))) class CString; -- 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-string.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/sp-string.h') diff --git a/src/sp-string.h b/src/sp-string.h index 9e12f8429..64b19e950 100644 --- a/src/sp-string.h +++ b/src/sp-string.h @@ -18,6 +18,7 @@ class CString; class SPString : public SPObject { public: + SPString(); CString* cstring; Glib::ustring string; -- 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-string.h | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) (limited to 'src/sp-string.h') diff --git a/src/sp-string.h b/src/sp-string.h index 64b19e950..2aa1d98cb 100644 --- a/src/sp-string.h +++ b/src/sp-string.h @@ -10,29 +10,15 @@ #include "sp-object.h" -#define SP_TYPE_STRING (sp_string_get_type ()) #define SP_STRING(obj) ((SPString*)obj) -#define SP_IS_STRING(obj) (obj != NULL && static_cast(obj)->typeHierarchy.count(typeid(SPString))) +#define SP_IS_STRING(obj) (dynamic_cast((SPObject*)obj)) -class CString; - -class SPString : public SPObject { +class SPString : public SPObject, public CObject { public: SPString(); - CString* cstring; + virtual ~SPString(); Glib::ustring string; -}; - -struct SPStringClass { - SPObjectClass parent_class; -}; - - -class CString : public CObject { -public: - CString(SPString* str); - virtual ~CString(); virtual void build(SPDocument* doc, Inkscape::XML::Node* repr); virtual void release(); @@ -40,12 +26,6 @@ public: virtual void read_content(); virtual void update(SPCtx* ctx, unsigned int flags); - -protected: - SPString* spstring; }; - -GType sp_string_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-string.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sp-string.h') diff --git a/src/sp-string.h b/src/sp-string.h index 2aa1d98cb..2c6a92001 100644 --- a/src/sp-string.h +++ b/src/sp-string.h @@ -13,7 +13,7 @@ #define SP_STRING(obj) ((SPString*)obj) #define SP_IS_STRING(obj) (dynamic_cast((SPObject*)obj)) -class SPString : public SPObject, public CObject { +class SPString : public SPObject { public: SPString(); virtual ~SPString(); -- 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-string.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sp-string.h') diff --git a/src/sp-string.h b/src/sp-string.h index 2c6a92001..d7634a719 100644 --- a/src/sp-string.h +++ b/src/sp-string.h @@ -11,7 +11,7 @@ #include "sp-object.h" #define SP_STRING(obj) ((SPString*)obj) -#define SP_IS_STRING(obj) (dynamic_cast((SPObject*)obj)) +#define SP_IS_STRING(obj) (dynamic_cast((SPObject*)obj) != NULL) class SPString : public SPObject { public: -- 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-string.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sp-string.h') diff --git a/src/sp-string.h b/src/sp-string.h index d7634a719..eabf76353 100644 --- a/src/sp-string.h +++ b/src/sp-string.h @@ -10,7 +10,7 @@ #include "sp-object.h" -#define SP_STRING(obj) ((SPString*)obj) +#define SP_STRING(obj) (dynamic_cast((SPObject*)obj)) #define SP_IS_STRING(obj) (dynamic_cast((SPObject*)obj) != NULL) class SPString : public SPObject { -- cgit v1.2.3