replace setIconSet with QT4 seIcon

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

24 files changed, 68 insertions, 68 deletions

diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/kvi_action.cpp
index 71e78d958..3f3b25db0 100644
--- a/src/kvirc/kernel/kvi_action.cpp
+++ b/src/kvirc/kernel/kvi_action.cpp
@@ -178,7 +178,7 @@ void KviAction::reloadImages()
 	for(QWidget * b = m_pWidgetList->first();b;b = m_pWidgetList->next())
 	{
 		if(b->inherits("QToolButton"))
-			((QToolButton *)b)->setIconSet(p ? *p : QPixmap());
+			((QToolButton *)b)->setIcon(p ? *p : QPixmap());
 	}
 }
 
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
index 9ca128bbe..9943727b1 100644
--- a/src/kvirc/ui/kvi_input.cpp
+++ b/src/kvirc/ui/kvi_input.cpp
@@ -2286,14 +2286,14 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view)
 	if(!KVI_OPTION_BOOL(KviOption_boolDisableInputHistory))//G&N mar 2005
 	{
 		is1.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)));
-		m_pHistoryButton->setIconSet(is1);
+		m_pHistoryButton->setIcon(is1);
 		KviTalToolTip::add(m_pHistoryButton,__tr2qs("Show History<br>&lt;Ctrl+PageUp&gt;"));
 		connect(m_pHistoryButton,SIGNAL(clicked()),this,SLOT(historyButtonClicked()));
 	}
 	else
 	{
 		is1.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITSPLIT)));
-		m_pHistoryButton->setIconSet(is1);
+		m_pHistoryButton->setIcon(is1);
 		KviTalToolTip::add(m_pHistoryButton,__tr2qs("Input History Disabled"));
 	}
 
@@ -2301,7 +2301,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view)
 	m_pIconButton->setUsesBigPixmap(false);
 	QIcon is3;
 	is3.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_BIGGRIN)));
-	m_pIconButton->setIconSet(is3);
+	m_pIconButton->setIcon(is3);
 	KviTalToolTip::add(m_pIconButton,__tr2qs("Show Icons Popup<br>&lt;Ctrl+I&gt;<br>See also /help texticons"));
 
 	connect(m_pIconButton,SIGNAL(clicked()),this,SLOT(iconButtonClicked()));
@@ -2313,7 +2313,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view)
 	QIcon is0;
 	is0.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SAYSMILE)),QIcon::Normal,QIcon::On);
 	is0.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SAYKVS)),QIcon::Normal,QIcon::Off);
-	m_pCommandlineModeButton->setIconSet(is0);
+	m_pCommandlineModeButton->setIcon(is0);
 	KviTalToolTip::add(m_pCommandlineModeButton,__tr2qs("User friendly commandline mode<br>See also /help commandline"));
 	if(KVI_OPTION_BOOL(KviOption_boolCommandlineInUserFriendlyModeByDefault))
 		m_pCommandlineModeButton->setOn(true);
@@ -2325,7 +2325,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view)
 	QIcon is2;
 	is2.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),QIcon::Normal,QIcon::On);
 	is2.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),QIcon::Normal,QIcon::Off);
-	m_pMultiEditorButton->setIconSet(is2);
+	m_pMultiEditorButton->setIcon(is2);
 	QString szTip = __tr2qs("Multi-line Editor<br>&lt;Alt+Backspace&gt;");
 	szTip += " - &lt;Ctrl+Backspace&gt;";
 	KviTalToolTip::add(m_pMultiEditorButton,szTip);
@@ -2569,7 +2569,7 @@ void KviInput::applyOptions()
 	{
 		QIcon is1;
 		is1.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITSPLIT)));
-		m_pHistoryButton->setIconSet(is1);
+		m_pHistoryButton->setIcon(is1);
 		KviTalToolTip::add(m_pHistoryButton,__tr2qs("Input History Disabled"));
 		m_pHistoryButton->disconnect(SIGNAL(clicked()));
 	}
@@ -2578,7 +2578,7 @@ void KviInput::applyOptions()
 	{
 		QIcon is1;
 		is1.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)));
-		m_pHistoryButton->setIconSet(is1);
+		m_pHistoryButton->setIcon(is1);
 		KviTalToolTip::add(m_pHistoryButton,__tr2qs("Show History<br>&lt;Ctrl+PageUp&gt;"));
 		connect(m_pHistoryButton,SIGNAL(clicked()),this,SLOT(historyButtonClicked()));
 	}
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
index 289bb234f..7b1e22fee 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/kvi_ircview.cpp
@@ -354,7 +354,7 @@ KviIrcView::KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd)
 	m_pToolsButton = new KviStyledToolButton(this,"btntools");
 	QIcon is1(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUPMENU)));
 	m_pToolsButton->setAutoRaise(true);
-	m_pToolsButton->setIconSet(is1);
+	m_pToolsButton->setIcon(is1);
 
 	KviTalToolTip::add(m_pToolsButton,__tr2qs("Search tools"));
 	m_pToolsButton->setFocusProxy(this);
diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp
index 2b3e634c8..e3af85eca 100644
--- a/src/kvirc/ui/kvi_maskeditor.cpp
+++ b/src/kvirc/ui/kvi_maskeditor.cpp
@@ -82,12 +82,12 @@ KviMaskInputDialog::KviMaskInputDialog(const QString &szMask,KviMaskEditor* pEdi
 	m_pOkButton= new QPushButton(__tr2qs("Ok"),this);
 	connect(m_pOkButton,SIGNAL(clicked()), this, SLOT(accept()));
 	g->addWidget(m_pOkButton,2,1);
-	m_pOkButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
+	m_pOkButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	
 	m_pChancelButton= new QPushButton(__tr2qs("Cancel"),this);
 	connect(m_pChancelButton,SIGNAL(clicked()), this, SLOT(reject()));
 	g->addWidget(m_pChancelButton,2,2);
-	m_pChancelButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
+	m_pChancelButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	
 	QRegExp rx( "*!*@*", false,true );
 	QValidator* validator = new QRegExpValidator( rx, this );
@@ -202,7 +202,7 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPo
 	m_pRemoveMask->setFocusProxy(this);
 	g->addWidget(m_pRemoveMask,4,1);
 	connect(m_pRemoveMask,SIGNAL(clicked()),this,SLOT(removeClicked()));
-	m_pRemoveMask->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM)));
+	m_pRemoveMask->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM)));
 	
 	m_pAddButton = new QPushButton(__tr2qs("Add"),this);
 	m_pAddButton->setEnabled(isEnabled);
@@ -210,7 +210,7 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPo
 	m_pAddButton->setFocusProxy(this);
 	g->addWidget(m_pAddButton,4,0);
 	connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked()));
-	m_pAddButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM)));
+	m_pAddButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM)));
 	
 	g->setColumnStretch(3,1);
 
diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp
index 82f1f0b5e..5ec942375 100644
--- a/src/kvirc/ui/kvi_mdicaption.cpp
+++ b/src/kvirc/ui/kvi_mdicaption.cpp
@@ -112,9 +112,9 @@ KviMdiCaption::~KviMdiCaption()
 
 void KviMdiCaption::reloadImages()
 {
-	m_pMaximizeButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXIMIZE)));
-	m_pMinimizeButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)));
-	m_pCloseButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)));
+	m_pMaximizeButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXIMIZE)));
+	m_pMinimizeButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)));
+	m_pCloseButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)));
 }
 
 void KviMdiCaption::calcLineSpacing()
@@ -243,7 +243,7 @@ KviMenuBarToolButton::KviMenuBarToolButton(QWidget * par,const QPixmap &img, con
 : KviStyledToolButton(par)
 {
 	setProperty("name","name");
-	setIconSet(img);
+	setIcon(img);
 	setAutoRaise(true);
 }
 
diff --git a/src/kvirc/ui/kvi_scriptbutton.h b/src/kvirc/ui/kvi_scriptbutton.h
index 2561c21ac..414491691 100644
--- a/src/kvirc/ui/kvi_scriptbutton.h
+++ b/src/kvirc/ui/kvi_scriptbutton.h
@@ -42,7 +42,7 @@ protected:
 	KviKvsScript * m_pScript;
 public:
 	void setButtonCode(KviKvsScript * pScript);
-	virtual void setButtonPixmap(const QPixmap & pix){ setIconSet(pix); };
+	virtual void setButtonPixmap(const QPixmap & pix){ setIcon(pix); };
 	void setButtonText(const QString &text){ setTextLabel(text); };
 	virtual KviWindow * window();
 protected slots:
diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp
index 4ffd43144..f23a3017b 100644
--- a/src/kvirc/ui/kvi_selectors.cpp
+++ b/src/kvirc/ui/kvi_selectors.cpp
@@ -507,7 +507,7 @@ void KviColorSelector::setButtonPalette(QColor * pOption)
 
 	QPixmap pix(16,16);
 	pix.fill(*pOption);
-	m_pButton->setIconSet(pix);
+	m_pButton->setIcon(pix);
 }
 
 void KviColorSelector::forceColor(QColor clr)
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index c0ec11a3f..cb991bb53 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -490,7 +490,7 @@ void KviWindow::setCryptSessionInfo(KviCryptSessionInfo * inf)
 		QIcon is;
 		is.addPixmap(*(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKEDOFF : KVI_SMALLICON_UNLOCKEDOFF)),QIcon::Normal,QIcon::Off);
 		is.addPixmap(*(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKED : KVI_SMALLICON_UNLOCKED)),QIcon::Normal,QIcon::On);
-		m_pCryptControllerButton->setIconSet(is);
+		m_pCryptControllerButton->setIcon(is);
 
 		if(m_pCryptControllerButton->isOn())
 			m_pCryptControllerButton->setOn(false);
diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
index c9d8ee097..21224103d 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/actioneditor.cpp
@@ -902,19 +902,19 @@ KviActionEditorWindow::KviActionEditorWindow(KviFrame * lpFrm)
 	QPushButton * btn = new QPushButton(__tr2qs("OK"),m_pBase);

 	btn->setMinimumWidth(80);

 	connect(btn,SIGNAL(clicked()),this,SLOT(okClicked()));

-	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));

+	btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));

 	g->addWidget(btn,0,1);

 

 	btn = new QPushButton(__tr2qs("Apply"),m_pBase);

 	btn->setMinimumWidth(80);

 	connect(btn,SIGNAL(clicked()),this,SLOT(applyClicked()));

-	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));

+	btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));

 	g->addWidget(btn,0,2);

 

 	btn = new QPushButton(__tr2qs("Cancel"),m_pBase);

 	btn->setMinimumWidth(80);

 	connect(btn,SIGNAL(clicked()),this,SLOT(cancelClicked()));

-	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));

+	btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));

 	g->addWidget(btn,0,3);

 

 	g->setColStretch(0,1);

diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index 5bd55d333..9ffa1515c 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -1580,17 +1580,17 @@ KviAliasEditorWindow::KviAliasEditorWindow(KviFrame * lpFrm)
 

 	QPushButton * btn = new QPushButton(__tr2qs("&OK"),m_pBase);

 	connect(btn,SIGNAL(clicked()),this,SLOT(okClicked()));

-	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));

+	btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));

 	g->addWidget(btn,0,1);

 

 	btn = new QPushButton(__tr2qs("&Apply"),m_pBase);

 	connect(btn,SIGNAL(clicked()),this,SLOT(applyClicked()));

-	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));

+	btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));

 	g->addWidget(btn,0,2);

 

 	btn = new QPushButton(__tr2qs("Cancel"),m_pBase);

 	connect(btn,SIGNAL(clicked()),this,SLOT(cancelClicked()));

-	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));

+	btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));

 	g->addWidget(btn,0,3);

 

 	g->setColumnStretch(0,1);

diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index a57dc36c5..87d810c73 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -685,7 +685,7 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name
 	QIcon iset;
 	iset.addPixmap(*(g_pIconManager->getBigIcon(KVI_BIGICON_DISCONNECTED)),QIcon::Normal,QIcon::Off);
 	iset.addPixmap(*(g_pIconManager->getBigIcon(KVI_BIGICON_CONNECTED)),QIcon::Normal,QIcon::On);
-	m_pTalkButton->setIconSet(iset);
+	m_pTalkButton->setIcon(iset);
 	m_pTalkButton->setUsesBigPixmap(true);
 	connect(m_pTalkButton,SIGNAL(toggled(bool)),this,SLOT(startOrStopTalking(bool)));
 
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
index 281b2b971..84bbcf83e 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/eventeditor.cpp
@@ -424,17 +424,17 @@ KviEventEditorWindow::KviEventEditorWindow(KviFrame * lpFrm)
 
 	QPushButton * btn = new QPushButton(__tr2qs("&OK"),m_pBase);
 	connect(btn,SIGNAL(clicked()),this,SLOT(okClicked()));
-	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
+	btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g->addWidget(btn,0,1);
 
 	btn = new QPushButton(__tr2qs("&Apply"),m_pBase);
 	connect(btn,SIGNAL(clicked()),this,SLOT(applyClicked()));
-	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
+	btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g->addWidget(btn,0,2);
 
 	btn = new QPushButton(__tr2qs("Cancel"),m_pBase);
 	connect(btn,SIGNAL(clicked()),this,SLOT(cancelClicked()));
-	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
+	btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	g->addWidget(btn,0,3);
 
 	g->setColStretch(0,1);
diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp
index 9824ac238..c6f8639ff 100644
--- a/src/modules/help/helpwidget.cpp
+++ b/src/modules/help/helpwidget.cpp
@@ -54,18 +54,18 @@ KviHelpWidget::KviHelpWidget(QWidget * par,KviFrame * lpFrm,bool bIsStandalone)
 	m_pToolBar = new KviTalHBox(this);
 
 	m_pBtnIndex = new KviStyledToolButton(m_pToolBar);
-	m_pBtnIndex->setIconSet(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPINDEX));
+	m_pBtnIndex->setIcon(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPINDEX));
 	connect(m_pBtnIndex,SIGNAL(clicked()),this,SLOT(showIndex()));
 	//m_pBtnIndex->setUsesBigPixmap(true);
 
 	m_pBtnBackward = new KviStyledToolButton(m_pToolBar);
-	m_pBtnBackward->setIconSet(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPBACK));
+	m_pBtnBackward->setIcon(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPBACK));
 	connect(m_pBtnBackward,SIGNAL(clicked()),m_pTextBrowser,SLOT(backward()));
 	m_pBtnBackward->setEnabled(false);
 	//m_pBtnBackward->setUsesBigPixmap(true);
 
 	m_pBtnForward = new KviStyledToolButton(m_pToolBar);
-	m_pBtnForward->setIconSet(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPFORWARD));
+	m_pBtnForward->setIcon(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPFORWARD));
 	connect(m_pBtnForward,SIGNAL(clicked()),m_pTextBrowser,SLOT(forward()));
 	m_pBtnForward->setEnabled(false);
 	//m_pBtnForward->setUsesBigPixmap(true);
@@ -75,7 +75,7 @@ KviHelpWidget::KviHelpWidget(QWidget * par,KviFrame * lpFrm,bool bIsStandalone)
 	if(bIsStandalone)
 	{
 		QToolButton * b = new KviStyledToolButton(m_pToolBar);
-		b->setIconSet(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPCLOSE));
+		b->setIcon(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPCLOSE));
 		connect(b,SIGNAL(clicked()),this,SLOT(doClose()));
 		//b->setUsesBigPixmap(true);
 	}
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp
index 3bc290534..b93bf5de8 100644
--- a/src/modules/help/helpwindow.cpp
+++ b/src/modules/help/helpwindow.cpp
@@ -88,7 +88,7 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name)
 	     this, SLOT( showIndexTopic() ) );
 	
 	KviStyledToolButton* pBtnRefreshIndex = new KviStyledToolButton(pSearchBox);
-	pBtnRefreshIndex->setIconSet(*g_pIconManager->getBigIcon(KVI_REFRESH_IMAGE_NAME));
+	pBtnRefreshIndex->setIcon(*g_pIconManager->getBigIcon(KVI_REFRESH_IMAGE_NAME));
 	connect(pBtnRefreshIndex,SIGNAL(clicked()),this,SLOT(refreshIndex()));
 	QToolTip::add( pBtnRefreshIndex, __tr2qs("Refresh index") );
 	
diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp
index 9c0b86938..db90bc47b 100644
--- a/src/modules/objects/class_toolbutton.cpp
+++ b/src/modules/objects/class_toolbutton.cpp
@@ -143,10 +143,10 @@ bool KviKvsObject_toolbutton::functionsetImage(KviKvsObjectFunctionCall *c)
 	if (!widget()) return true;
 	QPixmap * pix = g_pIconManager->getImage(icon);
 	if(pix){
-			((QToolButton *)widget())->setIconSet(QIcon(*pix));
+			((QToolButton *)widget())->setIcon(QIcon(*pix));
 	}
 	else
-		((QToolButton *)widget())->setIconSet(QIcon());
+		((QToolButton *)widget())->setIcon(QIcon());
 	return true;
 }
 bool KviKvsObject_toolbutton::functionsetUsesBigPixmap(KviKvsObjectFunctionCall *c)
diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp
index d99a072f7..19b7e3d0d 100644
--- a/src/modules/options/container.cpp
+++ b/src/modules/options/container.cpp
@@ -62,13 +62,13 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w)
 	g->addWidget(b,1,1);
 	b->setDefault(true);
 	connect(b,SIGNAL(clicked()),this,SLOT(okClicked()));
-	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
+	b->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 
 	m_pCancel = new QPushButton(__tr2qs_ctx("Cancel","options"),this);
 	KviTalToolTip::add(m_pCancel,__tr2qs_ctx("Close this dialog, discarding all changes.","options"));
 	g->addWidget(m_pCancel,1,2);
 	connect(m_pCancel,SIGNAL(clicked()),this,SLOT(cancelClicked()));
-	m_pCancel->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
+	m_pCancel->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 
 
 	g->setRowStretch(0,1);
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 6a88c59b5..9a3a0dc19 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -202,7 +202,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	connect(m_pSearchLineEdit,SIGNAL(returnPressed()),this,SLOT(searchClicked()));
 	m_pSearchButton = new KviStyledToolButton(hbox);
 	m_pSearchButton->setUsesBigPixmap(false);
-	m_pSearchButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)));
+	m_pSearchButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)));
 	connect(m_pSearchButton,SIGNAL(clicked()),this,SLOT(searchClicked()));
 	connect(m_pSearchLineEdit,SIGNAL(textChanged(const QString &)),this,SLOT(searchLineEditTextChanged(const QString &)));
 
@@ -241,13 +241,13 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	KviTalToolTip::add(b,__tr2qs_ctx("Close this dialog, accepting all changes.","options"));
 	connect(b,SIGNAL(clicked()),this,SLOT(okClicked()));
 	//b->setMinimumWidth(whatIsThisWidth);
-	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
+	b->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g1->addWidget(b,1,2);	
 
 	b = new QPushButton(__tr2qs_ctx("&Apply","options"),this,"btnapply");
 	KviTalToolTip::add(b,__tr2qs_ctx("Commit all changes immediately.","options"));
 	connect(b,SIGNAL(clicked()),this,SLOT(applyClicked()));
-	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
+	b->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g1->addWidget(b,1,3);
 
 	b = new QPushButton(__tr2qs_ctx("Cancel","options"),this,"btncancel");
@@ -255,7 +255,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	b->setDefault(true);
 	//b->setMinimumWidth(whatIsThisWidth);
 	connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked()));
-	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
+	b->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	g1->addWidget(b,1,4);
 
 	g1->setRowStretch(0,1);
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index 1eaf818e9..8b2be8f08 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -458,7 +458,7 @@ void KviMessageColorsOptionsWidget::newIconSelected(int iconId)
 	if(!m_pLastItem)return;
 	if(iconId >= KVI_NUM_SMALL_ICONS)return;
 	m_pLastItem->msgType()->setPixId(iconId);
-	m_pIconButton->setIconSet(*(g_pIconManager->getSmallIcon(iconId)));
+	m_pIconButton->setIcon(*(g_pIconManager->getSmallIcon(iconId)));
 	m_pListView->repaintItem(m_pLastItem);
 }
 
@@ -517,7 +517,7 @@ void KviMessageColorsOptionsWidget::itemChanged(KviTalListViewItem * it)
 		}
 		m_pLevelListBox->setCurrentItem(((KviMessageListViewItem *)it)->msgType()->level());
 		m_pEnableLogging->setChecked(((KviMessageListViewItem *)it)->msgType()->logEnabled());
-		m_pIconButton->setIconSet(*(g_pIconManager->getSmallIcon(((KviMessageListViewItem *)it)->msgType()->pixId())));
+		m_pIconButton->setIcon(*(g_pIconManager->getSmallIcon(((KviMessageListViewItem *)it)->msgType()->pixId())));
 	}
 
 	// Ok...can save from now on
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index 89e160d3c..c92674c1c 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -1280,17 +1280,17 @@ KviPopupEditorWindow::KviPopupEditorWindow(KviFrame * lpFrm)
 
 	QPushButton * btn = new QPushButton(__tr2qs("&OK"),m_pBase);
 	connect(btn,SIGNAL(clicked()),this,SLOT(okClicked()));
-	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
+	btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g->addWidget(btn,0,1);
 
 	btn = new QPushButton(__tr2qs("&Apply"),m_pBase);
 	connect(btn,SIGNAL(clicked()),this,SLOT(applyClicked()));
-	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
+	btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g->addWidget(btn,0,2);
 
 	btn = new QPushButton(__tr2qs("Cancel"),m_pBase);
 	connect(btn,SIGNAL(clicked()),this,SLOT(cancelClicked()));
-	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
+	btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	g->addWidget(btn,0,3);
 
 	g->setColStretch(0,1);
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index 7ae9b417c..ffdcec14d 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -449,17 +449,17 @@ KviRawEditorWindow::KviRawEditorWindow(KviFrame * lpFrm)
 
 	QPushButton * btn = new QPushButton(__tr2qs("&OK"),m_pBase);
 	connect(btn,SIGNAL(clicked()),this,SLOT(okClicked()));
-	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
+	btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g->addWidget(btn,0,1);
 
 	btn = new QPushButton(__tr2qs("&Apply"),m_pBase);
 	connect(btn,SIGNAL(clicked()),this,SLOT(applyClicked()));
-	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
+	btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g->addWidget(btn,0,2);
 
 	btn = new QPushButton(__tr2qs("Cancel"),m_pBase);
 	connect(btn,SIGNAL(clicked()),this,SLOT(cancelClicked()));
-	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
+	btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	g->addWidget(btn,0,3);
 
 	g->setColStretch(0,1);
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 325bc41cb..ea7e36c49 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -196,31 +196,31 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(QWidget * par)
 	m_pWizardAddButton = new QPushButton(__tr2qs("Add (Wizard)..."),vbox);

 	connect(m_pWizardAddButton,SIGNAL(clicked()),this,SLOT(addWizardClicked()));

 	QToolTip::add(m_pWizardAddButton,__tr2qs("Add a registered user by means of a user-friendly wizard."));

-	m_pWizardAddButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEMBYWIZARD)));

+	m_pWizardAddButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEMBYWIZARD)));

 

 

 	m_pAddButton = new QPushButton(__tr2qs("&Add..."),vbox);

 	connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked()));

 	QToolTip::add(m_pAddButton,__tr2qs("Open the edit dialog to create a new user entry."));

-	m_pAddButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM)));

+	m_pAddButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM)));

 	

 	m_pAddGroupButton = new QPushButton(__tr2qs("&Add Group..."),vbox);

 	connect(m_pAddGroupButton,SIGNAL(clicked()),this,SLOT(addGroupClicked()));

 	QToolTip::add(m_pAddGroupButton,__tr2qs("Adds a new group"));

-	m_pAddGroupButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM)));

+	m_pAddGroupButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM)));

 

 	m_pRemoveButton = new QPushButton(__tr2qs("Re&move"),vbox);

 	connect(m_pRemoveButton,SIGNAL(clicked()),this,SLOT(removeClicked()));

 	m_pRemoveButton->setEnabled(false);

 	QToolTip::add(m_pRemoveButton,__tr2qs("Remove the currently selected entries."));

-	m_pRemoveButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM)));

+	m_pRemoveButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM)));

 

 

 	m_pEditButton = new QPushButton(__tr2qs("&Edit..."),vbox);

 	connect(m_pEditButton,SIGNAL(clicked()),this,SLOT(editClicked()));

 	m_pEditButton->setEnabled(false);

 	QToolTip::add(m_pEditButton,__tr2qs("Edit the first selected entry."));

-	m_pEditButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_EDITITEM)));

+	m_pEditButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_EDITITEM)));

 

 	QFrame * f = new QFrame(vbox);

 	f->setFrameStyle(QFrame::HLine | QFrame::Sunken);

@@ -229,13 +229,13 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(QWidget * par)
 	m_pExportButton->setEnabled(false);

 	connect(m_pExportButton,SIGNAL(clicked()),this,SLOT(exportClicked()));

 	QToolTip::add(m_pExportButton,__tr2qs("Export the selected entries to a file.<br>All the data associated with the selected registered users will be exported.<br>You (or anyone else) can later import the entries by using the \"Import\" button."));

-	m_pExportButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FLOPPY)));

+	m_pExportButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FLOPPY)));

 

 

 	m_pImportButton = new QPushButton(__tr("Import From..."),vbox);

 	connect(m_pImportButton,SIGNAL(clicked()),this,SLOT(importClicked()));

 	QToolTip::add(m_pImportButton,__tr2qs("Import entries from a file exported earlier by the \"export\" function of this dialog."));

-	m_pImportButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)));

+	m_pImportButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)));

 

 

 	KviTalHBox * hbox = new KviTalHBox(this);

@@ -247,12 +247,12 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(QWidget * par)
 

 	b = new QPushButton(__tr2qs("&OK"),hbox);

 	connect(b,SIGNAL(clicked()),this,SLOT(okClicked()));

-	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));

+	b->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));

 	//b->setMinimumWidth(120);

 

 	b = new QPushButton(__tr2qs("Cancel"),hbox);

 	connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked()));

-	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));

+	b->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));

 	//b->setMinimumWidth(120);

 

 	g->addRowSpacing(2,15);

diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index bafa1815d..b432717af 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -98,11 +98,11 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviPointerHas
 

 	m_pAddButton = new QPushButton(__tr2qs("&New"),vb);

 	connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked()));

-	m_pAddButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM)));

+	m_pAddButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM)));

 

 	m_pDelButton = new QPushButton(__tr2qs("&Remove"),vb);

 	connect(m_pDelButton,SIGNAL(clicked()),this,SLOT(delClicked()));

-	m_pDelButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM)));

+	m_pDelButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM)));

 

 	KviTalHBox * b = new KviTalHBox(this);

 	b->setSpacing(4);

@@ -366,17 +366,17 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste
 

 	m_pAddMaskButton = new QPushButton(__tr2qs("&Add..."),b);

 	connect(m_pAddMaskButton,SIGNAL(clicked()),this,SLOT(addMaskClicked()));

-	m_pAddMaskButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM)));

+	m_pAddMaskButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM)));

 

 	m_pDelMaskButton = new QPushButton(__tr2qs("Re&move"),b);

 	m_pDelMaskButton->setEnabled(false);

 	connect(m_pDelMaskButton,SIGNAL(clicked()),this,SLOT(delMaskClicked()));

-	m_pDelMaskButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM)));

+	m_pDelMaskButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM)));

 

 	m_pEditMaskButton = new QPushButton(__tr2qs("&Edit"),b);

 	m_pEditMaskButton->setEnabled(false);

 	connect(m_pEditMaskButton,SIGNAL(clicked()),this,SLOT(editMaskClicked()));

-	m_pEditMaskButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_EDITITEM)));

+	m_pEditMaskButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_EDITITEM)));

 

 	g->setRowStretch(4,1);

 	g->setColumnStretch(1,1);

diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index 66ca6b6db..f679de1ff 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
@@ -93,11 +93,11 @@ KviSharedFileEditDialog::KviSharedFileEditDialog(QWidget * par,KviSharedFile * f
 
 	pb = new QPushButton(__tr2qs_ctx("&OK","sharedfileswindow"),this);
 	connect(pb,SIGNAL(clicked()),this,SLOT(okClicked()));
-	pb->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
+	pb->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g->addWidget(pb,5,2);
 	pb = new QPushButton(__tr2qs_ctx("Cancel","sharedfileswindow"),this);
 	connect(pb,SIGNAL(clicked()),this,SLOT(reject()));
-	pb->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
+	pb->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	g->addWidget(pb,5,3);
 
 	g->setRowStretch(4,1);
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index 959f78c80..f22f63f9b 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -192,7 +192,7 @@ KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent)
 	connect(m_pPackThemeButton,SIGNAL(clicked()),this,SLOT(packTheme()));
 
 	m_pDeleteThemeButton = new QToolButton(hb);
-	m_pDeleteThemeButton->setIconSet(*(g_pIconManager->getBigIcon(KVI_BIGICON_REMOVE)));
+	m_pDeleteThemeButton->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_REMOVE)));
 	m_pDeleteThemeButton->setIconSize(QSize(32,32));
 	QToolTip::add(m_pDeleteThemeButton,__tr2qs_ctx("Delete Selected Themes","theme"));
 	connect(m_pDeleteThemeButton,SIGNAL(clicked()),this,SLOT(deleteTheme()));