removed some helper structs used for qt4/qt3 compatibility

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

12 files changed, 77 insertions, 69 deletions

diff --git a/src/kvilib/tal/kvi_tal_treewidget.h b/src/kvilib/tal/kvi_tal_treewidget.h
index 5a7204511..3f6d8636e 100644
--- a/src/kvilib/tal/kvi_tal_treewidget.h
+++ b/src/kvilib/tal/kvi_tal_treewidget.h
@@ -42,8 +42,6 @@ public:
 	KviTalTreeWidget(QWidget * pParent);
 	virtual ~KviTalTreeWidget() {};
 public:
-	void addColumn(const QString label){ setHeaderLabel(label); };
-	void addColumn(const QString label, const int width ){ setHeaderLabel(label); setColumnWidth(0, width); };
 	inline KviTalTreeWidgetItem* topLevelItem(int i) { return (KviTalTreeWidgetItem*) QTreeWidget::topLevelItem(i); }
 signals:
 	void currentItemChanged(KviTalTreeWidgetItem *,KviTalTreeWidgetItem *);
@@ -87,46 +85,6 @@ public:
 	KviTalTreeWidgetItem(KviTalTreeWidgetItem * pParent, KviTalTreeWidgetItem * preceding)
 	: QTreeWidgetItem(pParent, preceding) {};
 
-	KviTalTreeWidgetItem(KviTalTreeWidgetItem * pParent,const QString &szLabel, const QString &szLabel1 = QString(), const QString &szLabel2 = QString(), const QString &szLabel3 = QString(), const QString &szLabel4 = QString())
-	: QTreeWidgetItem(pParent) {
-		setText(0,szLabel);
-		if(!szLabel1.isEmpty())
-		{
-			setText(1,szLabel1);
-			if(!szLabel2.isEmpty())
-			{
-				setText(2,szLabel2);
-				if(!szLabel3.isEmpty())
-				{
-					setText(3,szLabel3);
-					if(!szLabel4.isEmpty())
-					{
-						setText(4,szLabel4);
-					}
-				}
-			}
-		}
-	};
-	KviTalTreeWidgetItem(KviTalTreeWidget * pParent,const QString &szLabel, const QString &szLabel1 = QString(), const QString &szLabel2 = QString(), const QString &szLabel3 = QString(), const QString &szLabel4 = QString())
-	: QTreeWidgetItem(pParent) {
-		setText(0,szLabel);
-		if(!szLabel1.isEmpty())
-		{
-			setText(1,szLabel1);
-			if(!szLabel2.isEmpty())
-			{
-				setText(2,szLabel2);
-				if(!szLabel3.isEmpty())
-				{
-					setText(3,szLabel3);
-					if(!szLabel4.isEmpty())
-					{
-						setText(4,szLabel4);
-					}
-				}
-			}
-		}
-	};
 	virtual ~KviTalTreeWidgetItem() {};
 	int compare ( KviTalTreeWidgetItem * i, int col, bool ascending ) const
 	{
diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp
index cd573b0bd..9fe382b2d 100644
--- a/src/kvirc/ui/kvi_selectors.cpp
+++ b/src/kvirc/ui/kvi_selectors.cpp
@@ -693,11 +693,12 @@ void KviSoundSelector::setEnabled(bool bEnabled)
 }
 
 KviChanTreeViewItem::KviChanTreeViewItem(KviTalTreeWidget* pList,QString szChan,QString szPass)
-:KviTalTreeWidgetItem(pList,szChan)
+:KviTalTreeWidgetItem(pList)
 {
 	m_szPass=szPass;
 	QString mask;
 	mask.fill('*',szPass.length());
+	setText(0,szChan);
 	setText(1,mask);
 }
 
diff --git a/src/kvirc/ui/kvi_windowlist_tree.cpp b/src/kvirc/ui/kvi_windowlist_tree.cpp
index 9056c07a5..d3b43e618 100644
--- a/src/kvirc/ui/kvi_windowlist_tree.cpp
+++ b/src/kvirc/ui/kvi_windowlist_tree.cpp
@@ -369,7 +369,8 @@ KviTreeWindowList::KviTreeWindowList()
 : KviWindowListBase()
 {
 	m_pTreeWidget = new KviTreeWindowListTreeWidget(this);
-	m_pTreeWidget->addColumn(__tr2qs("Window List"),135);
+	m_pTreeWidget->setHeaderLabel(__tr2qs("Window List"));
+	m_pTreeWidget->setColumnWidth(0,135);
 	setWidget(m_pTreeWidget);
 
 	//ad-hoc itemdelegate for this view
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index cd22fdfad..4e514480f 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -64,7 +64,7 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(QWidget * par, const char * name)
 	QGridLayout * g = new QGridLayout(this);
 	
 	m_pTreeWidget = new KviTalTreeWidget(this);
-	m_pTreeWidget->addColumn(__tr2qs("Channel"));
+	m_pTreeWidget->setHeaderLabel(__tr2qs("Channel"));
 	m_pTreeWidget->setRootIsDecorated(true);
 	m_pTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
 	g->addWidget(m_pTreeWidget,0,0,1,2);
@@ -161,7 +161,8 @@ void KviChannelsJoinWindow::fillListView()
 
 	m_pTreeWidget->header()->hide();
 
-	KviTalTreeWidgetItem * par = new KviTalTreeWidgetItem(m_pTreeWidget,__tr2qs("Recent Channels"));
+	KviTalTreeWidgetItem * par = new KviTalTreeWidgetItem(m_pTreeWidget);
+	par->setText(0,__tr2qs("Recent Channels"));
 	par->setExpanded(true);
 	KviTalTreeWidgetItem * chld;
 	
@@ -172,13 +173,15 @@ void KviChannelsJoinWindow::fillListView()
 		{
 			for(QStringList::Iterator it = pList->begin(); it != pList->end(); ++it)
 			{
-				chld = new KviTalTreeWidgetItem(par,*it);
+				chld = new KviTalTreeWidgetItem(par);
+				chld->setText(0,*it);
 				chld->setIcon(0,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)));
 			}
 		}
 	}
 
-	par = new KviTalTreeWidgetItem(m_pTreeWidget,__tr2qs("Registered Channels"));
+	par = new KviTalTreeWidgetItem(m_pTreeWidget);
+	par->setText(0,__tr2qs("Registered Channels"));
 	par->setExpanded(true);
 
 	KviPointerHashTable<const char *,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict();
@@ -187,7 +190,8 @@ void KviChannelsJoinWindow::fillListView()
 		KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*d);
 		while(it.current())
 		{
-			chld = new KviTalTreeWidgetItem(par,it.currentKey());
+			chld = new KviTalTreeWidgetItem(par);
+			chld->setText(0,it.currentKey());
 			chld->setIcon(0,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)));
 			++it;
 		}
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index f93b1cab4..43b6d7b1c 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -219,8 +219,13 @@ void KviLinksWindow::endOfLinks()
 	m_pListView->setUpdatesEnabled(false);
 	for(KviLink *l=m_pLinkList->first();l;l=m_pLinkList->next()){
 		totalHosts++;
-		if(l->hops == 0)root = new KviTalTreeWidgetItem(m_pListView,QString(l->host.ptr()),QString("0"),QString(l->description.ptr()));
-		else {
+		if(l->hops == 0)
+		{
+			root = new KviTalTreeWidgetItem(m_pListView);
+			root->setText(0,QString(l->host.ptr()));
+			root->setText(1,QString("0"));
+			root->setText(2,QString(l->description.ptr()));
+		} else {
 			totalHops += l->hops;
 			if(l->hops < 4){
 				nearLinks++;
@@ -237,17 +242,26 @@ void KviLinksWindow::endOfLinks()
 			}
 			if(l->host.contains('*'))wildServers++;
 			it = insertLink(l);
-			if(!it){
+			if(!it)
+			{
 				output(KVI_OUT_SYSTEMERROR,__tr2qs("Broken link: Missing parent (%s) for %s (%d hops): %s (used /LINKS <mask> ?)"),
 					l->parent.ptr(),l->host.ptr(),l->hops,l->description.ptr());
 				brokenLinks++;
 				QString tmp;
 				KviQString::sprintf(tmp,__tr2qs("%s: Parent link %s"),l->description.ptr(),l->parent.ptr());
 				KviStr tmp2(KviStr::Format,"%d",l->hops);
-				if(root)it = new KviTalTreeWidgetItem(root,QString(l->host.ptr()),QString(tmp2.ptr()),tmp);
-				else {
+				if(root)
+				{
+					it = new KviTalTreeWidgetItem(root);
+					it->setText(0,QString(l->host.ptr()));
+					it->setText(1,QString(tmp2.ptr()));
+					it->setText(2,tmp);
+				} else {
 					outputNoFmt(KVI_OUT_SYSTEMERROR,__tr2qs("Warning: No root link was sent by the server, the stats may be invalid."));
-					it = new KviTalTreeWidgetItem(m_pListView,QString(l->host.ptr()),QString(tmp2.ptr()),tmp);
+					it = new KviTalTreeWidgetItem(m_pListView);
+					it->setText(0,QString(l->host.ptr()));
+					it->setText(1,QString(tmp2.ptr()));
+					it->setText(2,tmp);
 				}
 			} else {
 				it = (KviTalTreeWidgetItem*) it->parent();
@@ -317,10 +331,15 @@ KviTalTreeWidgetItem * KviLinksWindow::insertLink(KviLink *l)
 	__range_valid(l->hops > 0);
 	KviTalTreeWidgetItem * i = getItemByHost(l->parent.ptr(),0);
 	KviTalTreeWidgetItem * it = 0;
-	if(!i)return 0;
-	else {
+	if(!i)
+	{
+		return 0;
+	} else {
 		KviStr hops(KviStr::Format,"%d",l->hops);
-		it = new KviTalTreeWidgetItem(i,QString(l->host.ptr()),QString(hops.ptr()),QString(l->description.ptr()));
+		it = new KviTalTreeWidgetItem(i);
+		it->setText(0,QString(l->host.ptr()));
+		it->setText(1,QString(hops.ptr()));
+		it->setText(2,QString(l->description.ptr()));
 		i->setExpanded(true);
 	}
 	return it;
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 2953f49ef..5df1f2934 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -175,7 +175,6 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 
 	// Controlling list view
 	m_pTreeWidget = new KviTalTreeWidget(vbox);
-	m_pTreeWidget->addColumn("");
 
 	m_pTreeWidget->header()->hide();
 	m_pTreeWidget->setRootIsDecorated(true);
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index 8e97f8eae..6cc8103d2 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -276,10 +276,16 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent)
 
 	if(rs && rs->rules())
 	{
+		KviTalTreeWidgetItem *it;
 		KviPointerList<KviNickServRule> * ll = rs->rules();
 		for(KviNickServRule * rule = ll->first();rule;rule = ll->next())
 		{
-			(void)new KviTalTreeWidgetItem(m_pNickServTreeWidget,rule->registeredNick(),rule->serverMask(),rule->nickServMask(),rule->messageRegexp(),rule->identifyCommand());
+			it = new KviTalTreeWidgetItem(m_pNickServTreeWidget);
+			it->setText(0,rule->registeredNick());
+			it->setText(1,rule->serverMask());
+			it->setText(2,rule->nickServMask());
+			it->setText(3,rule->messageRegexp());
+			it->setText(4,rule->identifyCommand());
 		}
 	}
 
@@ -313,7 +319,14 @@ void KviNickServOptionsWidget::addNickServRule()
 	KviNickServRule r;
 	KviNickServRuleEditor ed(this,true);
 	if(ed.editRule(&r))
-		(void)new KviTalTreeWidgetItem(m_pNickServTreeWidget,r.registeredNick(),r.serverMask(),r.nickServMask(),r.messageRegexp(),r.identifyCommand());
+	{
+		KviTalTreeWidgetItem* it = new KviTalTreeWidgetItem(m_pNickServTreeWidget);
+		it->setText(0,r.registeredNick());
+		it->setText(1,r.serverMask());
+		it->setText(2,r.nickServMask());
+		it->setText(3,r.messageRegexp());
+		it->setText(4,r.identifyCommand());
+	}
 }
 
 void KviNickServOptionsWidget::delNickServRule()
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 5ebbc7979..5cd2b5bee 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -44,9 +44,10 @@
 
 
 KviProxyOptionsTreeWidgetItem::KviProxyOptionsTreeWidgetItem(KviTalTreeWidget *parent,const QPixmap &pm,KviProxy * prx)
-: KviTalTreeWidgetItem(parent,prx->m_szHostname)
+: KviTalTreeWidgetItem(parent)
 {
 	debug("Creating item");
+	setText(0,prx->m_szHostname);
 	setIcon(0,QIcon(pm));
 	m_pProxyData = new KviProxy(*prx);
 }
@@ -66,7 +67,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
 
 	m_pTreeWidget = new KviTalTreeWidget(this);
 	addWidgetToLayout(m_pTreeWidget,0,1,0,1);
-	m_pTreeWidget->addColumn(__tr2qs_ctx("Proxy","options"));
+	m_pTreeWidget->setHeaderLabel(__tr2qs_ctx("Proxy","options"));
 	m_pTreeWidget->setRootIsDecorated(true);
 	m_pTreeWidget->setAllColumnsShowFocus(true);
 	m_pTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 7f68e53b3..3aa48e8a9 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -319,7 +319,11 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviNetwork * n)
 		KviPointerList<KviNickServRule> * ll = rs->rules();
 		for(KviNickServRule * rule = ll->first();rule;rule = ll->next())
 		{
-			(void)new KviTalTreeWidgetItem(m_pNickServTreeWidget,rule->registeredNick(),rule->nickServMask(),rule->messageRegexp(),rule->identifyCommand());
+			KviTalTreeWidgetItem* it = new KviTalTreeWidgetItem(m_pNickServTreeWidget);
+			it->setText(0,rule->registeredNick());
+			it->setText(1,rule->nickServMask());
+			it->setText(2,rule->messageRegexp());
+			it->setText(3,rule->identifyCommand());
 		}
 	}
 
@@ -373,7 +377,13 @@ void KviNetworkDetailsWidget::addNickServRule()
 	KviNickServRule r;
 	KviNickServRuleEditor ed(this,false);
 	if(ed.editRule(&r))
-		(void)new KviTalTreeWidgetItem(m_pNickServTreeWidget,r.registeredNick(),r.nickServMask(),r.messageRegexp(),r.identifyCommand());
+	{
+		KviTalTreeWidgetItem *it = new KviTalTreeWidgetItem(m_pNickServTreeWidget);
+		it->setText(0,r.registeredNick());
+		it->setText(1,r.nickServMask());
+		it->setText(2,r.messageRegexp());
+		it->setText(3,r.identifyCommand());
+	}
 }
 
 void KviNetworkDetailsWidget::delNickServRule()
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index 4e372998d..8fcaab192 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -1029,7 +1029,7 @@ KviPopupEditor::KviPopupEditor(QWidget * par)
 	KviTalVBox * box = new KviTalVBox(spl);
 
 	m_pTreeWidget = new KviTalTreeWidget(box);
-	m_pTreeWidget->addColumn(__tr2qs("Popup"));
+	m_pTreeWidget->setHeaderLabel(__tr2qs("Popup"));
 	m_pTreeWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
 	m_pTreeWidget->header()->setSortIndicatorShown(true);
 
diff --git a/src/modules/raweditor/raweditor.h b/src/modules/raweditor/raweditor.h
index 79fab527a..2f3deee9e 100644
--- a/src/modules/raweditor/raweditor.h
+++ b/src/modules/raweditor/raweditor.h
@@ -69,9 +69,10 @@ class KviRawHandlerTreeWidgetItem : public KviTalTreeWidgetItem
 {
 public:
 	KviRawHandlerTreeWidgetItem(KviTalTreeWidgetItem * par,const QString & name,const QString & buffer,bool bEnabled)
-	: KviTalTreeWidgetItem(par,name), m_szName(name) , m_szBuffer(buffer) , m_bEnabled(bEnabled) 
+	: KviTalTreeWidgetItem(par), m_szName(name) , m_szBuffer(buffer) , m_bEnabled(bEnabled) 
 	{
-		setEnabled(bEnabled); 
+		setText(0,name);
+		setEnabled(bEnabled);
 	};
 	~KviRawHandlerTreeWidgetItem() {};
 public:
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index fbb3e178b..6772dec9b 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
@@ -187,8 +187,9 @@ void KviSharedFileEditDialog::okClicked()
 
 
 KviSharedFilesTreeWidgetItem::KviSharedFilesTreeWidgetItem(KviTalTreeWidget * lv,KviSharedFile * f)
-: KviTalTreeWidgetItem(lv,f->name())
+: KviTalTreeWidgetItem(lv)
 {
+	setText(0,f->name());
 	setText(1,f->absFilePath());
 	setText(2,f->userMask());
 	if(f->expires())