ported option classes to qt4 way

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

29 files changed, 138 insertions, 75 deletions

diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 239dd5f77..00a614fbb 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -59,8 +59,9 @@ extern KVIRC_API KviApp * g_pApp;
 extern KviOptionsInstanceManager * g_pOptionsInstanceManager;
 
 KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(QWidget *parent,const QString &szText)
-:KviOptionsWidget(parent,"general_options_front_widget")
+:KviOptionsWidget(parent)
 {
+	setObjectName("general_options_front_widget");
 	createLayout();
 	QLabel * l = new QLabel(szText,this);
 	l->setWordWrap(true);
@@ -111,8 +112,10 @@ void KviOptionsListViewItem::paintCell(QPainter * p,const QColorGroup & cg,int c
 
 
 KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
-: QDialog(par,"general_options_dialog")
+: QDialog(par)
 {
+	setObjectName("general_options_dialog");
+
 	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)));
 
 	m_szGroup = szGroup;
diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp
index b2638fbd8..6db027d25 100644
--- a/src/modules/options/optw_antispam.cpp
+++ b/src/modules/options/optw_antispam.cpp
@@ -29,8 +29,9 @@
 #include <QLabel>
 
 KviAntispamOptionsWidget::KviAntispamOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"antispam_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("antispam_options_widget");
 	createLayout();
 
 	KviTalGroupBox *g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Enable Anti-spam For","options"));
diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp
index 9016ca905..fc05f1025 100644
--- a/src/modules/options/optw_avatar.cpp
+++ b/src/modules/options/optw_avatar.cpp
@@ -30,8 +30,10 @@
 #include "kvi_tal_tooltip.h"
 
 KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"avatar_advanced_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("avatar_advanced_options_widget");
+
 	createLayout();
 	// AVATAR
 
diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp
index 635b21d81..88a44fa55 100644
--- a/src/modules/options/optw_away.cpp
+++ b/src/modules/options/optw_away.cpp
@@ -29,8 +29,10 @@
 #include <QLayout>
 
 KviAwayOptionsWidget::KviAwayOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"away_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("away_options_widget");
+
 	createLayout();
 
 	addStringSelector(0,0,0,0, __tr2qs_ctx("Default away message:","options"), KviOption_stringAwayMessage);
@@ -58,7 +60,7 @@ KviAwayOptionsWidget::~KviAwayOptionsWidget()
 {
 }
 
-void KviAwayOptionsWidget::enableCustomAwayText(bool) 
+void KviAwayOptionsWidget::enableCustomAwayText(bool)
 {
 	m_pCustomAwayNick->setEnabled(m_pEnableAwayNick->isChecked() && !(m_pEnableCustomAwayNick->isChecked()));
 
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp
index 5063d3795..3910a65ee 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/optw_connection.cpp
@@ -33,8 +33,9 @@
 
 
 KviConnectionOptionsWidget::KviConnectionOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"connection_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("connection_options_widget");
 	createLayout();
 	KviTalGroupBox *gbox = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("On Disconnect","options"));
 
@@ -95,11 +96,12 @@ KviConnectionOptionsWidget::~KviConnectionOptionsWidget()
 
 
 KviSSLOptionsWidget::KviSSLOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ssl_options_widget")
+: KviOptionsWidget(parent)
 {
-#ifdef COMPILE_SSL_SUPPORT
+	setObjectName("ssl_options_widget");
 	createLayout();
 
+#ifdef COMPILE_SSL_SUPPORT
 	KviTalGroupBox * gbox = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Certificate","options"));
 
 	KviBoolSelector * b = addBoolSelector(gbox,__tr2qs_ctx("Use SSL certificate (PEM format only)","options"),
@@ -122,7 +124,6 @@ KviSSLOptionsWidget::KviSSLOptionsWidget(QWidget * parent)
 	connect(b,SIGNAL(toggled(bool)),p,SLOT(setEnabled(bool)));
 	addRowSpacer(0,2,0,2);
 #else
-	createLayout();
 	addLabel(0,0,0,0,__tr2qs_ctx("This executable has no SSL support.","options"));
 #endif
 }
@@ -133,8 +134,9 @@ KviSSLOptionsWidget::~KviSSLOptionsWidget()
 
 
 KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"transport_options_widget")
+: KviOptionsWidget(parent,)
 {
+	setObjectName("transport_options_widget");
 	createLayout();
 	KviUIntSelector * u;
 	
@@ -163,11 +165,11 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent)
 
 	b = addBoolSelector(0,4,0,4,__tr2qs_ctx("Pick Random IP Address for Round-Robin Servers","options"),KviOption_boolPickRandomIpAddressForRoundRobinServers);
 	mergeTip(b,__tr2qs_ctx("<center>This option will cause the KVIrc networking stack to pick up " \
-							"a random entry when multiple IP address are retrieved for a server " \
-							"dns lookup. This is harmless and can fix some problems with caching " \
-							"dns servers that do not properly rotate the records as the authoritative " \
-							"ones would do. On the other hand, you might want to disable it if " \
-							"you want to rely on the dns server to provide the best choice.</center>","options"));
+		"a random entry when multiple IP address are retrieved for a server " \
+		"dns lookup. This is harmless and can fix some problems with caching " \
+		"dns servers that do not properly rotate the records as the authoritative " \
+		"ones would do. On the other hand, you might want to disable it if " \
+		"you want to rely on the dns server to provide the best choice.</center>","options"));
 
 	addRowSpacer(0,5,0,5);
 }
@@ -178,8 +180,9 @@ KviTransportOptionsWidget::~KviTransportOptionsWidget()
 
 
 KviIdentOptionsWidget::KviIdentOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ident_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("ident_options_widget");
 	createLayout();
 
 	m_pEnableIdent = addBoolSelector(0,0,0,0,__tr2qs_ctx("Enable ident service (bad practice on UNIX!)","options"),KviOption_boolUseIdentService);
@@ -278,14 +281,13 @@ void KviIdentOptionsWidget::enableIpv4InIpv6(bool)
 
 
 KviConnectionAdvancedOptionsWidget::KviConnectionAdvancedOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"connection_advanced_options_widget")
+: KviOptionsWidget(parent)
 {
-
+	setObjectName("connection_advanced_options_widget");
 }
 
 KviConnectionAdvancedOptionsWidget::~KviConnectionAdvancedOptionsWidget()
 {
-
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/optw_ctcp.cpp
index b01fd431a..6f8860028 100644
--- a/src/modules/options/optw_ctcp.cpp
+++ b/src/modules/options/optw_ctcp.cpp
@@ -28,8 +28,10 @@
 
 
 KviCtcpOptionsWidget::KviCtcpOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ctcp_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("ctcp_options_widget");
+
 	createLayout();
 
 	QLabel * l;
diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp
index 5bf3c8fba..6007f3472 100644
--- a/src/modules/options/optw_ctcpfloodprotection.cpp
+++ b/src/modules/options/optw_ctcpfloodprotection.cpp
@@ -72,8 +72,10 @@
 
 
 KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ctcpfloodprotection_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("ctcpfloodprotection_options_widget");
+
 	createLayout();
 
 	KviBoolSelector * b = addBoolSelector(0,0,1,0,__tr2qs_ctx("Use flood protection (recommended)","options"),KviOption_boolUseCtcpFloodProtection);
diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp
index 0039abea8..f2df11fb3 100644
--- a/src/modules/options/optw_dcc.cpp
+++ b/src/modules/options/optw_dcc.cpp
@@ -43,8 +43,9 @@ KviDccOptionsWidget::~KviDccOptionsWidget()
 
 
 KviDccGeneralOptionsWidget::KviDccGeneralOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"dccgeneral_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("dccgeneral_options_widget");
 	createLayout();
 
 	KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Use workaround for firewall","options"),KviOption_boolCantAcceptIncomingDccConnections);
@@ -63,8 +64,9 @@ KviDccGeneralOptionsWidget::~KviDccGeneralOptionsWidget()
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"dccgeneral_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("dccgeneral_options_widget");
 	createLayout();
 
 	KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Network Properties","options"));
@@ -151,8 +153,9 @@ KviDccAdvancedOptionsWidget::~KviDccAdvancedOptionsWidget()
 
 
 KviDccSendOptionsWidget::KviDccSendOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"dccsend_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("dccsend_options_widget");
 }
 
 KviDccSendOptionsWidget::~KviDccSendOptionsWidget()
@@ -161,8 +164,9 @@ KviDccSendOptionsWidget::~KviDccSendOptionsWidget()
 
 
 KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"dccsend_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("dccsend_options_widget");
 	createLayout();
 
 	KviBoolSelector * b;
@@ -201,8 +205,9 @@ KviDccSendGeneralOptionsWidget::~KviDccSendGeneralOptionsWidget()
 
 
 KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"dccsend_advanced_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("dccsend_advanced_options_widget");
 	createLayout();
 
 	KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Bug Compatibility","options"));
@@ -282,7 +287,6 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * paren
 
 KviDccSendAdvancedOptionsWidget::~KviDccSendAdvancedOptionsWidget()
 {
-	
 }
 
 
@@ -293,8 +297,9 @@ KviDccSendAdvancedOptionsWidget::~KviDccSendAdvancedOptionsWidget()
 
 
 KviDccChatOptionsWidget::KviDccChatOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"dccchat_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("dccchat_options_widget");
 	createLayout();
 
 	KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("On Chat Request","options"));
diff --git a/src/modules/options/optw_generalopt.cpp b/src/modules/options/optw_generalopt.cpp
index a6001ab90..2a1b1d041 100644
--- a/src/modules/options/optw_generalopt.cpp
+++ b/src/modules/options/optw_generalopt.cpp
@@ -30,9 +30,9 @@
 
 
 KviGeneralOptOptionsWidget::KviGeneralOptOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"generalopt_options_widget")
+: KviOptionsWidget(parent)
 {
-
+	setObjectName("generalopt_options_widget");
 	createLayout();
 
 	QLabel * l;
@@ -42,7 +42,6 @@ KviGeneralOptOptionsWidget::KviGeneralOptOptionsWidget(QWidget * parent)
 	addAdvancedButton(4,1,4,1);
 }
 
-
 KviGeneralOptOptionsWidget::~KviGeneralOptOptionsWidget()
 {
 }
diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp
index 29152e93a..2585f0ac1 100644
--- a/src/modules/options/optw_highlighting.cpp
+++ b/src/modules/options/optw_highlighting.cpp
@@ -30,8 +30,9 @@
 #include <QLabel>
 
 KviAlertHighlightingOptionsWidget::KviAlertHighlightingOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"highlighting_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("highlighting_options_widget");
 }
 
 KviAlertHighlightingOptionsWidget::~KviAlertHighlightingOptionsWidget()
@@ -40,8 +41,10 @@ KviAlertHighlightingOptionsWidget::~KviAlertHighlightingOptionsWidget()
 
 
 KviHighlightingOptionsWidget::KviHighlightingOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"highlighting_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("highlighting_options_widget");
+
 	createLayout();
 
 	KviBoolSelector * b;
@@ -69,11 +72,12 @@ KviHighlightingOptionsWidget::~KviHighlightingOptionsWidget()
 
 
 KviAlertOptionsWidget::KviAlertOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"highlighting_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("highlighting_options_widget");
+
 	createLayout();
 
-	
 	KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Alert Restrictions","options"));
 	KviBoolSelector * b3 = addBoolSelector(g,__tr2qs_ctx("Restrict alert","options"),KviOption_boolHighlightOnlyNormalMsg);
 	mergeTip(b3, __tr2qs_ctx("<center>If this option is enabled, KVIrc will alert in the taskbar only if a normal message is received in a channel.<br>Actions like joins, parts and mode changes will be ignored.<br> This is useful if you are in channels with a high rate of traffic and only want to be alerted for messages that are interesting to you.</center>","options"));
diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/optw_ignore.cpp
index a41231e35..23a947f9c 100644
--- a/src/modules/options/optw_ignore.cpp
+++ b/src/modules/options/optw_ignore.cpp
@@ -29,8 +29,9 @@
 
 
 KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ignore_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("ignore_options_widget");
 	createLayout();
 
 	KviTalGroupBox *g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Enable Ignore For","options"));
diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp
index f4bdef2d0..5816a2ec1 100644
--- a/src/modules/options/optw_input.cpp
+++ b/src/modules/options/optw_input.cpp
@@ -27,8 +27,9 @@
 #include <QLayout>
 
 KviInputLookOptionsWidget::KviInputLookOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ircviewlook_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("ircviewlook_options_widget");
 	createLayout();
 
 	addFontSelector(0,0,1,0,__tr2qs_ctx("Font","options"),KviOption_fontInput);
@@ -130,10 +131,10 @@ void KviInputLookOptionsWidget::commit()
 }
 
 
-
 KviInputFeaturesOptionsWidget::KviInputFeaturesOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ircviewfeatures_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("ircviewfeatures_options_widget");
 	createLayout();
 
 	addBoolSelector(0,0,0,0,__tr2qs_ctx("Warp cursor at the end of line when browsing history","options"),KviOption_boolInputHistoryCursorAtEnd);
diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp
index 0a8f8f1de..22cfc72ff 100644
--- a/src/modules/options/optw_interfacefeatures.cpp
+++ b/src/modules/options/optw_interfacefeatures.cpp
@@ -36,8 +36,9 @@
 
 
 KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"interfacefeatures_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("interfacefeatures_options_widget");
 	createLayout();
 
 	addBoolSelector(0,0,0,0,__tr2qs_ctx("Minimize on startup","options"),KviOption_boolStartupMinimized);
diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp
index 7f108f63e..b461a7234 100644
--- a/src/modules/options/optw_irc.cpp
+++ b/src/modules/options/optw_irc.cpp
@@ -32,19 +32,20 @@
 
 
 KviIrcOptionsWidget::KviIrcOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"irc_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("irc_options_widget");
 }
 
-
 KviIrcOptionsWidget::~KviIrcOptionsWidget()
 {
 }
 
 
 KviIrcGeneralOptionsWidget::KviIrcGeneralOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"irc_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("irc_options_widget");
 	createLayout();
 	KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Minimize console after successful login","options"),KviOption_boolMinimizeConsoleAfterConnect);
 
@@ -56,15 +57,15 @@ KviIrcGeneralOptionsWidget::KviIrcGeneralOptionsWidget(QWidget * parent)
 	addRowSpacer(0,2,0,2);
 }
 
-
 KviIrcGeneralOptionsWidget::~KviIrcGeneralOptionsWidget()
 {
 }
 
 
 KviIrcAdvancedOptionsWidget::KviIrcAdvancedOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"irc_advanced_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("irc_advanced_options_widget");
 	createLayout();
 	KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Force immediate quit","options"),KviOption_boolForceBrutalQuit);    
 	mergeTip(b,
diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp
index fcce3671e..c8fd53d54 100644
--- a/src/modules/options/optw_ircoutput.cpp
+++ b/src/modules/options/optw_ircoutput.cpp
@@ -33,8 +33,9 @@
 
 
 KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ircoutput_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("ircoutput_options_widget");
 	createLayout();
 
 	QLabel * l =new QLabel(__tr2qs_ctx("Output verbosity","options"),this);
diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp
index c3c7852d6..c2b2cacef 100644
--- a/src/modules/options/optw_lag.cpp
+++ b/src/modules/options/optw_lag.cpp
@@ -31,8 +31,9 @@
 
 
 KviLagOptionsWidget::KviLagOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"lag_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("lag_options_widget");
 	createLayout();
 
 	KviBoolSelector * pUse = addBoolSelector(0,0,0,0, __tr2qs_ctx("Enable lag meter","options"), KviOption_boolUseLagMeterEngine);
diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/optw_logging.cpp
index 095fd451b..6c9ba65a1 100644
--- a/src/modules/options/optw_logging.cpp
+++ b/src/modules/options/optw_logging.cpp
@@ -30,8 +30,10 @@
 
 
 KviLoggingOptionsWidget::KviLoggingOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"logging_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("logging_options_widget");
+
 	createLayout();
 
 	KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Automatically Log","options"));
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index d14c4694c..f631624b9 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -63,8 +63,10 @@ void KviMediaTypeTreeWidgetItem::copyData(KviMediaType * t)
 }
 
 KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"mediatypes_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("mediatypes_options_widget");
+
 	createLayout();
 
 	m_pTreeWidget = new KviTalTreeWidget(this);
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index 19e8276a2..2904e0312 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -66,8 +66,9 @@ KviMessageOptionsWidget::~KviMessageOptionsWidget()
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"privmsg_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("privmsg_options_widget");
 	createLayout();
 
 	KviBoolSelector * b1;
@@ -115,7 +116,6 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(QWidget * parent)
 
 KviPrivmsgOptionsWidget::~KviPrivmsgOptionsWidget()
 {
-
 }
 
 KviTimestampOptionsWidget::KviTimestampOptionsWidget(QWidget * pParent)
@@ -157,8 +157,9 @@ void KviTimestampOptionsWidget::enableDisableTimestampSelector(bool)
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 KviStandardColorsOptionsWidget::KviStandardColorsOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"stdcolors")
+: KviOptionsWidget(parent)
 {
+	setObjectName("stdcolors");
 	createLayout();
 	
 	addColorSelector(0,0,0,0,"0:",&(KVI_OPTION_MIRCCOLOR(0)));
@@ -363,15 +364,15 @@ KviIrcColorsOptionsWidget::~KviIrcColorsOptionsWidget()
 */
 
 KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"messages")
+: KviOptionsWidget(parent)
 {
-	int i;
+	setObjectName("messages");
 
 	createLayout();
 
+	int i;
 	m_pLastItem = 0;
 
-
 	m_pListView = new KviMessageListView(this);
 	m_pListView->addColumn(__tr2qs_ctx("Message Type","options"));
 	m_pListView->setAllColumnsShowFocus(true);
diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp
index 851815096..fcd785c2c 100644
--- a/src/modules/options/optw_notify.cpp
+++ b/src/modules/options/optw_notify.cpp
@@ -29,8 +29,10 @@
 #include <QLayout>
 
 KviNotifyOptionsWidget::KviNotifyOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"notify_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("notify_options_widget");
+
 	createLayout();
 
 	KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Use online notify list","options"),KviOption_boolUseNotifyList);
@@ -100,8 +102,10 @@ KviNotifyOptionsWidget::~KviNotifyOptionsWidget()
 
 
 KviNotifierOptionsWidget::KviNotifierOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"notifier_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("notifier_options_widget");
+
 	createLayout();
 
 	KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Enable the notifier","options"),KviOption_boolEnableNotifier);
diff --git a/src/modules/options/optw_protection.cpp b/src/modules/options/optw_protection.cpp
index f67ff80e0..2d9586b41 100644
--- a/src/modules/options/optw_protection.cpp
+++ b/src/modules/options/optw_protection.cpp
@@ -31,9 +31,10 @@
 #include <QLayout>
 
 KviProtectionOptionsWidget::KviProtectionOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"protection_options_widget")
+: KviOptionsWidget(parent)
 {
-	
+	setObjectName("protection_options_widget");
+
 	createLayout();
 
 	QLabel * l;
diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp
index f4abe673b..237b2c750 100644
--- a/src/modules/options/optw_query.cpp
+++ b/src/modules/options/optw_query.cpp
@@ -31,8 +31,10 @@
 
 
 KviQueryOptionsWidget::KviQueryOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"query_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("query_options_widget");
+
 	createLayout();
 
 	KviTalGroupBox *g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Open Query For","options"));
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 29faea3d8..b67853eda 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -68,6 +68,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviNetwork * n)
 {
 	setModal(true);
 	setObjectName("network_details");
+
 	m_pOnConnectEditor=0;
 	m_pOnLoginEditor=0;
 
@@ -457,6 +458,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviServer * s)
 {
 	setModal(true);
 	setObjectName("server_details");
+
 	m_szHostname = s->hostName();
 	QGridLayout * g = new QGridLayout(this);
 
@@ -1035,8 +1037,10 @@ void KviServerOptionsTreeWidgetItem::updateVisibleStrings()
 
 
 KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
-    : KviOptionsWidget(parent,"server_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("server_options_widget");
+
 	createLayout();
 
 	m_pContextPopup = new KviTalPopupMenu(this);
diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp
index c8d29352e..56b71395c 100644
--- a/src/modules/options/optw_sound.cpp
+++ b/src/modules/options/optw_sound.cpp
@@ -52,8 +52,9 @@ KviSoundOptionsWidget::~KviSoundOptionsWidget()
 
 
 KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"sound_system_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("sound_system_options_widget");
 	createLayout();
 
 	KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Sound System","options"),true);
@@ -276,8 +277,9 @@ void KviSoundGeneralOptionsWidget::commit()
 }
 
 KviSoundsOptionsWidget::KviSoundsOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"sound_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("sound_options_widget");
 	createLayout();
 	addLabel(0,0,0,0,__tr2qs_ctx("New Query opened","options"));
 	addSoundSelector(1,0,1,0,"",KviOption_stringOnNewQueryOpenedSound);
diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_taskbar.cpp
index b8b3de437..c31b28a25 100644
--- a/src/modules/options/optw_taskbar.cpp
+++ b/src/modules/options/optw_taskbar.cpp
@@ -28,8 +28,10 @@
 
 
 KviTaskBarOptionsWidget::KviTaskBarOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"taskbar_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("taskbar_options_widget");
+
 	createLayout();
 
 	addBoolSelector(0,0,0,0,__tr2qs_ctx("Use tree taskbar","options"),KviOption_boolUseTreeWindowListTaskBar);
@@ -58,8 +60,9 @@ KviTaskBarOptionsWidget::~KviTaskBarOptionsWidget()
 
 
 KviTreeTaskBarOptionsWidget::KviTreeTaskBarOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"treetaskbar_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("treetaskbar_options_widget");
 }
 
 KviTreeTaskBarOptionsWidget::~KviTreeTaskBarOptionsWidget()
@@ -70,8 +73,10 @@ KviTreeTaskBarOptionsWidget::~KviTreeTaskBarOptionsWidget()
 
 
 KviTreeTaskBarForegroundOptionsWidget::KviTreeTaskBarForegroundOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"treetaskbar_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("treetaskbar_options_widget");
+
 	createLayout();
 
 	addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontTreeTaskbar);
@@ -102,8 +107,10 @@ KviTreeTaskBarForegroundOptionsWidget::~KviTreeTaskBarForegroundOptionsWidget()
 
 
 KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"treetaskbar_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("treetaskbar_options_widget");
+
 	createLayout();
 	
 	KviTalGroupBox * g = addGroupBox(0,0,1,0,Qt::Horizontal,__tr2qs_ctx("Background Colors","options"));
@@ -204,8 +211,10 @@ void KviTreeTaskBarBackgroundOptionsWidget::commit()
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 KviTreeTaskBarFeaturesOptionsWidget::KviTreeTaskBarFeaturesOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"treetaskbar_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("treetaskbar_options_widget");
+
 	createLayout();
 
 	addBoolSelector(0,0,1,0,__tr2qs_ctx("Show header","options"),KviOption_boolShowTreeTaskbarHeader);
@@ -225,9 +234,12 @@ KviTreeTaskBarFeaturesOptionsWidget::~KviTreeTaskBarFeaturesOptionsWidget()
 
 
 KviClassicTaskBarOptionsWidget::KviClassicTaskBarOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"classictaskbar_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("classictaskbar_options_widget");
+
 	createLayout();
+
 	addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontTaskbar);
 	KviTalGroupBox *g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Text/Alert Colors","options"));
 	addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTaskBarNormalText);
diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp
index 084dfa5e8..641f1928c 100644
--- a/src/modules/options/optw_textencoding.cpp
+++ b/src/modules/options/optw_textencoding.cpp
@@ -33,8 +33,9 @@
 QString g_szPrevSettedLocale;
 
 KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"textencoding_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("textencoding_options_widget");
 	createLayout();
 
 	//server encoding
diff --git a/src/modules/options/optw_tools.cpp b/src/modules/options/optw_tools.cpp
index 54c883027..89274a4ba 100644
--- a/src/modules/options/optw_tools.cpp
+++ b/src/modules/options/optw_tools.cpp
@@ -31,9 +31,9 @@
 #include <QLayout>
 
 KviToolsOptionsWidget::KviToolsOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"tools_options_widget")
+: KviOptionsWidget(parent)
 {
-	
+	setObjectName("tools_options_widget");
 	createLayout();
 
 	QLabel * l;
diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp
index 441cf7476..4ac9ec687 100644
--- a/src/modules/options/optw_tray.cpp
+++ b/src/modules/options/optw_tray.cpp
@@ -31,8 +31,10 @@
 
 
 KviTrayOptionsWidget::KviTrayOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"tray_options_widget")
+: KviOptionsWidget(parent)
 {
+	setObjectName("tray_options_widget");
+
 	createLayout();
 	
 	m_pEnable = addBoolSelector(0,0,0,0, __tr2qs_ctx("Enable tray icon","options"), KviOption_boolShowDockExtension);
diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp
index c527d99ce..66c857e90 100644
--- a/src/modules/options/optw_urlhandlers.cpp
+++ b/src/modules/options/optw_urlhandlers.cpp
@@ -32,7 +32,7 @@
 
 
 KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"urlhandlers_options_widget")
+: KviOptionsWidget(parent)
 {
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	#define START_ROW 1
@@ -40,6 +40,8 @@ KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(QWidget * parent)
 	#define START_ROW 0
 #endif
 
+	setObjectName("urlhandlers_options_widget");
+
 	createLayout();
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)