fixed some serious bugs in module object+code clean and improvements.

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

41 files changed, 511 insertions, 558 deletions

diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index 5be3b5672..cd22fdfad 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -194,7 +194,7 @@ void KviChannelsJoinWindow::fillListView()
 	}
 }
 
-void KviChannelsJoinWindow::itemClicked(QTreeWidgetItem * it, int)
+void KviChannelsJoinWindow::itemClicked(QTreeWidgetItem * it, int index)
 {
 	if(!it)
 		return;
diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp
index 2e439a546..68326c1bd 100644
--- a/src/modules/objects/class_button.cpp
+++ b/src/modules/objects/class_button.cpp
@@ -92,14 +92,14 @@ bool KviKvsObject_button::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
 
 KVSO_CLASS_FUNCTION(button,text)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setString(((QPushButton *)widget())->text());
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(button,setText)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	QString szText;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("text",KVS_PT_STRING,0,szText)
@@ -110,7 +110,7 @@ KVSO_CLASS_FUNCTION(button,setText)
 
 KVSO_CLASS_FUNCTION(button,setImage)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	KviKvsVariant icon;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("icon_or_hobject",KVS_PT_VARIANT,0,icon)
@@ -122,10 +122,10 @@ KVSO_CLASS_FUNCTION(button,setImage)
 		KviKvsObject *pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObj);
 		if (!pObject)
 		{
-			c->warning(__tr2qs_ctx("Pixmap parameter is not an object!","object"));
+			c->warning(__tr2qs_ctx("Pixmap parameter is not an object!","objects"));
 			return true;
 		}
-		if(pObject->inherits("KviKvsObject_pixmap"))
+		if(pObject->inheritsClass("pixmap"))
 			((QPushButton *)widget())->setIcon(QIcon(*((KviKvsObject_pixmap *)pObject)->getPixmap()));
 		else{ 
 			c->warning(__tr2qs_ctx("Object Pixmap required!","object"));
diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp
index 9c41bdb52..ece10d839 100644
--- a/src/modules/objects/class_buttongroup.cpp
+++ b/src/modules/objects/class_buttongroup.cpp
@@ -75,7 +75,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_buttongroup)
 
 KVSO_CLASS_FUNCTION(buttongroup,addButton)
 {
-	CHECK_INTERNAL_QPOINTER(m_pButtonGroup)
+	CHECK_INTERNAL_POINTER(m_pButtonGroup)
 	KviKvsObject * pObject;
 	kvs_hobject_t hObject;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -84,12 +84,12 @@ KVSO_CLASS_FUNCTION(buttongroup,addButton)
 	pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
 	if (!pObject)
 	{
-		c->warning(__tr2qs_ctx("Widget parameter is not an object","object"));
+		c->warning(__tr2qs("Widget parameter is not an object"));
 		return true;
 	}
 	if (!pObject->object())
 	{
-		c->warning(__tr2qs_ctx("Widget parameter is not a valid object","object"));
+		c->warning(__tr2qs("Widget parameter is not a valid object"));
 		return true;
 	}
 	if(!pObject->object()->isWidgetType())
@@ -97,21 +97,23 @@ KVSO_CLASS_FUNCTION(buttongroup,addButton)
 		c->warning(__tr2qs("Can't add a non-widget object"));
 		return true;
 	}
-	if(pObject->inherits("KviKvsObject_radiobutton") || pObject->inherits("KviKvsObject_checkbox")){
+	if(pObject->inheritsClass("radiobutton") || pObject->inheritsClass("KviKvsObject"))
+	{
 		m_pButtonGroup->addButton(((QRadioButton *)(pObject->object())),m_iId);
 		c->returnValue()->setInteger(m_iId);
 		btnDict.insert(m_iId,pObject);
 		m_iId++;
 	}
-	else{
-		c->warning(__tr2qs_ctx("Buttongroup support only checkbox and radiobox object","object"));
+	else
+	{
+		c->warning(__tr2qs_ctx("Buttongroup supports only checkbox and radiobox object","objects"));
 		return true;
 	}
 	return true;
 }
 KVSO_CLASS_FUNCTION(buttongroup,checkedButton)
 {
-	CHECK_INTERNAL_QPOINTER(m_pButtonGroup)
+	CHECK_INTERNAL_POINTER(m_pButtonGroup)
 	int id=m_pButtonGroup->checkedId();
 	if (id!=-1) c->returnValue()->setHObject(btnDict.find(id)->handle());
 	else c->returnValue()->setNothing();
diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp
index 45f22b815..66fbba5ff 100644
--- a/src/modules/objects/class_checkbox.cpp
+++ b/src/modules/objects/class_checkbox.cpp
@@ -89,14 +89,14 @@ bool KviKvsObject_checkbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantLi
 
 KVSO_CLASS_FUNCTION(checkbox,isChecked)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setBoolean(((QCheckBox *)widget())->isChecked());
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(checkbox,setChecked)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	bool bChecked;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("bChecked",KVS_PT_BOOL,KVS_PF_OPTIONAL,bChecked)
diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp
index 7a2686341..2dddebe7b 100644
--- a/src/modules/objects/class_combobox.cpp
+++ b/src/modules/objects/class_combobox.cpp
@@ -143,7 +143,7 @@ bool KviKvsObject_combobox::init(KviKvsRunTimeContext * pContext,KviKvsVariantLi
 
 KVSO_CLASS_FUNCTION(combobox,insertItem)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	kvs_int_t iIndex;
 	QString szItem;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -158,24 +158,24 @@ KVSO_CLASS_FUNCTION(combobox,insertItem)
 }
 KVSO_CLASS_FUNCTION(combobox,clear)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	((QComboBox *)widget())->clear();
 	return true;
 }
 KVSO_CLASS_FUNCTION(combobox,changeItem)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uIndex,cnt;
 	QString szText;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("text",KVS_PT_STRING,0,szText)
 		KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex)
 	KVSO_PARAMETERS_END(c)
-	if (szText.isEmpty()) c->warning(__tr2qs_ctx("No string parameter given - using empty string","object"));
+	if (szText.isEmpty()) c->warning(__tr2qs_ctx("No string parameter given - using empty string","objects"));
 	if(uIndex >= (cnt = ((QComboBox *)widget())->count()))
 	{
 		c->warning(__tr2qs_ctx("Item index [%d] is too big - defaulting to " \
-			"$count() - 1 [%d]","object"), uIndex, cnt);
+			"$count() - 1 [%d]","objects"), uIndex, cnt);
 		uIndex = cnt - 1;
 	}
 	((QComboBox *)widget())->setItemText( uIndex,szText);
@@ -184,7 +184,7 @@ KVSO_CLASS_FUNCTION(combobox,changeItem)
 }
 KVSO_CLASS_FUNCTION(combobox,removeItem)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uIndex,cnt;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex)
@@ -192,7 +192,7 @@ KVSO_CLASS_FUNCTION(combobox,removeItem)
 	if(uIndex >= (cnt = ((QComboBox *)widget())->count()))
 	{
 		c->warning(__tr2qs_ctx("Item index [%d] is too big - defaulting to " \
-			"$count() - 1 [%d]","object"), uIndex, cnt);
+			"$count() - 1 [%d]","objects"), uIndex, cnt);
 		uIndex = cnt - 1;
 	}
 
@@ -203,7 +203,7 @@ KVSO_CLASS_FUNCTION(combobox,removeItem)
 }
 KVSO_CLASS_FUNCTION(combobox,setMaxCount)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t iMax;
 	QString szText;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -214,38 +214,38 @@ KVSO_CLASS_FUNCTION(combobox,setMaxCount)
 }
 KVSO_CLASS_FUNCTION(combobox,maxCount)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((QComboBox *)widget())->maxCount());
 	return true;
 }
 KVSO_CLASS_FUNCTION(combobox,count)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((QComboBox *)widget())->count());
 	return true;
 }
 KVSO_CLASS_FUNCTION(combobox,current)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setString(((QComboBox *)widget())->currentText());
 	return true;
 }
 KVSO_CLASS_FUNCTION(combobox,currentItem)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((QComboBox *)widget())->currentIndex());
 	return true;
 }
 KVSO_CLASS_FUNCTION(combobox,textLineEdit)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setString(((QComboBox *)widget())->lineEdit()->text());
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(combobox,setEditable)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	bool bFlag;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("bflag",KVS_PT_BOOLEAN,0,bFlag)
@@ -255,7 +255,7 @@ KVSO_CLASS_FUNCTION(combobox,setEditable)
 }
 KVSO_CLASS_FUNCTION(combobox,setTextLineEdit)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	QString szText;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("text",KVS_PT_STRING,0,szText)
@@ -266,26 +266,26 @@ KVSO_CLASS_FUNCTION(combobox,setTextLineEdit)
 
 KVSO_CLASS_FUNCTION(combobox,editable)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setBoolean(((QComboBox *)widget())->isEditable());
 	return true;
 }
 KVSO_CLASS_FUNCTION(combobox,setEditText)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	QString szText;
 	bool bQuiet=false;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("text",KVS_PT_STRING,0,szText)
 		KVSO_PARAMETER("quiet",KVS_PT_BOOLEAN,KVS_PF_OPTIONAL,bQuiet)
 	KVSO_PARAMETERS_END(c)
-	if (szText.isEmpty() && !bQuiet) c->warning("No string parameter given - using empty string");
+	if (szText.isEmpty() && !bQuiet) c->warning(__tr2qs_ctx("No string parameter given - using empty string","objects"));
 	((QComboBox *)widget())->setEditText(szText);
 	return true;
 }
 KVSO_CLASS_FUNCTION(combobox,textAt)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uIndex;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex)
@@ -295,7 +295,7 @@ KVSO_CLASS_FUNCTION(combobox,textAt)
 }
 KVSO_CLASS_FUNCTION(combobox,setCurrentItem)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uIndex;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex)
@@ -311,7 +311,7 @@ KVSO_CLASS_FUNCTION(combobox,popup)
 }
 KVSO_CLASS_FUNCTION(combobox,setInsertionPolicy)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	QString szPolicy;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("policy",KVS_PT_STRING,0,szPolicy)
@@ -328,7 +328,7 @@ KVSO_CLASS_FUNCTION(combobox,setInsertionPolicy)
 			((QComboBox *)widget())->setInsertPolicy(QComboBox::InsertAfterCurrent);
 	else if(KviQString::equalCI(szPolicy,"BeforeCurrent"))
 			((QComboBox *)widget())->setInsertPolicy(QComboBox::InsertBeforeCurrent);
-	else c->warning(__tr2qs_ctx("Invalid insertion Policy %Q","object"),&szPolicy);
+	else c->warning(__tr2qs_ctx("Invalid insertion Policy '%Q'","objects"),&szPolicy);
 	return true;
 }
 
diff --git a/src/modules/objects/class_dialog.cpp b/src/modules/objects/class_dialog.cpp
index cbd10ea99..590186227 100644
--- a/src/modules/objects/class_dialog.cpp
+++ b/src/modules/objects/class_dialog.cpp
@@ -78,7 +78,7 @@ bool KviKvsObject_dialog::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
 }
 KVSO_CLASS_FUNCTION(dialog,setModal)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled)
diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index c787733a6..40d83927a 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -91,7 +91,7 @@ bool KviKvsObject_dockwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariant
 
 KVSO_CLASS_FUNCTION(dockwindow,addWidget)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	kvs_hobject_t hWidget;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("widget",KVS_PT_HOBJECT,0,hWidget)
@@ -99,32 +99,32 @@ KVSO_CLASS_FUNCTION(dockwindow,addWidget)
 	if(hWidget == (kvs_hobject_t)0)
 	{
 		// null widget ?
-		c->warning(__tr2qs("Can't add a null object"));
+		c->warning(__tr2qs_ctx("Can't add a null object","objects"));
 		return true;
 	}
 
 	KviKvsObject * pWidget = KviKvsKernel::instance()->objectController()->lookupObject(hWidget);
 	if(!pWidget)
 	{
-		c->warning(__tr2qs("Invalid object handle passed as parameter (the object is no longer existing ?)"));
+		c->warning(__tr2qs_ctx("Invalid object handle passed as parameter (the object is no longer existing ?)","objects"));
 		return true;
 	}
 
 	if(!pWidget->object())
 	{
-		c->warning(__tr2qs("Object in invalid state"));
+		c->warning(__tr2qs_ctx("Object in invalid state","objects"));
 		return true;
 	}
 
 	if(!pWidget->object()->isWidgetType())
 	{
-		c->warning(__tr2qs("Can't set a non-widget object to be the main widget of a dock window"));
+		c->warning(__tr2qs_ctx("Can't set a non-widget object to be the main widget of a dock window","objects"));
 		return true;
 	}
 
 	if(((QWidget *)(pWidget->object()))->parent() != (QObject *)_pDockWindow)
 	{
-		c->warning(__tr2qs("The added widget is not a child of this dock window"));
+		c->warning(__tr2qs_ctx("The added widget is not a child of this dock window","objects"));
 	}
 
 	_pDockWindow->setWidget((QWidget *)(pWidget->object()));
@@ -133,7 +133,7 @@ KVSO_CLASS_FUNCTION(dockwindow,addWidget)
 // Fix me
 KVSO_CLASS_FUNCTION(dockwindow,resizeEnabled)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setBoolean(false);
 	return true;
 }
@@ -141,7 +141,7 @@ KVSO_CLASS_FUNCTION(dockwindow,resizeEnabled)
 // Fix me
 KVSO_CLASS_FUNCTION(dockwindow,setResizeEnabled)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	bool bResizeEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bResizeEnabled)
@@ -151,7 +151,7 @@ KVSO_CLASS_FUNCTION(dockwindow,setResizeEnabled)
 
 KVSO_CLASS_FUNCTION(dockwindow,setAllowedDockAreas)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	QString szFlags;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("docks",KVS_PT_STRING,0,szFlags)
@@ -177,7 +177,7 @@ KVSO_CLASS_FUNCTION(dockwindow,setAllowedDockAreas)
 
 KVSO_CLASS_FUNCTION(dockwindow,dock)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	QString szDock;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("dock",KVS_PT_STRING,0,szDock)
diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp
index fa92aa341..5f039ea7d 100644
--- a/src/modules/objects/class_file.cpp
+++ b/src/modules/objects/class_file.cpp
@@ -36,6 +36,9 @@
 //#include <QFile>
 #include <QTextStream>
 
+#define CHECK_FILE_IS_OPEN if (!m_pFile->isOpen())\
+	{c->warning(__tr2qs_ctx("File is not open!","objects"));return true;}
+
 // needed for $open()
 const char * const mod_tbl[] =	{
 					"Raw",
@@ -178,12 +181,12 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_file,"file","object")
 
 	KVSO_REGISTER_HANDLER(KviKvsObject_file,"write",write)
 	KVSO_REGISTER_HANDLER(KviKvsObject_file,"read",read)
-	
+
 	
 KVSO_END_REGISTERCLASS(KviKvsObject_file)
 
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_file,KviKvsObject)
+KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_file,KviKvsObject_widget)
 
 	m_pFile = new KviFile();
 
@@ -194,26 +197,28 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_file)
 	if (m_pFile) delete m_pFile;
 
 KVSO_END_CONSTRUCTOR(KviKvsObject_file)
+
 KVSO_CLASS_FUNCTION(file,setName)
 {
+	CHECK_INTERNAL_POINTER(m_pFile)
 	QString szName;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("file_name",KVS_PT_STRING,0,szName)
 	KVSO_PARAMETERS_END(c)
-	if (m_pFile) m_pFile->setFileName(szName);
+	m_pFile->setFileName(szName);
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(file,name)
 {
-	CHECK_INTERNAL_QPOINTER(m_pFile)
+	CHECK_INTERNAL_POINTER(m_pFile)
 	c->returnValue()->setString(m_pFile->fileName());
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(file,open)
 {
-	CHECK_INTERNAL_QPOINTER(m_pFile)
+	CHECK_INTERNAL_POINTER(m_pFile)
 	QStringList modes;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("file_mode",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,modes)
@@ -221,7 +226,7 @@ KVSO_CLASS_FUNCTION(file,open)
 	
 	if(m_pFile->fileName().isEmpty())
 	{
-		c->warning(__tr2qs("Empty filename string"));
+		c->warning(__tr2qs_ctx("Empty filename string","objects"));
 		return true;
 	}
 	QIODevice::OpenMode mod,sum;
@@ -242,7 +247,7 @@ KVSO_CLASS_FUNCTION(file,open)
 			if(mod!=QIODevice::ReadOnly)
 				sum = sum | mod;
 			else
-				c->warning(__tr2qs("No such open mode: '%Q'"),&modes.at(idx));
+				c->warning(__tr2qs_ctx("No such open mode: '%Q'","objects"),&modes.at(idx));
 		}
 	}
 
@@ -252,35 +257,35 @@ KVSO_CLASS_FUNCTION(file,open)
 
 KVSO_CLASS_FUNCTION(file,isOpen)
 {
-	CHECK_INTERNAL_QPOINTER(m_pFile)
+	CHECK_INTERNAL_POINTER(m_pFile)
 	c->returnValue()->setBoolean(m_pFile->isOpen());
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(file,close)
 {
-	CHECK_INTERNAL_QPOINTER(m_pFile)
-	if (!m_pFile->isOpen()) c->warning(__tr2qs("File is not open!"));
-	else m_pFile->close();
+	CHECK_INTERNAL_POINTER(m_pFile)
+	CHECK_FILE_IS_OPEN
+	m_pFile->close();
 	return true;
 }
 KVSO_CLASS_FUNCTION(file,flush)
 {
-	CHECK_INTERNAL_QPOINTER(m_pFile)
-	if (!m_pFile->isOpen()) c->warning(__tr2qs("File is not open!"));
-	else m_pFile->flush();
+	CHECK_INTERNAL_POINTER(m_pFile)
+	CHECK_FILE_IS_OPEN
+	m_pFile->flush();
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(file,size)
 {
-	CHECK_INTERNAL_QPOINTER(m_pFile)
+	CHECK_INTERNAL_POINTER(m_pFile)
 	c->returnValue()->setInteger((kvs_int_t)(m_pFile->size()));
 	return true;
 }
 KVSO_CLASS_FUNCTION(file,atEnd)
 {
-	CHECK_INTERNAL_QPOINTER(m_pFile)
+	CHECK_INTERNAL_POINTER(m_pFile)
 	c->returnValue()->setInteger((kvs_int_t)(m_pFile->atEnd()));
 	return true;
 }
@@ -288,70 +293,62 @@ KVSO_CLASS_FUNCTION(file,atEnd)
 
 KVSO_CLASS_FUNCTION(file,where)
 {
-	CHECK_INTERNAL_QPOINTER(m_pFile)
-	if (!m_pFile->isOpen()) c->warning(__tr2qs("File is not open!"));
-	else c->returnValue()->setInteger((kvs_int_t)(m_pFile->pos()));
+	CHECK_INTERNAL_POINTER(m_pFile)
+	CHECK_FILE_IS_OPEN
+	c->returnValue()->setInteger((kvs_int_t)(m_pFile->pos()));
 	return true;
 }
 KVSO_CLASS_FUNCTION(file,seek)
 {
-	CHECK_INTERNAL_QPOINTER(m_pFile)
+	CHECK_INTERNAL_POINTER(m_pFile)
 	kvs_uint_t uIndex;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex)
 	KVSO_PARAMETERS_END(c)
-	if(!m_pFile->isOpen())
-		c->warning(__tr2qs("File is not open !"));
-	else m_pFile->seek(uIndex);
+	CHECK_FILE_IS_OPEN
+	m_pFile->seek(uIndex);
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(file,putch)
 {
-	CHECK_INTERNAL_QPOINTER(m_pFile)
+	CHECK_INTERNAL_POINTER(m_pFile)
 	QString szChar;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("char",KVS_PT_STRING,0,szChar)
 	KVSO_PARAMETERS_END(c)
-	if (szChar.length()>1)c->warning(__tr2qs("Argument to long, using only first char"));
+	if (szChar.length()>1)c->warning(__tr2qs_ctx("Argument to long, using only first char","objects"));
 	const char *ch=szChar.toUtf8().data();
-	if (!m_pFile->putChar(ch[0])) c->warning(__tr2qs("Write error occured !"));
+	if (!m_pFile->putChar(ch[0])) c->warning(__tr2qs_ctx("Write error occured !","objects"));
 	return true;
 }
 KVSO_CLASS_FUNCTION(file,getch)
 {
-	CHECK_INTERNAL_QPOINTER(m_pFile)
-	if(!m_pFile->isOpen())
-		c->warning(__tr2qs("File is not open !"));
-	else
-	{
-		char ch;
-		if (!m_pFile->getChar(&ch)) c->warning(__tr2qs("Read error occured !"));	// c->error ?
-		QString szChar = QChar(ch);
-		c->returnValue()->setString(szChar);
-	}
+	CHECK_INTERNAL_POINTER(m_pFile)
+	CHECK_FILE_IS_OPEN
+	char ch;
+	if (!m_pFile->getChar(&ch)) c->warning(__tr2qs_ctx("Read error occured !","objects"));	// c->error ?
+	QString szChar = QChar(ch);
+	c->returnValue()->setString(szChar);
 	return true;
 }
 KVSO_CLASS_FUNCTION(file,unGetch)
 {
-	CHECK_INTERNAL_QPOINTER(m_pFile)
+	CHECK_INTERNAL_POINTER(m_pFile)
+	CHECK_FILE_IS_OPEN
 	QString szChar;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("char",KVS_PT_STRING,0,szChar)
 	KVSO_PARAMETERS_END(c)
-	if(!m_pFile->isOpen())
-		c->warning(__tr2qs("File is not open !"));
-	else
-	{
-		if (szChar.length()>1) c->warning(__tr2qs("Argument to long, using only first char"));
-		const char *ch=szChar.toUtf8().data();
-		m_pFile->ungetChar(ch[0]);
-	}
+	if (szChar.length()>1) c->warning(__tr2qs_ctx("Argument to long, using only first char","objects"));
+	const char *ch=szChar.toUtf8().data();
+	m_pFile->ungetChar(ch[0]);
 	return true;
 }
 KVSO_CLASS_FUNCTION(file,readBlock)
 {
-	CHECK_INTERNAL_QPOINTER(m_pFile)
+	CHECK_INTERNAL_POINTER(m_pFile)
+	CHECK_FILE_IS_OPEN
 	kvs_uint_t uLen;
 	KviKvsObject * pObject;
 	kvs_hobject_t hObject;
@@ -359,118 +356,106 @@ KVSO_CLASS_FUNCTION(file,readBlock)
 		KVSO_PARAMETER("length",KVS_PT_UNSIGNEDINTEGER,0,uLen)
 		KVSO_PARAMETER("hobject",KVS_PT_HOBJECT,KVS_PF_OPTIONAL,hObject)
 	KVSO_PARAMETERS_END(c)
-	if(!m_pFile->isOpen()){
-		c->warning(__tr2qs("File is not open !"));
-	}
-	else
+	if (uLen>(kvs_uint_t)m_pFile->size()) uLen=m_pFile->size();
+	if (hObject)
 	{
-		if (uLen>(kvs_uint_t)m_pFile->size()) uLen=m_pFile->size();
-		if (hObject)
+		pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
+		if (!pObject)
 		{
-			pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
-			if (!pObject)
-			{
-				c->warning(__tr2qs("Buffer parameter is not an object"));
-				return true;
-			}
-			if (!pObject->inherits("KviKvsObject_memorybuffer"))
-			{
-				debug ("Classname %s",pObject->metaObject()->className());
-				c->warning(__tr2qs("Buffer parameter is not a memorybuffer object"));
-				return true;
-			}
-			//m_pFile->flush();
-			((KviKvsObject_memorybuffer *)pObject)->pBuffer()->append(m_pFile->read(uLen));
+			c->warning(__tr2qs_ctx("Buffer parameter is not an object","objects"));
 			return true;
 		}
-		else
+		if (!pObject->inheritsClass("memorybuffer"))
 		{
-			char * buff = new char[uLen + 1];
-			//m_pFile->flush(); // advice from QFile man page (to avoid trash)
-			int rlen = m_pFile->read(buff, uLen);
-			buff[rlen] = '\0';
-			QString szBlock(buff);
-			c->returnValue()->setString(szBlock);
+			c->warning(__tr2qs_ctx("Buffer parameter is not a memorybuffer object","objects"));
+			return true;
 		}
+		//m_pFile->flush();
+		((KviKvsObject_memorybuffer *)pObject)->pBuffer()->append(m_pFile->read(uLen));
+		return true;
+	}
+	else
+	{
+		char * buff = new char[uLen + 1];
+		//m_pFile->flush(); // advice from QFile man page (to avoid trash)
+		int rlen = m_pFile->read(buff, uLen);
+		buff[rlen] = '\0';
+		QString szBlock(buff);
+		c->returnValue()->setString(szBlock);
 	}
 	return true;
 }
 KVSO_CLASS_FUNCTION(file,read)
 {
-	CHECK_INTERNAL_QPOINTER(m_pFile)
+	CHECK_INTERNAL_POINTER(m_pFile)
+	CHECK_FILE_IS_OPEN
 	QString szType;
 	KVSO_PARAMETERS_BEGIN(c)
 			KVSO_PARAMETER("type",KVS_PT_STRING,0,szType)
 	KVSO_PARAMETERS_END(c)
-	if(!m_pFile->isOpen()){
-		c->warning(__tr2qs("File is not open !"));
+	if(KviQString::equalCI(szType, "String"))
+	{
+		QString szStr;
+		m_pFile->load(szStr);
+		c->returnValue()->setString(szStr);
+	}
+	else if(KviQString::equalCI(szType, "Integer"))
+	{
+		int iValue;
+		m_pFile->load(iValue);
+		c->returnValue()->setInteger(iValue);
+	}
+	else if(KviQString::equalCI(szType, "Array"))
+	{
+		QString szData;
+		m_pFile->load(szData);
+		KviKvsVariant *pVar = KviKvsVariant::unserialize(szData);
+		if (pVar->isArray())
+			c->returnValue()->setArray(pVar->array());
+		else
+			c->warning(__tr2qs_ctx("The incoming data doesn't an array","objects"));
+	}
+	else if(KviQString::equalCI(szType, "Dict"))
+	{
+		QString szData;
+		m_pFile->load(szData);
+		KviKvsVariant *pVar = KviKvsVariant::unserialize(szData);
+		if (pVar->isHash())
+			c->returnValue()->setHash(pVar->hash());
+		else
+			c->warning(__tr2qs_ctx("The incoming data doesn't a Dictionary","objects"));
+	}
+	else if(KviQString::equalCI(szType, "String"))
+	{
+		QString szStr;
+		m_pFile->load(szStr);
+		c->returnValue()->setString(szStr);
 	}
 	else
 	{
-		if(KviQString::equalCI(szType, "String"))
-		{
-			QString szStr;
-			m_pFile->load(szStr);
-			c->returnValue()->setString(szStr);
-		}
-		else if(KviQString::equalCI(szType, "Integer"))
-		{
-			int iValue;
-			m_pFile->load(iValue);
-			c->returnValue()->setInteger(iValue);
-		}
-		if(KviQString::equalCI(szType, "Array"))
-		{
-			QString szData;
-			m_pFile->load(szData);
-			KviKvsVariant *pVar = KviKvsVariant::unserialize(szData);
-			if (pVar->isArray())
-				c->returnValue()->setArray(pVar->array());
-			else
-				c->warning(__tr2qs("The incoming data doesn't an array"));
-		}
-		if(KviQString::equalCI(szType, "Dict"))
-		{
-			QString szData;
-			m_pFile->load(szData);
-			KviKvsVariant *pVar = KviKvsVariant::unserialize(szData);
-			if (pVar->isHash())
-				c->returnValue()->setHash(pVar->hash());
-			else
-				c->warning(__tr2qs("The incoming data doesn't a Dictionary"));
-		}
-		if(KviQString::equalCI(szType, "String"))
-		{
-			QString szStr;
-			m_pFile->load(szStr);
-			c->returnValue()->setString(szStr);
-		}
+		c->warning(__tr2qs_ctx("Unsupported datatype '%Q'","objects"),&szType);
 	}
 	return true;
 }
 KVSO_CLASS_FUNCTION(file,write)
 {
-	CHECK_INTERNAL_QPOINTER(m_pFile)
+	CHECK_INTERNAL_POINTER(m_pFile)
+	CHECK_FILE_IS_OPEN
 	KviKvsVariant * pVariantData;
 	KVSO_PARAMETERS_BEGIN(c)
 			KVSO_PARAMETER("variant_data",KVS_PT_VARIANT,0,pVariantData)
 	KVSO_PARAMETERS_END(c)
-	if(!m_pFile->isOpen())c->warning(__tr2qs("File is not open !"));
-	else
+	if (pVariantData->isInteger()) 
 	{
-		if (pVariantData->isInteger()) 
-		{
-			kvs_int_t num;
-			pVariantData->asInteger(num);
-			m_pFile->save(num);
-		}
-		if (pVariantData->isHash() || pVariantData->isArray() || pVariantData->isString())
-		{
-			QString szTmp;
-			pVariantData->serialize(szTmp);
-			m_pFile->save(szTmp);
-		}
-
+		kvs_int_t num;
+		pVariantData->asInteger(num);
+		m_pFile->save(num);
+	}
+	if (pVariantData->isHash() || pVariantData->isArray() || pVariantData->isString())
+	{
+		QString szTmp;
+		pVariantData->serialize(szTmp);
+		m_pFile->save(szTmp);
 	}
 	return true;
 }
@@ -478,7 +463,7 @@ KVSO_CLASS_FUNCTION(file,write)
 
 KVSO_CLASS_FUNCTION(file,writeBlock)
 {
-	CHECK_INTERNAL_QPOINTER(m_pFile)
+	CHECK_INTERNAL_POINTER(m_pFile)
 	kvs_uint_t uLen;
 	KviKvsObject * pObject;
 	KviKvsVariant * pVariantData;
@@ -496,10 +481,10 @@ KVSO_CLASS_FUNCTION(file,writeBlock)
 			pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
 			if (!pObject)
 			{
-				c->warning(__tr2qs("Buffer parameter is not an object"));
+				c->warning(__tr2qs_ctx("Buffer parameter is not an object","objects"));
 				return true;
 			}
-			if (pObject->inherits("KviKvsObject_memorybuffer"))
+			if (pObject->inheritsClass("memorybuffer"))
 			{
 				if (!uLen)
 				{
@@ -507,7 +492,7 @@ KVSO_CLASS_FUNCTION(file,writeBlock)
 						uLen=((KviKvsObject_memorybuffer *)pObject)->pBuffer()->size();
 					else
 					{
-						c->warning(__tr2qs("The memoryBuffer object is empty: nothing will be saved"));
+						c->warning(__tr2qs_ctx("The memoryBuffer object is empty: nothing will be saved","objects"));
 					}
 				}
 				const char *pData=((KviKvsObject_memorybuffer *)pObject)->pBuffer()->data();
@@ -517,7 +502,7 @@ KVSO_CLASS_FUNCTION(file,writeBlock)
 			}
 			else
 			{
-				c->warning(__tr2qs("Buffer parameter is not a memorybufferobject"));
+				c->warning(__tr2qs_ctx("Buffer parameter is not a memorybuffer object","objects"));
 				return true;
 			}
 		
@@ -525,7 +510,7 @@ KVSO_CLASS_FUNCTION(file,writeBlock)
 		else
 		{
 			if (!pVariantData->isString()){
-				c->warning(__tr2qs("Block must been a string or a memorybufferobject"));
+				c->warning(__tr2qs_ctx("Block parameter must been a string or a memorybufferobject","objects"));
 				return true;
 			}
 			QString szBlock;
@@ -540,88 +525,69 @@ KVSO_CLASS_FUNCTION(file,writeBlock)
 }
 KVSO_CLASS_FUNCTION(file,readLine)
 {
-	CHECK_INTERNAL_QPOINTER(m_pFile)
-	if(!m_pFile->isOpen())
-		c->warning(__tr2qs("File is not open !"));
-	else
-	{
-		QString buffer;
-		KviFileUtils::readLine(m_pFile,buffer);
-		c->returnValue()->setString(buffer);
-	}
+	CHECK_INTERNAL_POINTER(m_pFile)
+	CHECK_FILE_IS_OPEN
+	QString buffer;
+	KviFileUtils::readLine(m_pFile,buffer);
+	c->returnValue()->setString(buffer);
 	return true;
 }
 KVSO_CLASS_FUNCTION(file,writeLine)
 {
-	CHECK_INTERNAL_QPOINTER(m_pFile)
+	CHECK_INTERNAL_POINTER(m_pFile)
+	CHECK_FILE_IS_OPEN
 	QString szLine;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("text_line",KVS_PT_STRING,0,szLine)
 	KVSO_PARAMETERS_END(c)
-	
-	if(!m_pFile->isOpen())
-		c->warning(__tr2qs("File is not open !"));
-	else
-	{
-		QTextStream ts(m_pFile);
-		ts << szLine;
-	}
+	QTextStream ts(m_pFile);
+	ts << szLine;
 	return true;
 }
 KVSO_CLASS_FUNCTION(file,readHexBlock)
 {
-	CHECK_INTERNAL_QPOINTER(m_pFile)
+	CHECK_INTERNAL_POINTER(m_pFile)
+	CHECK_FILE_IS_OPEN
 	kvs_uint_t uLen;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("lenght",KVS_PT_UNSIGNEDINTEGER,0,uLen)
 	KVSO_PARAMETERS_END(c)
-	
-	if(!m_pFile->isOpen())
-		c->warning(__tr2qs("File is not open !"));
-	else
+	if (uLen>(kvs_uint_t)m_pFile->size()) uLen=m_pFile->size();
+	char * buff = new char[uLen];
+	char * str = new char [(uLen*2)+1];
+	m_pFile->flush(); // advice from QFile man page (to avoid trash)
+	int rlen = m_pFile->read(buff, uLen);
+	int index=0;
+	unsigned char byte,msb,lsb=0;
+	for (int i=0;i<rlen;i++)
 	{
-		if (uLen>(kvs_uint_t)m_pFile->size()) uLen=m_pFile->size();
-		char * buff = new char[uLen];
-		char * str = new char [(uLen*2)+1];
-		m_pFile->flush(); // advice from QFile man page (to avoid trash)
-		int rlen = m_pFile->read(buff, uLen);
-		int index=0;
-		unsigned char byte,msb,lsb=0;
-		for (int i=0;i<rlen;i++)
-		{
-			byte=(unsigned char)buff[i];
-			lsb=byte & 0x0f;
-			msb=byte>>4;
-			
-			msb>9?msb+='7':msb+='0'; 
-			lsb>9?lsb+='7':lsb+='0'; 
-			str[index++]=msb; 
-			str[index++]=lsb;
-		}		
-		str[index]='\0';
-		c->returnValue()->setString(str);
-		delete str;
-		delete buff;
-	}
+		byte=(unsigned char)buff[i];
+		lsb=byte & 0x0f;
+		msb=byte>>4;
+		msb>9?msb+='7':msb+='0'; 
+		lsb>9?lsb+='7':lsb+='0'; 
+		str[index++]=msb; 
+		str[index++]=lsb;
+	}		
+	str[index]='\0';
+	c->returnValue()->setString(str);
+	delete str;
+	delete buff;
 	return true;
 }
 KVSO_CLASS_FUNCTION(file,writeHexBlock)
 {
-	CHECK_INTERNAL_QPOINTER(m_pFile)
+	CHECK_INTERNAL_POINTER(m_pFile)
+	CHECK_FILE_IS_OPEN
 	QString szBlock;
 	kvs_uint_t uLen;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("text_block",KVS_PT_STRING,0,szBlock)
 		KVSO_PARAMETER("lenght",KVS_PT_UNSIGNEDINTEGER,KVS_PF_OPTIONAL,uLen)
 	KVSO_PARAMETERS_END(c)
-	
-	if(!m_pFile->isOpen()){
-		c->warning(__tr2qs("File is not open !"));
-		return true;
-	}
 	if (szBlock.length()%2) 
 	{
-		c->warning(__tr2qs("Lenght of hex string is not multiple of 2"));
+		c->warning(__tr2qs_ctx("Lenght of hex string is not multiple of 2","objects"));
 		return true;
 	}
 	if (uLen>(szBlock.length()/2)|| !uLen) uLen=szBlock.length();
@@ -638,7 +604,7 @@ KVSO_CLASS_FUNCTION(file,writeHexBlock)
 					lsb>='A'?lsb-='7':lsb-='0';
 		}
 		else{
-			c->warning("The hex string is not correct!");
+			c->warning(__tr2qs_ctx("The hex string is not correct!","objects"));
 			return true;
 		}
 		byte=(msb*16)+lsb;
diff --git a/src/modules/objects/class_file.h b/src/modules/objects/class_file.h
index 54781fa42..2f1f047b8 100644
--- a/src/modules/objects/class_file.h
+++ b/src/modules/objects/class_file.h
@@ -24,22 +24,23 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 //=============================================================================
-
+#include "class_widget.h"
 #include "kvi_file.h"
 
 #include "object_macros.h"
 
 
 
-class KviKvsObject_file : public KviKvsObject
+class KviKvsObject_file : public KviKvsObject_widget
 {
 public:
 	KVSO_DECLARE_OBJECT(KviKvsObject_file)
 protected:
 	KviFile* m_pFile;
 public:
+
 	KviFile *pFile(){return m_pFile;};
-  	bool setName(KviKvsObjectFunctionCall *c);
+	bool setName(KviKvsObjectFunctionCall *c);
 	bool name(KviKvsObjectFunctionCall *c);
 	bool open(KviKvsObjectFunctionCall *c);
 	bool isOpen(KviKvsObjectFunctionCall *c);
diff --git a/src/modules/objects/class_ftp.cpp b/src/modules/objects/class_ftp.cpp
index c9a45cc33..023dae845 100644
--- a/src/modules/objects/class_ftp.cpp
+++ b/src/modules/objects/class_ftp.cpp
@@ -62,19 +62,18 @@
 
 KVSO_BEGIN_REGISTERCLASS(KviKvsObject_ftp,"ftp","object")
 	KVSO_REGISTER_HANDLER(KviKvsObject_ftp,"connect",functionConnect)
-	KVSO_REGISTER_HANDLER(KviKvsObject_ftp,"abort",functionAbort)
-	KVSO_REGISTER_HANDLER(KviKvsObject_ftp,"login",functionLogin)
-	KVSO_REGISTER_HANDLER(KviKvsObject_ftp,"get",functionGet)
-	KVSO_REGISTER_HANDLER(KviKvsObject_ftp,"cd",functionCd)
-	KVSO_REGISTER_HANDLER(KviKvsObject_ftp,"list",functionList)
-	KVSO_REGISTER_HANDLER(KviKvsObject_ftp,"commandFinishedEvent",function_commandFinishedEvent)
-	KVSO_REGISTER_HANDLER(KviKvsObject_ftp,"listInfoEvent",function_listInfoEvent)
-	KVSO_REGISTER_HANDLER(KviKvsObject_ftp,"dataTransferProgressEvent",function_dataTransferProgressEvent)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_ftp,abort)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_ftp,login)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_ftp,get)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_ftp,cd)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_ftp,list)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_ftp,commandFinishedEvent)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_ftp,listInfoEvent)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_ftp,dataTransferProgressEvent)
 KVSO_END_REGISTERCLASS(KviKvsObject_ftp)
 
 
 KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_ftp,KviKvsObject)
-debug("this %s",this->metaObject()->className());
 	m_pFtp = new QFtp();
 	m_pFile=0;
 	connect(m_pFtp,SIGNAL(commandFinished(int,bool)),this,SLOT(slotCommandFinished(int,bool)));
@@ -89,14 +88,13 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_ftp)
 
 KVSO_BEGIN_DESTRUCTOR(KviKvsObject_ftp)
 	if (m_pFile) delete m_pFile;
+	delete m_pFtp;
 KVSO_END_DESTRUCTOR(KviKvsObject_ftp)
 //----------------------
 
 
 
-
-
-bool  KviKvsObject_ftp::functionConnect(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(ftp,functionConnect)
 {
 	QString szHost;
 	kvs_uint_t uRemotePort;
@@ -110,7 +108,7 @@ bool  KviKvsObject_ftp::functionConnect(KviKvsObjectFunctionCall *c)
 	c->returnValue()->setInteger(id);
 	return true;
 }
-bool  KviKvsObject_ftp::functionLogin(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(ftp,login)
 {
 	QString szUser,szPass;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -122,7 +120,7 @@ bool  KviKvsObject_ftp::functionLogin(KviKvsObjectFunctionCall *c)
 	c->returnValue()->setInteger(id);
 	return true;
 }
-bool  KviKvsObject_ftp::functionGet(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(ftp,get)
 {
 	QString szFile,szDest;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -136,7 +134,7 @@ bool  KviKvsObject_ftp::functionGet(KviKvsObjectFunctionCall *c)
 	c->returnValue()->setInteger(id);
 	return true;
 }
-bool  KviKvsObject_ftp::functionCd(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(ftp,cd)
 {
 	QString szPath;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -147,7 +145,7 @@ bool  KviKvsObject_ftp::functionCd(KviKvsObjectFunctionCall *c)
 	c->returnValue()->setInteger(id);
 	return true;
 }
-bool  KviKvsObject_ftp::functionList(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(ftp,list)
 {
 	QString szPath;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -158,13 +156,13 @@ bool  KviKvsObject_ftp::functionList(KviKvsObjectFunctionCall *c)
 	c->returnValue()->setInteger(id);
 	return true;
 }
-bool  KviKvsObject_ftp::functionAbort(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(ftp,abort)
 {
 	if (m_pFtp) m_pFtp->abort();
 	return true;
 }
 //signals & slots 
-bool KviKvsObject_ftp::function_commandFinishedEvent(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(ftp,commandFinishedEvent)
 {
 	emitSignal("commandFinished",c,c->params());
 	return true;
@@ -196,7 +194,7 @@ void KviKvsObject_ftp::slotDataTransferProgress ( qint64 done, qint64 total )
 	callFunction(this,"dataTransferProgressEvent",0,new KviKvsVariantList(
 		new KviKvsVariant((kvs_int_t) done),new KviKvsVariant((kvs_int_t) total)));
 }
-bool KviKvsObject_ftp::function_dataTransferProgressEvent(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(ftp,dataTransferProgressEvent)
 {
 	emitSignal("dataTransferProgress",c,c->params());
 	return true;
@@ -207,11 +205,10 @@ void KviKvsObject_ftp::slotDone ( bool error )
 
 void KviKvsObject_ftp::slotListInfo ( const QUrlInfo & i )
 {
-	callFunction(this,"listInfoEvent",0,new KviKvsVariantList(
-		new KviKvsVariant(i.name())));
+	callFunction(this,"listInfoEvent",0,new KviKvsVariantList(new KviKvsVariant(i.name())));
 	
 }
-bool KviKvsObject_ftp::function_listInfoEvent(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(ftp,listInfoEvent)
 {
 	emitSignal("listInfo",c,c->params());
 	return true;
@@ -236,7 +233,7 @@ void KviKvsObject_ftp::slotStateChanged ( int state)
 	callFunction(this,"stateChangedEvent",0,new KviKvsVariantList(
 		new KviKvsVariant(szState)));
 }
-bool KviKvsObject_ftp::function_stateChangedEvent(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(ftp,stateChangedEvent)
 {
 	emitSignal("stateChanged",c,c->params());
 	return true;
diff --git a/src/modules/objects/class_ftp.h b/src/modules/objects/class_ftp.h
index e508e36c8..e5dd8255a 100644
--- a/src/modules/objects/class_ftp.h
+++ b/src/modules/objects/class_ftp.h
@@ -42,15 +42,15 @@ protected:
 	QFile *m_pFile;
 protected:
 	bool functionConnect(KviKvsObjectFunctionCall *c);
-	bool functionGet(KviKvsObjectFunctionCall *c);
-	bool functionLogin(KviKvsObjectFunctionCall *c);
-	bool functionCd(KviKvsObjectFunctionCall *c);
-	bool functionList(KviKvsObjectFunctionCall *c);
-	bool function_dataTransferProgressEvent(KviKvsObjectFunctionCall *c);
-	bool function_listInfoEvent(KviKvsObjectFunctionCall *c);
-	bool function_commandFinishedEvent(KviKvsObjectFunctionCall *c);
-	bool function_stateChangedEvent(KviKvsObjectFunctionCall *c);
-	bool functionAbort(KviKvsObjectFunctionCall *c);
+	bool get(KviKvsObjectFunctionCall *c);
+	bool login(KviKvsObjectFunctionCall *c);
+	bool cd(KviKvsObjectFunctionCall *c);
+	bool list(KviKvsObjectFunctionCall *c);
+	bool dataTransferProgressEvent(KviKvsObjectFunctionCall *c);
+	bool listInfoEvent(KviKvsObjectFunctionCall *c);
+	bool commandFinishedEvent(KviKvsObjectFunctionCall *c);
+	bool stateChangedEvent(KviKvsObjectFunctionCall *c);
+	bool abort(KviKvsObjectFunctionCall *c);
 
 protected slots:
 	void slotCommandFinished ( int id, bool error );
diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp
index 86f80ce00..50c3a86e0 100644
--- a/src/modules/objects/class_groupbox.cpp
+++ b/src/modules/objects/class_groupbox.cpp
@@ -204,7 +204,7 @@ KVSO_CLASS_FUNCTION(groupbox,title)
 }
 KVSO_CLASS_FUNCTION(groupbox,setFlat)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("bFlag",KVS_PT_BOOL,0,bEnabled)
@@ -214,13 +214,13 @@ KVSO_CLASS_FUNCTION(groupbox,setFlat)
 }
 KVSO_CLASS_FUNCTION(groupbox,isFlat)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setBoolean(((KviTalGroupBox *)widget())->isFlat());
 	return true;
 }
 KVSO_CLASS_FUNCTION(groupbox,setCheckable)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("bFlag",KVS_PT_BOOL,0,bEnabled)
@@ -230,13 +230,13 @@ KVSO_CLASS_FUNCTION(groupbox,setCheckable)
 }
 KVSO_CLASS_FUNCTION(groupbox,isCheckable)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setBoolean(((KviTalGroupBox *)widget())->isCheckable());
 	return true;
 }
 KVSO_CLASS_FUNCTION(groupbox,setChecked)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("bFlag",KVS_PT_BOOL,0,bEnabled)
@@ -246,13 +246,13 @@ KVSO_CLASS_FUNCTION(groupbox,setChecked)
 }
 KVSO_CLASS_FUNCTION(groupbox,isChecked)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setBoolean(((KviTalGroupBox *)widget())->isChecked());
 	return true;
 }
 KVSO_CLASS_FUNCTION(groupbox,setInsideMargin)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uMargin;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("margin",KVS_PT_UNSIGNEDINTEGER,0,uMargin)
@@ -262,13 +262,13 @@ KVSO_CLASS_FUNCTION(groupbox,setInsideMargin)
 }
 KVSO_CLASS_FUNCTION(groupbox,insideMargin)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((KviTalGroupBox *)widget())->insideMargin());
 	return true;
 }
 KVSO_CLASS_FUNCTION(groupbox,setInsideSpacing)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uSpacing;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("spacing",KVS_PT_UNSIGNEDINTEGER,0,uSpacing)
@@ -278,14 +278,14 @@ KVSO_CLASS_FUNCTION(groupbox,setInsideSpacing)
 }
 KVSO_CLASS_FUNCTION(groupbox,insideSpacing)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((KviTalGroupBox *)widget())->insideSpacing());
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(groupbox,addSpace)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t iSpace;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("colums",KVS_PT_UNSIGNEDINTEGER,0,iSpace)
@@ -296,7 +296,7 @@ KVSO_CLASS_FUNCTION(groupbox,addSpace)
 
 KVSO_CLASS_FUNCTION(groupbox,setAlignment)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	QString szAlign;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("alignment",KVS_PT_STRING,0,szAlign)
@@ -315,7 +315,7 @@ KVSO_CLASS_FUNCTION(groupbox,setAlignment)
 
 KVSO_CLASS_FUNCTION(groupbox,alignment)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	int mode = ((KviTalGroupBox *)widget())->alignment();
 	QString szAlignment="";
 	for(unsigned int i = 0; i < align_num; i++)
@@ -332,7 +332,7 @@ KVSO_CLASS_FUNCTION(groupbox,alignment)
 
 KVSO_CLASS_FUNCTION(groupbox,setOrientation)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	QString szMode;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("orientation",KVS_PT_STRING,0,szMode)
diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp
index 8989c5882..cf867ccaa 100644
--- a/src/modules/objects/class_layout.cpp
+++ b/src/modules/objects/class_layout.cpp
@@ -111,6 +111,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_layout,"layout","object")
 	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_layout,addWidget)
 	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_layout,addMultiCellWidget)
 	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_layout,setRowStretch)
+	KVSO_REGISTER_HANDLER(KviKvsObject_layout,"setColStretch",setColumnStretch)
 	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_layout,setColumnStretch)
 	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_layout,addRowSpacing)
 	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_layout,addColSpacing)
diff --git a/src/modules/objects/class_list.cpp b/src/modules/objects/class_list.cpp
index 935250cf3..0614ecd15 100644
--- a/src/modules/objects/class_list.cpp
+++ b/src/modules/objects/class_list.cpp
@@ -174,7 +174,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_list)
 
 KVSO_CLASS_FUNCTION(list,current)
 {
-	CHECK_INTERNAL_QPOINTER(m_pDataList)
+	CHECK_INTERNAL_POINTER(m_pDataList)
 	if(!m_pDataList->count())
 	{
 		c->returnValue()->setNothing();
@@ -188,49 +188,49 @@ KVSO_CLASS_FUNCTION(list,current)
 
 KVSO_CLASS_FUNCTION(list,eof)
 {
-	CHECK_INTERNAL_QPOINTER(m_pDataList)
+	CHECK_INTERNAL_POINTER(m_pDataList)
 	c->returnValue()->setBoolean(m_pDataList->current() != 0);
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(list,moveLast)
 {
-	CHECK_INTERNAL_QPOINTER(m_pDataList)
+	CHECK_INTERNAL_POINTER(m_pDataList)
 	c->returnValue()->setBoolean(m_pDataList->last() != 0);
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(list,movePrev)
 {
-	CHECK_INTERNAL_QPOINTER(m_pDataList)
+	CHECK_INTERNAL_POINTER(m_pDataList)
 	c->returnValue()->setBoolean(m_pDataList->prev() != 0);
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(list,moveNext)
 {
-	CHECK_INTERNAL_QPOINTER(m_pDataList)
+	CHECK_INTERNAL_POINTER(m_pDataList)
 	c->returnValue()->setBoolean(m_pDataList->next() != 0);
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(list,moveFirst)
 {
-	CHECK_INTERNAL_QPOINTER(m_pDataList)
+	CHECK_INTERNAL_POINTER(m_pDataList)
 	c->returnValue()->setBoolean(m_pDataList->first() != 0);
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(list,removeLast)
 {
-	CHECK_INTERNAL_QPOINTER(m_pDataList)
+	CHECK_INTERNAL_POINTER(m_pDataList)
 	c->returnValue()->setBoolean(m_pDataList->removeLast());
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(list,removeCurrent)
 {
-	CHECK_INTERNAL_QPOINTER(m_pDataList)
+	CHECK_INTERNAL_POINTER(m_pDataList)
 	if(m_pDataList->current())
 	{
 		m_pDataList->removeCurrent();
@@ -243,14 +243,14 @@ KVSO_CLASS_FUNCTION(list,removeCurrent)
 
 KVSO_CLASS_FUNCTION(list,removeFirst)
 {
-	CHECK_INTERNAL_QPOINTER(m_pDataList)
+	CHECK_INTERNAL_POINTER(m_pDataList)
 	c->returnValue()->setBoolean(m_pDataList->removeFirst());
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(list,remove)
 {
-	CHECK_INTERNAL_QPOINTER(m_pDataList)
+	CHECK_INTERNAL_POINTER(m_pDataList)
 	kvs_uint_t uIndex;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("index",KVS_PT_UINT,0,uIndex)
@@ -261,7 +261,7 @@ KVSO_CLASS_FUNCTION(list,remove)
 
 KVSO_CLASS_FUNCTION(list,at)
 {
-	CHECK_INTERNAL_QPOINTER(m_pDataList)
+	CHECK_INTERNAL_POINTER(m_pDataList)
 	kvs_uint_t uIndex;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("index",KVS_PT_UINT,0,uIndex)
@@ -274,7 +274,7 @@ KVSO_CLASS_FUNCTION(list,at)
 
 KVSO_CLASS_FUNCTION(list,insert)
 {
-	CHECK_INTERNAL_QPOINTER(m_pDataList)
+	CHECK_INTERNAL_POINTER(m_pDataList)
 	kvs_uint_t uIndex;
 	KviKvsVariant * pVar;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -287,7 +287,7 @@ KVSO_CLASS_FUNCTION(list,insert)
 
 KVSO_CLASS_FUNCTION(list,prepend)
 {
-	CHECK_INTERNAL_QPOINTER(m_pDataList)
+	CHECK_INTERNAL_POINTER(m_pDataList)
 	KviKvsVariant * pVar;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("item",KVS_PT_VARIANT,0,pVar)
@@ -298,7 +298,7 @@ KVSO_CLASS_FUNCTION(list,prepend)
 
 KVSO_CLASS_FUNCTION(list,append)
 {
-	CHECK_INTERNAL_QPOINTER(m_pDataList)
+	CHECK_INTERNAL_POINTER(m_pDataList)
 	KviKvsVariant * pVar;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("item",KVS_PT_VARIANT,0,pVar)
@@ -310,7 +310,7 @@ KVSO_CLASS_FUNCTION(list,append)
 
 KVSO_CLASS_FUNCTION(list,clear)
 {
-	CHECK_INTERNAL_QPOINTER(m_pDataList)
+	CHECK_INTERNAL_POINTER(m_pDataList)
 	m_pDataList->clear();
 	return true;
 }
@@ -322,21 +322,21 @@ inline int kvi_compare(const KviKvsVariant * p1,const KviKvsVariant * p2)
 
 KVSO_CLASS_FUNCTION(list,sort)
 {
-	CHECK_INTERNAL_QPOINTER(m_pDataList)
+	CHECK_INTERNAL_POINTER(m_pDataList)
 	m_pDataList->sort();
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(list,isEmpty)
 {
-	CHECK_INTERNAL_QPOINTER(m_pDataList)
+	CHECK_INTERNAL_POINTER(m_pDataList)
 	c->returnValue()->setBoolean(m_pDataList->isEmpty());
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(list,count)
 {
-	CHECK_INTERNAL_QPOINTER(m_pDataList)
+	CHECK_INTERNAL_POINTER(m_pDataList)
 	c->returnValue()->setInteger(m_pDataList->count());
 	return true;
 }
diff --git a/src/modules/objects/class_listwidget.cpp b/src/modules/objects/class_listwidget.cpp
index f8936cca4..4e40b5f6a 100644
--- a/src/modules/objects/class_listwidget.cpp
+++ b/src/modules/objects/class_listwidget.cpp
@@ -157,7 +157,7 @@ bool KviKvsObject_listwidget::init(KviKvsRunTimeContext * pContext,KviKvsVariant
 

 KVSO_CLASS_FUNCTION(listwidget,insertItem)

 {

-	CHECK_INTERNAL_QPOINTER(widget())

+	CHECK_INTERNAL_POINTER(widget())

 	kvs_int_t iRow;

 	QString szText;

 	KVSO_PARAMETERS_BEGIN(c)

@@ -171,14 +171,14 @@ KVSO_CLASS_FUNCTION(listwidget,insertItem)
 

 KVSO_CLASS_FUNCTION(listwidget,clear)

 {

-	CHECK_INTERNAL_QPOINTER(widget())

+	CHECK_INTERNAL_POINTER(widget())

 	((QListWidget *)widget())->clear();

 	return true;

 }

 

 KVSO_CLASS_FUNCTION(listwidget,changeItem)

 {

-	CHECK_INTERNAL_QPOINTER(widget())

+	CHECK_INTERNAL_POINTER(widget())

 	kvs_int_t iIndex,cnt;

 	QString szText;

 	KVSO_PARAMETERS_BEGIN(c)

@@ -199,7 +199,7 @@ KVSO_CLASS_FUNCTION(listwidget,changeItem)
 

 KVSO_CLASS_FUNCTION(listwidget,removeItem)

 {

-	CHECK_INTERNAL_QPOINTER(widget())

+	CHECK_INTERNAL_POINTER(widget())

 	kvs_uint_t iIndex,cnt;

 	KVSO_PARAMETERS_BEGIN(c)

 		KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,iIndex)

@@ -216,13 +216,13 @@ KVSO_CLASS_FUNCTION(listwidget,removeItem)
 

 KVSO_CLASS_FUNCTION(listwidget,count)

 {

-	CHECK_INTERNAL_QPOINTER(widget())

+	CHECK_INTERNAL_POINTER(widget())

 	c->returnValue()->setInteger(((QListWidget *)widget())->count());

 	return true;

 }

 KVSO_CLASS_FUNCTION(listwidget,currentText)

 {

-	CHECK_INTERNAL_QPOINTER(widget())

+	CHECK_INTERNAL_POINTER(widget())

 	QString text;

 	QListWidgetItem *item=((QListWidget *)widget())->currentItem();

 	if (item) text=item->text();

@@ -232,14 +232,14 @@ KVSO_CLASS_FUNCTION(listwidget,currentText)
 }

 KVSO_CLASS_FUNCTION(listwidget,currentItem)

 {

-	CHECK_INTERNAL_QPOINTER(widget())

+	CHECK_INTERNAL_POINTER(widget())

 	c->returnValue()->setInteger(((QListWidget *)widget())->currentRow());

 	return true;

 }

 

 KVSO_CLASS_FUNCTION(listwidget,textAt)

 {

-	CHECK_INTERNAL_QPOINTER(widget())

+	CHECK_INTERNAL_POINTER(widget())

 	kvs_uint_t iIndex;

 	KVSO_PARAMETERS_BEGIN(c)

 		KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,iIndex)

@@ -249,7 +249,7 @@ KVSO_CLASS_FUNCTION(listwidget,textAt)
 }

 KVSO_CLASS_FUNCTION(listwidget,setCurrentItem)

 {

-	CHECK_INTERNAL_QPOINTER(widget())

+	CHECK_INTERNAL_POINTER(widget())

 	kvs_uint_t iIndex;

 	KVSO_PARAMETERS_BEGIN(c)

 		KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,iIndex)

@@ -259,7 +259,7 @@ KVSO_CLASS_FUNCTION(listwidget,setCurrentItem)
 }

 KVSO_CLASS_FUNCTION(listwidget,setSelectionMode)

 {

-	CHECK_INTERNAL_QPOINTER(widget())

+	CHECK_INTERNAL_POINTER(widget())

 	QString szMode;

 	KVSO_PARAMETERS_BEGIN(c)

 		KVSO_PARAMETER("selection_mode",KVS_PT_STRING,0,szMode)

@@ -275,7 +275,7 @@ KVSO_CLASS_FUNCTION(listwidget,setSelectionMode)
 }

 KVSO_CLASS_FUNCTION(listwidget,selectionMode)

 {

-	CHECK_INTERNAL_QPOINTER(widget())

+	CHECK_INTERNAL_POINTER(widget())

 	switch(((QListWidget *)widget())->selectionMode())

 	{

 		case QAbstractItemView::SingleSelection: c->returnValue()->setString("single"); break;

@@ -289,7 +289,7 @@ KVSO_CLASS_FUNCTION(listwidget,selectionMode)
 

 KVSO_CLASS_FUNCTION(listwidget,insertWidgetItem)

 {

-	CHECK_INTERNAL_QPOINTER(widget())

+	CHECK_INTERNAL_POINTER(widget())

 	KviKvsObject *pObject;

 	kvs_int_t iIndex;

 	kvs_hobject_t hWid;

@@ -315,7 +315,7 @@ KVSO_CLASS_FUNCTION(listwidget,insertWidgetItem)
 }

 KVSO_CLASS_FUNCTION(listwidget,selectedItems)

 {

-	CHECK_INTERNAL_QPOINTER(widget())

+	CHECK_INTERNAL_POINTER(widget())

 	QList<QListWidgetItem *> list=((QListWidget *)widget())->selectedItems();

 	KviKvsArray * pArray = new KviKvsArray();

 	c->returnValue()->setArray(pArray);

@@ -329,7 +329,7 @@ KVSO_CLASS_FUNCTION(listwidget,selectedItems)
 

 KVSO_CLASS_FUNCTION(listwidget,setSelected)

 {

-	CHECK_INTERNAL_QPOINTER(widget())

+	CHECK_INTERNAL_POINTER(widget())

 	bool bSel;

 	kvs_uint_t uIndex;

 	KVSO_PARAMETERS_BEGIN(c)

@@ -341,7 +341,7 @@ KVSO_CLASS_FUNCTION(listwidget,setSelected)
 }

 KVSO_CLASS_FUNCTION(listwidget,isSelected)

 {

-	CHECK_INTERNAL_QPOINTER(widget())

+	CHECK_INTERNAL_POINTER(widget())

 	kvs_uint_t uIndex;

 	KVSO_PARAMETERS_BEGIN(c)

 		KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex)

@@ -351,7 +351,7 @@ KVSO_CLASS_FUNCTION(listwidget,isSelected)
 }

 KVSO_CLASS_FUNCTION(listwidget,itemAt)

 {

-	CHECK_INTERNAL_QPOINTER(widget())

+	CHECK_INTERNAL_POINTER(widget())

 	kvs_uint_t uX,uY;

 	KVSO_PARAMETERS_BEGIN(c)

 		KVSO_PARAMETER("uX",KVS_PT_UNSIGNEDINTEGER,0,uX)

@@ -362,7 +362,7 @@ KVSO_CLASS_FUNCTION(listwidget,itemAt)
 }

 KVSO_CLASS_FUNCTION(listwidget,itemRect)

 {

-	CHECK_INTERNAL_QPOINTER(widget())

+	CHECK_INTERNAL_POINTER(widget())

 	kvs_uint_t uIndex;

 	KVSO_PARAMETERS_BEGIN(c)

 		KVSO_PARAMETER("iIndex",KVS_PT_UNSIGNEDINTEGER,0,uIndex)

diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp
index 824f48635..6e102f78b 100644
--- a/src/modules/objects/class_mainwindow.cpp
+++ b/src/modules/objects/class_mainwindow.cpp
@@ -75,7 +75,7 @@ bool KviKvsObject_mainwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariant
 
 KVSO_CLASS_FUNCTION(mainwindow,setCentralWidget)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	KviKvsObject * pObject;
 	kvs_hobject_t hObject;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -92,7 +92,7 @@ KVSO_CLASS_FUNCTION(mainwindow,setCentralWidget)
 		c->warning(__tr2qs("Widget parameter is not a valid object"));
 		return true;
 	}
-	if(!pObject->object()->inherits("KviKvsObject_widget"))
+	if(!pObject->inheritsClass("widget"))
     {
 		c->warning(__tr2qs("Widget object required"));
         return TRUE;
@@ -103,7 +103,7 @@ KVSO_CLASS_FUNCTION(mainwindow,setCentralWidget)
 //FIX ME
 KVSO_CLASS_FUNCTION(mainwindow,setDockEnabled)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	QString szDockarea;
 	bool bFlag;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -122,7 +122,7 @@ KVSO_CLASS_FUNCTION(mainwindow,setDockEnabled)
 //FIX ME
 KVSO_CLASS_FUNCTION(mainwindow,isDockEnabled)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	QString szDockarea;
 	bool bFlag = false;
 	KVSO_PARAMETERS_BEGIN(c)
diff --git a/src/modules/objects/class_memorybuffer.cpp b/src/modules/objects/class_memorybuffer.cpp
index f05632546..66dbcec4b 100644
--- a/src/modules/objects/class_memorybuffer.cpp
+++ b/src/modules/objects/class_memorybuffer.cpp
@@ -75,7 +75,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_memorybuffer)
 

 KVSO_CLASS_FUNCTION(memorybuffer,loadFromFile)

 {

-	CHECK_INTERNAL_QPOINTER(m_pBuffer)

+	CHECK_INTERNAL_POINTER(m_pBuffer)

 	QString szFileName;

 	KVSO_PARAMETERS_BEGIN(c)

 		KVSO_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szFileName)

@@ -92,7 +92,7 @@ KVSO_CLASS_FUNCTION(memorybuffer,loadFromFile)
 }

 KVSO_CLASS_FUNCTION(memorybuffer,saveToFile)

 {

-	CHECK_INTERNAL_QPOINTER(m_pBuffer)

+	CHECK_INTERNAL_POINTER(m_pBuffer)

 	QString szFileName;

 	KVSO_PARAMETERS_BEGIN(c)

 		KVSO_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szFileName)

diff --git a/src/modules/objects/class_menubar.cpp b/src/modules/objects/class_menubar.cpp
index 652297b89..d731af67e 100644
--- a/src/modules/objects/class_menubar.cpp
+++ b/src/modules/objects/class_menubar.cpp
@@ -67,7 +67,7 @@ bool KviKvsObject_menubar::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 
 KVSO_CLASS_FUNCTION(menubar,insertItem)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	QString szItem;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("item",KVS_PT_STRING,0,szItem)
diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
index 82bafc023..d73c51c8c 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/class_painter.cpp
@@ -846,7 +846,7 @@ bool KviKvsObject_painter::functionsetBrush(KviKvsObjectFunctionCall *c)
 			c->warning(__tr2qs("Pixmap parameter is not an object!"));
 			return true;
 		}
-		if(pObject->inherits("KviKvsObject_pixmap"))
+		if(pObject->inheritsClass("pixmap"))
 			m_pPainter->setBrush(*((KviKvsObject_pixmap *)pObject)->getPixmap());
 		else c->warning(__tr2qs("Object Pixmap required!"));
 		return true;
@@ -1038,15 +1038,15 @@ bool KviKvsObject_painter::functionbegin(KviKvsObjectFunctionCall *c)
 		return true;
 	}
 	QPaintDevice * pd;
-	if(pObject->inherits("KviKvsObject_pixmap"))pd=((KviKvsObject_pixmap *)pObject)->getPixmap();
+	if(pObject->inheritsClass("pixmap"))pd=((KviKvsObject_pixmap *)pObject)->getPixmap();
 		
-	else if (pObject->inherits("KviKvsObject_widget")) pd=((KviKvsObject_widget *)pObject)->widget();
+	else if (pObject->inheritsClass("widget")) pd=((KviKvsObject_widget *)pObject)->widget();
 	else{
 		c->warning(__tr2qs("Widget or Pixmap required "));
 		return true;
 	}
 	attachDevice(pObject,pd);
-	if (pObject->inherits("KviKvsObject_pixmap")) ((KviKvsObject_pixmap *)pObject)->pixmapChanged();
+	if (pObject->inheritsClass("pixmap")) ((KviKvsObject_pixmap *)pObject)->pixmapChanged();
 	return true;
 }
 
@@ -1138,7 +1138,7 @@ bool KviKvsObject_painter::functiondrawPixmap(KviKvsObjectFunctionCall *c)
 		c->warning(__tr2qs("Pixmap parameter is not an object"));
 		return true;
 	}
-	if (!obj->inherits("KviKvsObject_pixmap"))
+	if (!obj->inheritsClass("pixmap"))
 	{
 		c->warning(__tr2qs("Pixmap object required"));
 		return true;
diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp
index a2f0eb9cd..1f897f270 100644
--- a/src/modules/objects/class_pixmap.cpp
+++ b/src/modules/objects/class_pixmap.cpp
@@ -218,7 +218,7 @@ bool KviKvsObject_pixmap::functionloadFromMemoryBuffer(KviKvsObjectFunctionCall
 		c->warning(__tr2qs("Buffer parameter is not an object"));
 		return true;
 	}
-	if (!pObject->inherits("KviKvsObjet_memorybuffer"))
+	if (!pObject->inheritsClass("memorybuffer"))
 	{
 		c->warning(__tr2qs("Buffer parameter is not a memorybuffer object"));
 		return true;
@@ -268,7 +268,7 @@ bool KviKvsObject_pixmap::functionsetOpacity(KviKvsObjectFunctionCall *c)
 		return true;
 	}
 
-	if(!pObDest->inherits("KviKvsObject_pixmap"))
+	if(!pObDest->inheritsClass("pixmap"))
 	{
 		c->warning(__tr2qs("Destination must be a pixmap object"));
 		return true;
diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp
index ea9ccadf6..fbe94a292 100644
--- a/src/modules/objects/class_popupmenu.cpp
+++ b/src/modules/objects/class_popupmenu.cpp
@@ -273,7 +273,7 @@ bool KviKvsObject_popupmenu::functioninsertHandle(KviKvsObjectFunctionCall *c)
 		KVSO_PARAMETER("icon_id",KVS_PT_STRING,KVS_PF_OPTIONAL,szIcon)
 	KVSO_PARAMETERS_END(c)
 	ob=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
-	if(!ob->object()->inherits("KviKvsObject_popupmenu"))
+	if(!ob->object()->inheritsClass("popupmenu"))
 	{
 		c->warning(__tr2qs("Can't add a non - popupmenu  object"));
 		return TRUE;
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index 8556bed0c..5d113d261 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -428,7 +428,7 @@ KVSO_CLASS_FUNCTION(socket,read)
 			c->warning(__tr2qs("Buffer parameter is not an object"));
 			return true;
 		}
-		if (!pObject->inherits("KviKvsObject_memorybuffer"))
+		if (!pObject->inheritsClass("memorybuffer"))
 		{
 			c->warning(__tr2qs("Buffer parameter is not a memorybuffer object"));
 			return true;
@@ -499,12 +499,12 @@ KVSO_CLASS_FUNCTION(socket,write)
 			c->warning(__tr2qs("Buffer parameter is not an object"));
 			return true;
 		}
-		if (pObject->inherits("KviKvsObject_memorybuffer"))
+		if (pObject->inheritsClass("memorybuffer"))
 		{
 			QByteArray *p=((KviKvsObject_memorybuffer *)pObject)->pBuffer();
 			m_pOutBuffer->append((const unsigned char*)p->data(),p->size());
 		}
-		else if (pObject->inherits("KviKvsObject_file"))
+		else if (pObject->inheritsClass("file"))
 		{
 			KviFile *pFile=((KviKvsObject_file *)pObject)->pFile();
 			if (!pFile->isOpen()) 
@@ -567,7 +567,7 @@ KVSO_CLASS_FUNCTION(socket,accept)
 		return true;
 	}
 
-	if(!pObject->inherits("KviKvsObject_socket"))
+	if(!pObject->inheritsClass("socket"))
 	{
 		c->warning(__tr2qs("Invalid socket object specified (it doesn't inherit from socket)"));
 		return true;
diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp
index 446d4f8f5..dc2c3477c 100644
--- a/src/modules/objects/class_tabwidget.cpp
+++ b/src/modules/objects/class_tabwidget.cpp
@@ -180,7 +180,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_tabwidget)
 bool KviKvsObject_tabwidget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 	SET_OBJECT(QTabWidget)
-	connect(widget(),SIGNAL(currentChanged(int)),this,SLOT(slotcurrentChanged(int)));
+	connect(widget(),SIGNAL(currentChanged(int)),this,SLOT(slotCurrentChanged(int)));
 	return true;
 }
 bool KviKvsObject_tabwidget::functionaddTab(KviKvsObjectFunctionCall *c)
diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp
index bb5dca94d..7bd056d9a 100644
--- a/src/modules/objects/class_tbrowser.cpp
+++ b/src/modules/objects/class_tbrowser.cpp
@@ -32,6 +32,7 @@
 
 #include <QTextBrowser>
 #include <QFile>
+#include <QUrl>
 /*
 	@doc: textbrowser
 	@keyterms:
@@ -86,7 +87,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_textbrowser)
 bool KviKvsObject_textbrowser::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 	SET_OBJECT(QTextBrowser);
-	connect(obj,SIGNAL(anchorClicked(const QString &,const QString &)),this,SLOT(anchorClicked(const QString &,const QString &)));
+	connect(obj,SIGNAL(anchorClicked(const QUrl &)),this,SLOT(anchorClicked(const QUrl &)));
 	return true;
 }
 
@@ -131,9 +132,9 @@ bool KviKvsObject_textbrowser::function_reload(KviKvsObjectFunctionCall *c)
 	return true;
 }
 
-void KviKvsObject_textbrowser::anchorClicked(const QString &szName,const QString &szLink)
+void KviKvsObject_textbrowser::anchorClicked(const QUrl &url)
 {
-	KviKvsVariantList parms(new KviKvsVariant(szLink));
+	KviKvsVariantList parms(new KviKvsVariant(url.path()));
 	callFunction(this,"linkClickedEvent",0,&parms);
 }
 
diff --git a/src/modules/objects/class_tbrowser.h b/src/modules/objects/class_tbrowser.h
index 5d19c321c..05fc6952a 100644
--- a/src/modules/objects/class_tbrowser.h
+++ b/src/modules/objects/class_tbrowser.h
@@ -28,7 +28,7 @@
 #include "class_widget.h"
 #include "class_multilineedit.h"
 #include "object_macros.h"
-
+#include <QUrl>
 class KviKvsObject_textbrowser : public KviKvsObject_textedit
 {
 	Q_OBJECT
@@ -46,7 +46,7 @@ protected:
 	bool function_reload(KviKvsObjectFunctionCall *c);
 	bool function_linkClickedEvent(KviKvsObjectFunctionCall *c);
 protected slots:
-	void anchorClicked(const QString &szName,const QString &szLink);
+	void anchorClicked(const QUrl &);
 };
 
 #endif	//!_CLASS_TBROWSER_H_
diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp
index 765926aaa..56608a2ea 100644
--- a/src/modules/objects/class_toolbar.cpp
+++ b/src/modules/objects/class_toolbar.cpp
@@ -83,7 +83,7 @@ bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 		pContext->warning(__tr2qs("the toolbar cannot be a parent-widget!"));
 		return true;
 	}
-	if(parentObject()->inherits("KviKvsObject_mainwindow"))
+	if(parentObject()->inheritsClass("mainwindow"))
 	{ 
 		setObject(new KviTalToolBar(getName(), ((KviTalMainWindow *)parentScriptWidget())), true);
 	}
diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp
index 69c18112b..9e36a25d8 100644
--- a/src/modules/objects/class_toolbutton.cpp
+++ b/src/modules/objects/class_toolbutton.cpp
@@ -268,7 +268,7 @@ bool KviKvsObject_toolbutton::functionsetPopup(KviKvsObjectFunctionCall *c)
 		c->warning(__tr2qs("Widget parameter is not a valid object"));
 		return true;
 	}
-	if(!ob->object()->inherits("KviKvsObject_popupmenu"))
+	if(!ob->inheritsClass("popupmenu"))
     {
 		c->warning(__tr2qs("Can't add a non - popupmenu  object"));
         return TRUE;
diff --git a/src/modules/objects/class_treewidget.cpp b/src/modules/objects/class_treewidget.cpp
index 0ce2934d3..ec0ca85bb 100644
--- a/src/modules/objects/class_treewidget.cpp
+++ b/src/modules/objects/class_treewidget.cpp
@@ -180,49 +180,49 @@
 
 KVSO_BEGIN_REGISTERCLASS(KviKvsObject_treewidget,"listview","widget")
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"setHeaderLabels",function_setHeaderLabels)
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"addColumn",function_addColumn)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,setHeaderLabels)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,addColumn)
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"setColumnText",function_setColumnText)
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"setColumnCount",function_setColumnCount)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,setColumnText)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,setColumnCount)
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"setSorting",function_setSorting)
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"setRootIsDecorated",function_setRootIsDecorated)
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"setAllColumnsShowFocus",function_setAllColumnsShowFocus)
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"clear",function_clear)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,setSorting)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,setRootIsDecorated)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,setAllColumnsShowFocus)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,clear)
 	//FIXME 
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"selectedItem",function_selectedItems)//<--- remove this
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"selectedItems",function_selectedItems)
+	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"selectedItem",selectedItems)//<--- remove this
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,selectedItems)
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"currentItem",function_currentItem)
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"setSelectionMode",function_setSelectionMode)
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"listViewHeaderIsVisible",function_listViewHeaderIsVisible)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,currentItem)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,setSelectionMode)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,listViewHeaderIsVisible)
 
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"hideListViewHeader",function_hideListViewHeader)
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"showListViewHeader",function_showListViewHeader)
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"firstChild",function_firstChild)
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"selectionChangedEvent",function_selectionChangedEvent);
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"currentChangedEvent",function_currentChangedEvent);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,hideListViewHeader)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,showListViewHeader)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,firstChild)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,selectionChangedEvent);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,currentChangedEvent);
 	
 	// FIX-ME
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"returnPressedEvent",function_itemActivatedEvent);//<- remove me
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"itemActivatedEvent",function_itemActivatedEvent);
+	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"returnPressedEvent",itemActivatedEvent);//<- remove me
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,itemActivatedEvent);
 	//
 	
-//	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"spacePressedEvent",function_spacePressedEvent);
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"onItemEvent",function_onItemEvent);
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"itemClickedEvent",function_itemClickedEvent);
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"itemExpandedEvent",function_itemExpandedEvent);
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"itemCollapsedEvent",function_itemCollapsedEvent);
+//	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,"spacePressedEvent",function_spacePressedEvent);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,onItemEvent);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,itemClickedEvent);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,itemExpandedEvent);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,itemCollapsedEvent);
 	
 	//FIXME
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"itemRenamedEvent",function_itemChangedEvent);//<- remove me
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"itemChangedEvent",function_itemChangedEvent);
+	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"itemRenamedEvent",itemChangedEvent);//<- remove me
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,itemChangedEvent);
 	//
 	
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"rightButtonClickedEvent",function_customContextMenuRequestedEvent);
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"customContextMenuRequestedEvent",function_customContextMenuRequestedEvent);
+	KVSO_REGISTER_HANDLER(KviKvsObject_treewidget,"rightButtonClickedEvent",customContextMenuRequestedEvent);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidget,customContextMenuRequestedEvent);
 
 	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_treewidget,"fileDroppedEvent")
 
@@ -255,12 +255,12 @@ bool KviKvsObject_treewidget::init(KviKvsRunTimeContext * pContext,KviKvsVariant
 	connect(widget(),SIGNAL(itemChanged(KviTalTreeWidgetItem *,int)),this,SLOT(slotItemChanged(KviTalTreeWidgetItem *,int)));
 	
 	widget()->setContextMenuPolicy(Qt::CustomContextMenu);
-	connect(widget(),SIGNAL(customContextMenuRequested(const QPoint &)),this,SLOT(customContextMenuRequested(const QPoint &)));
+	connect(widget(),SIGNAL(customContextMenuRequested(const QPoint &)),this,SLOT(slotCustomContextMenuRequested(const QPoint &)));
 	
 	return true;
 }
 
-bool KviKvsObject_treewidget::function_setHeaderLabels(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,setHeaderLabels)
 {
 	QStringList columns;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -272,7 +272,7 @@ bool KviKvsObject_treewidget::function_setHeaderLabels(KviKvsObjectFunctionCall
     return true;
 }
 
-bool KviKvsObject_treewidget::function_setColumnText(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,setColumnText)
 {
 	if (!widget()) return true;
 	QString szLabel;
@@ -286,7 +286,7 @@ bool KviKvsObject_treewidget::function_setColumnText(KviKvsObjectFunctionCall *c
 	return true;
 }
 
-bool KviKvsObject_treewidget::function_addColumn(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,addColumn)
 {
 	if (!widget()) return true;
 	QString szLabel;
@@ -305,7 +305,7 @@ bool KviKvsObject_treewidget::function_addColumn(KviKvsObjectFunctionCall *c)
 	return true;
 }
 /*
-bool KviKvsObject_treewidget::function_setAcceptDrops(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,setAcceptDrops)
 {
 	bool bEnable;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -316,14 +316,14 @@ bool KviKvsObject_treewidget::function_setAcceptDrops(KviKvsObjectFunctionCall *
 	return true;
 }
 */
-bool KviKvsObject_treewidget::function_clear(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,clear)
 {
 	if (widget())
 		((KviTalTreeWidget *)object())->clear();
 	return true;
 }
 
-bool KviKvsObject_treewidget::function_selectedItems(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,selectedItems)
 {
 	if(widget())
 	{
@@ -338,7 +338,7 @@ bool KviKvsObject_treewidget::function_selectedItems(KviKvsObjectFunctionCall *c
 	return true;
 }
 
-bool KviKvsObject_treewidget::function_firstChild(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,firstChild)
 {
 	if(widget())
 		c->returnValue()->setHObject(KviKvsObject_treewidgetitem::itemToHandle((KviTalTreeWidgetItem*)((KviTalTreeWidget *)widget())->topLevelItem(0)));
@@ -347,7 +347,7 @@ bool KviKvsObject_treewidget::function_firstChild(KviKvsObjectFunctionCall *c)
 	return true;
 }
 
-bool KviKvsObject_treewidget::function_currentItem(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,currentItem)
 {
 	if(widget())
 		c->returnValue()->setHObject(KviKvsObject_treewidgetitem::itemToHandle((KviTalTreeWidgetItem*)((KviTalTreeWidget *)widget())->currentItem()));
@@ -356,7 +356,7 @@ bool KviKvsObject_treewidget::function_currentItem(KviKvsObjectFunctionCall *c)
 	return true;
 }
 /*
-bool KviKvsObject_treewidget::function_setColumnText(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,setColumnText)
 {
 	kvs_int_t uCol;
 	QString szText;
@@ -368,7 +368,7 @@ bool KviKvsObject_treewidget::function_setColumnText(KviKvsObjectFunctionCall *c
     return true;
 }
 */
-bool KviKvsObject_treewidget::function_setColumnCount(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,setColumnCount)
 {
 	kvs_int_t uCol;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -378,7 +378,7 @@ bool KviKvsObject_treewidget::function_setColumnCount(KviKvsObjectFunctionCall *
 	return true;
 }
 
-bool KviKvsObject_treewidget::function_setSelectionMode(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,setSelectionMode)
 {
 	QString szMode;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -397,7 +397,7 @@ bool KviKvsObject_treewidget::function_setSelectionMode(KviKvsObjectFunctionCall
 	return true;
 }
 
-bool KviKvsObject_treewidget::function_setSorting(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,setSorting)
 {
 	kvs_int_t iCol;
 	bool bEnables;
@@ -414,7 +414,7 @@ bool KviKvsObject_treewidget::function_setSorting(KviKvsObjectFunctionCall *c)
 	return true;
 }
 
-bool KviKvsObject_treewidget::function_setRootIsDecorated(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,setRootIsDecorated)
 {
 	bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -424,7 +424,7 @@ bool KviKvsObject_treewidget::function_setRootIsDecorated(KviKvsObjectFunctionCa
 	return true;
 }
 
-bool KviKvsObject_treewidget::function_setAllColumnsShowFocus(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,setAllColumnsShowFocus)
 {
 	bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -434,25 +434,25 @@ bool KviKvsObject_treewidget::function_setAllColumnsShowFocus(KviKvsObjectFuncti
 	return true;
 }
 
-bool KviKvsObject_treewidget::function_hideListViewHeader(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,hideListViewHeader)
 {
 	((KviTalTreeWidget *)widget())->header()->hide();
 	return true;
 }
 
-bool KviKvsObject_treewidget::function_showListViewHeader(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,showListViewHeader)
 {
 	((KviTalTreeWidget *)widget())->header()->show(); 
 	return true;
 }
 
-bool KviKvsObject_treewidget::function_listViewHeaderIsVisible(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,listViewHeaderIsVisible)
 {
 	c->returnValue()->setBoolean(((KviTalTreeWidget *)widget())->header()->isVisible());
 	return true;
 }
 
-bool KviKvsObject_treewidget::function_itemClickedEvent(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,itemClickedEvent)
 {
 	emitSignal("itemClicked",c,c->params());
 	return true;
@@ -466,7 +466,7 @@ void KviKvsObject_treewidget::slotClicked(KviTalTreeWidgetItem * i,int col)
 	callFunction(this,"itemClickedEvent",0,&params);
 }
 
-bool KviKvsObject_treewidget::function_selectionChangedEvent(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,selectionChangedEvent)
 {
 	emitSignal("selectionChanged",c,c->params());
 	return true;
@@ -486,7 +486,7 @@ void KviKvsObject_treewidget::slotSelectionChanged()
 	}
 }
 
-bool KviKvsObject_treewidget::function_currentChangedEvent(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,currentChangedEvent)
 {
 	emitSignal("currentChanged",c,c->params());
 	return true;
@@ -498,7 +498,7 @@ void KviKvsObject_treewidget::slotCurrentChanged(KviTalTreeWidgetItem * i,KviTal
 	callFunction(this,"currentChangedEvent",0,&params);
 }
 
-bool KviKvsObject_treewidget::function_itemActivatedEvent(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,itemActivatedEvent)
 {
 	//FIXME: compatibility
 	emitSignal("returnPressed",c,c->params());//<----remove me 
@@ -515,7 +515,7 @@ void KviKvsObject_treewidget::slotItemActivated(KviTalTreeWidgetItem * i,int col
 	callFunction(this,"itemActivatedEvent",0,&params);
 }
 
-bool KviKvsObject_treewidget::function_onItemEvent(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,onItemEvent)
 {
 	
 	emitSignal("onItem",c,c->params());
@@ -530,7 +530,7 @@ void KviKvsObject_treewidget::slotOnItemEntered(KviTalTreeWidgetItem * i,int col
 	callFunction(this,"onItemEvent",0,&params);
 }
 
-bool KviKvsObject_treewidget::function_itemExpandedEvent(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,itemExpandedEvent)
 {
 	emitSignal("itemExpanded",c,c->params());
 	return true;
@@ -542,7 +542,7 @@ void KviKvsObject_treewidget::slotItemExpanded(KviTalTreeWidgetItem * i)
 	callFunction(this,"itemExpandedEvent",0,&params);
 }
 
-bool KviKvsObject_treewidget::function_itemCollapsedEvent(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,itemCollapsedEvent)
 {
 	emitSignal("itemCollapsed",c,c->params());
 	return true;
@@ -554,14 +554,14 @@ void KviKvsObject_treewidget::slotItemCollapsed(KviTalTreeWidgetItem * i)
 	callFunction(this,"itemCollapsedEvent",0,&params);
 }
 
-bool KviKvsObject_treewidget::function_customContextMenuRequestedEvent(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,customContextMenuRequestedEvent)
 {
 	emitSignal("rightButtonClicked",c,c->params());
 	emitSignal("customContextMenuRequested",c,c->params());
 	return true;
 }
 
-void KviKvsObject_treewidget::customContextMenuRequested(const QPoint &pnt)
+void KviKvsObject_treewidget::slotCustomContextMenuRequested(const QPoint &pnt)
 {
 	KviKvsVariant *xpos=new KviKvsVariant((kvs_int_t)pnt.x());
 	KviKvsVariant *ypos=new KviKvsVariant((kvs_int_t)pnt.y());
@@ -570,7 +570,7 @@ void KviKvsObject_treewidget::customContextMenuRequested(const QPoint &pnt)
 	callFunction(this,"customContextMenuRequestedEvent",0,&params);
 }
 
-bool KviKvsObject_treewidget::function_itemChangedEvent(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidget,itemChangedEvent)
 {
 	//FIXME
 	emitSignal("itemRenamed",c,c->params());//<--remove me
diff --git a/src/modules/objects/class_treewidget.h b/src/modules/objects/class_treewidget.h
index 8e72486bf..08620169c 100644
--- a/src/modules/objects/class_treewidget.h
+++ b/src/modules/objects/class_treewidget.h
@@ -43,35 +43,35 @@ public:
 protected:
 	virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
 
-	bool function_addColumn(KviKvsObjectFunctionCall *c);
-	bool function_setColumnText(KviKvsObjectFunctionCall *c);
-	bool function_takeItem(KviKvsObjectFunctionCall *c);
-	bool function_setSorting(KviKvsObjectFunctionCall *c);
-	bool function_setRootIsDecorated(KviKvsObjectFunctionCall *c);
-	bool function_clear(KviKvsObjectFunctionCall *c);
-	bool function_setAllColumnsShowFocus(KviKvsObjectFunctionCall *c);
-	bool function_itemClickedEvent(KviKvsObjectFunctionCall *c);
-	bool function_selectionChangedEvent(KviKvsObjectFunctionCall *c);
-	bool function_currentChangedEvent(KviKvsObjectFunctionCall *c);
-	bool function_itemActivatedEvent(KviKvsObjectFunctionCall *c);
-	bool function_onItemEvent(KviKvsObjectFunctionCall *c);
-	bool function_itemExpandedEvent(KviKvsObjectFunctionCall *c);
-	bool function_itemCollapsedEvent(KviKvsObjectFunctionCall *c);
-	bool function_itemChangedEvent(KviKvsObjectFunctionCall *c);
-	bool function_customContextMenuRequestedEvent(KviKvsObjectFunctionCall *c);
-	bool function_selectedItems(KviKvsObjectFunctionCall *c);
-	bool function_currentItem(KviKvsObjectFunctionCall *c);
-	bool function_setSelectionMode(KviKvsObjectFunctionCall *c);
-	bool function_firstChild(KviKvsObjectFunctionCall *c);
-	bool function_listViewHeaderIsVisible(KviKvsObjectFunctionCall *c);
-	bool function_showListViewHeader(KviKvsObjectFunctionCall *c);
-	bool function_hideListViewHeader(KviKvsObjectFunctionCall *c);
-	bool function_setAcceptDrops(KviKvsObjectFunctionCall *c);
-	bool function_setHeaderLabels(KviKvsObjectFunctionCall *c);
-	bool function_setColumnCount(KviKvsObjectFunctionCall *c);
+	bool addColumn(KviKvsObjectFunctionCall *c);
+	bool setColumnText(KviKvsObjectFunctionCall *c);
+	bool takeItem(KviKvsObjectFunctionCall *c);
+	bool setSorting(KviKvsObjectFunctionCall *c);
+	bool setRootIsDecorated(KviKvsObjectFunctionCall *c);
+	bool clear(KviKvsObjectFunctionCall *c);
+	bool setAllColumnsShowFocus(KviKvsObjectFunctionCall *c);
+	bool itemClickedEvent(KviKvsObjectFunctionCall *c);
+	bool selectionChangedEvent(KviKvsObjectFunctionCall *c);
+	bool currentChangedEvent(KviKvsObjectFunctionCall *c);
+	bool itemActivatedEvent(KviKvsObjectFunctionCall *c);
+	bool onItemEvent(KviKvsObjectFunctionCall *c);
+	bool itemExpandedEvent(KviKvsObjectFunctionCall *c);
+	bool itemCollapsedEvent(KviKvsObjectFunctionCall *c);
+	bool itemChangedEvent(KviKvsObjectFunctionCall *c);
+	bool customContextMenuRequestedEvent(KviKvsObjectFunctionCall *c);
+	bool selectedItems(KviKvsObjectFunctionCall *c);
+	bool currentItem(KviKvsObjectFunctionCall *c);
+	bool setSelectionMode(KviKvsObjectFunctionCall *c);
+	bool firstChild(KviKvsObjectFunctionCall *c);
+	bool listViewHeaderIsVisible(KviKvsObjectFunctionCall *c);
+	bool showListViewHeader(KviKvsObjectFunctionCall *c);
+	bool hideListViewHeader(KviKvsObjectFunctionCall *c);
+	bool setAcceptDrops(KviKvsObjectFunctionCall *c);
+	bool setHeaderLabels(KviKvsObjectFunctionCall *c);
+	bool setColumnCount(KviKvsObjectFunctionCall *c);
 protected slots:
 	void slotClicked(KviTalTreeWidgetItem *,int);
-	void customContextMenuRequested(const QPoint &pnt);
+	void slotCustomContextMenuRequested(const QPoint &pnt);
 	void slotSelectionChanged();
 	void slotCurrentChanged(KviTalTreeWidgetItem *,KviTalTreeWidgetItem *);
 	void slotItemActivated(KviTalTreeWidgetItem *,int col);
diff --git a/src/modules/objects/class_treewidgetitem.cpp b/src/modules/objects/class_treewidgetitem.cpp
index 5416ec6e0..3a1668078 100644
--- a/src/modules/objects/class_treewidgetitem.cpp
+++ b/src/modules/objects/class_treewidgetitem.cpp
@@ -130,22 +130,22 @@ const char * const itemflags_tbl[] = {
 //===========================================================================================
 
 KVSO_BEGIN_REGISTERCLASS(KviKvsObject_treewidgetitem,"listviewitem","object")
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidgetitem,"setText",function_setText)
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidgetitem,"text",function_text)
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidgetitem,"setPixmap",function_setPixmap);
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidgetitem,"setRenameEnabled",function_setRenameEnabled);
-	//KVSO_REGISTER_HANDLER(KviKvsObject_treewidgetitem,"setEnabled",function_setEnabled);
-	//KVSO_REGISTER_HANDLER(KviKvsObject_treewidgetitem,"isEnabled",function_isEnabled);
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidgetitem,"setOpen",function_setOpen);
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidgetitem,"isOpen",function_isOpen);
-	//KVSO_REGISTER_HANDLER(KviKvsObject_treewidgetitem,"setCheckable",function_setCheckable);
-	//KVSO_REGISTER_HANDLER(KviKvsObject_treewidgetitem,"isCheckable",function_isCheckable);
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidgetitem,"setChecked",function_setChecked);
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidgetitem,"isChecked",function_isChecked);
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidgetitem,"firstChild",function_firstChild);
-	KVSO_REGISTER_HANDLER(KviKvsObject_treewidgetitem,"setFlags",function_setFlags);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,setText)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,text)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,setPixmap);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,setRenameEnabled);
+	//KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,"setEnabled",function_setEnabled);
+	//KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,"isEnabled",function_isEnabled);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,setOpen);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,isOpen);
+	//KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,"setCheckable",function_setCheckable);
+	//KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,"isCheckable",function_isCheckable);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,setChecked);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,isChecked);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,firstChild);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,setFlags);
 
-	//KVSO_REGISTER_HANDLER(KviKvsObject_treewidgetitem,"nextSibling",function_nextSibling);
+	//KVSO_REGISTER_HANDLER_NEW(KviKvsObject_treewidgetitem,"nextSibling",function_nextSibling);
 KVSO_END_REGISTERCLASS(KviKvsObject_treewidgetitem)
 
 
@@ -166,17 +166,17 @@ bool KviKvsObject_treewidgetitem::init(KviKvsRunTimeContext * pContext,KviKvsVar
 {
 	if (!parentObject())
 	{
-			pContext->error(__tr2qs("The treewidgetitem cannot be parentless"));
+			pContext->error(__tr2qs("The listviewitem cannot be parentless"));
 			return false;
 	}
-	if(parentObject()->inherits("KviKvsObject_treewidgetitem"))
+	if(parentObject()->inheritsClass("listviewitem"))
 	{
 		 m_pTreeWidgetItem = new KviKvsStandardTreeWidgetItem(this,((KviKvsObject_treewidgetitem *)parentObject())->m_pTreeWidgetItem);
 	} else {
-		if(parentObject()->inherits("KviKvsObject_treewidget"))
+		if(parentObject()->inheritsClass("listview"))
 			m_pTreeWidgetItem = new KviKvsStandardTreeWidgetItem(this,((KviTalTreeWidget *)parentScriptWidget()));
 		else {
-			pContext->error(__tr2qs("The parent of the treewidgetitem must be either another treewidgetitem or a treewidget"));
+			pContext->error(__tr2qs("The parent of the listwidgetitem must be either another listwidgetitem or a listwidget"));
 			return false;
 		}
 	}
@@ -205,35 +205,16 @@ KviKvsStandardTreeWidgetItem::~KviKvsStandardTreeWidgetItem()
 	if(m_pMasterObject)m_pMasterObject->childDestroyed();
 }
 
-/*
-KviKvsCheckTreeWidgetItem::KviKvsCheckTreeWidgetItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidget * par)
-:KviTalCheckListItem(par,QString(),KviTalCheckListItem::CheckBox), m_pMasterObject(ob)
-{
-}
-
-KviKvsCheckTreeWidgetItem::KviKvsCheckTreeWidgetItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidgetItem * par)
-:KviTalCheckListItem(par,QString(),KviTalCheckListItem::CheckBox), m_pMasterObject(ob)
-{
-}
-
-KviKvsCheckTreeWidgetItem::~KviKvsCheckTreeWidgetItem()
-{
-	if(m_pMasterObject)m_pMasterObject->childDestroyed();
-}
-*/
-
 kvs_hobject_t KviKvsObject_treewidgetitem::itemToHandle(KviTalTreeWidgetItem * it)
 {
 	if(!it)return (kvs_hobject_t)0;
 	KviKvsObject_treewidgetitem * pObject;
-	//if(it->rtti() == 1)pObject = ((KviKvsCheckTreeWidgetItem *)it)->masterObject();
-	//else
 	pObject = ((KviKvsStandardTreeWidgetItem *)it)->masterObject();
 	if(!pObject)return (kvs_hobject_t)0;
 	return pObject->handle();
 }
 
-bool KviKvsObject_treewidgetitem::function_setText(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidgetitem,setText)
 {
 	kvs_uint_t uCol;
 	QString szText;
@@ -246,7 +227,7 @@ bool KviKvsObject_treewidgetitem::function_setText(KviKvsObjectFunctionCall *c)
 	return true;
 }
 
-bool KviKvsObject_treewidgetitem::function_firstChild(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidgetitem,firstChild)
 {
 	if(m_pTreeWidgetItem)
 		c->returnValue()->setHObject(itemToHandle((KviTalTreeWidgetItem*)m_pTreeWidgetItem->child(0)));
@@ -255,7 +236,7 @@ bool KviKvsObject_treewidgetitem::function_firstChild(KviKvsObjectFunctionCall *
 	return true;
 }
 /*
-bool KviKvsObject_treewidgetitem::function_nextSibling(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidgetitem,nextSibling)
 {
 	if(m_pTreeWidgetItem)
 		c->returnValue()->setHObject(itemToHandle(m_pTreeWidgetItem->nextSibling()));
@@ -264,7 +245,7 @@ bool KviKvsObject_treewidgetitem::function_nextSibling(KviKvsObjectFunctionCall
 	return true;
 }
 */
-bool KviKvsObject_treewidgetitem::function_setRenameEnabled(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidgetitem,setRenameEnabled)
 {
 	kvs_uint_t uCol;
 	bool bEnabled;
@@ -277,7 +258,7 @@ bool KviKvsObject_treewidgetitem::function_setRenameEnabled(KviKvsObjectFunction
 	return true;
 }
 
-bool KviKvsObject_treewidgetitem::function_setFlags(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidgetitem,setFlags)
 {
 	QStringList itemflags;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -301,7 +282,7 @@ bool KviKvsObject_treewidgetitem::function_setFlags(KviKvsObjectFunctionCall *c)
 			sum = sum | flag;
 		}
 		else
-			c->warning(__tr2qs("Unknown item flag: %s"),&itemflags.at(i));
+			c->warning(__tr2qs("Unknown item flag: '%Q'"),&itemflags.at(i));
 	}
 	if(m_pTreeWidgetItem)
 		m_pTreeWidgetItem->setFlags((Qt::ItemFlags)sum);
@@ -309,7 +290,7 @@ bool KviKvsObject_treewidgetitem::function_setFlags(KviKvsObjectFunctionCall *c)
 	return true;
 }
 /*
-bool KviKvsObject_treewidgetitem::function_setEnabled(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidgetitem,setEnabled)
 {
 	bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -320,7 +301,7 @@ bool KviKvsObject_treewidgetitem::function_setEnabled(KviKvsObjectFunctionCall *
 	return true;
 }
 
-bool KviKvsObject_treewidgetitem::function_isEnabled(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidgetitem,isEnabled)
 {
 	if(!m_pTreeWidgetItem)
 	{
@@ -331,7 +312,7 @@ bool KviKvsObject_treewidgetitem::function_isEnabled(KviKvsObjectFunctionCall *c
 	return true;
 }
 */
-bool KviKvsObject_treewidgetitem::function_setOpen(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidgetitem,setOpen)
 {
 	bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -342,7 +323,7 @@ bool KviKvsObject_treewidgetitem::function_setOpen(KviKvsObjectFunctionCall *c)
 	return true;
 }
 
-bool KviKvsObject_treewidgetitem::function_isOpen(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidgetitem,isOpen)
 {
 	if(!m_pTreeWidgetItem)
 	{
@@ -353,7 +334,7 @@ bool KviKvsObject_treewidgetitem::function_isOpen(KviKvsObjectFunctionCall *c)
 	return true;
 }
 
-bool KviKvsObject_treewidgetitem::function_setChecked(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidgetitem,setChecked)
 {
 	bool bChecked;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -365,7 +346,7 @@ bool KviKvsObject_treewidgetitem::function_setChecked(KviKvsObjectFunctionCall *
 	return true;
 }
 
-bool KviKvsObject_treewidgetitem::function_isChecked(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidgetitem,isChecked)
 {
 	if(!m_pTreeWidgetItem)
 	{
@@ -382,7 +363,7 @@ bool KviKvsObject_treewidgetitem::function_isChecked(KviKvsObjectFunctionCall *c
 	return true;
 }
 /*
-bool KviKvsObject_treewidgetitem::function_setCheckable(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidgetitem,setCheckable)
 {
 	bool bCheckable;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -418,7 +399,7 @@ bool KviKvsObject_treewidgetitem::function_setCheckable(KviKvsObjectFunctionCall
 	return true;
 }
 
-bool KviKvsObject_treewidgetitem::function_isCheckable(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidgetitem,isCheckable)
 {
 	if(!m_pTreeWidgetItem)
 	{
@@ -429,7 +410,7 @@ bool KviKvsObject_treewidgetitem::function_isCheckable(KviKvsObjectFunctionCall
 	return true;
 }
 */
-bool KviKvsObject_treewidgetitem::function_text(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidgetitem,text)
 {
 	kvs_uint_t uCol;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -440,7 +421,7 @@ bool KviKvsObject_treewidgetitem::function_text(KviKvsObjectFunctionCall *c)
 	return true;
 }
 
-bool KviKvsObject_treewidgetitem::function_setPixmap(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(treewidgetitem,setPixmap)
 {
 	kvs_uint_t uCol;
 	KviKvsObject *obPixmap;
@@ -455,7 +436,7 @@ bool KviKvsObject_treewidgetitem::function_setPixmap(KviKvsObjectFunctionCall *c
 	{
 		vPixmap->asHObject(obHpixmap);
 		obPixmap=KviKvsKernel::instance()->objectController()->lookupObject(obHpixmap);
-		if (!obPixmap->inherits("KviKvsObject_pixmap"))
+		if (!obPixmap->inheritsClass("pixmap"))
 		{
 			c->warning(__tr2qs("Pixmap object or image Id required"));
 			return true;
diff --git a/src/modules/objects/class_treewidgetitem.h b/src/modules/objects/class_treewidgetitem.h
index 96515b41f..b1968293d 100644
--- a/src/modules/objects/class_treewidgetitem.h
+++ b/src/modules/objects/class_treewidgetitem.h
@@ -41,22 +41,22 @@ protected:
 protected:
 	virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
 protected:
-	bool function_setText(KviKvsObjectFunctionCall *c);
-	bool function_insertItem(KviKvsObjectFunctionCall *c);
-	bool function_setPixmap(KviKvsObjectFunctionCall *c);
-	bool function_setRenameEnabled(KviKvsObjectFunctionCall *c);
-	bool function_setEnabled(KviKvsObjectFunctionCall *c);
-	bool function_isEnabled(KviKvsObjectFunctionCall *c);
-	bool function_setOpen(KviKvsObjectFunctionCall *c);
-	bool function_isOpen(KviKvsObjectFunctionCall *c);
-	bool function_text(KviKvsObjectFunctionCall *c);
-	bool function_setCheckable(KviKvsObjectFunctionCall *c);
-	bool function_isCheckable(KviKvsObjectFunctionCall *c);
-	bool function_setChecked(KviKvsObjectFunctionCall *c);
-	bool function_isChecked(KviKvsObjectFunctionCall *c);
-	bool function_firstChild(KviKvsObjectFunctionCall *c);
-	//bool function_nextSibling(KviKvsObjectFunctionCall *c);
-	bool function_setFlags(KviKvsObjectFunctionCall *c);
+	bool setText(KviKvsObjectFunctionCall *c);
+	bool insertItem(KviKvsObjectFunctionCall *c);
+	bool setPixmap(KviKvsObjectFunctionCall *c);
+	bool setRenameEnabled(KviKvsObjectFunctionCall *c);
+	bool setEnabled(KviKvsObjectFunctionCall *c);
+	bool isEnabled(KviKvsObjectFunctionCall *c);
+	bool setOpen(KviKvsObjectFunctionCall *c);
+	bool isOpen(KviKvsObjectFunctionCall *c);
+	bool text(KviKvsObjectFunctionCall *c);
+	bool setCheckable(KviKvsObjectFunctionCall *c);
+	bool isCheckable(KviKvsObjectFunctionCall *c);
+	bool setChecked(KviKvsObjectFunctionCall *c);
+	bool isChecked(KviKvsObjectFunctionCall *c);
+	bool firstChild(KviKvsObjectFunctionCall *c);
+	//bool nextSibling(KviKvsObjectFunctionCall *c);
+	bool setFlags(KviKvsObjectFunctionCall *c);
 
 public:
 	static kvs_hobject_t itemToHandle(KviTalTreeWidgetItem * it);
diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp
index 0b7961a9b..458e9f691 100644
--- a/src/modules/objects/class_vbox.cpp
+++ b/src/modules/objects/class_vbox.cpp
@@ -88,11 +88,11 @@ const int align_cod[] = {
 
 
 KVSO_BEGIN_REGISTERCLASS(KviKvsObject_vbox,"vbox","widget")
-	KVSO_REGISTER_HANDLER(KviKvsObject_vbox,"setMargin", functionsetMargin)
-	KVSO_REGISTER_HANDLER(KviKvsObject_vbox,"setSpacing", functionsetSpacing)
-	KVSO_REGISTER_HANDLER(KviKvsObject_vbox,"setStretchFactor", functionsetStretchFactor )
-	KVSO_REGISTER_HANDLER(KviKvsObject_vbox,"addStretch", functionaddStretch )
-	KVSO_REGISTER_HANDLER(KviKvsObject_vbox,"setAlignment", functionsetAlignment )
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_vbox,setMargin)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_vbox,setSpacing)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_vbox,setStretchFactor)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_vbox,addStretch)
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_vbox,setAlignment)
 KVSO_END_REGISTERCLASS(KviKvsObject_vbox)
 
 KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_vbox,KviKvsObject_widget)
@@ -110,7 +110,7 @@ bool KviKvsObject_vbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *
 	return true;
 }
 
-bool KviKvsObject_vbox::functionsetMargin(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(vbox,setMargin)
 {
 	kvs_int_t iMargin;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -120,7 +120,7 @@ bool KviKvsObject_vbox::functionsetMargin(KviKvsObjectFunctionCall *c)
 	return true;
 }
 
-bool KviKvsObject_vbox::functionsetSpacing(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(vbox,setSpacing)
 {
 	kvs_int_t iSpacing;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -130,7 +130,7 @@ bool KviKvsObject_vbox::functionsetSpacing(KviKvsObjectFunctionCall *c)
 	return true;
 }
 
-bool KviKvsObject_vbox::functionsetStretchFactor(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(vbox,setStretchFactor)
 {
 	KviKvsObject * pObject;
 	kvs_hobject_t hObject;
@@ -165,7 +165,7 @@ bool KviKvsObject_vbox::functionsetStretchFactor(KviKvsObjectFunctionCall *c)
 	((KviTalVBox *)widget())->setStretchFactor(((QWidget *)(pObject->object())),uStretch);
 	return true;
 }
-bool KviKvsObject_vbox::functionaddStretch(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(vbox,addStretch)
 {
 	kvs_int_t iStretch;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -175,7 +175,7 @@ bool KviKvsObject_vbox::functionaddStretch(KviKvsObjectFunctionCall *c)
 	if (widget())((KviTalVBox *)widget())->addStretch(iStretch);
 	return true;
 }
-bool KviKvsObject_vbox::functionsetAlignment(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(vbox,setAlignment)
 {
 	QStringList alignment;
 	KviKvsObject * pObject;
diff --git a/src/modules/objects/class_vbox.h b/src/modules/objects/class_vbox.h
index 5d1a5042a..eff95e6ff 100644
--- a/src/modules/objects/class_vbox.h
+++ b/src/modules/objects/class_vbox.h
@@ -37,11 +37,11 @@ public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
 	virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
-	bool functionsetMargin(KviKvsObjectFunctionCall *c);
-	bool functionsetSpacing(KviKvsObjectFunctionCall *c);
-	bool functionsetStretchFactor(KviKvsObjectFunctionCall *c);
-	bool functionaddStretch(KviKvsObjectFunctionCall *c);
-	bool functionsetAlignment(KviKvsObjectFunctionCall *c);
+	bool setMargin(KviKvsObjectFunctionCall *c);
+	bool setSpacing(KviKvsObjectFunctionCall *c);
+	bool setStretchFactor(KviKvsObjectFunctionCall *c);
+	bool addStretch(KviKvsObjectFunctionCall *c);
+	bool setAlignment(KviKvsObjectFunctionCall *c);
 
 };
 
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index 7272dbc08..c3dff4b7e 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -719,9 +719,11 @@ KVSO_END_REGISTERCLASS(KviKvsObject_widget)
 
 KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_widget,KviKvsObject)
 KVSO_END_CONSTRUCTOR(KviKvsObject_widget)
-
 KVSO_BEGIN_DESTRUCTOR(KviKvsObject_widget)
-	emit aboutToDie();
+debug("destr");
+int tt=0;
+
+emit aboutToDie();
 //	if (webview) delete webview;
 KVSO_END_CONSTRUCTOR(KviKvsObject_widget)
 
@@ -1864,7 +1866,7 @@ bool KviKvsObject_widget::function_setMask(KviKvsObjectFunctionCall *c)
 		c->warning(__tr2qs("Pixmap parameter is not an object"));
 		return true;
 	}
-	if (!obj->inherits("KviKvsObject_pixmap"))
+	if (!obj->inheritsClass("pixmap"))
 	{
 		c->warning(__tr2qs("Pixmap object required"));
 		return true;
diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp
index 9108ca47f..e82d0f179 100644
--- a/src/modules/objects/class_window.cpp
+++ b/src/modules/objects/class_window.cpp
@@ -120,7 +120,7 @@ bool KviKvsObject_window::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
 }
 KVSO_CLASS_FUNCTION(window,setWindowTitle)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	QString szCaption;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("caption",KVS_PT_STRING,0,szCaption)
@@ -130,7 +130,7 @@ KVSO_CLASS_FUNCTION(window,setWindowTitle)
 }
 KVSO_CLASS_FUNCTION(window,setCentralWidget)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 
 	KviKvsObject *ob;
 	kvs_hobject_t hObject;
@@ -143,7 +143,7 @@ KVSO_CLASS_FUNCTION(window,setCentralWidget)
 		c->warning(__tr2qs("Can't add a non-widget object"));
 		return true;
 	}
-	if(!ob->inherits("KviKvsObject_widget"))
+	if(!ob->inheritsClass("widget"))
 	{
 		c->warning(__tr2qs("Can't add a non-widget object"));
 		return true;
diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp
index f23f803ee..adea7a8ad 100644
--- a/src/modules/objects/class_wizard.cpp
+++ b/src/modules/objects/class_wizard.cpp
@@ -132,7 +132,7 @@ bool KviKvsObject_wizard::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
 }
 KVSO_CLASS_FUNCTION(wizard,addPage)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	KviKvsObject *ob;
 	QString szLabel;
 	kvs_hobject_t hObject;
@@ -151,7 +151,7 @@ KVSO_CLASS_FUNCTION(wizard,addPage)
 }
 KVSO_CLASS_FUNCTION(wizard,insertPage)
 {	
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 
 	KviKvsObject *ob;
 	QString szLabel;
@@ -175,7 +175,7 @@ KVSO_CLASS_FUNCTION(wizard,insertPage)
 
 KVSO_CLASS_FUNCTION(wizard,setTitle)
 {	
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	KviKvsObject *ob;
 	QString szTitle;
 	kvs_hobject_t hObject;
@@ -194,7 +194,7 @@ KVSO_CLASS_FUNCTION(wizard,setTitle)
 }
 KVSO_CLASS_FUNCTION(wizard,setBackEnabled)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	bool bEnabled;
 	KviKvsObject *ob;
 	kvs_hobject_t hObject;
@@ -214,7 +214,7 @@ KVSO_CLASS_FUNCTION(wizard,setBackEnabled)
 
 KVSO_CLASS_FUNCTION(wizard,setNextEnabled)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 
 	bool bEnabled;
 	KviKvsObject *ob;
@@ -234,7 +234,7 @@ KVSO_CLASS_FUNCTION(wizard,setNextEnabled)
 }
 KVSO_CLASS_FUNCTION(wizard,setFinishEnabled)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 
 	bool bEnabled;
 	KviKvsObject *ob;
@@ -254,7 +254,7 @@ KVSO_CLASS_FUNCTION(wizard,setFinishEnabled)
 }
 KVSO_CLASS_FUNCTION(wizard,setHelpEnabled)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 
 	bool bEnabled;
 	KviKvsObject *ob;
@@ -274,7 +274,7 @@ KVSO_CLASS_FUNCTION(wizard,setHelpEnabled)
 }
 KVSO_CLASS_FUNCTION(wizard,setBackBtnText)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 
 	QString szText;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -285,7 +285,7 @@ KVSO_CLASS_FUNCTION(wizard,setBackBtnText)
 }
 KVSO_CLASS_FUNCTION(wizard,setNextBtnText)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 
 	QString szText;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -296,7 +296,7 @@ KVSO_CLASS_FUNCTION(wizard,setNextBtnText)
 }
 KVSO_CLASS_FUNCTION(wizard,setHelpBtnText)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 
 	QString szText;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -307,7 +307,7 @@ KVSO_CLASS_FUNCTION(wizard,setHelpBtnText)
 }
 KVSO_CLASS_FUNCTION(wizard,setFinishBtnText)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 
 	QString szText;
 	KVSO_PARAMETERS_BEGIN(c)
diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp
index 578a5d809..eef236418 100644
--- a/src/modules/objects/class_xmlreader.cpp
+++ b/src/modules/objects/class_xmlreader.cpp
@@ -330,7 +330,7 @@ KVSO_CLASS_FUNCTION(xmlreader,parse)
 			c->warning(__tr2qs("Data parameter is not an object"));
 			return true;
 		}
-		if (pObject->inherits("KviKvsObject_memorybuffer"))
+		if (pObject->inheritsClass("memorybuffer"))
 		{
 			source.setData(*((KviKvsObject_memorybuffer *)pObject)->pBuffer());
 		}
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index e9f2154c1..8ddd86718 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -657,24 +657,24 @@ static bool objects_kvs_cmd_bitBlt(KviKvsModuleCommandCall * c)
 	QImage  * imgSource=0;
 	QPaintDevice  * pdSource = 0;
 
-	if(obSrc->inherits("KviKvsObject_pixmap")) pdSource =((KviKvsObject_pixmap *)obSrc)->getPixmap();
-	else if (obSrc->inherits("KviKvsObject_widget")) pdSource=((KviKvsObject_widget *)obSrc)->widget();
+	if(obSrc->inheritsClass("pixmap")) pdSource =((KviKvsObject_pixmap *)obSrc)->getPixmap();
+	else if (obSrc->inheritsClass("widget")) pdSource=((KviKvsObject_widget *)obSrc)->widget();
 	if (!pdSource)
 	{
 		c->warning(__tr2qs("Widget, Image or Pixmap required "));
 		return true;
 	}
 	QPaintDevice  * pdDest = 0;
-	if(obDst->inherits("KviKvsObject_pixmap")){
+	if(obDst->inheritsClass("pixmap")){
 		pdDest= ((KviKvsObject_pixmap *)obDst)->getPixmap();
 	}
-	else if (obDst->inherits("KviKvsObject_widget")) pdDest=((KviKvsObject_widget *)obDst)->widget();
+	else if (obDst->inheritsClass("widget")) pdDest=((KviKvsObject_widget *)obDst)->widget();
 	if (!pdDest)
 	{
 		c->warning(__tr2qs("Widget or Pixmap required"));
 		return true;
 	}
-	if(obDst->inherits("KviKvsObject_pixmap")){
+	if(obDst->inheritsClass("pixmap")){
 		((KviKvsObject_pixmap *)obDst)->pixmapChanged();
 	}
 
@@ -751,15 +751,15 @@ static bool objects_kvs_cmd_blend(KviKvsModuleCommandCall * c)
 		return true;
 	}
 
-	if (!obBck->inherits("KviKvsObject_pixmap") || !obFor->inherits("KviKvsObject_pixmap"))
+	if (!obBck->inheritsClass("pixmap") || !obFor->inherits("KviKvsObject_pixmap"))
 	{
 		c->warning(__tr2qs("Pixmap objects required"));
 		return true;
 	}
 
 	QPaintDevice  * pdDest = 0;
-	if(obDest->inherits("KviKvsObject_pixmap")) pdDest = ((KviKvsObject_pixmap *)obDest)->getPixmap();
-	else if (obDest->inherits("KviKvsObject_widget")) pdDest=((KviKvsObject_widget *)obDest)->widget();
+	if(obDest->inheritsClass("pixmap")) pdDest = ((KviKvsObject_pixmap *)obDest)->getPixmap();
+	else if (obDest->inheritsClass("widget")) pdDest=((KviKvsObject_widget *)obDest)->widget();
 
 	if (!pdDest)
 	{
@@ -767,7 +767,7 @@ static bool objects_kvs_cmd_blend(KviKvsModuleCommandCall * c)
 		return true;
 	}
 
-	if(obDest->inherits("KviKvsObject_pixmap")) ((KviKvsObject_pixmap *)obDest)->pixmapChanged();
+	if(obDest->inheritsClass("pixmap")) ((KviKvsObject_pixmap *)obDest)->pixmapChanged();
 
 
 	QImage  *img_back=((KviKvsObject_pixmap *)obBck)->getImage();
diff --git a/src/modules/objects/object_macros.h b/src/modules/objects/object_macros.h
index 55552a1d5..cea176c44 100644
--- a/src/modules/objects/object_macros.h
+++ b/src/modules/objects/object_macros.h
@@ -89,7 +89,9 @@ g_pKvs##__className##Class->registerFunctionHandler(#__szName,(KviKvsObjectFunct
 
 #define KVSO_BEGIN_DESTRUCTOR(__className) \
 	__className::~__className() \
-	{
+	{\
+	callFunction(this,"destructor");
+
 
 #define KVSO_END_DESTRUCTOR(__className) \
 	}
@@ -97,10 +99,10 @@ g_pKvs##__className##Class->registerFunctionHandler(#__szName,(KviKvsObjectFunct
 #define KVSO_CLASS_FUNCTION(__className,__functionName)\
 	bool KviKvsObject_##__className::__functionName(KviKvsObjectFunctionCall * c)
 
-#define CHECK_INTERNAL_QPOINTER(__pointer)\
+#define CHECK_INTERNAL_POINTER(__pointer)\
 	if(!__pointer) \
 	{ \
-		c->error(__tr2qs_ctx("Internal error: no valid pointer for this object","object")); \
+		c->error(__tr2qs("Internal error: no valid pointer for this object")); \
 		return false; \
 	}
 #endif
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index d4676ad2c..151001999 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -591,11 +591,11 @@ static bool trayicon_kvs_cmd_hide(KviKvsModuleCommandCall * c)
 	@title:
 		trayicon.hidewindow
 	@short:
-		Returns the state of the dock widget
+		Hides the window, associated with trayicon
 	@syntax:
 		trayicon.hidewindow
-	@description:
-		Hides the window, assotiated with trayicon
+	@description
+		Hides the window, associated with trayicon
 	@seealso:
 		[cmd]trayicon.show[/cmd], [cmd]trayicon.hide[/cmd]
 */
diff --git a/src/modules/upnp/upnp_QT4_vc05.vcproj b/src/modules/upnp/upnp_QT4_vc05.vcproj
index fd9368ead..ce4b75a20 100644
--- a/src/modules/upnp/upnp_QT4_vc05.vcproj
+++ b/src/modules/upnp/upnp_QT4_vc05.vcproj
@@ -276,7 +276,7 @@
 					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\moc_$(InputName).cpp&quot; &quot;$(InputDir)\$(InputFileName)&quot;"

+						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\moc_$(InputName).cpp&quot; &quot;$(InputDir)\$(InputFileName)&quot;&#x0D;&#x0A;"

 						Outputs="$(InputDir)\moc_$(InputName).cpp"

 					/>

 				</FileConfiguration>

@@ -289,7 +289,7 @@
 					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\moc_$(InputName).cpp&quot; &quot;$(InputDir)\$(InputFileName)&quot;"

+						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\moc_$(InputName).cpp&quot; &quot;$(InputDir)\$(InputFileName)&quot;&#x0D;&#x0A;"

 						Outputs="$(InputDir)\moc_$(InputName).cpp"

 					/>

 				</FileConfiguration>

@@ -315,7 +315,7 @@
 					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\moc_$(InputName).cpp&quot; &quot;$(InputDir)\$(InputFileName)&quot;"

+						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\moc_$(InputName).cpp&quot; &quot;$(InputDir)\$(InputFileName)&quot;&#x0D;&#x0A;"

 						Outputs="$(InputDir)\moc_$(InputName).cpp"

 					/>

 				</FileConfiguration>

@@ -328,7 +328,7 @@
 					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\moc_$(InputName).cpp&quot; &quot;$(InputDir)\$(InputFileName)&quot;"

+						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\moc_$(InputName).cpp&quot; &quot;$(InputDir)\$(InputFileName)&quot;&#x0D;&#x0A;"

 						Outputs="$(InputDir)\moc_$(InputName).cpp"

 					/>

 				</FileConfiguration>

@@ -341,8 +341,8 @@
 					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\moc_$(InputName).cpp&quot; &quot;$(InputDir)\$(InputFileName)&quot;"

-						Outputs="$(InputDir)\moc_$(InputName).cpp"

+						CommandLine=""

+						Outputs=""

 					/>

 				</FileConfiguration>

 			</File>