Merged more classes.

(bzr r11608.1.84)

1 files changed, 6 insertions, 28 deletions

diff --git a/src/sp-title.cpp b/src/sp-title.cpp
index 614d5033e..57c61f590 100644
--- a/src/sp-title.cpp
+++ b/src/sp-title.cpp
@@ -26,38 +26,16 @@ namespace {
 	bool titleRegistered = SPFactory::instance().registerObject("svg:title", createTitle);
 }
 
-G_DEFINE_TYPE(SPTitle, sp_title, G_TYPE_OBJECT);
-
-static void
-sp_title_class_init(SPTitleClass *klass)
-{
-}
-
-CTitle::CTitle(SPTitle* title) : CObject(title) {
-	this->sptitle = title;
-}
-
-CTitle::~CTitle() {
-}
-
-SPTitle::SPTitle() : SPObject() {
-	SPTitle* desc = this;
-
-	desc->ctitle = new CTitle(desc);
-	desc->typeHierarchy.insert(typeid(SPTitle));
-
-	delete desc->cobject;
-	desc->cobject = desc->ctitle;
+SPTitle::SPTitle() : SPObject(), CObject(this) {
+	delete this->cobject;
+	this->cobject = this;
 }
 
-static void
-sp_title_init(SPTitle *desc)
-{
-	new (desc) SPTitle();
+SPTitle::~SPTitle() {
 }
 
-Inkscape::XML::Node* CTitle::write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) {
-	SPTitle* object = this->sptitle;
+Inkscape::XML::Node* SPTitle::write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) {
+	SPTitle* object = this;
 
     if (!repr) {
         repr = object->getRepr()->duplicate(xml_doc);