4 files changed, 30 insertions, 7 deletions
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()