cleaned tal_treewidget , hopefully re-connecting again all the signal/slot pairs

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

23 files changed, 62 insertions, 70 deletions

diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
index 3f1e6fa91..ba03594a8 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/actioneditor.cpp
@@ -622,7 +622,7 @@ KviActionEditor::KviActionEditor(QWidget * par)
 	m_pTreeWidget->setItemDelegate(itemDelegate);
 	//m_pTreeWidget->setShowSortIndicator(true);
 	m_pTreeWidget->setFocusPolicy(Qt::StrongFocus);
-	connect(m_pTreeWidget,SIGNAL(currentItemChanged(KviTalTreeWidgetItem *,KviTalTreeWidgetItem *)),this,SLOT(currentItemChanged(KviTalTreeWidgetItem *,KviTalTreeWidgetItem *)));
+	connect(m_pTreeWidget,SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),this,SLOT(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)));
 
 	m_pNewActionButton = new QPushButton(__tr2qs("New Action"),box);
 	connect(m_pNewActionButton,SIGNAL(clicked()),this,SLOT(newAction()));
@@ -797,7 +797,7 @@ bool KviActionEditor::actionExists(const QString &szName)
 }
 
 
-void KviActionEditor::currentItemChanged(KviTalTreeWidgetItem * i,KviTalTreeWidgetItem *prev)
+void KviActionEditor::currentItemChanged(QTreeWidgetItem * i,QTreeWidgetItem *prev)
 {
 	if(m_pSingleActionEditor->actionData())
 		m_pSingleActionEditor->commit();
diff --git a/src/modules/actioneditor/actioneditor.h b/src/modules/actioneditor/actioneditor.h
index 2084bbd65..c0a41a0e0 100644
--- a/src/modules/actioneditor/actioneditor.h
+++ b/src/modules/actioneditor/actioneditor.h
@@ -173,7 +173,7 @@ protected:
 	int selectedCount();
 	QString nameForAutomaticAction(const QString &szTemplate);
 protected slots:
-	void currentItemChanged(KviTalTreeWidgetItem * it,KviTalTreeWidgetItem *prev);
+	void currentItemChanged(QTreeWidgetItem * it,QTreeWidgetItem *prev);
 	void newAction();
 	void deleteActions();
 	void exportActions();
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index 8fb58534b..986575cd4 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -208,7 +208,7 @@ KviListWindow::KviListWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 	m_pTreeWidget->setAllColumnsShowFocus(TRUE);
 	m_pTreeWidget->sortItems(0,Qt::AscendingOrder);
 
-	connect(m_pTreeWidget,SIGNAL(itemDoubleClicked(KviTalTreeWidgetItem *, int)),this,SLOT(itemDoubleClicked(KviTalTreeWidgetItem *, int)));
+	connect(m_pTreeWidget,SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)),this,SLOT(itemDoubleClicked(QTreeWidgetItem *, int)));
 
 	m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this);
 
diff --git a/src/modules/list/listwindow.h b/src/modules/list/listwindow.h
index 125917cb1..1a32d2480 100644
--- a/src/modules/list/listwindow.h
+++ b/src/modules/list/listwindow.h
@@ -112,7 +112,7 @@ protected:
 	virtual void getBaseLogFileName(KviStr &buffer);
 protected slots:
 	void flush();
-	void itemDoubleClicked(KviTalTreeWidgetItem *it, int);
+	void itemDoubleClicked(QTreeWidgetItem *it, int);
 	void requestList();
 	void stoplistdownload();
 	void connectionStateChange();
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index 1490ab8ec..b6590e172 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -78,7 +78,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 
 	m_pListView = new KviLogViewListView(m_pIndexTab);
 
-	connect(m_pListView,SIGNAL(currentItemChanged(KviTalTreeWidgetItem *,KviTalTreeWidgetItem *)),this,SLOT(itemSelected(KviTalTreeWidgetItem *,KviTalTreeWidgetItem *)));
+	connect(m_pListView,SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),this,SLOT(itemSelected(QTreeWidgetItem *,QTreeWidgetItem *)));
 	connect(m_pListView,SIGNAL(rightButtonPressed(QTreeWidgetItem *,QPoint)),
 		this,SLOT(rightButtonClicked(QTreeWidgetItem *,QPoint)));
 
diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/logviewmdiwindow.h
index 489893dad..d91df4d6f 100644
--- a/src/modules/logview/logviewmdiwindow.h
+++ b/src/modules/logview/logviewmdiwindow.h
@@ -132,7 +132,7 @@ protected:
 	virtual QSize sizeHint() const;
 protected slots:
 	void rightButtonClicked ( QTreeWidgetItem *, const QPoint &);
-	void itemSelected(KviTalTreeWidgetItem * it, KviTalTreeWidgetItem *);
+	void itemSelected(QTreeWidgetItem * it, QTreeWidgetItem *);
 	void deleteCurrent();
 	void applyFilter();
 };
diff --git a/src/modules/objects/class_treewidget.cpp b/src/modules/objects/class_treewidget.cpp
index 1f248f213..e07dd33d0 100644
--- a/src/modules/objects/class_treewidget.cpp
+++ b/src/modules/objects/class_treewidget.cpp
@@ -245,15 +245,15 @@ bool KviKvsObject_treewidget::init(KviKvsRunTimeContext * pContext,KviKvsVariant
 	// hack for compatibility with "old" addColumn method;
 	((KviTalTreeWidget*) widget())->setColumnCount(0);
 	
-	connect(widget(),SIGNAL(itemClicked(KviTalTreeWidgetItem *,int)),this,SLOT(slotClicked(KviTalTreeWidgetItem *,int)));
+	connect(widget(),SIGNAL(itemClicked(QTreeWidgetItem *,int)),this,SLOT(slotClicked(QTreeWidgetItem *,int)));
 	connect(widget(),SIGNAL(itemSelectionChanged()),this,SLOT(slotSelectionChanged()));
-	connect(widget(),SIGNAL(currentItemChanged(KviTalTreeWidgetItem *,KviTalTreeWidgetItem *)),this,SLOT(slotCurrentChanged(KviTalTreeWidgetItem *,KviTalTreeWidgetItem *)));
-	connect(widget(),SIGNAL(itemActivated(KviTalTreeWidgetItem *,int)),this,SLOT(slotItemActivated(KviTalTreeWidgetItem *,int)));
-	connect(widget(),SIGNAL(itemEntered(KviTalTreeWidgetItem *,int)),this,SLOT(slotOnItemEntered(KviTalTreeWidgetItem *,int)));
-	connect(widget(),SIGNAL(itemExpanded(KviTalTreeWidgetItem *)),this,SLOT(slotItemExpanded(KviTalTreeWidgetItem *)));
-	connect(widget(),SIGNAL(itemCollapsed(KviTalTreeWidgetItem *)),this,SLOT(slotItemCollapsed(KviTalTreeWidgetItem *)));
-	//connect(widget(),SIGNAL(rightButtonClicked(KviTalTreeWidgetItem *,const QPoint &,int)),this,SLOT(slotRightButtonClicked(KviTalTreeWidgetItem *,const QPoint &,int)));
-	connect(widget(),SIGNAL(itemChanged(KviTalTreeWidgetItem *,int)),this,SLOT(slotItemChanged(KviTalTreeWidgetItem *,int)));
+	connect(widget(),SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),this,SLOT(slotCurrentChanged(QTreeWidgetItem *,QTreeWidgetItem *)));
+	connect(widget(),SIGNAL(itemActivated(QTreeWidgetItem *,int)),this,SLOT(slotItemActivated(QTreeWidgetItem *,int)));
+	connect(widget(),SIGNAL(itemEntered(QTreeWidgetItem *,int)),this,SLOT(slotOnItemEntered(QTreeWidgetItem *,int)));
+	connect(widget(),SIGNAL(itemExpanded(QTreeWidgetItem *)),this,SLOT(slotItemExpanded(QTreeWidgetItem *)));
+	connect(widget(),SIGNAL(itemCollapsed(QTreeWidgetItem *)),this,SLOT(slotItemCollapsed(QTreeWidgetItem *)));
+	//connect(widget(),SIGNAL(rightButtonClicked(QTreeWidgetItem *,const QPoint &,int)),this,SLOT(slotRightButtonClicked(QTreeWidgetItem *,const QPoint &,int)));
+	connect(widget(),SIGNAL(itemChanged(QTreeWidgetItem *,int)),this,SLOT(slotItemChanged(QTreeWidgetItem *,int)));
 	
 	widget()->setContextMenuPolicy(Qt::CustomContextMenu);
 	connect(widget(),SIGNAL(customContextMenuRequested(const QPoint &)),this,SLOT(slotCustomContextMenuRequested(const QPoint &)));
diff --git a/src/modules/objects/class_treewidget.h b/src/modules/objects/class_treewidget.h
index 08620169c..e53df62b9 100644
--- a/src/modules/objects/class_treewidget.h
+++ b/src/modules/objects/class_treewidget.h
@@ -73,12 +73,12 @@ protected slots:
 	void slotClicked(KviTalTreeWidgetItem *,int);
 	void slotCustomContextMenuRequested(const QPoint &pnt);
 	void slotSelectionChanged();
-	void slotCurrentChanged(KviTalTreeWidgetItem *,KviTalTreeWidgetItem *);
-	void slotItemActivated(KviTalTreeWidgetItem *,int col);
-	void slotOnItemEntered(KviTalTreeWidgetItem *,int col);
-	void slotItemExpanded(KviTalTreeWidgetItem *);
-	void slotItemCollapsed(KviTalTreeWidgetItem *);
-	void slotItemChanged(KviTalTreeWidgetItem *,int);
+	void slotCurrentChanged(QTreeWidgetItem *,QTreeWidgetItem *);
+	void slotItemActivated(QTreeWidgetItem *,int col);
+	void slotOnItemEntered(QTreeWidgetItem *,int col);
+	void slotItemExpanded(QTreeWidgetItem *);
+	void slotItemCollapsed(QTreeWidgetItem *);
+	void slotItemChanged(QTreeWidgetItem *,int);
 };
 
 class KviKvsTreeWidget : public KviTalTreeWidget
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 5df1f2934..f59c068f4 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -180,7 +180,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	m_pTreeWidget->setRootIsDecorated(true);
 	m_pTreeWidget->setSortingEnabled(false);
 
-	connect(m_pTreeWidget,SIGNAL(currentItemChanged(KviTalTreeWidgetItem*, KviTalTreeWidgetItem *)),this,SLOT(treeWidgetItemSelectionChanged(KviTalTreeWidgetItem *, KviTalTreeWidgetItem *)));
+	connect(m_pTreeWidget,SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem *)),this,SLOT(treeWidgetItemSelectionChanged(QTreeWidgetItem *, QTreeWidgetItem *)));
 
 	KviTalHBox * hbox = new KviTalHBox(vbox);
 	hbox->setSpacing(2);
diff --git a/src/modules/options/dialog.h b/src/modules/options/dialog.h
index d3f82f0a9..be213fb04 100644
--- a/src/modules/options/dialog.h
+++ b/src/modules/options/dialog.h
@@ -80,7 +80,7 @@ private:
 	//KviOptionsTreeWidgetItem * showHiddenChildren(KviTalTreeWidgetItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
 	//KviOptionsTreeWidgetItem * findItemByPage(KviOptionsTreeWidgetItem *it,KviOptionsWidget * pPage);
 private slots:
-	void treeWidgetItemSelectionChanged(KviTalTreeWidgetItem* it, KviTalTreeWidgetItem *prev);
+	void treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTreeWidgetItem *prev);
 	void applyClicked();
 	void okClicked();
 	void cancelClicked();
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index 241fa3736..c85d1c823 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -80,7 +80,7 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent)
 	m_pTreeWidget->setHeaderLabels(columnLabels);
 	m_pTreeWidget->setAllColumnsShowFocus(true);
 	m_pTreeWidget->setRootIsDecorated(false);
-	connect(m_pTreeWidget,SIGNAL(currentItemChanged(KviTalTreeWidgetItem *,KviTalTreeWidgetItem *)),this,SLOT(currentItemChanged(KviTalTreeWidgetItem *,KviTalTreeWidgetItem *)));
+	connect(m_pTreeWidget,SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),this,SLOT(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)));
 
 	layout()->addWidget(m_pTreeWidget,0,0,1,3);
 //	layout()->addMultiCellWidget(m_pTreeWidget,0,0,0,2);
@@ -222,7 +222,7 @@ void KviMediaTypesOptionsWidget::setLineEdits()
 	m_pIcon->setText(m_pLastItem ? m_pLastItem->data()->szIcon.ptr() : "");
 }
 
-void KviMediaTypesOptionsWidget::currentItemChanged(KviTalTreeWidgetItem *it,KviTalTreeWidgetItem *prev)
+void KviMediaTypesOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *prev)
 {
 	saveLastItem();
 	m_pLastItem = (KviMediaTypeTreeWidgetItem *)it;
diff --git a/src/modules/options/optw_mediatypes.h b/src/modules/options/optw_mediatypes.h
index 6aacba699..ae1d43b66 100644
--- a/src/modules/options/optw_mediatypes.h
+++ b/src/modules/options/optw_mediatypes.h
@@ -75,7 +75,7 @@ private:
 	void enableOrDisable();
 	void setLineEdits();
 private slots:
-	void currentItemChanged(KviTalTreeWidgetItem *it,KviTalTreeWidgetItem *prev);
+	void currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *prev);
 	void newMediaType();
 	void delMediaType();
 public:
diff --git a/src/modules/options/optw_protection.cpp b/src/modules/options/optw_protection.cpp
index 6c22dff87..df211c245 100644
--- a/src/modules/options/optw_protection.cpp
+++ b/src/modules/options/optw_protection.cpp
@@ -36,12 +36,6 @@ KviProtectionOptionsWidget::KviProtectionOptionsWidget(QWidget * parent)
 	setObjectName("protection_options_widget");
 
 	createLayout();
-
-	QLabel * l;
-	l = addLabel(0,0,0,0,__tr2qs_ctx("This section contains irc protection tools<br>"\
-		"<p>like<b> flood, ignore, antispam. </b> " \
-		"</p>","options"));
-
 }
 
 KviProtectionOptionsWidget::~KviProtectionOptionsWidget()
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 5cd2b5bee..22d5ac885 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -72,8 +72,8 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
 	m_pTreeWidget->setAllColumnsShowFocus(true);
 	m_pTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
 
-	connect(m_pTreeWidget,SIGNAL(currentItemChanged(KviTalTreeWidgetItem *,KviTalTreeWidgetItem *)),
-		this,SLOT(currentItemChanged(KviTalTreeWidgetItem *,KviTalTreeWidgetItem *)));
+	connect(m_pTreeWidget,SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),
+		this,SLOT(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)));
 	m_pTreeWidget->setContextMenuPolicy(Qt::CustomContextMenu);
 	connect(m_pTreeWidget,SIGNAL(customContextMenuRequested(const QPoint &)),
 			this,SLOT(customContextMenuRequested(const QPoint &)));
@@ -170,7 +170,7 @@ void KviProxyOptionsWidget::fillProxyList()
 	if(!(g_pProxyDataBase->currentProxy()))currentItemChanged(0,0);
 }
 
-void KviProxyOptionsWidget::currentItemChanged(KviTalTreeWidgetItem *it,KviTalTreeWidgetItem *prev)
+void KviProxyOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *prev)
 {
 	if(m_pLastEditedItem)saveLastItem();
 	m_pLastEditedItem = (KviProxyOptionsTreeWidgetItem *)it;
diff --git a/src/modules/options/optw_proxy.h b/src/modules/options/optw_proxy.h
index d979b27b5..0eb5a1779 100644
--- a/src/modules/options/optw_proxy.h
+++ b/src/modules/options/optw_proxy.h
@@ -83,7 +83,7 @@ private:
 	void fillProxyList();
 	void saveLastItem();
 protected slots:
-	void currentItemChanged(KviTalTreeWidgetItem *it,KviTalTreeWidgetItem *prev);
+	void currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *prev);
 	void customContextMenuRequested(const QPoint &pnt);
 	void newProxy();
 	void removeCurrent();
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 3aa48e8a9..bd2df9341 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -1074,11 +1074,11 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	m_pTreeWidget->setContextMenuPolicy(Qt::CustomContextMenu);
 	connect(m_pTreeWidget,SIGNAL(customContextMenuRequested(const QPoint &)),
 		this,SLOT(customContextMenuRequested(const QPoint &)));
-	connect(m_pTreeWidget,SIGNAL(currentItemChanged(KviTalTreeWidgetItem *,KviTalTreeWidgetItem *)),
-		this,SLOT(currentItemChanged(KviTalTreeWidgetItem *,KviTalTreeWidgetItem *)));
+	connect(m_pTreeWidget,SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),
+		this,SLOT(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)));
 
-	connect(m_pTreeWidget,SIGNAL(itemDoubleClicked(KviTalTreeWidgetItem*, int )),
-		this,SLOT(itemDoubleClicked(KviTalTreeWidgetItem*, int )));
+	connect(m_pTreeWidget,SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int )),
+		this,SLOT(itemDoubleClicked(QTreeWidgetItem*, int )));
 
 	QString tiptxt = __tr2qs_ctx("<center>This is the list of available IRC servers.<br>" \
 			"Right-click on the list to add or remove servers and perform other actions.<br>"\
@@ -1320,12 +1320,12 @@ void KviServerOptionsWidget::fillServerList()
 	}
 }
 
-void KviServerOptionsWidget::itemDoubleClicked(KviTalTreeWidgetItem*, int )
+void KviServerOptionsWidget::itemDoubleClicked(QTreeWidgetItem*, int )
 {
 	detailsClicked();
 }
 
-void KviServerOptionsWidget::currentItemChanged(KviTalTreeWidgetItem *it,KviTalTreeWidgetItem *prev)
+void KviServerOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *prev)
 {
 	saveLastItem();
 	m_pLastEditedItem = (KviServerOptionsTreeWidgetItem *)it;
diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h
index 76324d66b..64a053737 100644
--- a/src/modules/options/optw_servers.h
+++ b/src/modules/options/optw_servers.h
@@ -192,7 +192,7 @@ protected slots:
 	void importerDead();
 	void importServer(const KviServer & s,const QString &network);
 	void importPopupAboutToShow();
-	void currentItemChanged(KviTalTreeWidgetItem *cur,KviTalTreeWidgetItem *prev);
+	void currentItemChanged(QTreeWidgetItem *cur,QTreeWidgetItem *prev);
 	void customContextMenuRequested(const QPoint &pnt);
 	void newNetwork();
 	void removeCurrent();
@@ -200,7 +200,7 @@ protected slots:
 	void copyServer();
 	void pasteServer();
 	void clearList();
-	void itemDoubleClicked(KviTalTreeWidgetItem*, int );
+	void itemDoubleClicked(QTreeWidgetItem*, int );
 	void detailsClicked();
 	void connectCurrentClicked();
 	void recentServersPopupAboutToShow();
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index ddcc3bf99..6aa308f87 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -216,8 +216,8 @@ KviSinglePopupEditor::KviSinglePopupEditor(QWidget * par)
 	m_pTreeWidget->setSortingEnabled(false);
 
 	connect(m_pTreeWidget,SIGNAL(itemSelectionChanged()),this,SLOT(selectionChanged()));
-	connect(m_pTreeWidget,SIGNAL(itemPressed(KviTalTreeWidgetItem *, int)),
-		this,SLOT(itemPressed(KviTalTreeWidgetItem *, int)));
+	connect(m_pTreeWidget,SIGNAL(itemPressed(QTreeWidgetItem *, int)),
+		this,SLOT(itemPressed(QTreeWidgetItem *, int)));
 
 	
 
@@ -1077,9 +1077,9 @@ void KviPopupEditor::oneTimeSetup()
 		++it;
 	}
 
-	connect(m_pTreeWidget,SIGNAL(currentItemChanged(KviTalTreeWidgetItem *,KviTalTreeWidgetItem *)),this,SLOT(currentItemChanged(KviTalTreeWidgetItem *,KviTalTreeWidgetItem *)));
-	connect(m_pTreeWidget,SIGNAL(itemPressed(KviTalTreeWidgetItem *, int)),
-		this,SLOT(itemPressed(KviTalTreeWidgetItem *, int)));
+	connect(m_pTreeWidget,SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),this,SLOT(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)));
+	connect(m_pTreeWidget,SIGNAL(itemPressed(QTreeWidgetItem *, int)),
+		this,SLOT(itemPressed(QTreeWidgetItem *, int)));
 }
 
 void KviPopupEditor::itemPressed(KviTalTreeWidgetItem * it, int)
@@ -1220,7 +1220,7 @@ void KviPopupEditor::saveLastEditedItem()
 	m_pLastEditedItem->setText(0,m->popupName());
 }
 
-void KviPopupEditor::currentItemChanged(KviTalTreeWidgetItem *it,KviTalTreeWidgetItem *prev)
+void KviPopupEditor::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *prev)
 {
 	saveLastEditedItem();
 
diff --git a/src/modules/popupeditor/popupeditor.h b/src/modules/popupeditor/popupeditor.h
index 1aa8285b0..a5de9cb9e 100644
--- a/src/modules/popupeditor/popupeditor.h
+++ b/src/modules/popupeditor/popupeditor.h
@@ -124,7 +124,7 @@ protected slots:
 	void contextNewPrologue();
 	void contextNewEpilogue();
 	void selectionChanged();
-	void itemPressed(KviTalTreeWidgetItem * item, int column);
+	void itemPressed(QTreeWidgetItem * item, int column);
 	void testPopup();
 	void testModeMenuItemClicked(KviKvsPopupMenuItem * it);
 };
@@ -161,7 +161,7 @@ public:
 	void commit();
 	void exportPopups(bool);
 protected slots:
-	void currentItemChanged(KviTalTreeWidgetItem *it,KviTalTreeWidgetItem *prev);
+	void currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *prev);
 	void newPopup();
 	void exportAll();
 	void exportSelected();
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index c137204d1..fef65fb99 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -101,7 +101,7 @@ void KviRegisteredUsersListView::mousePressEvent (QMouseEvent *e)
 {
 	if (e->button() == Qt::RightButton)
 	{
-		KviTalTreeWidgetItem *i= (KviTalTreeWidgetItem*)itemAt(e->pos());
+		QTreeWidgetItem *i= itemAt(e->pos());
 		if (i) emit rightButtonPressed(i,QCursor::pos());
 	}
 	KviTalTreeWidget::mousePressEvent(e);
@@ -221,8 +221,8 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(QWidget * par)
 	m_pListView = new KviRegisteredUsersListView(this);
 	m_pListView->setItemDelegate(new KviRegisteredUsersDialogItemDelegate());
 
-	connect(m_pListView,SIGNAL(itemPressed(KviTalTreeWidgetItem *,int)),this,SLOT(itemPressed(KviTalTreeWidgetItem *,int)));
-	connect(m_pListView,SIGNAL(itemDoubleClicked(KviTalTreeWidgetItem *, int)),this,SLOT(itemDoubleClicked(KviTalTreeWidgetItem *, int)));
+	connect(m_pListView,SIGNAL(itemPressed(QTreeWidgetItem *,int)),this,SLOT(itemPressed(QTreeWidgetItem *,int)));
+	connect(m_pListView,SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)),this,SLOT(itemDoubleClicked(QTreeWidgetItem *, int)));
 
 	g->addWidget(m_pListView,0,0,2,2);
 
@@ -297,7 +297,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(QWidget * par)
 	g->setRowStretch(1,1);
 
 	connect(m_pListView,SIGNAL(itemSelectionChanged()),this,SLOT(selectionChanged()));
-	connect(m_pListView,SIGNAL(rightButtonPressed(KviTalTreeWidgetItem *, QPoint)),this,SLOT(listViewRightButtonClicked(KviTalTreeWidgetItem *, QPoint)));
+	connect(m_pListView,SIGNAL(rightButtonPressed(QTreeWidgetItem *, QPoint)),this,SLOT(rightButtonPressed(QTreeWidgetItem *, QPoint)));
 
 	fillList();
 
@@ -428,7 +428,7 @@ void KviRegisteredUsersDialog::editGroup(KviRegisteredUserGroup* group)
 }
 
 
-void KviRegisteredUsersDialog::listViewRightButtonClicked ( KviTalTreeWidgetItem * pItem, QPoint pnt)
+void KviRegisteredUsersDialog::rightButtonPressed ( QTreeWidgetItem * pItem, QPoint pnt)
 {
 	if(pItem)
 	{
diff --git a/src/modules/reguser/dialog.h b/src/modules/reguser/dialog.h
index 2376b9ddf..f136b81a6 100644
--- a/src/modules/reguser/dialog.h
+++ b/src/modules/reguser/dialog.h
@@ -48,7 +48,7 @@ public:
 protected:
 	void mousePressEvent (QMouseEvent *e);
 signals:
-	void rightButtonPressed(KviTalTreeWidgetItem *,QPoint);
+	void rightButtonPressed(QTreeWidgetItem *,QPoint);
 };
 
 class KviRegisteredUsersDialogItemDelegate : public QItemDelegate
@@ -132,15 +132,11 @@ public:
 	QPushButton * m_pExportButton;
 	QPushButton * m_pAddGroupButton;
 	QMultiHash<int, KviRegisteredUserGroup*> m_TmpDict;
-protected slots:
-	void itemPressed(KviTalTreeWidgetItem *it,int c);
-	void itemDoubleClicked(KviTalTreeWidgetItem *it, int);
 protected:
 	void fillList();
-protected:
-	virtual void closeEvent(QCloseEvent *);
 	void editItem(KviRegisteredUsersDialogItem * i);
 	void editGroup(KviRegisteredUserGroup* group);
+	virtual void closeEvent(QCloseEvent *);
 protected slots:
 	void cancelClicked();
 	void okClicked();
@@ -152,7 +148,9 @@ protected slots:
 	void exportClicked();
 	void addWizardClicked();
 	void addGroupClicked();
-	void listViewRightButtonClicked ( KviTalTreeWidgetItem *, QPoint);
+	void itemPressed(QTreeWidgetItem *it,int c);
+	void itemDoubleClicked(QTreeWidgetItem *it, int);
+	void rightButtonPressed ( QTreeWidgetItem *, QPoint);
 	void moveToGroupMenuClicked(int);
 };
 
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index c4c53ffcf..f4772e007 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -92,7 +92,7 @@ void KviUrlDialogTreeWidget::mousePressEvent (QMouseEvent *e)
 {
 	if (e->button() == Qt::RightButton)
 	{
-		KviTalTreeWidgetItem *i= (KviTalTreeWidgetItem*)itemAt(e->pos());
+		QTreeWidgetItem *i= itemAt(e->pos());
 		if (i) emit rightButtonPressed(i,QCursor::pos());
 	}
 	KviTalTreeWidget::mousePressEvent(e);
@@ -165,8 +165,8 @@ UrlDialog::UrlDialog(KviPointerList<KviUrl> *g_pList)
 	m_pUrlList->setColumnWidth(2,cfg.readIntEntry("Count",70));
 	m_pUrlList->setColumnWidth(3,cfg.readIntEntry("Timestamp",70));
 
-	connect(m_pUrlList,SIGNAL(itemDoubleClicked(KviTalTreeWidgetItem *, int)),SLOT(dblclk_url(KviTalTreeWidgetItem *, int)));
-	connect(m_pUrlList,SIGNAL(rightButtonPressed(KviTalTreeWidgetItem *, const QPoint &)),SLOT(popup(KviTalTreeWidgetItem *, const QPoint &)));
+	connect(m_pUrlList,SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)),SLOT(dblclk_url(QTreeWidgetItem *, int)));
+	connect(m_pUrlList,SIGNAL(rightButtonPressed(QTreeWidgetItem *, const QPoint &)),SLOT(popup(QTreeWidgetItem *, const QPoint &)));
 
 //	setFocusHandlerNoChildren(m_pUrlList);
 	m_pUrlList->setFocusPolicy(Qt::StrongFocus);
diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h
index 493416541..dd65b0081 100644
--- a/src/modules/url/libkviurl.h
+++ b/src/modules/url/libkviurl.h
@@ -62,7 +62,7 @@ public:
 protected:
 	void mousePressEvent (QMouseEvent *e);
 signals:
-	void rightButtonPressed(KviTalTreeWidgetItem *,QPoint);
+	void rightButtonPressed(QTreeWidgetItem *,QPoint);
 };
 
 class UrlDialog : public KviWindow
@@ -91,8 +91,8 @@ protected slots:
 	void close_slot();
 	void remove();
 	void findtext();
-	void dblclk_url(KviTalTreeWidgetItem *item, int);
-	void popup(KviTalTreeWidgetItem *item, const QPoint &p);
+	void dblclk_url(QTreeWidgetItem *item, int);
+	void popup(QTreeWidgetItem *item, const QPoint &p);
 	void sayToWin(QAction * act);
 };