more qt4 port

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

21 files changed, 496 insertions, 405 deletions

diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp
index ef66a61ef..ca1603afb 100644
--- a/src/modules/options/container.cpp
+++ b/src/modules/options/container.cpp
@@ -29,7 +29,7 @@
 
 #include <qlayout.h>
 #include <qpushbutton.h>
-#include <qtooltip.h>
+#include "kvi_tal_tooltip.h"
 #include <qevent.h>
 
 #ifdef COMPILE_USE_QT4
@@ -58,7 +58,7 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w)
 
 
 	QPushButton * b = new QPushButton(__tr2qs_ctx("&OK","options"),this);
-	QToolTip::add(b,__tr2qs_ctx("Close this dialog, accepting all changes.","options"));
+	KviTalToolTip::add(b,__tr2qs_ctx("Close this dialog, accepting all changes.","options"));
 	//b->setMinimumWidth(m_pCancel->sizeHint().width());
 	g->addWidget(b,1,1);
 	b->setDefault(true);
@@ -66,7 +66,7 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w)
 	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 
 	m_pCancel = new QPushButton(__tr2qs_ctx("Cancel","options"),this);
-	QToolTip::add(m_pCancel,__tr2qs_ctx("Close this dialog, discarding all changes.","options"));
+	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)));
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index e629bbd4e..b5713732a 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -32,7 +32,6 @@
 #include "kvi_module.h"
 #include "kvi_styled_controls.h"
 #include "kvi_ptrdict.h"
-//FIX ME //szText.append(QToolTip::textFor((QWidget*)o));
 #include <qlayout.h>
 #include "kvi_accel.h"
 #include <qlabel.h>
@@ -40,7 +39,8 @@
 #include <qsplitter.h>
 #include "kvi_tal_widgetstack.h"
 #include <qpushbutton.h>
-#include <qtooltip.h>
+#include "kvi_tal_tooltip.h"
+
 #ifdef COMPILE_USE_QT4
 #include <Q3Header>
 #else
@@ -50,7 +50,6 @@
 #include <qtoolbutton.h>
 #include <qcheckbox.h>
 #include <kvi_tal_groupbox.h>
-#include <qtooltip.h>
 #ifndef COMPILE_USE_QT4
 #include <qobjectlist.h>
 
@@ -227,8 +226,8 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 								"The pages that contain some options related to the " \
 								"search term will be highlighted and you will be able " \
 								"to quickly find them.</p><p>Try \"nickname\" for example.</p>","options");
-	QToolTip::add(m_pSearchLineEdit,szTip);
-	QToolTip::add(m_pSearchButton,szTip);
+	KviTalToolTip::add(m_pSearchLineEdit,szTip);
+	KviTalToolTip::add(m_pSearchButton,szTip);
 #endif
 
 	vbox = new KviTalVBox(spl);
@@ -253,20 +252,20 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 //  Ok,Cancel,Help
 
 	QPushButton * b = new QPushButton(__tr2qs_ctx("&OK","options"),this,"btnok");
-	QToolTip::add(b,__tr2qs_ctx("Close this dialog, accepting all changes.","options"));
+	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)));
 	g1->addWidget(b,1,2);	
 
 	b = new QPushButton(__tr2qs_ctx("&Apply","options"),this,"btnapply");
-	QToolTip::add(b,__tr2qs_ctx("Commit all changes immediately.","options"));
+	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)));
 	g1->addWidget(b,1,3);
 
 	b = new QPushButton(__tr2qs_ctx("Cancel","options"),this,"btncancel");
-	QToolTip::add(b,__tr2qs_ctx("Close this dialog, discarding all changes.","options"));
+	KviTalToolTip::add(b,__tr2qs_ctx("Close this dialog, discarding all changes.","options"));
 	b->setDefault(true);
 	//b->setMinimumWidth(whatIsThisWidth);
 	connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked()));
@@ -294,7 +293,8 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	}
 
 	KviAccel *a = new KviAccel( this );
-        a->connectItem( a->insertItem(Qt::Key_Escape), this,SLOT(close()) );        
+        a->connectItem( a->insertItem(Qt::Key_Escape), this,SLOT(close()) );
+	
 }
 
 KviOptionsDialog::~KviOptionsDialog()
@@ -340,7 +340,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr
 		while((o = it.current())/* && (!bFoundSomethingHere)*/)
 		{
 #else
-		for(int i;i<ol.count();i++)
+		for(int i=0;i<ol.count();i++)
 		{
 			o=ol.at(i);
 #endif
@@ -350,9 +350,8 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr
 			else if(o->inherits("QCheckBox"))szText = ((QCheckBox *)o)->text();
 			else if(o->inherits("KviTalGroupBox"))szText = ((KviTalGroupBox *)o)->title();
 #ifdef COMPILE_INFO_TIPS
-			// FIX ME
 			if(o->inherits("QWidget")){
-				//szText.append(QToolTip::textFor((QWidget*)o));
+				szText.append(KviTalToolTip::textFor((QWidget*)o));
 			}
 #endif
 #ifdef COMPILE_USE_QT4
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index 7af9111ff..9d98a9eed 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -122,8 +122,6 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
 		}
 		g_pOptionsDialogDict->insert(szGroup,d);
 	}
-
-	d->show();
 	d->raise();
 	d->setFocus();
 	return true;
diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp
index de908d209..287cba617 100644
--- a/src/modules/options/optw_avatar.cpp
+++ b/src/modules/options/optw_avatar.cpp
@@ -28,7 +28,7 @@
 #include "kvi_selectors.h"
 #include "kvi_options.h"
 
-#include <qtooltip.h>
+#include "kvi_tal_tooltip.h"
 
 KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"avatar_advanced_options_widget")
@@ -40,7 +40,7 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent)
 	KviTalGroupBox *g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Scaling","options"));
 	KviBoolSelector *b = addBoolSelector(g,__tr2qs_ctx("Scale avatar images (recommended)","options"),KviOption_boolScaleAvatars);
 #ifdef COMPILE_INFO_TIPS	
-	QToolTip::add(b,__tr2qs_ctx("<center>This option will force KVIrc to scale avatars" \
+	KviTalToolTip::add(b,__tr2qs_ctx("<center>This option will force KVIrc to scale avatars" \
 			" shown in the userlist.<br>" \
 			"Avatars will be scaled to fit the " \
 			"constraints set below. Better keep this option on. :)</center>","options"));
diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/optw_ctcp.cpp
index b2096ae7c..59d5e7da0 100644
--- a/src/modules/options/optw_ctcp.cpp
+++ b/src/modules/options/optw_ctcp.cpp
@@ -27,7 +27,7 @@
 #include "kvi_options.h"
 
 //#ifdef COMPILE_INFO_TIPS
-//	#include <qtooltip.h>
+//	#include "kvi_tal_tooltip.h"
 //#endif
 
 KviCtcpOptionsWidget::KviCtcpOptionsWidget(QWidget * parent)
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index 668a55dd0..e5e9be91f 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -28,12 +28,11 @@
 #include <qcheckbox.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
-#include <qtooltip.h>
+#include "kvi_tal_tooltip.h"
 #include <qtabwidget.h>
 #include <qcombobox.h>
 #include <qmessagebox.h>
 #include <qtimer.h>
-#include <qtooltip.h>
 #include <qvalidator.h>
 
 #include "kvi_defaults.h"
@@ -365,8 +364,8 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 	m_pAgeCombo = new QComboBox(hb);
 #ifdef COMPILE_INFO_TIPS
 	QString szTip1 = szCenterBegin + __tr2qs_ctx("Here you can specify your age.","options") + szTrailing;
-	QToolTip::add(l,szTip1);
-	QToolTip::add(m_pAgeCombo,szTip1);
+	KviTalToolTip::add(l,szTip1);
+	KviTalToolTip::add(m_pAgeCombo,szTip1);
 #endif
 	m_pAgeCombo->insertItem(__tr2qs_ctx("Unspecified","options"));
 	unsigned int i;
@@ -395,8 +394,8 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 	m_pGenderCombo = new QComboBox(hb);
 #ifdef COMPILE_INFO_TIPS
 	QString szTip2 =  szCenterBegin + __tr2qs_ctx("Here you can specify your gender.","options") + szTrailing;
-	QToolTip::add(l,szTip2);
-	QToolTip::add(m_pGenderCombo,szTip2);
+	KviTalToolTip::add(l,szTip2);
+	KviTalToolTip::add(m_pGenderCombo,szTip2);
 #endif
 
 	m_pGenderCombo->insertItem(__tr2qs_ctx("Unspecified","options"));
diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp
index c33b65da4..a7e565f1a 100644
--- a/src/modules/options/optw_ircoutput.cpp
+++ b/src/modules/options/optw_ircoutput.cpp
@@ -32,7 +32,7 @@
 #include <qlabel.h>
 
 #ifdef COMPILE_INFO_TIPS
-	#include <qtooltip.h>
+	#include "kvi_tal_tooltip.h"
 #endif
 
 KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(QWidget * parent)
diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp
index 84ec5449e..34e3eb300 100644
--- a/src/modules/options/optw_lag.cpp
+++ b/src/modules/options/optw_lag.cpp
@@ -24,7 +24,7 @@
 #include "optw_lag.h"
 
 #include <qlayout.h>
-#include <qtooltip.h>
+#include "kvi_tal_tooltip.h"
 
 #include "kvi_options.h"
 #include "kvi_locale.h"
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index b00bb9fd6..062b50309 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -24,7 +24,7 @@
 
 #include <qlayout.h>
 #include <qlabel.h>
-#include <qtooltip.h>
+#include "kvi_tal_tooltip.h"
 
 #include "kvi_options.h"
 #include "kvi_locale.h"
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index 0d7406979..2742d6dd8 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -34,7 +34,7 @@
 #include "kvi_styled_controls.h"
 
 #include "kvi_settings.h"
-//FIX ME: p->drawWinFocusRect
+
 #ifndef COMPILE_ON_WINDOWS
 	#include <unistd.h> // symlink()
 #endif
@@ -297,8 +297,17 @@ void KviMessageListViewItem::paintCell(QPainter * p,const QColorGroup &,int,int
 	p->drawText(24,listView()->itemMargin(),w - 24,height() - (listView()->itemMargin() * 2),Qt::AlignLeft | Qt::AlignVCenter,txt);
 	if(isSelected())
 	{
-//		p->drawWinFocusRect(0,0,w,height(),KVI_OPTION_COLOR(KviOption_colorIrcViewBackground));
-	//	p->drawWinFocusRect(1,1,w - 2,height() - 2,KVI_OPTION_COLOR(KviOption_colorIrcViewBackground));
+#ifdef COMPILE_USE_QT4
+		QPen pen(KVI_OPTION_COLOR(KviOption_colorIrcViewBackground));
+		pen.setStyle(Qt::DashLine);
+		p->setPen( pen);
+		p->drawRect(0,0,w,height());
+		p->drawRect(1,1,w - 2,height() - 2);
+#else
+	
+		p->drawWinFocusRect(0,0,w,height(),KVI_OPTION_COLOR(KviOption_colorIrcViewBackground));
+		p->drawWinFocusRect(1,1,w - 2,height() - 2,KVI_OPTION_COLOR(KviOption_colorIrcViewBackground));
+#endif
 	}
 }
 
@@ -335,11 +344,18 @@ void KviMessageColorListBoxItem::paint(QPainter * p)
 	if(selected())
 #endif
 	{
-		/*
-		p->drawWinFocusRect(0,0,width(lb),height(lb),clr);
-		p->drawWinFocusRect(1,1,width(lb) - 2,height(lb) - 2,clr);
-		p->drawWinFocusRect(2,2,width(lb) - 4,height(lb) - 4,clr);
-		*/
+#ifdef COMPILE_USE_QT4
+	QPen pen(clr);
+	pen.setStyle(Qt::DashLine);
+	p->setPen( pen);
+	p->drawRect(0,0,width(lb),height(lb));
+	p->drawRect(1,1,width(lb) - 2,height(lb) - 2);
+	p->drawRect(2,2,width(lb) - 4,height(lb) - 4);
+#else
+	p->drawWinFocusRect(0,0,width(lb),height(lb),clr);
+	p->drawWinFocusRect(1,1,width(lb) - 2,height(lb) - 2,clr);
+	p->drawWinFocusRect(2,2,width(lb) - 4,height(lb) - 4,clr);
+#endif
 	}
 }
 /*
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index 41f2a6d38..c6ac75df6 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -25,7 +25,7 @@
 #include "optw_nickserv.h"
 
 #include <qlayout.h>
-#include <qtooltip.h>
+#include "kvi_tal_tooltip.h"
 #include "kvi_tal_listview.h"
 #include <qlineedit.h>
 #include <qpushbutton.h>
@@ -57,7 +57,7 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi
 	
 	m_pRegisteredNickEdit = new QLineEdit(this);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pRegisteredNickEdit,html_center_begin + __tr2qs_ctx("Put here the nickname that you have registered with NickServ","options") + html_center_end);
+	KviTalToolTip::add(m_pRegisteredNickEdit,html_center_begin + __tr2qs_ctx("Put here the nickname that you have registered with NickServ","options") + html_center_end);
 #endif
 	gl->addMultiCellWidget(m_pRegisteredNickEdit,0,0,1,3);
 	
@@ -66,7 +66,7 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi
 	
 	m_pNickServMaskEdit = new QLineEdit(this);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pNickServMaskEdit,
+	KviTalToolTip::add(m_pNickServMaskEdit,
 		html_center_begin + __tr2qs_ctx("This is the mask that NickServ must match to be correctly identified as the NickServ service. "  \
 			"This usually will be something like <b>NickServ!service@services.dalnet</b>.<br>" \
 			"You can use wildcards for this field, but generally it is a security flaw. " \
@@ -82,7 +82,7 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi
 	gl->addMultiCellWidget(m_pMessageRegexpEdit,2,2,1,3);
 
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pMessageRegexpEdit,
+	KviTalToolTip::add(m_pMessageRegexpEdit,
 		html_center_begin + __tr2qs_ctx("This is the simple regular expression that the identification request message "  \
 			"from NickServ must match in order to be correctly recognized.<br>" \
 			"The message is usually something like \"To identify yourself please use /ns IDENTIFY password\" " \
@@ -94,7 +94,7 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi
 
 	m_pIdentifyCommandEdit = new QLineEdit(this);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pIdentifyCommandEdit,
+	KviTalToolTip::add(m_pIdentifyCommandEdit,
 		html_center_begin + __tr2qs_ctx("This is the command that will be executed when NickServ requests authentication " \
 			"for the nickname described in this rule (if the both server and NickServ mask are matched). " \
 			"This usually will be something like <b>msg NickServ identify &lt;yourpassword&gt;</b>.<br>" \
@@ -113,7 +113,7 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi
 		
 		m_pServerMaskEdit = new QLineEdit(this);
 #ifdef COMPILE_INFO_TIPS
-		QToolTip::add(m_pServerMaskEdit,
+		KviTalToolTip::add(m_pServerMaskEdit,
 			html_center_begin + __tr2qs_ctx("This is the mask that the current server must match in order " \
 			"for this rule to apply. It can contain * and ? wildcards.<br>Do NOT use simply \"*\" here...","options") + html_center_end);
 #endif
@@ -244,7 +244,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent)
 	m_pNickServCheck = new KviStyledCheckBox(__tr2qs_ctx("Enable NickServ Identification","options"),this);
 	gl->addMultiCellWidget(m_pNickServCheck,0,0,0,2);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pNickServCheck,
+	KviTalToolTip::add(m_pNickServCheck,
 			__tr2qs_ctx("This check enables the automatic identification with NickServ","options"));
 #endif
 	m_pNickServCheck->setChecked(bNickServEnabled);
@@ -261,7 +261,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent)
 
 	gl->addMultiCellWidget(m_pNickServListView,1,1,0,2);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pNickServListView,
+	KviTalToolTip::add(m_pNickServListView,
 		__tr2qs_ctx("<center>This is a list of NickServ identification rules. " \
 			"KVIrc will use them to model its automatic interaction with NickServ on all the networks.<br>" \
 			"Please be aware that this feature can cause your NickServ passwords to be stolen " \
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index a72169a0d..44c635205 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -37,7 +37,7 @@
 #include <kvi_tal_groupbox.h>
 #include "kvi_tal_popupmenu.h"
 #include <qcursor.h>
-#include <qtooltip.h>
+#include "kvi_tal_tooltip.h"
 #include <qtoolbutton.h>
 
 
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index dc43be07c..1b1a2655c 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -56,7 +56,7 @@
 #include <qcheckbox.h>
 #include "kvi_tal_popupmenu.h"
 #include <qcursor.h>
-#include <qtooltip.h>
+#include "kvi_tal_tooltip.h"
 #include <qvalidator.h>
 #include <qmessagebox.h>
 #include "kvi_asciidict.h"
@@ -113,7 +113,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	g->addMultiCellWidget(m_pDescEditor,1,1,1,3);
 	m_pDescEditor->setText(n->description());
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pDescEditor,__tr2qs_ctx("<center>Put here a brief description of the network.</center>","options"));
+	KviTalToolTip::add(m_pDescEditor,__tr2qs_ctx("<center>Put here a brief description of the network.</center>","options"));
 #endif
 
 	// Identity tab
@@ -131,7 +131,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	m_pUserEditor = new QLineEdit(gbox);
 	m_pUserEditor->setText(n->userName());
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pUserEditor,__tr2qs_ctx("<center>This is the <b>username</b> that KVIrc will use to login to servers on this network.\n" \
+	KviTalToolTip::add(m_pUserEditor,__tr2qs_ctx("<center>This is the <b>username</b> that KVIrc will use to login to servers on this network.\n" \
 										"If this field is left empty (most common case), KVIrc will use the default username " \
 										"specified in the \"Identity\" options tab.</center>","options"));
 #endif
@@ -142,7 +142,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	m_pNickEditor->setValidator(v);
 	m_pNickEditor->setText(n->nickName());
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pNickEditor,__tr2qs_ctx("<center>You can specify a \"special\" <b>nickname</b> that will be used to log in to the servers on this network.<br>" \
+	KviTalToolTip::add(m_pNickEditor,__tr2qs_ctx("<center>You can specify a \"special\" <b>nickname</b> that will be used to log in to the servers on this network.<br>" \
 									"If this field is left empty (most common case), the default nickname (specified in the \"Identity\" settings) will be used.</center>","options"));
 #endif
 
@@ -150,7 +150,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	m_pRealEditor = new QLineEdit(gbox);
 	m_pRealEditor->setText(n->realName());
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pRealEditor,__tr2qs_ctx("<center>You can specify a \"special\" <b>real name</b> that will be used to login with the servers on this network.<br>" \
+	KviTalToolTip::add(m_pRealEditor,__tr2qs_ctx("<center>You can specify a \"special\" <b>real name</b> that will be used to login with the servers on this network.<br>" \
 									"If you leave this field empty (most common case), the default \"real name\" (specified in the \"Identity\" settings) will be used.</center>","options"));
 #endif
 
@@ -161,7 +161,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	m_pEncodingEditor->setDuplicatesEnabled(false);
 	gl->addWidget(m_pEncodingEditor,1,1);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pEncodingEditor,__tr2qs_ctx("<center>This box allows you to choose the preferred encoding for the servers in this network. " \
+	KviTalToolTip::add(m_pEncodingEditor,__tr2qs_ctx("<center>This box allows you to choose the preferred encoding for the servers in this network. " \
 									"If you choose \"Use System Encoding\" then the encoding will be set to the systemwide " \
 									"value that you choose in the \"Encoding\" page of the options dialog.</center>","options"));
 #endif
@@ -186,7 +186,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	m_pAutoConnectCheck->setChecked(n->autoConnect());
 	gl->addMultiCellWidget(m_pAutoConnectCheck,2,2,0,1);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pAutoConnectCheck,__tr2qs_ctx("<center>This option will cause KVIrc to automatically connect to this network at startup</center>","options"));
+	KviTalToolTip::add(m_pAutoConnectCheck,__tr2qs_ctx("<center>This option will cause KVIrc to automatically connect to this network at startup</center>","options"));
 #endif
 
 
@@ -208,7 +208,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	m_pChannelListSelector = new KviCahnnelListSelector(tab,
 		__tr2qs_ctx("Channels to join automatically upon connect:","options"),&m_lstChannels,true);
 #ifdef COMPILE_INFO_TIPS
-  QToolTip::add(m_pChannelListSelector,__tr2qs_ctx("<center>Here you can set a list of channels to be joined automatically " \
+  KviTalToolTip::add(m_pChannelListSelector,__tr2qs_ctx("<center>Here you can set a list of channels to be joined automatically " \
 		"after a connection to a server in this network has been established. To add a channel, type its name in the " \
 		"text input below and click \"<b>Add</b>\".</center>","options"));
 #endif
@@ -225,7 +225,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	m_pOnConnectEditor->setText(n->onConnectCommand());
 	m_pOnConnectEditor->setMinimumHeight(150);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pOnConnectEditor,__tr2qs_ctx("<center>The following commands will be executed after a connection to a server in this network has been established.<br>" \
+	KviTalToolTip::add(m_pOnConnectEditor,__tr2qs_ctx("<center>The following commands will be executed after a connection to a server in this network has been established.<br>" \
 				"<b>Important:</b> Enter commands <b>without</b> a preceding slash (e.g. <tt>quote pass secret</tt> instead of <tt>/quote pass secret</tt>).<br>"\
 				"KVIrc will first send the USER command, then eventually PASS and NICK and then execute this " \
 				"command sequence.</center>","options"));
@@ -245,7 +245,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	m_pOnLoginEditor->setMinimumHeight(150);
 	
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pOnLoginEditor,
+	KviTalToolTip::add(m_pOnLoginEditor,
 				__tr2qs_ctx("<center>The following commands will be executed after a successful login to a server in this network.<br>" \
 						"<b>Important:</b> Enter commands <b>without</b> a preceding slash (e.g. <tt>quote privatelog</tt> instead of <tt>/quote privatelog</tt>).<br>"
 						"This is useful for automatically opening queries, setting variables, etc.</center>","options"));
@@ -265,7 +265,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	m_pNickServCheck = new KviStyledCheckBox(__tr2qs_ctx("Enable NickServ Identification","options"),tab);
 	gl->addMultiCellWidget(m_pNickServCheck,0,0,0,2);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pNickServCheck,
+	KviTalToolTip::add(m_pNickServCheck,
 				__tr2qs_ctx("This check enables the automatic identification with NickServ","options"));
 #endif
 	m_pNickServCheck->setChecked(bNickServEnabled);
@@ -281,7 +281,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	
 	gl->addMultiCellWidget(m_pNickServListView,1,1,0,2);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pNickServListView,
+	KviTalToolTip::add(m_pNickServListView,
 		__tr2qs_ctx("<center>This is a list of NickServ identification rules. " \
 				"KVIrc will use them to model its automatic interaction with NickServ on this network.<br>" \
 				"Please be aware that this feature can cause your NickServ passwords to be stolen " \
@@ -462,7 +462,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	g->addMultiCellWidget(m_pDescEditor,1,1,1,3);
 	m_pDescEditor->setText(s->description());
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pDescEditor,__tr2qs_ctx("<center>This is a brief description of this server. " \
+	KviTalToolTip::add(m_pDescEditor,__tr2qs_ctx("<center>This is a brief description of this server. " \
 								"This field has no restrictions but many server lists use it to describe the server's physical location</center>","options"));
 #endif
 
@@ -481,7 +481,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	m_pUserEditor = new QLineEdit(gbox);
 	m_pUserEditor->setText(s->userName());
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pUserEditor,__tr2qs_ctx("<center>This is the <b>username</b> that KVIrc will use to login to this server.\n" \
+	KviTalToolTip::add(m_pUserEditor,__tr2qs_ctx("<center>This is the <b>username</b> that KVIrc will use to login to this server.\n" \
 										"If this field is left empty (most common case), KVIrc will first look if an username is specified " \
 										"for the network that this server belongs to, and if that is empty then KVIrc will use the default username " \
 										"specified in the \"Identity\" options tab.</center>","options"));
@@ -492,7 +492,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	m_pPassEditor->setEchoMode(QLineEdit::Password);
 	m_pPassEditor->setText(s->password());
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pPassEditor,__tr2qs_ctx("<center>If this server requires a password, put it in this field, otherwise leave it empty.</center>","options"));
+	KviTalToolTip::add(m_pPassEditor,__tr2qs_ctx("<center>If this server requires a password, put it in this field, otherwise leave it empty.</center>","options"));
 #endif
 
 	l = new QLabel(__tr2qs_ctx("Nickname:","options"),gbox);
@@ -501,7 +501,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	m_pNickEditor->setValidator(v);
 	m_pNickEditor->setText(s->nickName());
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pNickEditor,__tr2qs_ctx("<center>You can specify a \"special\" <b>nickname</b> that will be used to log in to this server.<br>" \
+	KviTalToolTip::add(m_pNickEditor,__tr2qs_ctx("<center>You can specify a \"special\" <b>nickname</b> that will be used to log in to this server.<br>" \
 									"If this field is left empty (most common case), KVIrc will first look if a nickname is specified " \
 									"for the network that this server belongs to, and if that is empty then the default nickname (specified in the \"Identity\" settings) will be used.</center>","options"));
 #endif
@@ -510,7 +510,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	m_pRealEditor = new QLineEdit(gbox);
 	m_pRealEditor->setText(s->realName());
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pRealEditor,__tr2qs_ctx("<center>You can specify a \"special\" <b>real name</b> that will be used to login with this server.<br>" \
+	KviTalToolTip::add(m_pRealEditor,__tr2qs_ctx("<center>You can specify a \"special\" <b>real name</b> that will be used to login with this server.<br>" \
 									"If you leave this field empty (most common case), KVIrc will first look if a real name is specified " \
 									"for the network that this server belongs to, and if that is empty the default \"real name\" (specified in the \"Identity\" settings) will be used.</center>","options"));
 #endif
@@ -519,7 +519,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	
 	m_pUseDefaultInitUMode = new KviStyledCheckBox(__tr2qs_ctx("Use default user mode","options"),gbox);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pUseDefaultInitUMode,__tr2qs_ctx("<center>If this is enabled, the global initial <b>user mode</b> (configured from"\
+	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"));
 #endif
 	bool bHasUmode = !(s->initUMode().isEmpty());
@@ -562,7 +562,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	tmpz.setNum(s->port());
 	m_pPortEditor->setText(tmpz);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pPortEditor,__tr2qs_ctx("<center>This is the default <b>port</b> that this server will be contacted on.<br>Usually <b>6667</b> is OK.</center>","options"));
+	KviTalToolTip::add(m_pPortEditor,__tr2qs_ctx("<center>This is the default <b>port</b> that this server will be contacted on.<br>Usually <b>6667</b> is OK.</center>","options"));
 #endif
 	connect(m_pPortEditor,SIGNAL(textChanged(const QString &)),this,SLOT(portEditorTextChanged(const QString &)));
 
@@ -573,7 +573,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	m_pIpEditor = new KviIpEditor(tab,KviIpEditor::IpV4);
 	gl->addWidget(m_pIpEditor,1,1);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pIpEditor,__tr2qs_ctx("<center>This is the <b>IP address</b> of this server, it is here for caching purposes.<br>" \
+	KviTalToolTip::add(m_pIpEditor,__tr2qs_ctx("<center>This is the <b>IP address</b> of this server, it is here for caching purposes.<br>" \
 										"If you leave this field empty, KVIrc will fill it in the first time it connects to the server. " \
 										"If you enable the \"cache IP address\" option below, KVIrc will use it as a \"cached result\" " \
 										"and avoid looking it up again.</center>","options"));
@@ -596,7 +596,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	m_pCacheIpCheck = new KviStyledCheckBox(__tr2qs_ctx("Cache IP address","options"),tab);
 	gl->addMultiCellWidget(m_pCacheIpCheck,2,2,0,1);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pCacheIpCheck,__tr2qs_ctx("<center>This check will enable <b>IP address caching</b> for this server:<br>" \
+	KviTalToolTip::add(m_pCacheIpCheck,__tr2qs_ctx("<center>This check will enable <b>IP address caching</b> for this server:<br>" \
 												"DNS lookups can be time-consuming and might be blocking on some platforms; " \
 												"this option will cause KVIrc to look up the server hostname only once.<br><br> " \
 												"Advanced: you can also use this option to force a certain server name to resolve " \
@@ -616,7 +616,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	connect(m_pUseIPV6Check,SIGNAL(toggled(bool)),this,SLOT(useIPV6CheckToggled(bool)));
 
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pUseIPV6Check,__tr2qs_ctx("<center>This check identifies IPv6 servers.<br>If enabled, KVIrc will attempt to use the IPv6 protocol " \
+	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"));
 #endif
 
@@ -624,7 +624,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	m_pUseSSLCheck = new KviStyledCheckBox(__tr2qs_ctx("Use SSL protocol","options"),tab);
 	gl->addMultiCellWidget(m_pUseSSLCheck,4,4,0,1);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pUseSSLCheck,__tr2qs_ctx("<center>This check will cause the connection to use the <b>Secure Socket Layer</b> " \
+	KviTalToolTip::add(m_pUseSSLCheck,__tr2qs_ctx("<center>This check will cause the connection to use the <b>Secure Socket Layer</b> " \
 						"encryption support. Obviously, this server must have support for this, too. :)</center>","options"));
 #endif
 #ifndef COMPILE_SSL_SUPPORT
@@ -638,7 +638,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	
 	gl->addMultiCellWidget(m_pUseAutoConnect,5,5,0,1);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pUseAutoConnect,__tr2qs_ctx("<center>This option will cause KVIrc to connect to the IRC server when it is started.</center>","options"));
+	KviTalToolTip::add(m_pUseAutoConnect,__tr2qs_ctx("<center>This option will cause KVIrc to connect to the IRC server when it is started.</center>","options"));
 #endif
 	
 	l = new QLabel(__tr2qs_ctx("Encoding:","options"),tab);
@@ -647,7 +647,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	m_pEncodingEditor->setDuplicatesEnabled(false);
 	gl->addWidget(m_pEncodingEditor,6,1);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pEncodingEditor,__tr2qs_ctx("<center>This box allows you to choose the preferred encoding for this sever. " \
+	KviTalToolTip::add(m_pEncodingEditor,__tr2qs_ctx("<center>This box allows you to choose the preferred encoding for this sever. " \
 									"If you choose \"Use Network Encoding\" then the encoding will be inherited from the " \
 									"network that this server belongs to.</center>","options"));
 #endif
@@ -698,7 +698,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 
 
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pLinkFilterEditor,__tr2qs_ctx("<center>This field specifies the name of a module that exports a link filter for this type of server.<br>" \
+	KviTalToolTip::add(m_pLinkFilterEditor,__tr2qs_ctx("<center>This field specifies the name of a module that exports a link filter for this type of server.<br>" \
 		"For plain IRC connections, you don't need any link filters; this is used for incompatible protocols.</center>","options"));
 #endif
 
@@ -710,7 +710,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	gl->addWidget(m_pIdEditor,8,1);
 
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pIdEditor,__tr2qs_ctx("<center>This field allows you to specify a really unique id for this server. " \
+	KviTalToolTip::add(m_pIdEditor,__tr2qs_ctx("<center>This field allows you to specify a really unique id for this server. " \
 		"You will then be able to use /server -x &lt;this_id&gt; to make the connection. This is especially " \
 		"useful when you have multiple server entries with the same hostname and port in different networks (bouncers?)</center>","options"));
 #endif
@@ -721,7 +721,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	m_pProxyEditor = new QComboBox(tab);
 	gl->addWidget(m_pProxyEditor,9,1);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pProxyEditor,__tr2qs_ctx("<center>This is the <b>proxy</b> that KVIrc will use to connect to thos server.\n" \
+	KviTalToolTip::add(m_pProxyEditor,__tr2qs_ctx("<center>This is the <b>proxy</b> that KVIrc will use to connect to thos server.\n" \
 										"If this field is set in \"Default\" KVirc will use global proxy settings, if it is set in \"Direct connection\" " \
 										"KVirc will connect to this server without proxy. You can define new proxy server in global options' \"Proxy servers\" menu.</center>","options"));
 #endif	
@@ -755,7 +755,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	m_pChannelListSelector = new KviCahnnelListSelector(tab,
 		__tr2qs_ctx("Channels to join automatically upon connect:","options"),&m_lstChannels,true);
 #ifdef COMPILE_INFO_TIPS
-  QToolTip::add(m_pChannelListSelector,__tr2qs_ctx("<center>Here you can set a list of channels to be joined automatically " \
+  KviTalToolTip::add(m_pChannelListSelector,__tr2qs_ctx("<center>Here you can set a list of channels to be joined automatically " \
 		"after a connection to this server has been established. To add a channel, type its name in the " \
 		"text input below and click \"<b>Add</b>\".</center>","options"));
 #endif
@@ -773,7 +773,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	m_pOnConnectEditor->setText(s->onConnectCommand());
 	m_pOnConnectEditor->setMinimumHeight(150);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pOnConnectEditor,__tr2qs_ctx("<center>The following commands will be executed after a connection has been established.<br>" \
+	KviTalToolTip::add(m_pOnConnectEditor,__tr2qs_ctx("<center>The following commands will be executed after a connection has been established.<br>" \
 			"<b>Important:</b> Enter commands <b>without</b> a preceding slash (e.g. <tt>quote pass secret</tt> instead of <tt>/quote pass secret</tt>).<br>"\
 			"KVIrc will first send the USER command, then eventually PASS and NICK and then execute this " \
 			"command sequence.<br>This is particularly useful for IRC bouncers that require login commands.</center>","options"));
@@ -792,7 +792,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	m_pOnLoginEditor->setMinimumHeight(150);
 
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pOnLoginEditor,
+	KviTalToolTip::add(m_pOnLoginEditor,
 			__tr2qs_ctx("<center>The following commands will be executed after a successful login to this server.<br>" \
 					"<b>Important:</b> Enter commands <b>without</b> a preceding slash (e.g. <tt>quote privatelog</tt> instead of <tt>/quote privatelog</tt>).<br>"
 					"This is useful for automatically opening queries, setting variables, etc.</center>","options"));
@@ -1054,8 +1054,8 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	QString tiptxt = __tr2qs_ctx("<center>This is the list of available IRC servers.<br>" \
 							"Right-click on the list to add or remove servers and perform other actions.<br>"\
 							"Double-click on a item for advanced options.</center>","options");
-	QToolTip::add(m_pListView,tiptxt);
-	QToolTip::add(m_pListView->viewport(),tiptxt);
+	KviTalToolTip::add(m_pListView,tiptxt);
+	KviTalToolTip::add(m_pListView->viewport(),tiptxt);
 #endif
 
 	KviTalVBox * vbox = new KviTalVBox(this);
@@ -1066,7 +1066,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	m_pNewNetworkButton->setAutoRaise(true);
 	connect(m_pNewNetworkButton,SIGNAL(clicked()),this,SLOT(newNetwork()));
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pNewNetworkButton,__tr2qs_ctx("New Network","options"));
+	KviTalToolTip::add(m_pNewNetworkButton,__tr2qs_ctx("New Network","options"));
 #endif
 
 	m_pNewServerButton = new KviStyledToolButton(vbox);
@@ -1074,7 +1074,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	m_pNewServerButton->setAutoRaise(true);
 	connect(m_pNewServerButton,SIGNAL(clicked()),this,SLOT(newServer()));
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pNewServerButton,__tr2qs_ctx("New Server","options"));
+	KviTalToolTip::add(m_pNewServerButton,__tr2qs_ctx("New Server","options"));
 #endif
 
 	m_pRemoveButton = new KviStyledToolButton(vbox);
@@ -1083,7 +1083,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	m_pRemoveButton->setAutoRaise(true);
 	connect(m_pRemoveButton,SIGNAL(clicked()),this,SLOT(removeCurrent()));
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pRemoveButton,__tr2qs_ctx("Remove Network/Server","options"));
+	KviTalToolTip::add(m_pRemoveButton,__tr2qs_ctx("Remove Network/Server","options"));
 #endif
 
 	QFrame * f = new QFrame(vbox);
@@ -1095,7 +1095,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	m_pCopyServerButton->setAutoRaise(true);
 	connect(m_pCopyServerButton,SIGNAL(clicked()),this,SLOT(copyServer()));
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pCopyServerButton,__tr2qs_ctx("Copy Server","options"));
+	KviTalToolTip::add(m_pCopyServerButton,__tr2qs_ctx("Copy Server","options"));
 #endif
 
 	m_pPasteServerButton = new KviStyledToolButton(vbox);
@@ -1104,7 +1104,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	m_pPasteServerButton->setAutoRaise(true);
 	connect(m_pPasteServerButton,SIGNAL(clicked()),this,SLOT(pasteServer()));
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pPasteServerButton,__tr2qs_ctx("Paste Server","options"));
+	KviTalToolTip::add(m_pPasteServerButton,__tr2qs_ctx("Paste Server","options"));
 #endif
 
 	f = new QFrame(vbox);
@@ -1116,7 +1116,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	m_pImportButton->setPopup(m_pImportPopup);
 	m_pImportButton->setPopupDelay(1);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pImportButton,__tr2qs_ctx("Import List","options"));
+	KviTalToolTip::add(m_pImportButton,__tr2qs_ctx("Import List","options"));
 #endif
 
 	QFrame * lll = new QFrame(vbox);
@@ -1127,7 +1127,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 
 	m_pSrvNetEdit = new QLineEdit(gbox);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pSrvNetEdit,__tr2qs_ctx("<center>This is the name of the currently selected server or network</center>","options"));
+	KviTalToolTip::add(m_pSrvNetEdit,__tr2qs_ctx("<center>This is the name of the currently selected server or network</center>","options"));
 #endif
 
 /*
@@ -1138,7 +1138,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 #endif
 
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pIpV6Check,__tr2qs_ctx("<center>This check identifies IPv6 servers.<br>If enabled, KVIrc will attempt to use the IPv6 protocol " \
+	KviTalToolTip::add(m_pIpV6Check,__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"));
 #endif
 
@@ -1146,14 +1146,14 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 
 	m_pPortEdit = new QLineEdit(gbox);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pPortEdit,__tr2qs_ctx("<center>This is the default <b>port</b> that this server will be contacted on.<br>Usually <b>6667</b> is OK.</center>","options"));
+	KviTalToolTip::add(m_pPortEdit,__tr2qs_ctx("<center>This is the default <b>port</b> that this server will be contacted on.<br>Usually <b>6667</b> is OK.</center>","options"));
 #endif
 */
 
 	m_pDetailsButton = new QPushButton(__tr2qs_ctx("Advanced...","options"),gbox);
 	connect(m_pDetailsButton,SIGNAL(clicked()),this,SLOT(detailsClicked()));
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pDetailsButton,__tr2qs_ctx("<center>Click here to edit advanced options for this entry</center>","options"));
+	KviTalToolTip::add(m_pDetailsButton,__tr2qs_ctx("<center>Click here to edit advanced options for this entry</center>","options"));
 #endif
 
 	m_pConnectCurrent = new QPushButton(__tr2qs_ctx("Connect &Now","options"),this);
@@ -1161,7 +1161,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	connect(m_pConnectCurrent,SIGNAL(clicked()),this,SLOT(connectCurrentClicked()));
 
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(m_pConnectCurrent,__tr2qs_ctx("<center>Hit this button to connect to the currently selected server.</center>","options"));
+	KviTalToolTip::add(m_pConnectCurrent,__tr2qs_ctx("<center>Hit this button to connect to the currently selected server.</center>","options"));
 #endif
 
 	m_pRecentPopup = new KviTalPopupMenu(this);
@@ -1174,14 +1174,14 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	tb->setPopup(m_pRecentPopup);
 	tb->setPopupDelay(1);
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(tb,__tr2qs_ctx("<center>This button shows a list of recently used servers. It allows you to quickly find them in the list.</center>","options"));
+	KviTalToolTip::add(tb,__tr2qs_ctx("<center>This button shows a list of recently used servers. It allows you to quickly find them in the list.</center>","options"));
 #endif
 
 
 	KviBoolSelector * b = addBoolSelector(0,3,1,3,__tr2qs_ctx("Show this dialog at startup","options"),KviOption_boolShowServersConnectDialogOnStart);
 
 #ifdef COMPILE_INFO_TIPS
-	QToolTip::add(b,__tr2qs_ctx("<center>If this option is enabled, the Servers dialog will appear every time you start KVIrc</center>","options"));
+	KviTalToolTip::add(b,__tr2qs_ctx("<center>If this option is enabled, the Servers dialog will appear every time you start KVIrc</center>","options"));
 #endif
 
 	// KviBoolSelector * c = addBoolSelector(0,6,2,6,__tr("Close after connection","options"),KviOption_boolCloseServerWidgetAfterConnect);
diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp
index 1a6425707..69f1f4a4a 100644
--- a/src/modules/options/optw_sound.cpp
+++ b/src/modules/options/optw_sound.cpp
@@ -36,7 +36,7 @@
 #include "kvi_tal_hbox.h"
 
 #ifdef COMPILE_INFO_TIPS
-	#include <qtooltip.h>
+	#include "kvi_tal_tooltip.h"
 #endif
 
 // FIXME: This module doesn't Cancel properly when auto-detection is performed!
@@ -63,7 +63,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 #endif
 	KviTalGroupBox * g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Sound System","options"),true);
 
-	QToolTip::add(g,__tr2qs_ctx("This allows you to select the sound system to be used with KVIrc.","options"));
+	KviTalToolTip::add(g,__tr2qs_ctx("This allows you to select the sound system to be used with KVIrc.","options"));
 
 	KviTalHBox * h = new KviTalHBox(g);
 
@@ -78,7 +78,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 
 	g = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Media Player","options"),true);
 
-	QToolTip::add(g,__tr2qs_ctx("This allows you to select the preferred media player to be used with " \
+	KviTalToolTip::add(g,__tr2qs_ctx("This allows you to select the preferred media player to be used with " \
 		"the mediaplayer.* module commands and functions.","options"));
 
 	h = new KviTalHBox(g);
@@ -101,7 +101,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 
 	g = addGroupBox(0,2,0,2,1,Qt::Horizontal,__tr2qs_ctx("ID3 tags' encoding","options"),true);
 
-	QToolTip::add(g,__tr2qs_ctx("This allows you to select encoding of mp3 tags.","options"));
+	KviTalToolTip::add(g,__tr2qs_ctx("This allows you to select encoding of mp3 tags.","options"));
 
 	h = new KviTalHBox(g);
 
@@ -124,7 +124,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 #ifdef COMPILE_ON_WINDOWS
 	g = addGroupBox(0,3,0,3,1,Qt::Horizontal,__tr2qs_ctx("Winamp messages ecoding","options"),true);
 
-	QToolTip::add(g,__tr2qs_ctx("This allows you to select encoding of winamp messages.","options"));
+	KviTalToolTip::add(g,__tr2qs_ctx("This allows you to select encoding of winamp messages.","options"));
 
 	h = new KviTalHBox(g);
 
diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp
index e273a6a44..791048d23 100644
--- a/src/modules/options/optw_tray.cpp
+++ b/src/modules/options/optw_tray.cpp
@@ -24,7 +24,7 @@
 #include "optw_tray.h"
 
 #include <qlayout.h>
-#include <qtooltip.h>
+#include "kvi_tal_tooltip.h"
 
 #include "kvi_options.h"
 #include "kvi_locale.h"
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 0b8d5506e..617d28677 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -42,7 +42,15 @@
 
 #include <qlayout.h>
 #include <qlabel.h>
+#ifdef COMPILE_USE_QT4
+#include <Q3Header>
+#include <QCloseEvent>
+#include <QImageWriter>
+#include <QImageReader>
+
+#else
 #include <qheader.h>
+#endif
 #include "kvi_asciidict.h"
 #include <qimage.h>
 #include <qstring.h>
@@ -329,7 +337,7 @@ void KviRegisteredUsersDialog::itemPressed(KviTalListViewItem *it,const QPoint &
 		if((c == 1) && (ppp.x() < (r.height() + 5 + daw)))
 		{
 			// notify list toggle
-			if(i->user()->getProperty("notify"))
+			if(i->user()->getProperty("notify").isEmpty())
 			{
 				i->user()->setProperty("notify",""); // kill that
 			} else {
@@ -660,8 +668,8 @@ void KviRegisteredUsersDialog::exportClicked()
 {
 	unsigned int nEntries = 0;
 
-	KviTalListViewItemIterator it( m_pListView, QListViewItemIterator::Selected );
-	KviTalListViewItemIterator cit( m_pListView, QListViewItemIterator::Selected );
+	KviTalListViewItemIterator it( m_pListView, KviTalListViewItemIterator::Selected );
+	KviTalListViewItemIterator cit( m_pListView, KviTalListViewItemIterator::Selected );
     while ( cit.current() ) {
 		if(((KviRegisteredUsersDialogItemBase *)(cit.current()))->type() == KviRegisteredUsersDialogItemBase::User)
 			nEntries++;
@@ -741,11 +749,18 @@ void KviRegisteredUsersDialog::exportClicked()
 					if(!av->pixmap()->isNull())
 					{
 						if(!f.save(1))goto write_error;
+#ifdef COMPILE_USE_QT4
+						QImageWriter io;
+						io.setDevice(&f);
+						io.setFormat("PNG");						
+						if(!io.write(av->pixmap()->convertToImage()))goto write_error;
+#else
 						QImageIO io;
 						io.setImage(av->pixmap()->convertToImage());
 						io.setIODevice(&f);
 						io.setFormat("PNG");
 						if(!io.write())goto write_error;
+#endif	
 					} else {
 						if(!f.save(0))goto write_error;
 					}
@@ -838,8 +853,16 @@ void KviRegisteredUsersDialog::importClicked()
 		if(count)
 		{
 			// there is an avatar
-			QImageIO io;
 			QImage img;
+#ifdef COMPILE_USE_QT4
+			QImageReader io;
+			io.setDevice(&f);
+			io.setFormat("PNG");
+			img=io.read();
+//			if(io.read())goto read_error;
+
+#else
+			QImageIO io;
 			io.setImage(img);
 			io.setIODevice(&f);
 			io.setFormat("PNG");
@@ -847,7 +870,7 @@ void KviRegisteredUsersDialog::importClicked()
 			if(!io.read())goto read_error;
 
 			img = io.image();
-
+#endif
 			if(img.isNull())debug("Ops.. readed a null image ?");
 
 			KviStr fName = u->name();
@@ -884,3 +907,4 @@ succesfull_import:
 	f.close();
 	fillList();
 }
+#include "dialog.moc"
\ No newline at end of file
diff --git a/src/modules/reguser/dialog.h b/src/modules/reguser/dialog.h
index 6b3a7d409..c5c933fc4 100644
--- a/src/modules/reguser/dialog.h
+++ b/src/modules/reguser/dialog.h
@@ -34,13 +34,17 @@
 #include "kvi_tal_listbox.h"
 #include "kvi_dict.h"
 #include "kvi_tal_popupmenu.h"
-#include <qintdict.h>
-
 #ifdef COMPILE_USE_QT4
+	#include <Q3IntDict>
+
+
 	#include <q3simplerichtext.h>
 	#define QSimpleRichText Q3SimpleRichText
 #else
 	#include <qsimplerichtext.h>
+	#include <qintdict.h>
+
+
 #endif
 
 class KviRegisteredUsersDialogItemBase : public KviTalListViewItem
@@ -113,9 +117,13 @@ public:
 	QPushButton * m_pImportButton;
 	QPushButton * m_pExportButton;
 	QPushButton * m_pAddGroupButton;
-	
+#ifdef COMPILE_USE_QT4
+	Q3IntDict<KviRegisteredUserGroup> m_TmpDict;
+#else
 	QIntDict<KviRegisteredUserGroup> m_TmpDict;
-protected slots:
+#endif
+
+	protected slots:
 	void itemPressed(KviTalListViewItem *it,const QPoint &pnt,int c);
 	void itemDoubleClicked(KviTalListViewItem *it);
 protected:
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index eb5857538..b366c4c3a 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -43,7 +43,13 @@
 

 #include <qlayout.h>

 #include <qlabel.h>

+#ifdef COMPILE_USE_QT4

+#include <QCloseEvent>

+#include <Q3Header>

+#include <Q3Vbox>

+#else

 #include <qheader.h>

+#endif

 #include "kvi_asciidict.h"

 #include <qimage.h>

 #include <qstring.h>

@@ -81,11 +87,15 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviDict<QStri
 

 	QGridLayout * g = new QGridLayout(this,3,3,4,4);

 

+#ifdef COMPILE_USE_QT4

+	m_pTable = new Q3Table(this);

+#else

 	m_pTable = new QTable(this);

+#endif

 	g->addMultiCellWidget(m_pTable,0,1,0,1);

 

 	m_pTable->setNumCols(2);

-	m_pTable->setSelectionMode(QTable::NoSelection);

+	m_pTable->setSelectionMode(Kvi_Tal_Table::NoSelection);

 

 	m_pTable->horizontalHeader()->setLabel(0,__tr2qs("Property"));

 	m_pTable->horizontalHeader()->setLabel(1,__tr2qs("Value"));

@@ -141,8 +151,8 @@ void KviReguserPropertiesDialog::fillData()
 	int row = 0;

 	while(it.current())

 	{

-		m_pTable->setItem(row,0,new QTableItem(m_pTable,QTableItem::OnTyping,it.currentKey()));

-		m_pTable->setItem(row,1,new QTableItem(m_pTable,QTableItem::OnTyping,*(it.current())));

+		m_pTable->setItem(row,0,new Kvi_Tal_TableItem(m_pTable,Kvi_Tal_TableItem::OnTyping,it.currentKey()));

+		m_pTable->setItem(row,1,new Kvi_Tal_TableItem(m_pTable,Kvi_Tal_TableItem::OnTyping,*(it.current())));

 		++row;

 		++it;

 	}

@@ -171,8 +181,8 @@ void KviReguserPropertiesDialog::okClicked()
 void KviReguserPropertiesDialog::addClicked()

 {

 	m_pTable->setNumRows(m_pTable->numRows() + 1);

-	m_pTable->setItem(m_pTable->numRows() - 1,0,new QTableItem(m_pTable,QTableItem::OnTyping,""));

-	m_pTable->setItem(m_pTable->numRows() - 1,1,new QTableItem(m_pTable,QTableItem::OnTyping,""));

+	m_pTable->setItem(m_pTable->numRows() - 1,0,new Kvi_Tal_TableItem(m_pTable,Kvi_Tal_TableItem::OnTyping,""));

+	m_pTable->setItem(m_pTable->numRows() - 1,1,new Kvi_Tal_TableItem(m_pTable,Kvi_Tal_TableItem::OnTyping,""));

 	m_pDelButton->setEnabled(true);

 }

 

@@ -437,7 +447,11 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste
 	addTab(p2,__tr2qs("Properties"));

 

 	// Ignore TAB

+#ifdef COMPILE_USE_QT4

+	Q3VBox * vb = new Q3VBox(this);

+#else

 	QVBox * vb = new QVBox(this);

+#endif

 	vb->setMargin(10);

 

 	m_pIgnoreEnabled = new KviStyledCheckBox(__tr2qs("Enable ignore for this user"),vb);

diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/edituser.h
index 6c017a08e..09be2913a 100644
--- a/src/modules/reguser/edituser.h
+++ b/src/modules/reguser/edituser.h
@@ -35,7 +35,17 @@
 #include "kvi_tal_listbox.h"
 #include "kvi_dict.h"
 #include <kvi_tal_tabdialog.h>
+#ifdef COMPILE_USE_QT4
+#include <Q3Table>
+#define Kvi_Tal_Table Q3Table
+#define Kvi_Tal_TableItem Q3TableItem
+
+#else
 #include <qtable.h>
+#define Kvi_Tal_Table QTable
+#define Kvi_Tal_TableItem QTableItem
+
+#endif
 #include "kvi_tal_popupmenu.h"
 
 #ifndef _EDITUSER_CPP_
@@ -51,7 +61,11 @@ public:
 	KviReguserPropertiesDialog(QWidget *p,KviDict<QString> * dict);
 	~KviReguserPropertiesDialog();
 protected:
+#ifdef COMPILE_USE_QT4
+	Q3Table *m_pTable;
+#else
 	QTable             * m_pTable;
+#endif
 	KviDict<QString>     * m_pPropertyDict;
 	QPushButton        * m_pDelButton;
 	QPushButton        * m_pAddButton;
diff --git a/src/modules/reguser/reguser_QT4_vc05.vcproj b/src/modules/reguser/reguser_QT4_vc05.vcproj
index 84fe48d0f..bf3cc8633 100644
--- a/src/modules/reguser/reguser_QT4_vc05.vcproj
+++ b/src/modules/reguser/reguser_QT4_vc05.vcproj
@@ -1,286 +1,302 @@
 <?xml version="1.0" encoding="Windows-1252"?>

- <VisualStudioProject

- 	ProjectType="Visual C++"

- 	Version="8,00"

- 	Name="reguser"

- 	ProjectGUID="{12DB9879-4F34-4EFC-8415-8714224CDDF4}"

- 	RootNamespace="reguser"

- 	Keyword="Win32Proj"

- 	>

- 	<Platforms>

- 		<Platform

- 			Name="Win32"

- 		/>

- 	</Platforms>

- 	<ToolFiles>

- 	</ToolFiles>

- 	<Configurations>

- 		<Configuration

- 			Name="Debug|Win32"

- 			OutputDirectory="$(SolutionDir)\win32build\bin\modules\"

- 			IntermediateDirectory="Debug"

- 			ConfigurationType="2"

- 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

- 			CharacterSet="2"

- 			>

- 			<Tool

- 				Name="VCPreBuildEventTool"

- 			/>

- 			<Tool

- 				Name="VCCustomBuildTool"

- 			/>

- 			<Tool

- 				Name="VCXMLDataGeneratorTool"

- 			/>

- 			<Tool

- 				Name="VCWebServiceProxyGeneratorTool"

- 			/>

- 			<Tool

- 				Name="VCMIDLTool"

- 			/>

- 			<Tool

- 				Name="VCCLCompilerTool"

- 				Optimization="0"

- 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\kvirc\module&quot;;&quot;$(ProjectDir)\..\..\kvilib\config&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(ProjectDir)\..\..\kvilib\core&quot;;&quot;$(ProjectDir)\..\..\kvilib\system&quot;;&quot;$(ProjectDir)\..\..\kvirc\uparser&quot;;&quot;$(ProjectDir)\..\..\kvilib\ext&quot;;&quot;$(ProjectDir)\..\..\kvirc\kvs&quot;;&quot;$(ProjectDir)\..\..\kvirc\ui&quot;;&quot;$(ProjectDir)\..\..\kvirc\kernel&quot;;&quot;$(ProjectDir)\..\..\kvilib\tal&quot;;&quot;$(ProjectDir)\..\..\kvilib\irc&quot;;&quot;$(ProjectDir)\..\..\kvilib\file&quot;;&quot;$(QTDIR)\include\Qt3Support&quot;;&quot;$(QTDIR)\include\QtCore\&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include\Qt&quot;;&quot;$(QTDIR)\include\QtNetwork&quot;;&quot;$(QTDIR)\include\QtXml&quot;;"

- 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;REGUSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"

- 				MinimalRebuild="true"

- 				BasicRuntimeChecks="3"

- 				RuntimeLibrary="1"

- 				UsePrecompiledHeader="0"

- 				WarningLevel="3"

- 				Detect64BitPortabilityProblems="true"

- 				DebugInformationFormat="4"

- 			/>

- 			<Tool

- 				Name="VCManagedResourceCompilerTool"

- 			/>

- 			<Tool

- 				Name="VCResourceCompilerTool"

- 			/>

- 			<Tool

- 				Name="VCPreLinkEventTool"

- 			/>

- 			<Tool

- 				Name="VCLinkerTool"

- 				AdditionalDependencies="qtmain.lib libeay32.lib SSLeay32.lib ws2_32.lib kvilib.lib kvirc.lib msvcrt.lib perl58.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib winmm.lib qt3supportd4.lib qtcored4.lib qtnetworkd4.lib qtguid4.lib "

- 				OutputFile="$(OutDir)/kvi$(ProjectName).dll"

- 				LinkIncremental="2"

- 				AdditionalLibraryDirectories="&quot;$(SSLLIBDIR)&quot;;&quot;$(PERLDIR)\lib\CORE&quot;;&quot;$(QTDIR)\lib&quot;;&quot;$(SolutionDir)\win32build\bin&quot;;&quot;$(ZLIBLIBDIR)&quot;"

- 				GenerateManifest="true"

- 				IgnoreAllDefaultLibraries="true"

- 				GenerateDebugInformation="true"

- 				ProgramDatabaseFile="$(OutDir)/reguser.pdb"

- 				SubSystem="2"

- 				TurnOffAssemblyGeneration="true"

- 				ImportLibrary="$(OutDir)/reguser.lib"

- 				TargetMachine="1"

- 			/>

- 			<Tool

- 				Name="VCALinkTool"

- 			/>

- 			<Tool

- 				Name="VCManifestTool"

- 				AdditionalManifestFiles="$(SolutionDir)/data/manifests/commctrl.manifest"

- 				EmbedManifest="true"

- 				VerboseOutput="true"

- 			/>

- 			<Tool

- 				Name="VCXDCMakeTool"

- 			/>

- 			<Tool

- 				Name="VCBscMakeTool"

- 			/>

- 			<Tool

- 				Name="VCFxCopTool"

- 			/>

- 			<Tool

- 				Name="VCAppVerifierTool"

- 			/>

- 			<Tool

- 				Name="VCWebDeploymentTool"

- 			/>

- 			<Tool

- 				Name="VCPostBuildEventTool"

- 			/>

- 		</Configuration>

- 		<Configuration

- 			Name="Release|Win32"

- 			OutputDirectory="$(SolutionDir)\win32build\bin\modules"

- 			IntermediateDirectory="Release"

- 			ConfigurationType="2"

- 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

- 			CharacterSet="2"

- 			>

- 			<Tool

- 				Name="VCPreBuildEventTool"

- 			/>

- 			<Tool

- 				Name="VCCustomBuildTool"

- 			/>

- 			<Tool

- 				Name="VCXMLDataGeneratorTool"

- 			/>

- 			<Tool

- 				Name="VCWebServiceProxyGeneratorTool"

- 			/>

- 			<Tool

- 				Name="VCMIDLTool"

- 			/>

- 			<Tool

- 				Name="VCCLCompilerTool"

- 				Optimization="1"

- 				InlineFunctionExpansion="2"

- 				EnableIntrinsicFunctions="true"

- 				FavorSizeOrSpeed="1"

- 				OmitFramePointers="true"

- 				EnableFiberSafeOptimizations="true"

- 				WholeProgramOptimization="true"

- 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\kvirc\module&quot;;&quot;$(ProjectDir)\..\..\kvilib\config&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(ProjectDir)\..\..\kvilib\core&quot;;&quot;$(ProjectDir)\..\..\kvilib\system&quot;;&quot;$(ProjectDir)\..\..\kvirc\uparser&quot;;&quot;$(ProjectDir)\..\..\kvilib\ext&quot;;&quot;$(ProjectDir)\..\..\kvirc\kvs&quot;;&quot;$(ProjectDir)\..\..\kvirc\ui&quot;;&quot;$(ProjectDir)\..\..\kvirc\kernel&quot;;&quot;$(ProjectDir)\..\..\kvilib\tal&quot;;&quot;$(ProjectDir)\..\..\kvilib\irc&quot;;&quot;$(ProjectDir)\..\..\kvilib\file&quot;;&quot;$(QTDIR)\include\Qt3Support&quot;;&quot;$(QTDIR)\include\QtCore\&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include\Qt&quot;;&quot;$(QTDIR)\include\QtNetwork&quot;;&quot;$(QTDIR)\include\QtXml&quot;;"

- 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;REGUSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"

- 				StringPooling="true"

- 				MinimalRebuild="true"

- 				ExceptionHandling="1"

- 				RuntimeLibrary="0"

- 				UsePrecompiledHeader="0"

- 				WarningLevel="3"

- 				Detect64BitPortabilityProblems="true"

- 				DebugInformationFormat="3"

- 			/>

- 			<Tool

- 				Name="VCManagedResourceCompilerTool"

- 			/>

- 			<Tool

- 				Name="VCResourceCompilerTool"

- 			/>

- 			<Tool

- 				Name="VCPreLinkEventTool"

- 			/>

- 			<Tool

- 				Name="VCLinkerTool"

- 				AdditionalDependencies="qtmain.lib libeay32.lib SSLeay32.lib ws2_32.lib kvilib.lib kvirc.lib msvcrt.lib perl58.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib winmm.lib qt3support4.lib qtcore4.lib qtnetwork4.lib qtgui4.lib "

- 				OutputFile="$(OutDir)/kvi$(ProjectName).dll"

- 				LinkIncremental="1"

- 				AdditionalLibraryDirectories="&quot;$(SSLLIBDIR)&quot;;&quot;$(PERLDIR)\lib\CORE&quot;;&quot;$(QTDIR)\lib&quot;;&quot;$(SolutionDir)\win32build\bin&quot;;&quot;$(ZLIBLIBDIR)&quot;"

- 				GenerateManifest="true"

- 				IgnoreAllDefaultLibraries="true"

- 				GenerateDebugInformation="true"

- 				SubSystem="2"

- 				OptimizeReferences="2"

- 				EnableCOMDATFolding="2"

- 				OptimizeForWindows98="1"

- 				LinkTimeCodeGeneration="1"

- 				TurnOffAssemblyGeneration="true"

- 				ImportLibrary="$(OutDir)/reguser.lib"

- 				TargetMachine="1"

- 			/>

- 			<Tool

- 				Name="VCALinkTool"

- 			/>

- 			<Tool

- 				Name="VCManifestTool"

- 				AdditionalManifestFiles="$(SolutionDir)/data/manifests/commctrl.manifest"

- 				EmbedManifest="false"

- 				VerboseOutput="true"

- 			/>

- 			<Tool

- 				Name="VCXDCMakeTool"

- 			/>

- 			<Tool

- 				Name="VCBscMakeTool"

- 			/>

- 			<Tool

- 				Name="VCFxCopTool"

- 			/>

- 			<Tool

- 				Name="VCAppVerifierTool"

- 			/>

- 			<Tool

- 				Name="VCWebDeploymentTool"

- 			/>

- 			<Tool

- 				Name="VCPostBuildEventTool"

- 			/>

- 		</Configuration>

- 	</Configurations>

- 	<References>

- 	</References>

- 	<Files>

- 		<Filter

- 			Name="Source Files"

- 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

- 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

- 			>

- 			<File

- 				RelativePath=".\edituser.cpp"

- 				>

- 			</File>

- 			<File

- 				RelativePath=".\libkvireguser.cpp"

- 				>

- 			</File>

- 			<File

- 				RelativePath=".\wizard.cpp"

- 				>

- 			</File>

- 		</Filter>

- 		<Filter

- 			Name="Header Files"

- 			Filter="h;hpp;hxx;hm;inl;inc;xsd"

- 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

- 			>

- 			<File

- 				RelativePath=".\edituser.h"

- 				>

- 				<FileConfiguration

- 					Name="Debug|Win32"

- 					>

- 					<Tool

- 						Name="VCCustomBuildTool"

- 						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;&#x0D;&#x0A;"

- 						Outputs="$(InputDir)\$(InputName).moc"

- 					/>

- 				</FileConfiguration>

- 				<FileConfiguration

- 					Name="Release|Win32"

- 					>

- 					<Tool

- 						Name="VCCustomBuildTool"

- 						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;&#x0D;&#x0A;"

- 						Outputs="$(InputDir)\$(InputName).moc"

- 					/>

- 				</FileConfiguration>

- 			</File>

- 			<File

- 				RelativePath=".\wizard.h"

- 				>

- 				<FileConfiguration

- 					Name="Debug|Win32"

- 					>

- 					<Tool

- 						Name="VCCustomBuildTool"

- 						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;&#x0D;&#x0A;"

- 						Outputs="$(InputDir)\$(InputName).moc"

- 					/>

- 				</FileConfiguration>

- 				<FileConfiguration

- 					Name="Release|Win32"

- 					>

- 					<Tool

- 						Name="VCCustomBuildTool"

- 						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;&#x0D;&#x0A;"

- 						Outputs="$(InputDir)\$(InputName).moc"

- 					/>

- 				</FileConfiguration>

- 			</File>

- 		</Filter>

- 		<Filter

- 			Name="Resource Files"

- 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

- 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

- 			>

- 		</Filter>

- 	</Files>

- 	<Globals>

- 	</Globals>

- </VisualStudioProject>

- 
+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8,00"

+	Name="reguser"

+	ProjectGUID="{12DB9879-4F34-4EFC-8415-8714224CDDF4}"

+	RootNamespace="reguser"

+	Keyword="Win32Proj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(SolutionDir)\win32build\bin\modules\"

+			IntermediateDirectory="Debug"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\kvirc\module&quot;;&quot;$(ProjectDir)\..\..\kvilib\config&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(ProjectDir)\..\..\kvilib\core&quot;;&quot;$(ProjectDir)\..\..\kvilib\system&quot;;&quot;$(ProjectDir)\..\..\kvirc\uparser&quot;;&quot;$(ProjectDir)\..\..\kvilib\ext&quot;;&quot;$(ProjectDir)\..\..\kvirc\kvs&quot;;&quot;$(ProjectDir)\..\..\kvirc\ui&quot;;&quot;$(ProjectDir)\..\..\kvirc\kernel&quot;;&quot;$(ProjectDir)\..\..\kvilib\tal&quot;;&quot;$(ProjectDir)\..\..\kvilib\irc&quot;;&quot;$(ProjectDir)\..\..\kvilib\file&quot;;&quot;$(QTDIR)\include\Qt3Support&quot;;&quot;$(QTDIR)\include\QtCore\&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include\Qt&quot;;&quot;$(QTDIR)\include\QtNetwork&quot;;&quot;$(QTDIR)\include\QtXml&quot;;"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;REGUSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="qtmain.lib libeay32.lib SSLeay32.lib ws2_32.lib kvilib.lib kvirc.lib msvcrt.lib perl58.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib winmm.lib qt3supportd4.lib qtcored4.lib qtnetworkd4.lib qtguid4.lib "

+				OutputFile="$(OutDir)/kvi$(ProjectName).dll"

+				LinkIncremental="2"

+				AdditionalLibraryDirectories="&quot;$(SSLLIBDIR)&quot;;&quot;$(PERLDIR)\lib\CORE&quot;;&quot;$(QTDIR)\lib&quot;;&quot;$(SolutionDir)\win32build\bin&quot;;&quot;$(ZLIBLIBDIR)&quot;"

+				GenerateManifest="true"

+				IgnoreAllDefaultLibraries="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/reguser.pdb"

+				SubSystem="2"

+				TurnOffAssemblyGeneration="true"

+				ImportLibrary="$(OutDir)/reguser.lib"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="$(SolutionDir)/data/manifests/commctrl.manifest"

+				EmbedManifest="true"

+				VerboseOutput="true"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(SolutionDir)\win32build\bin\modules"

+			IntermediateDirectory="Release"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="1"

+				InlineFunctionExpansion="2"

+				EnableIntrinsicFunctions="true"

+				FavorSizeOrSpeed="1"

+				OmitFramePointers="true"

+				EnableFiberSafeOptimizations="true"

+				WholeProgramOptimization="true"

+				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\kvirc\module&quot;;&quot;$(ProjectDir)\..\..\kvilib\config&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(ProjectDir)\..\..\kvilib\core&quot;;&quot;$(ProjectDir)\..\..\kvilib\system&quot;;&quot;$(ProjectDir)\..\..\kvirc\uparser&quot;;&quot;$(ProjectDir)\..\..\kvilib\ext&quot;;&quot;$(ProjectDir)\..\..\kvirc\kvs&quot;;&quot;$(ProjectDir)\..\..\kvirc\ui&quot;;&quot;$(ProjectDir)\..\..\kvirc\kernel&quot;;&quot;$(ProjectDir)\..\..\kvilib\tal&quot;;&quot;$(ProjectDir)\..\..\kvilib\irc&quot;;&quot;$(ProjectDir)\..\..\kvilib\file&quot;;&quot;$(QTDIR)\include\Qt3Support&quot;;&quot;$(QTDIR)\include\QtCore\&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include\Qt&quot;;&quot;$(QTDIR)\include\QtNetwork&quot;;&quot;$(QTDIR)\include\QtXml&quot;;"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;REGUSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"

+				StringPooling="true"

+				MinimalRebuild="true"

+				ExceptionHandling="1"

+				RuntimeLibrary="0"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="qtmain.lib libeay32.lib SSLeay32.lib ws2_32.lib kvilib.lib kvirc.lib msvcrt.lib perl58.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib winmm.lib qt3support4.lib qtcore4.lib qtnetwork4.lib qtgui4.lib "

+				OutputFile="$(OutDir)/kvi$(ProjectName).dll"

+				LinkIncremental="1"

+				AdditionalLibraryDirectories="&quot;$(SSLLIBDIR)&quot;;&quot;$(PERLDIR)\lib\CORE&quot;;&quot;$(QTDIR)\lib&quot;;&quot;$(SolutionDir)\win32build\bin&quot;;&quot;$(ZLIBLIBDIR)&quot;"

+				GenerateManifest="true"

+				IgnoreAllDefaultLibraries="true"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				OptimizeForWindows98="1"

+				LinkTimeCodeGeneration="1"

+				TurnOffAssemblyGeneration="true"

+				ImportLibrary="$(OutDir)/reguser.lib"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="$(SolutionDir)/data/manifests/commctrl.manifest"

+				EmbedManifest="false"

+				VerboseOutput="true"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

+			<File

+				RelativePath=".\dialog.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\edituser.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\libkvireguser.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\wizard.cpp"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

+			<File

+				RelativePath=".\dialog.h"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;"

+						Outputs="$(InputDir)\$(InputName).moc"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath=".\edituser.h"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;&#x0D;&#x0A;"

+						Outputs="$(InputDir)\$(InputName).moc"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;&#x0D;&#x0A;"

+						Outputs="$(InputDir)\$(InputName).moc"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath=".\wizard.h"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;&#x0D;&#x0A;"

+						Outputs="$(InputDir)\$(InputName).moc"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;&#x0D;&#x0A;"

+						Outputs="$(InputDir)\$(InputName).moc"

+					/>

+				</FileConfiguration>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp
index ec6c5a544..6fefff089 100644
--- a/src/modules/reguser/wizard.cpp
+++ b/src/modules/reguser/wizard.cpp
@@ -31,6 +31,9 @@
 #include "kvi_pixmap.h"
 #include "kvi_regusersdb.h"
 #include "kvi_iconmanager.h"
+#ifdef COMPILE_USE_QT4
+#include <QDesktopWidget>
+#endif
 
 #include <qcheckbox.h>
 #include <qlabel.h>
@@ -115,13 +118,13 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 	//KviIrcMask masktempl(szMask.ptr());
 
     m_pNicknameEdit1 = new QLineEdit(m_pPage2);
-    m_pNicknameEdit1->setAlignment(int(QLineEdit::AlignRight));
+    m_pNicknameEdit1->setAlignment(Qt::AlignRight);
 	if(mask.nick() != "*")m_pNicknameEdit1->setText(mask.nick());
 	connect(m_pNicknameEdit1,SIGNAL(textChanged(const QString &)),this,SLOT(maskChanged(const QString &)));
     m_pPage2Layout->addWidget( m_pNicknameEdit1, 1, 0 );
 
     m_pUsernameEdit1 = new QLineEdit(m_pPage2);
-    m_pUsernameEdit1->setAlignment(int(QLineEdit::AlignHCenter));
+    m_pUsernameEdit1->setAlignment(Qt::AlignHCenter);
 	if(mask.hasUser())m_pUsernameEdit1->setText(mask.user());
 	connect(m_pUsernameEdit1,SIGNAL(textChanged(const QString &)),this,SLOT(maskChanged(const QString &)));
     m_pPage2Layout->addWidget(m_pUsernameEdit1,1,2);
@@ -132,11 +135,11 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 	m_pPage2Layout->addWidget(m_pHostEdit1,1,4);
 
     m_pNicknameEdit2 = new QLineEdit(m_pPage2);
-    m_pNicknameEdit2->setAlignment(int(QLineEdit::AlignRight));
+    m_pNicknameEdit2->setAlignment(Qt::AlignRight);
     m_pPage2Layout->addWidget(m_pNicknameEdit2,2,0);
 
     m_pUsernameEdit2 = new QLineEdit(m_pPage2);
-    m_pUsernameEdit2->setAlignment(int(QLineEdit::AlignHCenter));
+    m_pUsernameEdit2->setAlignment(Qt::AlignHCenter);
     m_pPage2Layout->addWidget(m_pUsernameEdit2,2,2);
 
     m_pHostEdit2 = new QLineEdit(m_pPage2);
@@ -144,22 +147,22 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 
     TextLabel10_2 = new QLabel(m_pPage2);
     TextLabel10_2->setText("<center><b>!</b></center>");
-    TextLabel10_2->setAlignment(int(QLabel::AlignCenter));
+    TextLabel10_2->setAlignment(int(Qt::AlignCenter));
     m_pPage2Layout->addWidget(TextLabel10_2,2,1);
 
     TextLabel10 = new QLabel(m_pPage2);
     TextLabel10->setText("<center><b>!</b></center>");
-    TextLabel10->setAlignment(int(QLabel::AlignCenter));
+    TextLabel10->setAlignment(int(Qt::AlignCenter));
     m_pPage2Layout->addWidget(TextLabel10,1,1);
 
     TextLabel10_3 = new QLabel(m_pPage2);
     TextLabel10_3->setText("<center><b>@</b></center>");
-    TextLabel10_3->setAlignment(int(QLabel::AlignCenter));
+    TextLabel10_3->setAlignment(int(Qt::AlignCenter));
     m_pPage2Layout->addWidget(TextLabel10_3,1,3);
 
     TextLabel10_3_2 = new QLabel(m_pPage2);
     TextLabel10_3_2->setText("<center><b>@</b></center>");
-    TextLabel10_3_2->setAlignment(int(QLabel::AlignCenter));
+    TextLabel10_3_2->setAlignment(int(Qt::AlignCenter));
     m_pPage2Layout->addWidget(TextLabel10_3_2,2,3);
 
     addPage(m_pPage2,__tr2qs("Step 2: Mask Selection"));