removed KviTalListView in favour of KviTalTreeWidget;

updated TODOs;


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

6 files changed, 130 insertions, 145 deletions

diff --git a/src/modules/objects/CMakeLists.txt b/src/modules/objects/CMakeLists.txt
index 9c713ba83..80bfdd078 100644
--- a/src/modules/objects/CMakeLists.txt
+++ b/src/modules/objects/CMakeLists.txt
@@ -16,8 +16,6 @@ SET(kviobjects_MOC_HDRS
 	class_http.h
 	class_lineedit.h
 	class_listbox.h
-	class_listview.h
-	class_listviewitem.h
 	class_multilineedit.h
 	class_painter.h
 	class_pixmap.h
@@ -31,6 +29,8 @@ SET(kviobjects_MOC_HDRS
 	class_tbrowser.h
 	class_toolbar.h
 	class_toolbutton.h
+	class_treewidget.h
+	class_treewidgetitem.h
 	class_widget.h
 	class_window.h
 	class_wizard.h
@@ -49,6 +49,7 @@ SET(kviobjects_SRCS
 	class_file.cpp
 	class_ftp.cpp
 	class_groupbox.cpp
+	class_hbox.cpp
 	class_http.cpp
 	class_label.cpp
 	class_layout.cpp
@@ -56,11 +57,11 @@ SET(kviobjects_SRCS
 	class_lineedit.cpp
 	class_list.cpp
 	class_listbox.cpp
-	class_listview.cpp
-	class_listviewitem.cpp
 	class_mainwindow.cpp
 	class_menubar.cpp
 	class_multilineedit.cpp
+	class_painter.cpp
+	class_pixmap.cpp
 	class_popupmenu.cpp
 	class_process.cpp
 	class_progressbar.cpp
@@ -69,19 +70,18 @@ SET(kviobjects_SRCS
 	class_socket.cpp
 	class_spinbox.cpp
 	class_tabwidget.cpp
+	class_tbrowser.cpp
 	class_toolbar.cpp
 	class_toolbutton.cpp
-	class_painter.cpp
-	class_pixmap.cpp
-	class_tbrowser.cpp
+	class_treewidget.cpp
+	class_treewidgetitem.cpp
+	class_vbox.cpp
 	class_widget.cpp
 	class_window.cpp
 	class_wizard.cpp
 	class_workspace.cpp
 	class_wrapper.cpp
 	class_xmlreader.cpp
-	class_vbox.cpp
-	class_hbox.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_treewidget.cpp
index 2936b9ac7..91f8ea6f4 100644
--- a/src/modules/objects/class_listview.cpp
+++ b/src/modules/objects/class_treewidget.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_listview.cpp
+//   File : class_treewidget.cpp
 //   Creation date : Fri Jan 28 14:21:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "class_listview.h"
+#include "class_treewidget.h"
 
 #include "kvi_error.h"
 #include "kvi_debug.h"
@@ -239,7 +239,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_treewidget)
 
 bool KviKvsObject_treewidget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(new KviKvsMdmListView(parentScriptWidget(),getName().toUtf8().data(),this),true);
+	setObject(new KviKvsTreeWidget(parentScriptWidget(),getName().toUtf8().data(),this),true);
 	
 	// hack for compatibility with "old" addColumn method;
 	((KviTalTreeWidget*) widget())->setColumnCount(0);
@@ -593,7 +593,7 @@ void KviKvsObject_treewidget::fileDropped(QString &szFile,KviTalTreeWidgetItem *
 	callFunction(this,"fileDroppedEvent",0,&params);
 }
 
-KviKvsMdmListView::KviKvsMdmListView(QWidget * par,const char * name,KviKvsObject_treewidget *parent)
+KviKvsTreeWidget::KviKvsTreeWidget(QWidget * par,const char * name,KviKvsObject_treewidget *parent)
 :KviTalTreeWidget(par)
 {
 	m_pParentScript=parent;
@@ -604,11 +604,11 @@ KviKvsMdmListView::KviKvsMdmListView(QWidget * par,const char * name,KviKvsObjec
 	viewport()->setAcceptDrops(true);
 }
 
-KviKvsMdmListView::~KviKvsMdmListView()
+KviKvsTreeWidget::~KviKvsTreeWidget()
 {
 }
 
-void KviKvsMdmListView::dragEnterEvent( QDragEnterEvent * e )
+void KviKvsTreeWidget::dragEnterEvent( QDragEnterEvent * e )
 {
 	debug("Drag enter event");
 	if(!e->mimeData()->hasUrls())
@@ -619,7 +619,7 @@ void KviKvsMdmListView::dragEnterEvent( QDragEnterEvent * e )
 	}
 }
 
-void KviKvsMdmListView::dropEvent(QDropEvent * e)
+void KviKvsTreeWidget::dropEvent(QDropEvent * e)
 {
 	debug("Drop event");
 	QList<QUrl> list;
diff --git a/src/modules/objects/class_listview.h b/src/modules/objects/class_treewidget.h
index 90e6a71d9..8e72486bf 100644
--- a/src/modules/objects/class_listview.h
+++ b/src/modules/objects/class_treewidget.h
@@ -1,8 +1,8 @@
-#ifndef _CLASS_LISTVIEW_H_
-#define _CLASS_LISTVIEW_H_
+#ifndef _CLASS_TREEWIDGET_H_
+#define _CLASS_TREEWIDGET_H_
 //=============================================================================
 //
-//   File : class_listview.h
+//   File : class_treewidget.h
 //   Creation date : Fri Jan 28 14:21:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -25,12 +25,12 @@
 //
 //=============================================================================
 
-#include "kvi_tal_treewidget.h"
 #include "class_widget.h"
-#include "class_listviewitem.h"
-
+#include "class_treewidgetitem.h"
 #include "object_macros.h"
 
+#include "kvi_tal_treewidget.h"
+
 class KviKvsObject_treewidget : public KviKvsObject_widget
 {
 	Q_OBJECT
@@ -69,8 +69,6 @@ protected:
 	bool function_setAcceptDrops(KviKvsObjectFunctionCall *c);
 	bool function_setHeaderLabels(KviKvsObjectFunctionCall *c);
 	bool function_setColumnCount(KviKvsObjectFunctionCall *c);
-
-
 protected slots:
 	void slotClicked(KviTalTreeWidgetItem *,int);
 	void customContextMenuRequested(const QPoint &pnt);
@@ -83,19 +81,17 @@ protected slots:
 	void slotItemChanged(KviTalTreeWidgetItem *,int);
 };
 
-class KviKvsMdmListView :  public KviTalTreeWidget
+class KviKvsTreeWidget : public KviTalTreeWidget
 {
 	Q_OBJECT
 public:
-	KviKvsMdmListView(QWidget * par,const char * name,KviKvsObject_treewidget *);
-
-	virtual ~KviKvsMdmListView();
+	KviKvsTreeWidget(QWidget * par, const char * name, KviKvsObject_treewidget *);
+	virtual ~KviKvsTreeWidget();
 protected:
-	KviKvsObject_treewidget *m_pParentScript;
-	void dropEvent(QDropEvent *e);
-	void dragEnterEvent( QDragEnterEvent *e );
-	
-
-
+	KviKvsObject_treewidget * m_pParentScript;
+protected:
+	void dropEvent(QDropEvent * e);
+	void dragEnterEvent(QDragEnterEvent * e);
 };
-#endif	//!_CLASS_LISTVIEW_H_
+
+#endif // _CLASS_TREEWIDGET_H_
diff --git a/src/modules/objects/class_listviewitem.cpp b/src/modules/objects/class_treewidgetitem.cpp
index 627892f4c..7ff677f2f 100644
--- a/src/modules/objects/class_listviewitem.cpp
+++ b/src/modules/objects/class_treewidgetitem.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_listviewitem.cpp
+//   File : class_treewidgetitem.cpp
 //   Creation date : Fri Jan 28 14:21:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -23,8 +23,9 @@
 //
 //=============================================================================
 
-#include "class_listviewitem.h"
+#include "class_treewidgetitem.h"
 #include "class_pixmap.h"
+
 #include "kvi_error.h"
 #include "kvi_debug.h"
 #include "kvi_locale.h"
@@ -144,20 +145,20 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_treewidgetitem,"listviewitem","object")
 	KVSO_REGISTER_HANDLER(KviKvsObject_treewidgetitem,"firstChild",function_firstChild);
 	KVSO_REGISTER_HANDLER(KviKvsObject_treewidgetitem,"setFlags",function_setFlags);
 
-	//	KVSO_REGISTER_HANDLER(KviKvsObject_treewidgetitem,"nextSibling",function_nextSibling);
+	//KVSO_REGISTER_HANDLER(KviKvsObject_treewidgetitem,"nextSibling",function_nextSibling);
 KVSO_END_REGISTERCLASS(KviKvsObject_treewidgetitem)
 
 
 KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_treewidgetitem,KviKvsObject)
 
-	m_pListViewItem = 0;
+	m_pTreeWidgetItem = 0;
 
 KVSO_END_CONSTRUCTOR(KviKvsObject_treewidgetitem)
 
 
 KVSO_BEGIN_DESTRUCTOR(KviKvsObject_treewidgetitem)
 
-	if(m_pListViewItem)delete m_pListViewItem;
+	if(m_pTreeWidgetItem)delete m_pTreeWidgetItem;
 
 KVSO_END_CONSTRUCTOR(KviKvsObject_treewidgetitem)
 
@@ -170,10 +171,10 @@ bool KviKvsObject_treewidgetitem::init(KviKvsRunTimeContext * pContext,KviKvsVar
 	}
 	if(parentObject()->inherits("KviKvsObject_treewidgetitem"))
 	{
-		 m_pListViewItem = new KviKvsMdmStandardListViewItem(this,((KviKvsObject_treewidgetitem *)parentObject())->m_pListViewItem);
+		 m_pTreeWidgetItem = new KviKvsStandardTreeWidgetItem(this,((KviKvsObject_treewidgetitem *)parentObject())->m_pTreeWidgetItem);
 	} else {
 		if(parentObject()->inherits("KviKvsObject_treewidget"))
-			m_pListViewItem = new KviKvsMdmStandardListViewItem(this,((KviTalTreeWidget *)parentScriptWidget()));
+			m_pTreeWidgetItem = new KviKvsStandardTreeWidgetItem(this,((KviTalTreeWidget *)parentScriptWidget()));
 		else {
 			pContext->error(__tr2qs("The parent of the treewidgetitem must be either another treewidgetitem or a treewidget"));
 			return false;
@@ -184,39 +185,38 @@ bool KviKvsObject_treewidgetitem::init(KviKvsRunTimeContext * pContext,KviKvsVar
 
 void KviKvsObject_treewidgetitem::childDestroyed()
 {
-	if(m_pListViewItem == 0)return;
-	m_pListViewItem = 0;
+	if(m_pTreeWidgetItem == 0)return;
+	m_pTreeWidgetItem = 0;
 	die();
 }
 
-KviKvsMdmStandardListViewItem::KviKvsMdmStandardListViewItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidget * par)
+KviKvsStandardTreeWidgetItem::KviKvsStandardTreeWidgetItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidget * par)
 :KviTalTreeWidgetItem(par), m_pMasterObject(ob)
 {
 }
 
-KviKvsMdmStandardListViewItem::KviKvsMdmStandardListViewItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidgetItem * par)
+KviKvsStandardTreeWidgetItem::KviKvsStandardTreeWidgetItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidgetItem * par)
 :KviTalTreeWidgetItem(par), m_pMasterObject(ob)
 {
 }
 
-KviKvsMdmStandardListViewItem::~KviKvsMdmStandardListViewItem()
+KviKvsStandardTreeWidgetItem::~KviKvsStandardTreeWidgetItem()
 {
 	if(m_pMasterObject)m_pMasterObject->childDestroyed();
 }
-/*
 
-
-KviKvsMdmCheckListViewItem::KviKvsMdmCheckListViewItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidget * par)
+/*
+KviKvsCheckTreeWidgetItem::KviKvsCheckTreeWidgetItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidget * par)
 :KviTalCheckListItem(par,QString::null,KviTalCheckListItem::CheckBox), m_pMasterObject(ob)
 {
 }
 
-KviKvsMdmCheckListViewItem::KviKvsMdmCheckListViewItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidgetItem * par)
+KviKvsCheckTreeWidgetItem::KviKvsCheckTreeWidgetItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidgetItem * par)
 :KviTalCheckListItem(par,QString::null,KviTalCheckListItem::CheckBox), m_pMasterObject(ob)
 {
 }
 
-KviKvsMdmCheckListViewItem::~KviKvsMdmCheckListViewItem()
+KviKvsCheckTreeWidgetItem::~KviKvsCheckTreeWidgetItem()
 {
 	if(m_pMasterObject)m_pMasterObject->childDestroyed();
 }
@@ -226,14 +226,13 @@ kvs_hobject_t KviKvsObject_treewidgetitem::itemToHandle(KviTalTreeWidgetItem * i
 {
 	if(!it)return (kvs_hobject_t)0;
 	KviKvsObject_treewidgetitem * pObject;
-//	if(it->rtti() == 1)pObject = ((KviKvsMdmCheckListViewItem *)it)->masterObject();
-//	else 
-	pObject = ((KviKvsMdmStandardListViewItem *)it)->masterObject();
+	//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)
 {
 	kvs_uint_t uCol;
@@ -242,15 +241,15 @@ bool KviKvsObject_treewidgetitem::function_setText(KviKvsObjectFunctionCall *c)
 		KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,uCol)
 		KVSO_PARAMETER("text",KVS_PT_STRING,0,szText)
 		KVSO_PARAMETERS_END(c)
-	if(m_pListViewItem)
-		m_pListViewItem->setText(uCol,szText);
+	if(m_pTreeWidgetItem)
+		m_pTreeWidgetItem->setText(uCol,szText);
 	return true;
 }
 
 bool KviKvsObject_treewidgetitem::function_firstChild(KviKvsObjectFunctionCall *c)
 {
-	if(m_pListViewItem)
-		c->returnValue()->setHObject(itemToHandle((KviTalTreeWidgetItem*)m_pListViewItem->child(0)));
+	if(m_pTreeWidgetItem)
+		c->returnValue()->setHObject(itemToHandle((KviTalTreeWidgetItem*)m_pTreeWidgetItem->child(0)));
 	else
 		c->returnValue()->setHObject((kvs_hobject_t)0);
 	return true;
@@ -258,8 +257,8 @@ bool KviKvsObject_treewidgetitem::function_firstChild(KviKvsObjectFunctionCall *
 /*
 bool KviKvsObject_treewidgetitem::function_nextSibling(KviKvsObjectFunctionCall *c)
 {
-	if(m_pListViewItem)
-		c->returnValue()->setHObject(itemToHandle(m_pListViewItem->nextSibling()));
+	if(m_pTreeWidgetItem)
+		c->returnValue()->setHObject(itemToHandle(m_pTreeWidgetItem->nextSibling()));
 	else
 		c->returnValue()->setHObject((kvs_hobject_t)0);
 	return true;
@@ -273,10 +272,9 @@ bool KviKvsObject_treewidgetitem::function_setRenameEnabled(KviKvsObjectFunction
 		KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,uCol)
 		KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled)
 		KVSO_PARAMETERS_END(c)
-	if(m_pListViewItem)
-		m_pListViewItem->setFlags(m_pListViewItem->flags()|Qt::ItemIsEditable);
+	if(m_pTreeWidgetItem)
+		m_pTreeWidgetItem->setFlags(m_pTreeWidgetItem->flags()|Qt::ItemIsEditable);
 	return true;
-
 }
 
 bool KviKvsObject_treewidgetitem::function_setFlags(KviKvsObjectFunctionCall *c)
@@ -287,33 +285,28 @@ bool KviKvsObject_treewidgetitem::function_setFlags(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_END(c)
 	int flag,sum=0;
 	for ( int i=0;i<itemflags.count();i++)
+	{
+		flag = 0;
+		for(unsigned int j = 0; j < itemflags_num; j++)
 		{
-		
-			flag = 0;
-			for(unsigned int j = 0; j < itemflags_num; j++)
+			if(KviQString::equalCI(itemflags.at(i), itemflags_tbl[j]))
 			{
-				if(KviQString::equalCI(itemflags.at(i), itemflags_tbl[j]))
-				{
-					flag=item_flags[j];
-					break;
-				}
-			}
-			if(flag){
-				if (flag==Qt::ItemIsUserCheckable) 
-						m_pListViewItem->setCheckState(0,Qt::Unchecked);
-				sum = sum | flag;
+				flag=item_flags[j];
+				break;
 			}
-			else
-				c->warning(__tr2qs("Unknown item flag: %s"),&itemflags.at(i));
-				
 		}
-	if(m_pListViewItem)
-		m_pListViewItem->setFlags((Qt::ItemFlags)sum);
+		if(flag){
+			if (flag==Qt::ItemIsUserCheckable) 
+					m_pTreeWidgetItem->setCheckState(0,Qt::Unchecked);
+			sum = sum | flag;
+		}
+		else
+			c->warning(__tr2qs("Unknown item flag: %s"),&itemflags.at(i));
+	}
+	if(m_pTreeWidgetItem)
+		m_pTreeWidgetItem->setFlags((Qt::ItemFlags)sum);
 	
 	return true;
-
-
-
 }
 /*
 bool KviKvsObject_treewidgetitem::function_setEnabled(KviKvsObjectFunctionCall *c)
@@ -322,19 +315,19 @@ bool KviKvsObject_treewidgetitem::function_setEnabled(KviKvsObjectFunctionCall *
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled)
 		KVSO_PARAMETERS_END(c)
-	if(m_pListViewItem)
-		m_pListViewItem->setEnabled(bEnabled);
+	if(m_pTreeWidgetItem)
+		m_pTreeWidgetItem->setEnabled(bEnabled);
 	return true;
 }
 
 bool KviKvsObject_treewidgetitem::function_isEnabled(KviKvsObjectFunctionCall *c)
 {
-	if(!m_pListViewItem)
+	if(!m_pTreeWidgetItem)
 	{
 		c->returnValue()->setBoolean(false);
 		return true;
 	}
-	c->returnValue()->setBoolean(m_pListViewItem->isEnabled());
+	c->returnValue()->setBoolean(m_pTreeWidgetItem->isEnabled());
 	return true;
 }
 */
@@ -344,49 +337,48 @@ bool KviKvsObject_treewidgetitem::function_setOpen(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled)
 	KVSO_PARAMETERS_END(c)
-	if(m_pListViewItem)
-		m_pListViewItem->setExpanded(bEnabled);
+	if(m_pTreeWidgetItem)
+		m_pTreeWidgetItem->setExpanded(bEnabled);
 	return true;
 }
 
 bool KviKvsObject_treewidgetitem::function_isOpen(KviKvsObjectFunctionCall *c)
 {
-	if(!m_pListViewItem)
+	if(!m_pTreeWidgetItem)
 	{
 		c->returnValue()->setBoolean(false);
 		return true;
 	}
-	c->returnValue()->setBoolean(m_pListViewItem->isExpanded());
+	c->returnValue()->setBoolean(m_pTreeWidgetItem->isExpanded());
 	return true;
 }
 
-
 bool KviKvsObject_treewidgetitem::function_setChecked(KviKvsObjectFunctionCall *c)
 {
 	bool bChecked;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("bChecked",KVS_PT_BOOL,0,bChecked)
 	KVSO_PARAMETERS_END(c)
-	if(!m_pListViewItem)return true;
-//	if(m_pListViewItem->rtti() != 1)return true; // not a QCheckListItem
-	((KviTalTreeWidgetItem *)m_pListViewItem)->setCheckState(0,bChecked?Qt::Checked:Qt::Unchecked);
+	if(!m_pTreeWidgetItem)return true;
+	//if(m_pTreeWidgetItem->rtti() != 1)return true; // not a QCheckListItem
+	((KviTalTreeWidgetItem *)m_pTreeWidgetItem)->setCheckState(0,bChecked?Qt::Checked:Qt::Unchecked);
 	return true;
 }
 
 bool KviKvsObject_treewidgetitem::function_isChecked(KviKvsObjectFunctionCall *c)
 {
-	if(!m_pListViewItem)
+	if(!m_pTreeWidgetItem)
 	{
 		c->returnValue()->setBoolean(false);
 		return true;
 	}
-	/*if(m_pListViewItem->rtti() != 1)
+	/*if(m_pTreeWidgetItem->rtti() != 1)
 	{
 		c->returnValue()->setBoolean(false);
 		return true;
 	}
 	*/
-	c->returnValue()->setBoolean(((KviTalTreeWidgetItem *)m_pListViewItem)->checkState(0)==Qt::Checked?1:0);
+	c->returnValue()->setBoolean(((KviTalTreeWidgetItem *)m_pTreeWidgetItem)->checkState(0)==Qt::Checked?1:0);
 	return true;
 }
 /*
@@ -396,44 +388,44 @@ bool KviKvsObject_treewidgetitem::function_setCheckable(KviKvsObjectFunctionCall
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("bCheckable",KVS_PT_BOOL,0,bCheckable)
 	KVSO_PARAMETERS_END(c)
-	if(!m_pListViewItem)return true;
+	if(!m_pTreeWidgetItem)return true;
 	if(bCheckable)
 	{
-		if(m_pListViewItem->rtti() == 1)return true; // a QCheckListItem already
-		KviTalTreeWidgetItem * pParent = m_pListViewItem->parent();
-		KviTalTreeWidget * pLV = (KviTalTreeWidget *)m_pListViewItem->listView();
+		if(m_pTreeWidgetItem->rtti() == 1)return true; // a QCheckListItem already
+		KviTalTreeWidgetItem * pParent = m_pTreeWidgetItem->parent();
+		KviTalTreeWidget * pLV = (KviTalTreeWidget *)m_pTreeWidgetItem->listView();
 		// swap the items, so we don't die now
-		KviTalTreeWidgetItem * pThis = m_pListViewItem;
-		m_pListViewItem = 0;
+		KviTalTreeWidgetItem * pThis = m_pTreeWidgetItem;
+		m_pTreeWidgetItem = 0;
 		delete pThis;
 		if(pParent)
-			m_pListViewItem = new KviKvsMdmCheckListViewItem(this,pParent);
+			m_pTreeWidgetItem = new KviKvsCheckTreeWidgetItem(this,pParent);
 		else
-			m_pListViewItem = new KviKvsMdmCheckListViewItem(this,pLV);
+			m_pTreeWidgetItem = new KviKvsCheckTreeWidgetItem(this,pLV);
 	} else {
-		if(m_pListViewItem->rtti() != 1)return true; // not a QCheckListItem yet
-		KviTalTreeWidgetItem * pParent = m_pListViewItem->parent();
-		KviTalTreeWidget * pLV = (KviTalTreeWidget *)m_pListViewItem->listView();
+		if(m_pTreeWidgetItem->rtti() != 1)return true; // not a QCheckListItem yet
+		KviTalTreeWidgetItem * pParent = m_pTreeWidgetItem->parent();
+		KviTalTreeWidget * pLV = (KviTalTreeWidget *)m_pTreeWidgetItem->listView();
 		// swap the items, so we don't die now
-		KviTalTreeWidgetItem * pThis = m_pListViewItem;
-		m_pListViewItem = 0;
+		KviTalTreeWidgetItem * pThis = m_pTreeWidgetItem;
+		m_pTreeWidgetItem = 0;
 		delete pThis;
 		if(pParent)
-			m_pListViewItem = new KviKvsMdmStandardListViewItem(this,pParent);
+			m_pTreeWidgetItem = new KviKvsStandardTreeWidgetItem(this,pParent);
 		else
-			m_pListViewItem = new KviKvsMdmStandardListViewItem(this,pLV);
+			m_pTreeWidgetItem = new KviKvsStandardTreeWidgetItem(this,pLV);
 	}
 	return true;
 }
 
 bool KviKvsObject_treewidgetitem::function_isCheckable(KviKvsObjectFunctionCall *c)
 {
-	if(!m_pListViewItem)
+	if(!m_pTreeWidgetItem)
 	{
 		c->returnValue()->setBoolean(false);
 		return true;
 	}
-	c->returnValue()->setBoolean(m_pListViewItem->rtti() == 1);
+	c->returnValue()->setBoolean(m_pTreeWidgetItem->rtti() == 1);
 	return true;
 }
 */
@@ -443,8 +435,8 @@ bool KviKvsObject_treewidgetitem::function_text(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,uCol)
 	KVSO_PARAMETERS_END(c)
-	if(m_pListViewItem)
-		c->returnValue()->setString(m_pListViewItem->text(uCol));
+	if(m_pTreeWidgetItem)
+		c->returnValue()->setString(m_pTreeWidgetItem->text(uCol));
 	return true;
 }
 
@@ -473,17 +465,16 @@ bool KviKvsObject_treewidgetitem::function_setPixmap(KviKvsObjectFunctionCall *c
 		QString szPix;
 		vPixmap->asString(szPix);
 		pix=g_pIconManager->getImage(szPix);
-	    if(!pix)
+		if(!pix)
 		{
 			c->warning(__tr2qs("Error occured: the suitable file '%Q' is not of the correct format or it is not a valid icon number."),&szPix);
 			return true;
 		}
 	}
-	m_pListViewItem->setIcon(uCol,QIcon(*pix));
+	m_pTreeWidgetItem->setIcon(uCol,QIcon(*pix));
 	return true;
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_class_listviewitem.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-
diff --git a/src/modules/objects/class_listviewitem.h b/src/modules/objects/class_treewidgetitem.h
index e7e14fb13..2fa65975c 100644
--- a/src/modules/objects/class_listviewitem.h
+++ b/src/modules/objects/class_treewidgetitem.h
@@ -1,8 +1,8 @@
-#ifndef _CLASS_LISTVIEWITEM_H_
-#define _CLASS_LISTVIEWITEM_H_
+#ifndef _CLASS_TREEWIDGETITEM_H_
+#define _CLASS_TREEWIDGETITEM_H_
 //=============================================================================
 //
-//   File : class_listviewitem.h
+//   File : class_treewidgetitem.h
 //   Creation date : Fri Jan 28 14:21:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -25,13 +25,12 @@
 //
 //=============================================================================
 
-#include "kvi_tal_treewidget.h"
-#include "class_widget.h"
-
-
 
+#include "class_widget.h"
 #include "object_macros.h"
 
+#include "kvi_tal_treewidget.h"
+
 class KviKvsObject_treewidgetitem : public KviKvsObject
 {
 	Q_OBJECT
@@ -39,7 +38,7 @@ public:
 	KVSO_DECLARE_OBJECT(KviKvsObject_treewidgetitem)
 	void childDestroyed();
 protected:
-	KviTalTreeWidgetItem * m_pListViewItem;
+	KviTalTreeWidgetItem * m_pTreeWidgetItem;
 protected:
 	virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
 protected:
@@ -65,29 +64,29 @@ public:
 };
 
 
-
-class KviKvsMdmStandardListViewItem : public KviTalTreeWidgetItem
+class KviKvsStandardTreeWidgetItem : public KviTalTreeWidgetItem
 {
 public:
-	KviKvsMdmStandardListViewItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidget * par);
-	KviKvsMdmStandardListViewItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidgetItem * par);
-	virtual ~KviKvsMdmStandardListViewItem();
+	KviKvsStandardTreeWidgetItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidget * par);
+	KviKvsStandardTreeWidgetItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidgetItem * par);
+	virtual ~KviKvsStandardTreeWidgetItem();
 protected:
 	KviKvsObject_treewidgetitem * m_pMasterObject;
 public:
 	KviKvsObject_treewidgetitem * masterObject(){ return m_pMasterObject; }
 };
+
 /*
-class KviKvsMdmCheckListViewItem : public KviTalCheckListItem
+class KviKvsCheckTreeWidgetItem : public KviTalCheckListItem
 {
 public:
-	KviKvsMdmCheckListViewItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidget * par);
-	KviKvsMdmCheckListViewItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidgetItem * par);
-	virtual ~KviKvsMdmCheckListViewItem();
+	KviKvsCheckTreeWidgetItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidget * par);
+	KviKvsCheckTreeWidgetItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidgetItem * par);
+	virtual ~KviKvsCheckTreeWidgetItem();
 protected:
 	KviKvsObject_treewidgetitem * m_pMasterObject;
 public:
 	KviKvsObject_treewidgetitem * masterObject(){ return m_pMasterObject; }
 };
 */
-#endif	// !_CLASS_LISTVIEWITEM_H_
+#endif // _CLASS_TREEWIDGETITEM_H_
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 275f1a06a..af33d636b 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -33,13 +33,12 @@
 #include "class_buttongroup.h"
 #include "class_hbox.h"
 #include "class_http.h"
+#include "class_label.h"
 #include "class_layout.h"
 #include "class_lcd.h"
 #include "class_lineedit.h"
 #include "class_list.h"
 #include "class_listbox.h"
-#include "class_listview.h"
-#include "class_listviewitem.h"
 #include "class_mainwindow.h"
 #include "class_menubar.h"
 #include "class_multilineedit.h"
@@ -56,7 +55,8 @@
 #include "class_tbrowser.h"
 #include "class_toolbar.h"
 #include "class_toolbutton.h"
-#include "class_label.h"
+#include "class_treewidget.h"
+#include "class_treewidgetitem.h"
 #include "class_vbox.h"
 #include "class_widget.h"
 #include "class_window.h"
@@ -77,7 +77,6 @@
 #include "kvi_out.h"
 #include "kvi_app.h"
 #include "kvi_fileutils.h"
-#include "kvi_tal_listview.h"
 
 #include <QDir>
 #include <QImage>