trashed kvi_styledcontrols

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

15 files changed, 60 insertions, 72 deletions

diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 703d188f3..239dd5f77 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -30,7 +30,6 @@
 #include "kvi_locale.h"
 #include "kvi_iconmanager.h"
 #include "kvi_module.h"
-#include "kvi_styled_controls.h"
 #include "kvi_pointerhashtable.h"
 #include "kvi_accel.h"
 #include "kvi_tal_vbox.h"
@@ -43,8 +42,6 @@
 #include <QLabel>
 #include <QSplitter>
 #include <QPushButton>
-#include "kvi_styled_controls.h"
-#include "kvi_styled_controls.h"
 #include <QPainter>
 #include <QFont>
 #include <QEvent>
@@ -200,7 +197,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 
 	m_pSearchLineEdit = new QLineEdit(hbox);
 	connect(m_pSearchLineEdit,SIGNAL(returnPressed()),this,SLOT(searchClicked()));
-	m_pSearchButton = new KviStyledToolButton(hbox);
+	m_pSearchButton = new QToolButton(hbox);
 	m_pSearchButton->setUsesBigPixmap(false);
 	m_pSearchButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)));
 	connect(m_pSearchButton,SIGNAL(clicked()),this,SLOT(searchClicked()));
@@ -320,7 +317,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr
 			o = *it;
 			QString szText;
 			if(o->inherits("QLabel"))szText = ((QLabel *)o)->text();
-			else if(o->inherits("QCheckBox"))szText = ((KviStyledCheckBox *)o)->text();
+			else if(o->inherits("QCheckBox"))szText = ((QCheckBox *)o)->text();
 			else if(o->inherits("KviTalGroupBox"))szText = ((KviTalGroupBox *)o)->title();
 
 			if(o->inherits("QWidget"))
diff --git a/src/modules/options/dialog.h b/src/modules/options/dialog.h
index 62c5a2e69..d333f8de4 100644
--- a/src/modules/options/dialog.h
+++ b/src/modules/options/dialog.h
@@ -32,11 +32,11 @@
 
 #include <QDialog>
 #include <QStringList>
+#include <QToolButton>
 
 class QLabel;
 class QPushButton;
 class QLineEdit;
-class KviStyledToolButton;
 class KviTalWidgetStack;
 
 class KviGeneralOptionsFrontWidget : public KviOptionsWidget
@@ -76,7 +76,7 @@ private:
 	KviGeneralOptionsFrontWidget* m_pFrontWidget;
 	QString        m_szGroup;
 	QLineEdit    * m_pSearchLineEdit;
-	KviStyledToolButton  * m_pSearchButton;
+	QToolButton  * m_pSearchButton;
 private:
 	void recursiveCommit(KviOptionsListViewItem *it);
 	void fillListView(KviTalListViewItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly = false);
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index 64c066be7..aa0b01d1b 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -39,7 +39,6 @@
 #include "kvi_tal_tooltip.h"
 
 #include <QLineEdit>
-#include "kvi_styled_controls.h"
 #include <QPushButton>
 #include <QLayout>
 #include <QTabWidget>
@@ -479,7 +478,7 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(QWidget * parent)
 		"The image also should be smaller than 800x600 pixels since<br>" \
 		"it will have to be viewable in everyone's monitor.","options");
 
-	m_pUseAvatarCheck = new KviStyledCheckBox(__tr2qs_ctx("Use avatar","options"),this);
+	m_pUseAvatarCheck = new QCheckBox(__tr2qs_ctx("Use avatar","options"),this);
 	addWidgetToLayout(m_pUseAvatarCheck,0,0,0,0);
 	m_pUseAvatarCheck->setChecked(bHaveAvatar);
 	mergeTip(m_pUseAvatarCheck,szTip);
diff --git a/src/modules/options/optw_identity.h b/src/modules/options/optw_identity.h
index db20cb690..8811e5880 100644
--- a/src/modules/options/optw_identity.h
+++ b/src/modules/options/optw_identity.h
@@ -32,9 +32,9 @@
 #include "kvi_pixmap.h"
 
 #include <QDialog>
+#include <QCheckBox>
 
 class QLineEdit;
-class KviStyledCheckBox;
 class QPushButton;
 class QComboBox;
 class KviHttpRequest;
@@ -152,7 +152,7 @@ public:
 	KviIdentityAvatarOptionsWidget(QWidget * pParent);
 	~KviIdentityAvatarOptionsWidget();
 protected:
-	KviStyledCheckBox        * m_pUseAvatarCheck;
+	QCheckBox        * m_pUseAvatarCheck;
 	QLineEdit        * m_pAvatarNameEdit;
 	QPushButton      * m_pChooseAvatarButton;
 	KviPixmap        * m_pLocalAvatar;
diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp
index a5b4da725..0a8f8f1de 100644
--- a/src/modules/options/optw_interfacefeatures.cpp
+++ b/src/modules/options/optw_interfacefeatures.cpp
@@ -47,7 +47,7 @@ KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(QWidget * p
 	QString szSplashDisableFile;
 	g_pApp->getLocalKvircDirectory(szSplashDisableFile,KviApp::Pics,"disable-splash." KVI_VERSION);
 	bool bDisableSplash = KviFileUtils::fileExists(szSplashDisableFile);
-	m_pDisableSplash = new KviStyledCheckBox(__tr2qs_ctx("Disable splash screen","options"),this);
+	m_pDisableSplash = new QCheckBox(__tr2qs_ctx("Disable splash screen","options"),this);
 	addWidgetToLayout(m_pDisableSplash,0,3,0,3);
 	m_pDisableSplash->setChecked(bDisableSplash);
 	
diff --git a/src/modules/options/optw_interfacefeatures.h b/src/modules/options/optw_interfacefeatures.h
index f917588f3..ecb4146c6 100644
--- a/src/modules/options/optw_interfacefeatures.h
+++ b/src/modules/options/optw_interfacefeatures.h
@@ -26,13 +26,12 @@
 //=============================================================================
 
 #include "kvi_optionswidget.h"
+#include <QCheckBox>
 
 #define KVI_OPTIONS_WIDGET_ICON_KviInterfaceFeaturesOptionsWidget KVI_SMALLICON_IDEA
 #define KVI_OPTIONS_WIDGET_NAME_KviInterfaceFeaturesOptionsWidget __tr2qs_no_lookup("Interface")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviInterfaceFeaturesOptionsWidget 50000
 
-class KviStyledCheckBox;
-
 class KviInterfaceFeaturesOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
@@ -40,7 +39,7 @@ public:
 	KviInterfaceFeaturesOptionsWidget(QWidget * parent);
 	~KviInterfaceFeaturesOptionsWidget();
 protected:
-	KviStyledCheckBox * m_pDisableSplash;
+	QCheckBox * m_pDisableSplash;
 public:
 	virtual void commit();
 };
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index 440e97bea..19e8276a2 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -34,7 +34,6 @@
 #include "kvi_mirccntrl.h"
 #include "kvi_config.h"
 #include "kvi_filedialog.h"
-#include "kvi_styled_controls.h"
 #include "kvi_tal_vbox.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index 1219677fa..ea1547f71 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -35,7 +35,6 @@
 #include <QLayout>
 #include <QLineEdit>
 #include <QPushButton>
-#include "kvi_styled_controls.h"
 #include <QMessageBox>
 
 
@@ -229,7 +228,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent)
 	KviNickServRuleSet * rs = g_pNickServRuleSet;
 	bool bNickServEnabled = rs ? (rs->isEnabled() && !rs->isEmpty()) : false;
 
-	m_pNickServCheck = new KviStyledCheckBox(__tr2qs_ctx("Enable NickServ Identification","options"),this);
+	m_pNickServCheck = new QCheckBox(__tr2qs_ctx("Enable NickServ Identification","options"),this);
 	gl->addWidget(m_pNickServCheck,0,0,1,3);
 //	gl->addMultiCellWidget(m_pNickServCheck,0,0,0,2);
 	KviTalToolTip::add(m_pNickServCheck,__tr2qs_ctx("This check enables the automatic identification with NickServ","options"));
diff --git a/src/modules/options/optw_nickserv.h b/src/modules/options/optw_nickserv.h
index 6c0f9bcb8..0fa01c0ad 100644
--- a/src/modules/options/optw_nickserv.h
+++ b/src/modules/options/optw_nickserv.h
@@ -30,10 +30,10 @@
 #include "kvi_optionswidget.h"
 
 #include <QDialog>
+#include <QCheckBox>
 
 class QLineEdit;
 class QPushButton;
-class KviStyledCheckBox;
 class KviNickServRule;
 class KviTalTreeWidget;
 
@@ -73,7 +73,7 @@ public:
 	~KviNickServOptionsWidget();
 protected:
 	KviTalTreeWidget             * m_pNickServTreeWidget;
-	KviStyledCheckBox             * m_pNickServCheck;
+	QCheckBox             * m_pNickServCheck;
 	QPushButton           * m_pAddRuleButton;
 	QPushButton           * m_pDelRuleButton;
 	QPushButton           * m_pEditRuleButton;
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 62f7a2af9..209ac489a 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -29,7 +29,6 @@
 #include "kvi_netutils.h"
 #include "kvi_settings.h"
 #include "kvi_options.h"
-//#include "kvi_styled_controls.h"
 #include <kvi_tal_groupbox.h>
 #include "kvi_tal_popupmenu.h"
 #include "kvi_tal_tooltip.h"
@@ -37,10 +36,9 @@
 #include <QLabel>
 #include <QLineEdit>
 #include <QComboBox>
-#include "kvi_styled_controls.h"
 #include <QCursor>
-#include "kvi_styled_controls.h"
 #include <QIcon>
+#include <QToolButton>
 
 
 KviProxyOptionsTreeWidgetItem::KviProxyOptionsTreeWidgetItem(KviTalTreeWidget *parent,const QPixmap &pm,KviProxy * prx)
@@ -85,13 +83,13 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
 	KviTalVBox * vbox = new KviTalVBox(this);
 	addWidgetToLayout(vbox,1,1,1,1);
 	
-	KviStyledToolButton * tb = new KviStyledToolButton(vbox);
+	QToolButton * tb = new QToolButton(vbox);
 	tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY))));
 	tb->setAutoRaise(true);
 	connect(tb,SIGNAL(clicked()),this,SLOT(newProxy()));
 	mergeTip(tb,__tr2qs_ctx("New Proxy","options"));
 
-	tb = new KviStyledToolButton(vbox);
+	tb = new QToolButton(vbox);
 	tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT))));
 	//tb->setEnabled(false);
 	tb->setAutoRaise(true);
@@ -125,7 +123,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
 
 	m_pProtocolBox->addItems(l);
 
-	m_pIpV6Check = new KviStyledCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox);
+	m_pIpV6Check = new QCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox);
 	connect(m_pIpV6Check,SIGNAL(toggled(bool)),this,SLOT(ipV6CheckToggled(bool)));
 #ifndef COMPILE_IPV6_SUPPORT
 	m_pIpV6Check->setEnabled(false);
diff --git a/src/modules/options/optw_proxy.h b/src/modules/options/optw_proxy.h
index 6b0f8dc83..f94e09673 100644
--- a/src/modules/options/optw_proxy.h
+++ b/src/modules/options/optw_proxy.h
@@ -26,9 +26,10 @@
 #include "kvi_optionswidget.h"
 #include "kvi_tal_treewidget.h"
 
+#include <QCheckBox>
+
 class QLabel;
 class QLineEdit;
-class KviStyledCheckBox;
 class QComboBox;
 class KviIpEditor;
 class KviTalPopupMenu;
@@ -74,7 +75,7 @@ protected:
 	QLabel       * m_pProtocolLabel;
 	QComboBox    * m_pProtocolBox;
 	KviTalPopupMenu   * m_pContextPopup;
-	KviStyledCheckBox    * m_pIpV6Check;
+	QCheckBox    * m_pIpV6Check;
 	KviProxyOptionsTreeWidgetItem * m_pLastEditedItem;
 private:
 
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index cbd83f47b..0e214f85d 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -49,14 +49,11 @@
 #include "kvi_nickserv.h"
 #include "kvi_proxydb.h"
 #include "kvi_kvs_script.h"
-#include "kvi_styled_controls.h"
 #include "kvi_pointerhashtable.h"
 #include "kvi_tal_popupmenu.h"
 #include "kvi_tal_tooltip.h"
 
-#include "kvi_styled_controls.h"
 #include <QLineEdit>
-#include "kvi_styled_controls.h"
 #include <QCursor>
 #include <QValidator>
 #include <QMessageBox>
@@ -178,7 +175,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 
 	m_pEncodingEditor->setCurrentIndex(current);
 
-	m_pAutoConnectCheck = new KviStyledCheckBox(__tr2qs_ctx("Connect to this network at startup","options"),tab);
+	m_pAutoConnectCheck = new QCheckBox(__tr2qs_ctx("Connect to this network at startup","options"),tab);
 	m_pAutoConnectCheck->setChecked(n->autoConnect());
 	gl->addWidget(m_pAutoConnectCheck,2,0,1,2);
 //	gl->addMultiCellWidget(m_pAutoConnectCheck,2,2,0,1);
@@ -253,7 +250,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	KviNickServRuleSet * rs = n->nickServRuleSet();
 	bool bNickServEnabled = rs ? (rs->isEnabled() && !rs->isEmpty()) : false;
 
-	m_pNickServCheck = new KviStyledCheckBox(__tr2qs_ctx("Enable NickServ Identification","options"),tab);
+	m_pNickServCheck = new QCheckBox(__tr2qs_ctx("Enable NickServ Identification","options"),tab);
 	gl->addWidget(m_pNickServCheck,0,0,1,3);
 //	gl->addMultiCellWidget(m_pNickServCheck,0,0,0,2);
 	KviTalToolTip::add(m_pNickServCheck,
@@ -498,7 +495,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	gbox = new KviTalGroupBox(Qt::Horizontal,__tr2qs_ctx("User Mode","options"),tab);
 	gl->addWidget(gbox,1,0);
 
-	m_pUseDefaultInitUMode = new KviStyledCheckBox(__tr2qs_ctx("Use default user mode","options"),gbox);
+	m_pUseDefaultInitUMode = new QCheckBox(__tr2qs_ctx("Use default user mode","options"),gbox);
 	KviTalToolTip::add(m_pUseDefaultInitUMode,__tr2qs_ctx("<center>If this is enabled, the global initial <b>user mode</b> (configured from"\
 			" the identity dialog) will be used. If disabled, you can configure an initial user mode for this server","options"));
 	bool bHasUmode = !(s->initUMode().isEmpty());
@@ -506,15 +503,15 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	m_pUseDefaultInitUMode->setChecked(!bHasUmode);
 	connect(m_pUseDefaultInitUMode,SIGNAL(toggled(bool)),this,SLOT(useDefaultInitUModeToggled(bool)));
 
-	m_pIMode = new KviStyledCheckBox(__tr2qs_ctx("Invisible (+i)","options"),gbox);
+	m_pIMode = new QCheckBox(__tr2qs_ctx("Invisible (+i)","options"),gbox);
 	m_pIMode->setEnabled(bHasUmode);
 	m_pIMode->setChecked(bHasUmode ? s->initUMode().contains('i',Qt::CaseInsensitive) : szDefUMode.contains('i',Qt::CaseInsensitive));
 
-	m_pSMode = new KviStyledCheckBox(__tr2qs_ctx("Server notices (+s)","options"),gbox);
+	m_pSMode = new QCheckBox(__tr2qs_ctx("Server notices (+s)","options"),gbox);
 	m_pSMode->setEnabled(bHasUmode);
 	m_pSMode->setChecked(bHasUmode ? s->initUMode().contains('s',Qt::CaseInsensitive) : szDefUMode.contains('s',Qt::CaseInsensitive));
 
-	m_pWMode = new KviStyledCheckBox(__tr2qs_ctx("Wallops (+w)","options"),gbox);
+	m_pWMode = new QCheckBox(__tr2qs_ctx("Wallops (+w)","options"),gbox);
 	m_pWMode->setEnabled(bHasUmode);
 	m_pWMode->setChecked(bHasUmode ? s->initUMode().contains('w',Qt::CaseInsensitive) : szDefUMode.contains('w',Qt::CaseInsensitive));
 
@@ -568,7 +565,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 #endif
 	}
 
-	m_pCacheIpCheck = new KviStyledCheckBox(__tr2qs_ctx("Cache IP address","options"),tab);
+	m_pCacheIpCheck = new QCheckBox(__tr2qs_ctx("Cache IP address","options"),tab);
 	gl->addWidget(m_pCacheIpCheck,2,0,1,2);
 //	gl->addMultiCellWidget(m_pCacheIpCheck,2,2,0,1);
 	KviTalToolTip::add(m_pCacheIpCheck,__tr2qs_ctx("<center>This check will enable <b>IP address caching</b> for this server:<br>" \
@@ -580,7 +577,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	m_pCacheIpCheck->setChecked(s->cacheIp());
 
 
-	m_pUseIPV6Check = new KviStyledCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),tab);
+	m_pUseIPV6Check = new QCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),tab);
 	gl->addWidget(m_pUseIPV6Check,3,0,1,2);
 //	gl->addMultiCellWidget(m_pUseIPV6Check,3,3,0,1);
 #ifdef COMPILE_IPV6_SUPPORT
@@ -593,7 +590,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	KviTalToolTip::add(m_pUseIPV6Check,__tr2qs_ctx("<center>This check identifies IPv6 servers.<br>If enabled, KVIrc will attempt to use the IPv6 protocol " \
 			"(thus your OS <b>must</b> have a working IPv6 stack and you <b>must</b> have an IPv6 connection).</center>","options"));
 
-	m_pUseSSLCheck = new KviStyledCheckBox(__tr2qs_ctx("Use SSL protocol","options"),tab);
+	m_pUseSSLCheck = new QCheckBox(__tr2qs_ctx("Use SSL protocol","options"),tab);
 	gl->addWidget(m_pUseSSLCheck,4,0,1,2);
 //	gl->addMultiCellWidget(m_pUseSSLCheck,4,4,0,1);
 	KviTalToolTip::add(m_pUseSSLCheck,__tr2qs_ctx("<center>This check will cause the connection to use the <b>Secure Socket Layer</b> " \
@@ -604,7 +601,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	m_pUseSSLCheck->setChecked(s->useSSL());
 
 
-	m_pUseAutoConnect = new KviStyledCheckBox(__tr2qs_ctx("Connect to this server at startup","options"),tab);
+	m_pUseAutoConnect = new QCheckBox(__tr2qs_ctx("Connect to this server at startup","options"),tab);
 	m_pUseAutoConnect->setChecked(s->autoConnect());
 
 	gl->addWidget(m_pUseAutoConnect,5,0,1,2);
@@ -1029,19 +1026,19 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	vbox->setSpacing(0);
 	addWidgetToLayout(vbox,1,0,1,0);
 
-	m_pNewNetworkButton = new KviStyledToolButton(vbox);
+	m_pNewNetworkButton = new QToolButton(vbox);
 	m_pNewNetworkButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD))));
 	m_pNewNetworkButton->setAutoRaise(true);
 	connect(m_pNewNetworkButton,SIGNAL(clicked()),this,SLOT(newNetwork()));
 	KviTalToolTip::add(m_pNewNetworkButton,__tr2qs_ctx("New Network","options"));
 
-	m_pNewServerButton = new KviStyledToolButton(vbox);
+	m_pNewServerButton = new QToolButton(vbox);
 	m_pNewServerButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER))));
 	m_pNewServerButton->setAutoRaise(true);
 	connect(m_pNewServerButton,SIGNAL(clicked()),this,SLOT(newServer()));
 	KviTalToolTip::add(m_pNewServerButton,__tr2qs_ctx("New Server","options"));
 
-	m_pRemoveButton = new KviStyledToolButton(vbox);
+	m_pRemoveButton = new QToolButton(vbox);
 	m_pRemoveButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT))));
 	m_pRemoveButton->setEnabled(false);
 	m_pRemoveButton->setAutoRaise(true);
@@ -1051,14 +1048,14 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	QFrame * f = new QFrame(vbox);
 	f->setFrameStyle(QFrame::Sunken | QFrame::HLine);
 
-	m_pCopyServerButton = new KviStyledToolButton(vbox);
+	m_pCopyServerButton = new QToolButton(vbox);
 	m_pCopyServerButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY))));
 	m_pCopyServerButton->setEnabled(false);
 	m_pCopyServerButton->setAutoRaise(true);
 	connect(m_pCopyServerButton,SIGNAL(clicked()),this,SLOT(copyServer()));
 	KviTalToolTip::add(m_pCopyServerButton,__tr2qs_ctx("Copy Server","options"));
 
-	m_pPasteServerButton = new KviStyledToolButton(vbox);
+	m_pPasteServerButton = new QToolButton(vbox);
 	m_pPasteServerButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)));
 	m_pPasteServerButton->setEnabled(false);
 	m_pPasteServerButton->setAutoRaise(true);
@@ -1068,7 +1065,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	f = new QFrame(vbox);
 	f->setFrameStyle(QFrame::Sunken | QFrame::HLine);
 
-	m_pImportButton = new KviStyledToolButton(vbox);
+	m_pImportButton = new QToolButton(vbox);
 	m_pImportButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER))));
 	m_pImportButton->setAutoRaise(true);
 	m_pImportButton->setMenu(m_pImportPopup);
@@ -1085,7 +1082,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	KviTalToolTip::add(m_pSrvNetEdit,__tr2qs_ctx("<center>This is the name of the currently selected server or network</center>","options"));
 
 /*
-	m_pIpV6Check = new KviStyledCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox);
+	m_pIpV6Check = new QCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox);
 
 #ifndef COMPILE_IPV6_SUPPORT
 	m_pIpV6Check->setEnabled(false);
@@ -1114,7 +1111,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	connect(m_pRecentPopup,SIGNAL(aboutToShow()),this,SLOT(recentServersPopupAboutToShow()));
 	connect(m_pRecentPopup,SIGNAL(activated(int)),this,SLOT(recentServersPopupClicked(int)));
 
-	KviStyledToolButton * tb = new KviStyledToolButton(this);
+	QToolButton * tb = new QToolButton(this);
 	addWidgetToLayout(tb,1,2,1,2);
 	tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME))));
 	tb->setMenu(m_pRecentPopup);
diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h
index 25dd4670d..949175d5f 100644
--- a/src/modules/options/optw_servers.h
+++ b/src/modules/options/optw_servers.h
@@ -31,13 +31,13 @@
 #include <QDialog>
 #include <QButtonGroup>
 #include <QTabWidget>
+#include <QCheckBox>
+#include <QToolButton>
 
 class QLabel;
 class QLineEdit;
-class KviStyledCheckBox;
 class QComboBox;
 class QPushButton;
-class KviStyledToolButton;
 class KviIpEditor;
 class KviIrcServer;
 class KviTalPopupMenu;
@@ -82,10 +82,10 @@ protected:
 
 	QComboBox             * m_pEncodingEditor;
 
-	KviStyledCheckBox             * m_pAutoConnectCheck;
+	QCheckBox             * m_pAutoConnectCheck;
 
 	KviTalTreeWidget        * m_pNickServTreeWidget;
-	KviStyledCheckBox             * m_pNickServCheck;
+	QCheckBox             * m_pNickServCheck;
 	QPushButton           * m_pAddRuleButton;
 	QPushButton           * m_pDelRuleButton;
 	QPushButton           * m_pEditRuleButton;
@@ -121,14 +121,14 @@ protected:
 	QComboBox             * m_pLinkFilterEditor;
 	QComboBox             * m_pEncodingEditor;
 	KviIpEditor           * m_pIpEditor;
-	KviStyledCheckBox             * m_pCacheIpCheck;
-	KviStyledCheckBox             * m_pUseSSLCheck;
-	KviStyledCheckBox             * m_pUseDefaultInitUMode;
-	KviStyledCheckBox             * m_pIMode;
-	KviStyledCheckBox             * m_pWMode;
-	KviStyledCheckBox             * m_pSMode;
-	KviStyledCheckBox             * m_pUseAutoConnect;
-	KviStyledCheckBox             * m_pUseIPV6Check;
+	QCheckBox             * m_pCacheIpCheck;
+	QCheckBox             * m_pUseSSLCheck;
+	QCheckBox             * m_pUseDefaultInitUMode;
+	QCheckBox             * m_pIMode;
+	QCheckBox             * m_pWMode;
+	QCheckBox             * m_pSMode;
+	QCheckBox             * m_pUseAutoConnect;
+	QCheckBox             * m_pUseIPV6Check;
 	QLineEdit             * m_pPortEditor;
 	QStringList             m_lstChannels;
 	KviChannelListSelector * m_pChannelListSelector;
@@ -167,7 +167,7 @@ protected:
 	KviTalPopupMenu                   * m_pContextPopup;
 	KviTalPopupMenu                   * m_pImportPopup;
 	KviIrcServer                 * m_pClipboard;
-	//KviStyledCheckBox                    * m_pIpV6Check;
+	//QCheckBox                    * m_pIpV6Check;
 	QPushButton                  * m_pConnectCurrent;
 	QPushButton                  * m_pConnectNew;
 	KviServerOptionsTreeWidgetItem * m_pLastEditedItem;
@@ -175,12 +175,12 @@ protected:
 	KviNetworkDetailsWidget      * m_pNetworkDetailsDialog;
 	KviMexServerImport           * m_pImportFilter;
 
-	KviStyledToolButton                  * m_pNewServerButton;
-	KviStyledToolButton                  * m_pNewNetworkButton;
-	KviStyledToolButton                  * m_pRemoveButton;
-	KviStyledToolButton                  * m_pCopyServerButton;
-	KviStyledToolButton                  * m_pPasteServerButton;
-	KviStyledToolButton                  * m_pImportButton;
+	QToolButton                  * m_pNewServerButton;
+	QToolButton                  * m_pNewNetworkButton;
+	QToolButton                  * m_pRemoveButton;
+	QToolButton                  * m_pCopyServerButton;
+	QToolButton                  * m_pPasteServerButton;
+	QToolButton                  * m_pImportButton;
 private:
 	void fillServerList();
 	void saveLastItem();
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
index a490d7040..d415077e3 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/optw_texticons.cpp
@@ -33,7 +33,7 @@
 #include <QCursor>
 #include <QTableWidget>
 #include <QTableWidgetItem>
-
+#include <QToolButton>
 
 
 KviTextIconTableItem::KviTextIconTableItem(QTableWidget * t,KviTextIcon * icon)
@@ -164,8 +164,8 @@ void KviTextIconsOptionsWidget::itemClicked(QTableWidgetItem *i)
 		delete m_pBox;
 	m_pBox=new KviTalHBox(0);
 	m_pItem=(KviTextIconTableItem *)i;
-	KviStyledToolButton *iconButton=new KviStyledToolButton(m_pBox);
-	KviStyledToolButton *browseButton=new KviStyledToolButton(m_pBox);
+	QToolButton *iconButton=new QToolButton(m_pBox);
+	QToolButton *browseButton=new QToolButton(m_pBox);
 	browseButton->setText("...");
 	m_pBox->setSpacing(0);
 	m_pBox->setMargin(0);
diff --git a/src/modules/options/optw_texticons.h b/src/modules/options/optw_texticons.h
index 091415aeb..8084b38ad 100644
--- a/src/modules/options/optw_texticons.h
+++ b/src/modules/options/optw_texticons.h
@@ -28,7 +28,6 @@
 #include "kvi_tal_popupmenu.h"
 #include "kvi_tal_hbox.h"
 
-#include "kvi_styled_controls.h"
 #include <QTableWidget>
 #include <QTableWidgetItem>