Fixed handling delete in kvs + code cleaning

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3817 17fca916-40b9-46aa-a4ea-0a15b648b75c

5 files changed, 6 insertions, 13 deletions

diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
index 118f819ab..4a5f29abb 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
@@ -829,6 +829,7 @@ namespace KviKvsCoreSimpleCommands
 				if(!KVSCSC_pSwitches->find('q',"quiet"))
 					KVSCSC_pContext->warning(__tr2qs_ctx("Can't delete an inexisting object","kvs"));
 			} else {
+                                o->callFunction(o,"destructor");
 				if(KVSCSC_pSwitches->find('i',"immediate"))
 					o->dieNow();
 				else
diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp
index d33ecfd0b..50e2a94fa 100644
--- a/src/kvirc/kvs/kvi_kvs_object.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object.cpp
@@ -626,9 +626,7 @@ KviKvsObject::KviKvsObject(KviKvsObjectClass * pClass,KviKvsObject * pParent,con
 
 KviKvsObject::~KviKvsObject()
 {
-	debug("deleting object %s",this->m_szName.toUtf8().data());
-	callFunction(this,"destructor");
-	m_bInDelayedDeath = true;
+        m_bInDelayedDeath = true;
 	while(m_pChildList->first())delete m_pChildList->first();
 	delete m_pChildList;
 
diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp
index 9b7e7eb08..932348577 100644
--- a/src/modules/objects/class_label.cpp
+++ b/src/modules/objects/class_label.cpp
@@ -208,9 +208,6 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_label)
 bool KviKvsObject_label::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	SET_OBJECT(QLabel)
-        int size=sizeof(*this);
-        debug ("sizeasd %d",size);
-
 	return true;
 }
 
diff --git a/src/modules/objects/class_list.cpp b/src/modules/objects/class_list.cpp
index 93283e50f..715dfff30 100644
--- a/src/modules/objects/class_list.cpp
+++ b/src/modules/objects/class_list.cpp
@@ -166,8 +166,8 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_list)
 
 
 KVSO_BEGIN_DESTRUCTOR(KviKvsObject_list)
-	delete m_pDataList;
-	m_pDataList = 0;
+delete m_pDataList;
+m_pDataList = 0;
 KVSO_END_CONSTRUCTOR(KviKvsObject_list)
 
 KVSO_CLASS_FUNCTION(list,current)
@@ -214,7 +214,7 @@ KVSO_CLASS_FUNCTION(list,moveNext)
 
 KVSO_CLASS_FUNCTION(list,moveFirst)
 {
-	CHECK_INTERNAL_POINTER(m_pDataList)
+        CHECK_INTERNAL_POINTER(m_pDataList)
 	c->returnValue()->setBoolean(m_pDataList->first() != 0);
 	return true;
 }
@@ -308,7 +308,7 @@ KVSO_CLASS_FUNCTION(list,append)
 
 KVSO_CLASS_FUNCTION(list,clear)
 {
-	CHECK_INTERNAL_POINTER(m_pDataList)
+        CHECK_INTERNAL_POINTER(m_pDataList)
 	m_pDataList->clear();
 	return true;
 }
diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
index ffe53b786..d1ce77c6a 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/class_painter.cpp
@@ -517,9 +517,6 @@ KVSO_END_REGISTERCLASS(KviKvsObject_painter)
 KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_painter,KviKvsObject)
 
 	m_pPainter = new QPainter();
-        int size=sizeof(*this);
-        debug ("sizeasd %d",size);
-
         bDonotdeleteinternalqpainter=false;
 	m_pPrinter = 0 ;
 	m_pDeviceObject=0;