Apply clang-format

3 files changed, 442 insertions, 418 deletions

diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp
index 167c2c2a8..153af8767 100644
--- a/src/modules/setup/SetupWizard.cpp
+++ b/src/modules/setup/SetupWizard.cpp
@@ -48,14 +48,13 @@ bool g_bFoundMirc;
 #include <QDesktopWidget>
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-	#include <winnls.h>  // for MultiByteToWideChar
-	#include <objbase.h> // CoCreateInstance, CoInitialize & CO.
-	#include <shlobj.h>  // IShellLink IPersistFile & CO.
+#include <winnls.h>  // for MultiByteToWideChar
+#include <objbase.h> // CoCreateInstance, CoInitialize & CO.
+#include <shlobj.h>  // IShellLink IPersistFile & CO.
 #else
-	#include <unistd.h>  // for symlink()
+#include <unistd.h> // for symlink()
 #endif
 
-
 // libkvisetup.cpp
 extern QString g_szChoosenIncomingDirectory;
 extern int g_iThemeToApply;
@@ -67,13 +66,13 @@ extern QString szMircServers;
 extern QString szMircIni;
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-	#define KVI_LOCAL_KVIRC_SUBDIRECTORY_NAME "KVIrc4"
+#define KVI_LOCAL_KVIRC_SUBDIRECTORY_NAME "KVIrc4"
 #else
-	#define KVI_LOCAL_KVIRC_SUBDIRECTORY_NAME ".config/KVIrc"
+#define KVI_LOCAL_KVIRC_SUBDIRECTORY_NAME ".config/KVIrc"
 #endif
 
 SetupPage::SetupPage(SetupWizard * w)
-: QWidget(w)
+    : QWidget(w)
 {
 	QGridLayout * g = new QGridLayout(this);
 
@@ -87,7 +86,7 @@ SetupPage::SetupPage(SetupWizard * w)
 	//w->KviTalWizard::helpButton()->setText(__tr2qs("Help"));
 
 	m_pPixmapLabel = new QLabel(this);
-	g->addWidget(m_pPixmapLabel,0,0);
+	g->addWidget(m_pPixmapLabel, 0, 0);
 
 	m_pPixmapLabel->setPixmap(*(w->m_pLabelPixmap));
 	m_pPixmapLabel->setFixedSize(w->m_pLabelPixmap->size());
@@ -103,16 +102,16 @@ SetupPage::SetupPage(SetupWizard * w)
 	//m_pVBox->setSizePolicy(QSizePolicy(QSizePolicy::Expanding));
 	//m_pVBox->setBackgroundColor(QColor(0,80,0));
 	//m_pVBox->setMaximumHeight(450);
-	g->addWidget(m_pVBox,0,1);
+	g->addWidget(m_pVBox, 0, 1);
 
-	g->setColumnStretch(1,1);
+	g->setColumnStretch(1, 1);
 
 	QLabel * l = new QLabel(m_pVBox);
 	l->setAlignment(Qt::AlignLeft | Qt::AlignTop);
 
-	QPalette pal=l->palette();
-	pal.setColor(l->backgroundRole(), QColor(48,48,48)); //aka #303030
-	pal.setColor(l->foregroundRole(), QColor(255,255,255)); //aka #FFFFFF
+	QPalette pal = l->palette();
+	pal.setColor(l->backgroundRole(), QColor(48, 48, 48));    //aka #303030
+	pal.setColor(l->foregroundRole(), QColor(255, 255, 255)); //aka #FFFFFF
 	l->setPalette(pal);
 	l->setText("<h1>&nbsp;KVIrc " KVI_VERSION "</h1>");
 	l->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel);
@@ -123,16 +122,15 @@ SetupPage::SetupPage(SetupWizard * w)
 	m_pTextLabel = new QLabel(m_pVBox);
 	m_pTextLabel->setWordWrap(true);
 	m_pTextLabel->setAlignment(Qt::AlignJustify | Qt::AlignTop);
-	m_pVBox->setStretchFactor(m_pTextLabel,1);
+	m_pVBox->setStretchFactor(m_pTextLabel, 1);
 }
 
 SetupPage::~SetupPage()
 {
 }
 
-
 SetupWizard::SetupWizard()
-: KviTalWizard(0)
+    : KviTalWizard(0)
 {
 	setWindowTitle(__tr2qs("Setup Wizard - KVIrc"));
 
@@ -142,13 +140,13 @@ SetupWizard::SetupWizard()
 	QString szLabelText;
 
 	QString szImagePath;
-	g_pApp->getGlobalKvircDirectory(szImagePath,KviApplication::Pics,"kvi_setup_label.png");
+	g_pApp->getGlobalKvircDirectory(szImagePath, KviApplication::Pics, "kvi_setup_label.png");
 
 	m_pLabelPixmap = new QPixmap(szImagePath);
 	if(m_pLabelPixmap->isNull())
 	{
 		delete m_pLabelPixmap;
-		m_pLabelPixmap = new QPixmap(250,450);
+		m_pLabelPixmap = new QPixmap(250, 450);
 	}
 
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -157,135 +155,130 @@ SetupWizard::SetupWizard()
 	m_pWelcome = new SetupPage(this);
 
 	// here we go...
-	QString szText = __tr2qs("<p>" \
-		"<h2>Welcome :)</h2>" \
-		"This is your first time running this version of KVIrc.<br>" \
-		"This wizard will guide you through the few steps " \
-		"required to complete the setup.<br><br>" \
-		"If you had a previous version of KVIrc installed, no worries. You will " \
-		"have a chance to preserve the old configuration." \
-		"</p>" \
-		"<p>Click \"<b>Next</b>\" to proceed.</p>");
+	QString szText = __tr2qs("<p>"
+	                         "<h2>Welcome :)</h2>"
+	                         "This is your first time running this version of KVIrc.<br>"
+	                         "This wizard will guide you through the few steps "
+	                         "required to complete the setup.<br><br>"
+	                         "If you had a previous version of KVIrc installed, no worries. You will "
+	                         "have a chance to preserve the old configuration."
+	                         "</p>"
+	                         "<p>Click \"<b>Next</b>\" to proceed.</p>");
 
 	m_pWelcome->m_pTextLabel->setText(szText);
 
-	addPage(m_pWelcome,__tr2qs("Welcome to KVIrc"));
-
-	setBackEnabled(m_pWelcome,false);
-	setHelpEnabled(m_pWelcome,false);
+	addPage(m_pWelcome, __tr2qs("Welcome to KVIrc"));
 
+	setBackEnabled(m_pWelcome, false);
+	setHelpEnabled(m_pWelcome, false);
 
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	// License
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// License
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) //it have been already shown by installer
 	SetupPage * m_pLicense = new SetupPage(this);
-	m_pLicense->m_pTextLabel->setText(__tr2qs( \
-		"<p>All of the files in this distribution are covered by the GPL. " \
-		"In human terms this can be read as follows:<br>" \
-		"<ul>" \
-		"<li><b>KVIrc is free</b>, use it, have fun! <b>:)</b></li>" \
-		"<li>If you use <b>any</b> part of KVIrc in your own project, you <b>must</b> release that project under the same license.</li>" \
-		"</ul></p>" \
-		"<p>The \"legalese\" version of the license is shown in the box below.</p>"));
+	m_pLicense->m_pTextLabel->setText(__tr2qs(
+	    "<p>All of the files in this distribution are covered by the GPL. "
+	    "In human terms this can be read as follows:<br>"
+	    "<ul>"
+	    "<li><b>KVIrc is free</b>, use it, have fun! <b>:)</b></li>"
+	    "<li>If you use <b>any</b> part of KVIrc in your own project, you <b>must</b> release that project under the same license.</li>"
+	    "</ul></p>"
+	    "<p>The \"legalese\" version of the license is shown in the box below.</p>"));
 
 	QTextEdit * ed = new QTextEdit(m_pLicense->m_pVBox);
 	ed->setReadOnly(true);
 	ed->setWordWrapMode(QTextOption::NoWrap);
 	QString szLicense;
 	QString szLicensePath;
-	g_pApp->getGlobalKvircDirectory(szLicensePath,KviApplication::License,"COPYING");
-	if(!KviFileUtils::loadFile(szLicensePath,szLicense))
+	g_pApp->getGlobalKvircDirectory(szLicensePath, KviApplication::License, "COPYING");
+	if(!KviFileUtils::loadFile(szLicensePath, szLicense))
 	{
-		szLicense = __tr("Oops! Can't find the license file.\n" \
-			"It MUST be included in the distribution...\n" \
-			"Please report to <pragma at kvirc dot net>");
+		szLicense = __tr("Oops! Can't find the license file.\n"
+		                 "It MUST be included in the distribution...\n"
+		                 "Please report to <pragma at kvirc dot net>");
 	}
 	ed->setText(szLicense);
 
-	m_pLicense->m_pVBox->setStretchFactor(ed,1);
+	m_pLicense->m_pVBox->setStretchFactor(ed, 1);
 
-	addPage(m_pLicense,__tr2qs("Dreaded License Agreement"));
+	addPage(m_pLicense, __tr2qs("Dreaded License Agreement"));
 
-	setHelpEnabled(m_pLicense,false);
+	setHelpEnabled(m_pLicense, false);
 #else
 	m_pLicense = 0;
 #endif
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Directories
 
 	m_pDirectory = new SetupPage(this);
 
-	m_pDirectory->m_pTextLabel->setText(__tr2qs("<p>Please choose a folder for " \
-		"KVIrc to store its settings and other data, and another for downloaded files. " \
-		"Make sure that you have permission to write to both folders.<br><br>" \
-		"The suggested locations are fine in most cases. If you don't know what " \
-		"this is about, just click \"<b>Next</b>\".<br><br>" \
-		"If you had a previous version of KVIrc installed, you can choose " \
-		"the existing directory for the settings, and your configuration " \
-		"will be preserved." \
-		"</p>"));
-
+	m_pDirectory->m_pTextLabel->setText(__tr2qs("<p>Please choose a folder for "
+	                                            "KVIrc to store its settings and other data, and another for downloaded files. "
+	                                            "Make sure that you have permission to write to both folders.<br><br>"
+	                                            "The suggested locations are fine in most cases. If you don't know what "
+	                                            "this is about, just click \"<b>Next</b>\".<br><br>"
+	                                            "If you had a previous version of KVIrc installed, you can choose "
+	                                            "the existing directory for the settings, and your configuration "
+	                                            "will be preserved."
+	                                            "</p>"));
 
 	QString tmp;
 
-	m_pDirButtonGroup = new KviTalGroupBox(Qt::Horizontal,__tr2qs("Store configuration in folder"),m_pDirectory->m_pVBox);
-	m_pDirUsePrev = new QRadioButton(__tr2qs("Use settings folder from previous installation"),m_pDirButtonGroup);
-	connect(m_pDirUsePrev,SIGNAL(clicked()),this,SLOT(oldDirClicked()));
+	m_pDirButtonGroup = new KviTalGroupBox(Qt::Horizontal, __tr2qs("Store configuration in folder"), m_pDirectory->m_pVBox);
+	m_pDirUsePrev = new QRadioButton(__tr2qs("Use settings folder from previous installation"), m_pDirButtonGroup);
+	connect(m_pDirUsePrev, SIGNAL(clicked()), this, SLOT(oldDirClicked()));
 
 	m_pOldPathBox = new KviTalHBox(m_pDirButtonGroup);
 	m_pOldDataPathEdit = new QLineEdit(m_pOldPathBox);
-	connect(m_pOldDataPathEdit,SIGNAL(textChanged ( const QString & )),this,SLOT(oldDataTextChanged ( const QString & )));
+	connect(m_pOldDataPathEdit, SIGNAL(textChanged(const QString &)), this, SLOT(oldDataTextChanged(const QString &)));
 
-	QPushButton * pb = new QPushButton(__tr2qs("&Browse..."),m_pOldPathBox);
-	connect(pb,SIGNAL(clicked()),this,SLOT(chooseOldDataPath()));
+	QPushButton * pb = new QPushButton(__tr2qs("&Browse..."), m_pOldPathBox);
+	connect(pb, SIGNAL(clicked()), this, SLOT(chooseOldDataPath()));
 	m_pOldPathBox->setSpacing(3);
-	m_pOldPathBox->setStretchFactor(m_pOldDataPathEdit,1);
+	m_pOldPathBox->setStretchFactor(m_pOldDataPathEdit, 1);
 
-	m_pDirUseNew = new QRadioButton(__tr2qs("Use new settings folder"),m_pDirButtonGroup);
-	connect(m_pDirUseNew,SIGNAL(clicked()),this,SLOT(newDirClicked()));
+	m_pDirUseNew = new QRadioButton(__tr2qs("Use new settings folder"), m_pDirButtonGroup);
+	connect(m_pDirUseNew, SIGNAL(clicked()), this, SLOT(newDirClicked()));
 
-	QLabel* l = new QLabel(m_pDirButtonGroup);
+	QLabel * l = new QLabel(m_pDirButtonGroup);
 	l->setText(__tr2qs("Settings folder:"));
 
 	m_pNewPathBox = new KviTalHBox(m_pDirButtonGroup);
 	m_pDataPathEdit = new QLineEdit(m_pNewPathBox);
 
-	pb = new QPushButton(__tr2qs("&Browse..."),m_pNewPathBox);
-	connect(pb,SIGNAL(clicked()),this,SLOT(chooseDataPath()));
+	pb = new QPushButton(__tr2qs("&Browse..."), m_pNewPathBox);
+	connect(pb, SIGNAL(clicked()), this, SLOT(chooseDataPath()));
 
 	m_pNewPathBox->setSpacing(3);
-	m_pNewPathBox->setStretchFactor(m_pDataPathEdit,1);
+	m_pNewPathBox->setStretchFactor(m_pDataPathEdit, 1);
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-	tmp = QTextCodec::codecForLocale()->toUnicode(getenv( "APPDATA" ));
+	tmp = QTextCodec::codecForLocale()->toUnicode(getenv("APPDATA"));
 	if(tmp.isEmpty())
 		tmp = QDir::homePath();
 #else
 	tmp = QDir::homePath();
 #endif //COMPILE_ON_WINDOWS
-	KviQString::ensureLastCharIs(tmp,KVI_PATH_SEPARATOR_CHAR);
+	KviQString::ensureLastCharIs(tmp, KVI_PATH_SEPARATOR_CHAR);
 	tmp.append(KVI_LOCAL_KVIRC_SUBDIRECTORY_NAME);
 	KviFileUtils::adjustFilePath(tmp);
 	m_pDataPathEdit->setText(tmp);
 
-
-
 	l = new QLabel(m_pDirButtonGroup);
 	l->setText(__tr2qs("Download files to folder:"));
 
-
 	m_pNewIncomingBox = new KviTalHBox(m_pDirButtonGroup);
 
 	m_pIncomingPathEdit = new QLineEdit(m_pNewIncomingBox);
 
-	pb = new QPushButton(__tr2qs("&Browse..."),m_pNewIncomingBox);
-	connect(pb,SIGNAL(clicked()),this,SLOT(chooseIncomingPath()));
+	pb = new QPushButton(__tr2qs("&Browse..."), m_pNewIncomingBox);
+	connect(pb, SIGNAL(clicked()), this, SLOT(chooseIncomingPath()));
 
 	m_pNewIncomingBox->setSpacing(3);
-	m_pNewIncomingBox->setStretchFactor(m_pIncomingPathEdit,1);
+	m_pNewIncomingBox->setStretchFactor(m_pIncomingPathEdit, 1);
 
 	tmp = QDir::homePath();
-	KviQString::ensureLastCharIs(tmp,KVI_PATH_SEPARATOR_CHAR);
+	KviQString::ensureLastCharIs(tmp, KVI_PATH_SEPARATOR_CHAR);
 	tmp.append(KVI_DEFAULT_INCOMING_SUBDIRECTORY_NAME);
 	KviFileUtils::adjustFilePath(tmp);
 	m_pIncomingPathEdit->setText(tmp);
@@ -293,9 +286,8 @@ SetupWizard::SetupWizard()
 	m_pDirUseNew->toggle();
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-	m_pDirMakePortable = new QRadioButton(__tr2qs("All settings in shared program folder (portable)")
-			,m_pDirButtonGroup);
-	connect(m_pDirMakePortable,SIGNAL(clicked()),this,SLOT(portableClicked()));
+	m_pDirMakePortable = new QRadioButton(__tr2qs("All settings in shared program folder (portable)"), m_pDirButtonGroup);
+	connect(m_pDirMakePortable, SIGNAL(clicked()), this, SLOT(portableClicked()));
 #endif
 	// Pragma: Unused, takes only space.
 	//m_pDirRestore = new QRadioButton(__tr2qs("Restore from backup archive"),m_pDirButtonGroup);
@@ -305,218 +297,219 @@ SetupWizard::SetupWizard()
 
 	//m_pDirectory->m_pVBox->setStretchFactor(m_pDirectory->m_pTextLabel,1);
 
-	addPage(m_pDirectory,__tr2qs("Application Folders"));
-	setHelpEnabled(m_pDirectory,false);
+	addPage(m_pDirectory, __tr2qs("Application Folders"));
+	setHelpEnabled(m_pDirectory, false);
 
-	connect(m_pDataPathEdit,SIGNAL(textChanged ( const QString & )),this,SLOT(newDataTextChanged ( const QString & )));
-	connect(m_pIncomingPathEdit,SIGNAL(textChanged ( const QString & )),this,SLOT(newIncomingTextChanged ( const QString & )));
+	connect(m_pDataPathEdit, SIGNAL(textChanged(const QString &)), this, SLOT(newDataTextChanged(const QString &)));
+	connect(m_pIncomingPathEdit, SIGNAL(textChanged(const QString &)), this, SLOT(newIncomingTextChanged(const QString &)));
 
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Identity
 
 	m_pIdentity = new SetupPage(this);
 
-	m_pIdentity->m_pTextLabel->setText(__tr2qs("Please choose a nickname.<br><br>" \
-		"Your nickname is the name that other IRC users will know you by. " \
-		"It can't contain spaces or punctuation. Some IRC networks will shorten your nickname if it is more than 32 characters " \
-		"long.<br><br>"
-		"If in doubt, just enter the first nick that comes to mind. " \
-		"You will be able to change it later in the Identity properties, or with the /NICK command."));
+	m_pIdentity->m_pTextLabel->setText(__tr2qs("Please choose a nickname.<br><br>"
+	                                           "Your nickname is the name that other IRC users will know you by. "
+	                                           "It can't contain spaces or punctuation. Some IRC networks will shorten your nickname if it is more than 32 characters "
+	                                           "long.<br><br>"
+	                                           "If in doubt, just enter the first nick that comes to mind. "
+	                                           "You will be able to change it later in the Identity properties, or with the /NICK command."));
 
-	KviTalGroupBox * gbox = new KviTalGroupBox(Qt::Horizontal,QString(),m_pIdentity->m_pVBox);
+	KviTalGroupBox * gbox = new KviTalGroupBox(Qt::Horizontal, QString(), m_pIdentity->m_pVBox);
 
-	m_pNickSelector = new KviStringSelector(gbox,__tr2qs("Nickname:"),&(KVI_OPTION_STRING(KviOption_stringNickname1)),true);
+	m_pNickSelector = new KviStringSelector(gbox, __tr2qs("Nickname:"), &(KVI_OPTION_STRING(KviOption_stringNickname1)), true);
 	m_pNickSelector->setMinimumLabelWidth(120);
 	m_pNickSelector->setMargin(0);
-	QObject::connect(m_pNickSelector->lineEdit(),SIGNAL(textChanged(const QString &)),this,SLOT(nickSelectorTextChanged(const QString &)));
+	QObject::connect(m_pNickSelector->lineEdit(), SIGNAL(textChanged(const QString &)), this, SLOT(nickSelectorTextChanged(const QString &)));
 
-	QValidator * v = new QRegExpValidator(QRegExp("[^-0-9 ][^ ]*"),gbox);
+	QValidator * v = new QRegExpValidator(QRegExp("[^-0-9 ][^ ]*"), gbox);
 	m_pNickSelector->setValidator(v);
 
 	QString szOptionalCtcpUserInfo = __tr2qs("This field is optional and will appear as part of the CTCP USERINFO reply.");
 	QString szTrailing = "<br><br>" + szOptionalCtcpUserInfo;
 
-	gbox = new KviTalGroupBox(Qt::Horizontal,__tr2qs("Profile"),m_pIdentity->m_pVBox);
+	gbox = new KviTalGroupBox(Qt::Horizontal, __tr2qs("Profile"), m_pIdentity->m_pVBox);
 
-	m_pRealNameSelector = new KviStringSelector(gbox,__tr2qs("Real name:"),&(KVI_OPTION_STRING(KviOption_stringRealname)),true);
+	m_pRealNameSelector = new KviStringSelector(gbox, __tr2qs("Real name:"), &(KVI_OPTION_STRING(KviOption_stringRealname)), true);
 	m_pRealNameSelector->setMinimumLabelWidth(120);
 	m_pRealNameSelector->setMargin(0);
 
-	KviTalHBox* hb = new KviTalHBox(gbox);
+	KviTalHBox * hb = new KviTalHBox(gbox);
 	hb->setSpacing(4);
 	hb->setMargin(0);
 
-	l = new QLabel(__tr2qs("Age:"),hb);
+	l = new QLabel(__tr2qs("Age:"), hb);
 	l->setMinimumWidth(120);
 
 	m_pAgeCombo = new QComboBox(hb);
 
-    m_pAgeCombo->insertItem(0,__tr2qs("Unspecified"));
+	m_pAgeCombo->insertItem(0, __tr2qs("Unspecified"));
 	unsigned int i;
-	for(i=1;i<120;i++)
+	for(i = 1; i < 120; i++)
 	{
 		QString tmp;
 		tmp.setNum(i);
-        m_pAgeCombo->insertItem(m_pAgeCombo->count(),tmp);
+		m_pAgeCombo->insertItem(m_pAgeCombo->count(), tmp);
 	}
 
 	bool bOk;
 	i = KVI_OPTION_STRING(KviOption_stringCtcpUserInfoAge).toUInt(&bOk);
-	if(!bOk)i = 0;
-	if(i > 120)i = 120;
+	if(!bOk)
+		i = 0;
+	if(i > 120)
+		i = 120;
 	m_pAgeCombo->setCurrentIndex(i);
 
-	hb->setStretchFactor(m_pAgeCombo,1);
-
+	hb->setStretchFactor(m_pAgeCombo, 1);
 
 	hb = new KviTalHBox(gbox);
 	hb->setSpacing(4);
 	hb->setMargin(0);
 
-	l = new QLabel(__tr2qs("Gender:"),hb);
+	l = new QLabel(__tr2qs("Gender:"), hb);
 	l->setMinimumWidth(120);
 
 	m_pGenderCombo = new QComboBox(hb);
 
-    m_pGenderCombo->insertItem(0,__tr2qs("Unspecified"));
-    m_pGenderCombo->insertItem(1,__tr2qs("Female"));
-    m_pGenderCombo->insertItem(2,__tr2qs("Male"));
+	m_pGenderCombo->insertItem(0, __tr2qs("Unspecified"));
+	m_pGenderCombo->insertItem(1, __tr2qs("Female"));
+	m_pGenderCombo->insertItem(2, __tr2qs("Male"));
 
-	if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender),"Male"))
+	if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender), "Male"))
 		m_pGenderCombo->setCurrentIndex(2);
-	else if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender),"Female"))
+	else if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender), "Female"))
 		m_pGenderCombo->setCurrentIndex(1);
 	else
 		m_pGenderCombo->setCurrentIndex(0);
 
-	hb->setStretchFactor(m_pGenderCombo,1);
+	hb->setStretchFactor(m_pGenderCombo, 1);
 
-	m_pLocationSelector = new KviStringSelector(gbox,__tr2qs("Location:"),&(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoLocation)),true);
+	m_pLocationSelector = new KviStringSelector(gbox, __tr2qs("Location:"), &(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoLocation)), true);
 	m_pLocationSelector->setMinimumLabelWidth(120);
 	m_pLocationSelector->setMargin(0);
 
-	m_pLanguagesSelector = new KviStringSelector(gbox,__tr2qs("Languages:"),&(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoLanguages)),true);
+	m_pLanguagesSelector = new KviStringSelector(gbox, __tr2qs("Languages:"), &(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoLanguages)), true);
 	m_pLanguagesSelector->setMinimumLabelWidth(120);
 	m_pLanguagesSelector->setMargin(0);
 
 	//m_pOtherInfoSelector = new KviStringSelector(gbox,__tr2qs("Other:"),&(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoOther)),true);
 	//m_pOtherInfoSelector->setMinimumLabelWidth(120);
 
-	addPage(m_pIdentity,__tr2qs("Identity"));
+	addPage(m_pIdentity, __tr2qs("Identity"));
 
 	//l = new QLabel(m_pIdentity->m_pVBox,"<b> </b>");
 
-	setHelpEnabled(m_pIdentity,false);
+	setHelpEnabled(m_pIdentity, false);
 
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Default theme
 	m_pTheme = new SetupPage(this);
-	m_pTheme->m_pTextLabel->setText(__tr2qs( \
-		"<p>Here you can choose the default appearance of KVIrc.<br><br>" \
-		"The Fancy theme uses icons, a transparent background and a lot of colors. " \
-		"The Minimalist theme is designed for low-color displays " \
-		"or for \"console\" extremists; it's more or less white text on a black background.<br><br>" \
-		"If you had a previous version of KVIrc installed, you can choose to not apply any theme " \
-		"in order to preserve your current visual settings.<br><br>" \
-		"If you don't know what to choose, just use the default.</p>"));
+	m_pTheme->m_pTextLabel->setText(__tr2qs(
+	    "<p>Here you can choose the default appearance of KVIrc.<br><br>"
+	    "The Fancy theme uses icons, a transparent background and a lot of colors. "
+	    "The Minimalist theme is designed for low-color displays "
+	    "or for \"console\" extremists; it's more or less white text on a black background.<br><br>"
+	    "If you had a previous version of KVIrc installed, you can choose to not apply any theme "
+	    "in order to preserve your current visual settings.<br><br>"
+	    "If you don't know what to choose, just use the default.</p>"));
 
-	m_pThemeButtonGroup = new  QGroupBox(m_pTheme->m_pVBox);
+	m_pThemeButtonGroup = new QGroupBox(m_pTheme->m_pVBox);
 
-	QGridLayout *pThemeGrid = new QGridLayout(m_pThemeButtonGroup);
+	QGridLayout * pThemeGrid = new QGridLayout(m_pThemeButtonGroup);
 	m_pThemeButtonGroup->setLayout(pThemeGrid);
 
 	QString szThemeImagePath;
-	g_pApp->getGlobalKvircDirectory(szThemeImagePath,KviApplication::Pics,"kvi_setup_theme_hires.png");
+	g_pApp->getGlobalKvircDirectory(szThemeImagePath, KviApplication::Pics, "kvi_setup_theme_hires.png");
 
-	QPixmap* pHiResPixmap = new QPixmap(szThemeImagePath);
+	QPixmap * pHiResPixmap = new QPixmap(szThemeImagePath);
 	if(pHiResPixmap->isNull())
 	{
 		delete pHiResPixmap;
-		pHiResPixmap= new QPixmap(200,118);
+		pHiResPixmap = new QPixmap(200, 118);
 	}
 
-	QLabel* pPixmapLabelHiRes = new QLabel(m_pThemeButtonGroup);
+	QLabel * pPixmapLabelHiRes = new QLabel(m_pThemeButtonGroup);
 
 	pPixmapLabelHiRes->setPixmap(*pHiResPixmap);
 	pPixmapLabelHiRes->setFixedSize(pHiResPixmap->size());
 	pPixmapLabelHiRes->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel);
 	pPixmapLabelHiRes->setMargin(0);
-	pThemeGrid->addWidget(pPixmapLabelHiRes, 1,1);
+	pThemeGrid->addWidget(pPixmapLabelHiRes, 1, 1);
 
-	m_pThemeHiRes = new QRadioButton(__tr2qs("&Fancy Theme"),m_pThemeButtonGroup);
-	pThemeGrid->addWidget(m_pThemeHiRes, 2,1);
+	m_pThemeHiRes = new QRadioButton(__tr2qs("&Fancy Theme"), m_pThemeButtonGroup);
+	pThemeGrid->addWidget(m_pThemeHiRes, 2, 1);
 
-	g_pApp->getGlobalKvircDirectory(szThemeImagePath,KviApplication::Pics,"kvi_setup_theme_lowres.png");
-	QPixmap* pLowResPixmap = new QPixmap(szThemeImagePath);
+	g_pApp->getGlobalKvircDirectory(szThemeImagePath, KviApplication::Pics, "kvi_setup_theme_lowres.png");
+	QPixmap * pLowResPixmap = new QPixmap(szThemeImagePath);
 	if(pLowResPixmap->isNull())
 	{
 		delete pLowResPixmap;
-		pLowResPixmap= new QPixmap(250,200);
+		pLowResPixmap = new QPixmap(250, 200);
 	}
 
-	QLabel* pPixmapLabelLowRes = new QLabel(m_pThemeButtonGroup);
+	QLabel * pPixmapLabelLowRes = new QLabel(m_pThemeButtonGroup);
 
 	pPixmapLabelLowRes->setPixmap(*pLowResPixmap);
 	pPixmapLabelLowRes->setFixedSize(pLowResPixmap->size());
 	pPixmapLabelLowRes->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel);
 	pPixmapLabelLowRes->setMargin(0);
-	pThemeGrid->addWidget(pPixmapLabelLowRes, 1,2);
+	pThemeGrid->addWidget(pPixmapLabelLowRes, 1, 2);
 
-	m_pThemeLoRes = new QRadioButton(__tr2qs("&Minimalist Theme"),m_pThemeButtonGroup);
-	pThemeGrid->addWidget(m_pThemeLoRes, 2,2);
-	m_pThemeNone = new QRadioButton(__tr2qs("&Don't apply any theme"),m_pThemeButtonGroup);
-	pThemeGrid->addWidget(m_pThemeNone, 3,1);
+	m_pThemeLoRes = new QRadioButton(__tr2qs("&Minimalist Theme"), m_pThemeButtonGroup);
+	pThemeGrid->addWidget(m_pThemeLoRes, 2, 2);
+	m_pThemeNone = new QRadioButton(__tr2qs("&Don't apply any theme"), m_pThemeButtonGroup);
+	pThemeGrid->addWidget(m_pThemeNone, 3, 1);
 
 	m_pThemeHiRes->setChecked(true);
 
-	addPage(m_pTheme,__tr2qs("Default Theme"));
+	addPage(m_pTheme, __tr2qs("Default Theme"));
 
-	setHelpEnabled(m_pTheme,false);
+	setHelpEnabled(m_pTheme, false);
 
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Desktop integration
 
 	m_pDesktopIntegration = new SetupPage(this);
 
-	szText  = __tr2qs( \
-		"<p>" \
-			"Here you can choose how much KVIrc will integrate with " \
-			"your system." \
-			"<br><br>" \
-			"The default settings are fine for most users so if " \
-			"you're in doubt just click \"<b>Finish</b>\" to continue." \
-		"</p>");
+	szText = __tr2qs(
+	    "<p>"
+	    "Here you can choose how much KVIrc will integrate with "
+	    "your system."
+	    "<br><br>"
+	    "The default settings are fine for most users so if "
+	    "you're in doubt just click \"<b>Finish</b>\" to continue."
+	    "</p>");
 
 	m_pDesktopIntegration->m_pTextLabel->setText(szText);
 
-	addPage(m_pDesktopIntegration,__tr2qs("Desktop Integration"));
+	addPage(m_pDesktopIntegration, __tr2qs("Desktop Integration"));
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-	m_pCreateUrlHandlers = new QCheckBox(__tr2qs("Make KVIrc the default IRC client"),m_pDesktopIntegration->m_pVBox);
+	m_pCreateUrlHandlers = new QCheckBox(__tr2qs("Make KVIrc the default IRC client"), m_pDesktopIntegration->m_pVBox);
 	m_pCreateUrlHandlers->setChecked(true);
 #endif
 #ifdef COMPILE_KDE_SUPPORT
-	m_pCreateDesktopShortcut = new QCheckBox(__tr2qs("Create desktop shortcut"),m_pDesktopIntegration->m_pVBox);
+	m_pCreateDesktopShortcut = new QCheckBox(__tr2qs("Create desktop shortcut"), m_pDesktopIntegration->m_pVBox);
 	m_pCreateDesktopShortcut->setChecked(true);
 #endif
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-	m_pUseMircServerList = new QCheckBox(__tr2qs("Import server list from mIRC"),m_pDesktopIntegration->m_pVBox);
+	m_pUseMircServerList = new QCheckBox(__tr2qs("Import server list from mIRC"), m_pDesktopIntegration->m_pVBox);
 	m_pUseMircServerList->setEnabled(false);
 #endif
 
-	setHelpEnabled(m_pDesktopIntegration,false);
-	setFinishEnabled(m_pDesktopIntegration,true);
+	setHelpEnabled(m_pDesktopIntegration, false);
+	setFinishEnabled(m_pDesktopIntegration, true);
 
-	// Preconfigured values
+// Preconfigured values
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	QString szTmp;
-	g_pApp->getGlobalKvircDirectory(szTmp,KviApplication::Config,"preinstalled.kvc");
+	g_pApp->getGlobalKvircDirectory(szTmp, KviApplication::Config, "preinstalled.kvc");
 	if(KviFileUtils::fileExists(szTmp))
 	{
-		KviConfigurationFile cfg(szTmp,KviConfigurationFile::Read);
+		KviConfigurationFile cfg(szTmp, KviConfigurationFile::Read);
 		cfg.setGroup("Setup");
-		if(cfg.readBoolEntry("hideServerList",false))
+		if(cfg.readBoolEntry("hideServerList", false))
 		{
 			//setPageEnabled(m_pServers,false);
 			//setFinishEnabled(m_pIdentity,true);
@@ -524,39 +517,40 @@ SetupWizard::SetupWizard()
 			KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = false;
 		}
 		int iDir;
-		iDir=cfg.readIntEntry("settingsDir",-1);
-		if(iDir>0) {
+		iDir = cfg.readIntEntry("settingsDir", -1);
+		if(iDir > 0)
+		{
 			switch(iDir)
 			{
 				case 1:
 					m_pDirUseNew->toggle();
-					setPageEnabled(m_pDirectory,false);
+					setPageEnabled(m_pDirectory, false);
 					break;
 				case 2:
 					m_pDirMakePortable->toggle();
-					setPageEnabled(m_pDirectory,false);
+					setPageEnabled(m_pDirectory, false);
 					break;
 			}
 		}
 	}
 
-	//mIRC import
-	#define QUERY_BUFFER 2048
-	char* buffer;
+//mIRC import
+#define QUERY_BUFFER 2048
+	char * buffer;
 	DWORD len = QUERY_BUFFER;
-	buffer = (char*)malloc(len*sizeof(char));
+	buffer = (char *)malloc(len * sizeof(char));
 	HKEY hKey;
 	QString szMircDir;
 
-	if(RegOpenKeyEx(HKEY_CLASSES_ROOT,"ChatFile\\DefaultIcon",0,KEY_READ,&hKey) == ERROR_SUCCESS )
+	if(RegOpenKeyEx(HKEY_CLASSES_ROOT, "ChatFile\\DefaultIcon", 0, KEY_READ, &hKey) == ERROR_SUCCESS)
 	{
-		if( RegQueryValueEx( hKey,0,0,0,(LPBYTE)buffer,&len) == ERROR_SUCCESS)
+		if(RegQueryValueEx(hKey, 0, 0, 0, (LPBYTE)buffer, &len) == ERROR_SUCCESS)
 		{
-			szMircDir = QString::fromLocal8Bit(buffer,len);
+			szMircDir = QString::fromLocal8Bit(buffer, len);
 
 			szMircDir.remove('"');
 			QString szMircFile = KviFileUtils::extractFileName(szMircDir);
-			szMircFile = szMircFile.left(szMircFile.length()-4); //cut off ".exe"
+			szMircFile = szMircFile.left(szMircFile.length() - 4); //cut off ".exe"
 			szMircDir = KviFileUtils::extractFilePath(szMircDir);
 
 			szMircIni = szMircDir + "/" + szMircFile + ".ini";
@@ -569,21 +563,19 @@ SetupWizard::SetupWizard()
 
 			if(KviFileUtils::fileExists(szMircIni))
 			{
-				KviConfigurationFile cfg(szMircIni,KviConfigurationFile::Read,true);
+				KviConfigurationFile cfg(szMircIni, KviConfigurationFile::Read, true);
 				if(cfg.hasGroup("mirc"))
 				{
 					g_bFoundMirc = true;
 					cfg.setGroup("mirc");
-					m_pNickSelector->setText(cfg.readEntry("nick",KVI_OPTION_STRING(KviOption_stringNickname1)));
-					m_pRealNameSelector->setText(cfg.readEntry("user",KVI_OPTION_STRING(KviOption_stringRealname)));
-					KVI_OPTION_STRING(KviOption_stringNickname2) =
-						cfg.readEntry("anick",KVI_OPTION_STRING(KviOption_stringNickname2));
-					KVI_OPTION_STRING(KviOption_stringUsername)  =
-						cfg.readEntry("email",KVI_OPTION_STRING(KviOption_stringUsername)).section('@',0,0);
+					m_pNickSelector->setText(cfg.readEntry("nick", KVI_OPTION_STRING(KviOption_stringNickname1)));
+					m_pRealNameSelector->setText(cfg.readEntry("user", KVI_OPTION_STRING(KviOption_stringRealname)));
+					KVI_OPTION_STRING(KviOption_stringNickname2) = cfg.readEntry("anick", KVI_OPTION_STRING(KviOption_stringNickname2));
+					KVI_OPTION_STRING(KviOption_stringUsername) = cfg.readEntry("email", KVI_OPTION_STRING(KviOption_stringUsername)).section('@', 0, 0);
 
 					if(cfg.hasGroup("files"))
 					{
-						m_szMircServerIniFile = cfg.readEntry("servers","servers.ini");
+						m_szMircServerIniFile = cfg.readEntry("servers", "servers.ini");
 						m_szMircServerIniFile.prepend('/');
 						m_szMircServerIniFile.prepend(szMircDir);
 						if(KviFileUtils::fileExists(m_szMircServerIniFile))
@@ -609,13 +601,12 @@ SetupWizard::SetupWizard()
 	enableOrDisableIdentityPageNextButton();
 }
 
-
 SetupWizard::~SetupWizard()
 {
 	delete m_pLabelPixmap;
 }
 
-void SetupWizard::showEvent(QShowEvent *e)
+void SetupWizard::showEvent(QShowEvent * e)
 {
 	int primary_screen = g_pApp->desktop()->primaryScreen();
 	QRect r = g_pApp->desktop()->screenGeometry(primary_screen);
@@ -629,22 +620,25 @@ void SetupWizard::showEvent(QShowEvent *e)
 	if(w < 800)
 	{
 		// 640x480
-		if(ww < 630)ww = 630;
-	} else {
-		if(ww < 770)ww = 770;
+		if(ww < 630)
+			ww = 630;
+	}
+	else
+	{
+		if(ww < 770)
+			ww = 770;
 	}
 
-	setGeometry(r.left() + (w - ww) / 2, r.top() + (h - wh) / 2,ww,wh);
+	setGeometry(r.left() + (w - ww) / 2, r.top() + (h - wh) / 2, ww, wh);
 
 	KviTalWizard::showEvent(e);
 }
 
 void SetupWizard::enableOrDisableIdentityPageNextButton()
 {
-	setNextEnabled(m_pIdentity,!m_pNickSelector->currentText().trimmed().isEmpty());
+	setNextEnabled(m_pIdentity, !m_pNickSelector->currentText().trimmed().isEmpty());
 }
 
-
 void SetupWizard::nickSelectorTextChanged(const QString & str)
 {
 	enableOrDisableIdentityPageNextButton();
@@ -656,27 +650,32 @@ void SetupWizard::oldDirClicked()
 	m_pNewPathBox->setEnabled(false);
 	m_pNewIncomingBox->setEnabled(false);
 
-	if(m_pIdentity) setPageEnabled(m_pIdentity,false);
-	if(m_pTheme) setPageEnabled(m_pTheme,false);
-	if(m_pServers) setPageEnabled(m_pServers,false);
+	if(m_pIdentity)
+		setPageEnabled(m_pIdentity, false);
+	if(m_pTheme)
+		setPageEnabled(m_pTheme, false);
+	if(m_pServers)
+		setPageEnabled(m_pServers, false);
 
-	if(m_pOldDataPathEdit->text().isEmpty()) setNextEnabled(m_pDirectory,false);
-	else setNextEnabled(m_pDirectory,true);
+	if(m_pOldDataPathEdit->text().isEmpty())
+		setNextEnabled(m_pDirectory, false);
+	else
+		setNextEnabled(m_pDirectory, true);
 }
 
 void SetupWizard::oldDataTextChanged(const QString & str)
 {
-	setNextEnabled(m_pDirectory,!str.isEmpty());
+	setNextEnabled(m_pDirectory, !str.isEmpty());
 }
 
 void SetupWizard::newDataTextChanged(const QString & str)
 {
-	setNextEnabled(m_pDirectory,!str.isEmpty() && !m_pIncomingPathEdit->text().isEmpty());
+	setNextEnabled(m_pDirectory, !str.isEmpty() && !m_pIncomingPathEdit->text().isEmpty());
 }
 
 void SetupWizard::newIncomingTextChanged(const QString & str)
 {
-	setNextEnabled(m_pDirectory,!str.isEmpty() && !m_pDataPathEdit->text().isEmpty());
+	setNextEnabled(m_pDirectory, !str.isEmpty() && !m_pDataPathEdit->text().isEmpty());
 }
 
 void SetupWizard::newDirClicked()
@@ -685,12 +684,17 @@ void SetupWizard::newDirClicked()
 	m_pNewPathBox->setEnabled(true);
 	m_pNewIncomingBox->setEnabled(true);
 
-	if(m_pIdentity) setPageEnabled(m_pIdentity,true);
-	if(m_pTheme) setPageEnabled(m_pTheme,true);
-	if(m_pServers) setPageEnabled(m_pServers,true);
+	if(m_pIdentity)
+		setPageEnabled(m_pIdentity, true);
+	if(m_pTheme)
+		setPageEnabled(m_pTheme, true);
+	if(m_pServers)
+		setPageEnabled(m_pServers, true);
 
-	if(m_pDataPathEdit->text().isEmpty() || m_pIncomingPathEdit->text().isEmpty()) setNextEnabled(m_pDirectory,false);
-	else setNextEnabled(m_pDirectory,true);
+	if(m_pDataPathEdit->text().isEmpty() || m_pIncomingPathEdit->text().isEmpty())
+		setNextEnabled(m_pDirectory, false);
+	else
+		setNextEnabled(m_pDirectory, true);
 }
 
 void SetupWizard::portableClicked()
@@ -699,45 +703,48 @@ void SetupWizard::portableClicked()
 	m_pNewPathBox->setEnabled(false);
 	m_pNewIncomingBox->setEnabled(false);
 
-	if(m_pIdentity) setPageEnabled(m_pIdentity,true);
-	if(m_pTheme) setPageEnabled(m_pTheme,true);
-	if(m_pServers) setPageEnabled(m_pServers,true);
+	if(m_pIdentity)
+		setPageEnabled(m_pIdentity, true);
+	if(m_pTheme)
+		setPageEnabled(m_pTheme, true);
+	if(m_pServers)
+		setPageEnabled(m_pServers, true);
 
-	setNextEnabled(m_pDirectory,true);
+	setNextEnabled(m_pDirectory, true);
 }
 
 void SetupWizard::chooseOldDataPath()
 {
 	// FIXME: We'd like to show hidden directories here ($HOME/.kvirc is hidden)...
 	QString szBuffer = KviTalFileDialog::getExistingDirectoryPath(
-			m_pDataPathEdit->text(),
-			__tr2qs("Choose an Existing Configuration Folder - KVIrc Setup"),
-			this
-		);
+	    m_pDataPathEdit->text(),
+	    __tr2qs("Choose an Existing Configuration Folder - KVIrc Setup"),
+	    this);
 
 	if(szBuffer.isEmpty())
 		return;
 
 	KviFileUtils::adjustFilePath(szBuffer);
 
-	KviQString::ensureLastCharIs(szBuffer,KVI_PATH_SEPARATOR_CHAR);
+	KviQString::ensureLastCharIs(szBuffer, KVI_PATH_SEPARATOR_CHAR);
 	if(!g_pApp->checkLocalKvircDirectory(szBuffer))
 	{
 		if(
-			QMessageBox::question(
-				this,
-				__tr2qs("Confirm Setting Configuration Folder - KVIrc Setup"),
-				__tr2qs("The folder %1 doesn't seem to be a valid KVIrc settings folder. Do you want to use it anyway?")
-					.arg(szBuffer),
-				__tr2qs("&Yes"),
-				__tr2qs("&No"),
-				QString(),
-				0,
-				1
-			) == 0
-		)
+		    QMessageBox::question(
+		        this,
+		        __tr2qs("Confirm Setting Configuration Folder - KVIrc Setup"),
+		        __tr2qs("The folder %1 doesn't seem to be a valid KVIrc settings folder. Do you want to use it anyway?")
+		            .arg(szBuffer),
+		        __tr2qs("&Yes"),
+		        __tr2qs("&No"),
+		        QString(),
+		        0,
+		        1)
+		    == 0)
 			m_pOldDataPathEdit->setText(szBuffer);
-	} else {
+	}
+	else
+	{
 		m_pOldDataPathEdit->setText(szBuffer);
 	}
 }
@@ -745,14 +752,13 @@ void SetupWizard::chooseOldDataPath()
 void SetupWizard::chooseDataPath()
 {
 	QString szBuffer = KviTalFileDialog::getExistingDirectoryPath(
-			m_pDataPathEdit->text(),
-			__tr2qs("Choose a Configuration Folder - KVIrc Setup"),
-			this
-		);
+	    m_pDataPathEdit->text(),
+	    __tr2qs("Choose a Configuration Folder - KVIrc Setup"),
+	    this);
 	KviFileUtils::adjustFilePath(szBuffer);
 	if(!szBuffer.isEmpty())
 	{
-		KviQString::ensureLastCharIs(szBuffer,KVI_PATH_SEPARATOR_CHAR);
+		KviQString::ensureLastCharIs(szBuffer, KVI_PATH_SEPARATOR_CHAR);
 		m_pDataPathEdit->setText(szBuffer);
 	}
 }
@@ -760,10 +766,9 @@ void SetupWizard::chooseDataPath()
 void SetupWizard::chooseIncomingPath()
 {
 	QString szBuffer = KviTalFileDialog::getExistingDirectoryPath(
-			m_pIncomingPathEdit->text(),
-			__tr2qs("Choose a Download Folder - KVIrc Setup"),
-			this
-		);
+	    m_pIncomingPathEdit->text(),
+	    __tr2qs("Choose a Download Folder - KVIrc Setup"),
+	    this);
 	KviFileUtils::adjustFilePath(szBuffer);
 	if(!szBuffer.isEmpty())
 	{
@@ -797,11 +802,12 @@ void SetupWizard::makeLink()
 
 	// Dig in the registry looking up the Desktop path
 	if(RegOpenKeyEx(HKEY_CURRENT_USER,
-		"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders",
-		0,KEY_QUERY_VALUE,&hCU) == ERROR_SUCCESS)
+	       "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders",
+	       0, KEY_QUERY_VALUE, &hCU)
+	    == ERROR_SUCCESS)
 	{
-		RegQueryValueEx(hCU,"Desktop",NULL,&lpType,
-		(unsigned char *)&szLink,&ulSize);
+		RegQueryValueEx(hCU, "Desktop", NULL, &lpType,
+		    (unsigned char *)&szLink, &ulSize);
 		RegCloseKey(hCU);
 	}
 
@@ -816,29 +822,30 @@ void SetupWizard::makeLink()
 	CoInitialize(NULL); // we need COM+OLE
 
 	// Fiddle with an obscure shell interface
-	IShellLink* psl;
+	IShellLink * psl;
 
 	// Get a pointer to the IShellLink interface: this is kinda ugly :)
-	if(CoCreateInstance(CLSID_ShellLink,NULL,CLSCTX_INPROC_SERVER,
-				IID_IShellLink,(void **)&psl) == S_OK)
+	if(CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
+	       IID_IShellLink, (void **)&psl)
+	    == S_OK)
 	{
 		// just for fun, lookup another shell interface
 
-		IPersistFile* ppf;
+		IPersistFile * ppf;
 
 		// Query IShellLink for the IPersistFile interface for
 		// saving the shell link in persistent storage.
-		if(psl->QueryInterface(IID_IPersistFile,(void **)&ppf) == S_OK)
+		if(psl->QueryInterface(IID_IPersistFile, (void **)&ppf) == S_OK)
 		{
 			WORD wsz[MAX_PATH];
 			// Set the path to the shell link target.
 			psl->SetPath(QTextCodec::codecForLocale()->fromUnicode(szKvircExec).data());
 			// Set the description of the shell link.
 			psl->SetDescription("kvirc");
-	        // Ensure string is ANSI.
-			MultiByteToWideChar(CP_ACP,0,QTextCodec::codecForLocale()->fromUnicode(szLinkTarget).data(),-1,(LPWSTR)wsz,MAX_PATH);
+			// Ensure string is ANSI.
+			MultiByteToWideChar(CP_ACP, 0, QTextCodec::codecForLocale()->fromUnicode(szLinkTarget).data(), -1, (LPWSTR)wsz, MAX_PATH);
 			// Save the link via the IPersistFile::Save method.
-			ppf->Save((LPCOLESTR)wsz,true);
+			ppf->Save((LPCOLESTR)wsz, true);
 			ppf->Release();
 		}
 		psl->Release();
@@ -849,92 +856,95 @@ void SetupWizard::makeLink()
 
 #ifdef COMPILE_KDE_SUPPORT
 	QString tmp = QDir::homePath();
-	KviQString::ensureLastCharIs(tmp,KVI_PATH_SEPARATOR_CHAR);
+	KviQString::ensureLastCharIs(tmp, KVI_PATH_SEPARATOR_CHAR);
 	tmp.append("Desktop");
-	KviQString::ensureLastCharIs(tmp,KVI_PATH_SEPARATOR_CHAR);
+	KviQString::ensureLastCharIs(tmp, KVI_PATH_SEPARATOR_CHAR);
 	tmp.append("kvirc.desktop");
 
-	QString contents = "[Desktop Entry]\n" \
-		"GenericName=IRC Client\n" \
-		"Comment=Connect to Internet Relay Chat\n" \
-		"Exec=kvirc -m %u\n" \
-		"Icon=kvirc\n" \
-		"MapNotify=true\n" \
-		"Name=KVIrc\n" \
-		"Terminal=false\n" \
-		"Type=Application\n" \
-		"X-KDE-SubstituteUID=false\n";
+	QString contents = "[Desktop Entry]\n"
+	                   "GenericName=IRC Client\n"
+	                   "Comment=Connect to Internet Relay Chat\n"
+	                   "Exec=kvirc -m %u\n"
+	                   "Icon=kvirc\n"
+	                   "MapNotify=true\n"
+	                   "Name=KVIrc\n"
+	                   "Terminal=false\n"
+	                   "Type=Application\n"
+	                   "X-KDE-SubstituteUID=false\n";
 
-	KviFileUtils::writeFile(tmp,contents,false);
+	KviFileUtils::writeFile(tmp, contents, false);
 #endif //COMPILE_KDE_SUPPORT
-
 }
 
 void SetupWizard::setUrlHandlers()
 {
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-	QString szReg = "REGEDIT4\r\n" \
-		"\r\n" \
-		"[HKEY_CLASSES_ROOT\\irc]\r\n" \
-		"@=\"URL:IRC Protocol\"\r\n" \
-		"\"IRC Protocol\"=\"http://www.kvirc.net/\"\r\n" \
-		"\"EditFlags\"=hex:02,00,00,00\r\n" \
-		"\"URL Protocol\"=""\r\n" \
-		"\r\n" \
-		"[HKEY_CLASSES_ROOT\\irc\\DefaultIcon]\r\n" \
-		"@=\"\\\"@KVIRCEXECUTABLE@\\\"\"\r\n" \
-		"\r\n" \
-		"[HKEY_CLASSES_ROOT\\irc\\shell]\r\n" \
-		"@=\"\"\r\n" \
-		"\r\n" \
-		"[HKEY_CLASSES_ROOT\\irc\\shell\\open]\r\n" \
-		"\"EditFlags\"=hex:01,00,00,00\r\n" \
-		"\r\n" \
-		"[HKEY_CLASSES_ROOT\\irc\\shell\\open\\command]\r\n" \
-		"@=\"\\\"@KVIRCEXECUTABLE@\\\" %1\"\r\n" \
-		"\r\n" \
-		"[HKEY_CLASSES_ROOT\\irc6]\r\n" \
-		"@=\"URL:IRC6 Protocol\"\r\n" \
-		"\"IRC6 Protocol\"=\"http://www.kvirc.net/\"\r\n" \
-		"\"EditFlags\"=hex:02,00,00,00\r\n" \
-		"\"URL Protocol\"=""\r\n" \
-		"\r\n" \
-		"[HKEY_CLASSES_ROOT\\irc6\\DefaultIcon]\r\n" \
-		"@=\"\\\"@KVIRCEXECUTABLE@\\\"\"\r\n" \
-		"\r\n" \
-		"[HKEY_CLASSES_ROOT\\irc6\\shell]\r\n" \
-		"@=\"\"\r\n" \
-		"\r\n" \
-		"[HKEY_CLASSES_ROOT\\irc6\\shell\\open]\r\n" \
-		"\"EditFlags\"=hex:01,00,00,00\r\n" \
-		"\r\n" \
-		"[HKEY_CLASSES_ROOT\\irc6\\shell\\open\\command]\r\n" \
-		"@=\"\\\"@KVIRCEXECUTABLE@\\\" %1\"\r\n";
+	QString szReg = "REGEDIT4\r\n"
+	                "\r\n"
+	                "[HKEY_CLASSES_ROOT\\irc]\r\n"
+	                "@=\"URL:IRC Protocol\"\r\n"
+	                "\"IRC Protocol\"=\"http://www.kvirc.net/\"\r\n"
+	                "\"EditFlags\"=hex:02,00,00,00\r\n"
+	                "\"URL Protocol\"="
+	                "\r\n"
+	                "\r\n"
+	                "[HKEY_CLASSES_ROOT\\irc\\DefaultIcon]\r\n"
+	                "@=\"\\\"@KVIRCEXECUTABLE@\\\"\"\r\n"
+	                "\r\n"
+	                "[HKEY_CLASSES_ROOT\\irc\\shell]\r\n"
+	                "@=\"\"\r\n"
+	                "\r\n"
+	                "[HKEY_CLASSES_ROOT\\irc\\shell\\open]\r\n"
+	                "\"EditFlags\"=hex:01,00,00,00\r\n"
+	                "\r\n"
+	                "[HKEY_CLASSES_ROOT\\irc\\shell\\open\\command]\r\n"
+	                "@=\"\\\"@KVIRCEXECUTABLE@\\\" %1\"\r\n"
+	                "\r\n"
+	                "[HKEY_CLASSES_ROOT\\irc6]\r\n"
+	                "@=\"URL:IRC6 Protocol\"\r\n"
+	                "\"IRC6 Protocol\"=\"http://www.kvirc.net/\"\r\n"
+	                "\"EditFlags\"=hex:02,00,00,00\r\n"
+	                "\"URL Protocol\"="
+	                "\r\n"
+	                "\r\n"
+	                "[HKEY_CLASSES_ROOT\\irc6\\DefaultIcon]\r\n"
+	                "@=\"\\\"@KVIRCEXECUTABLE@\\\"\"\r\n"
+	                "\r\n"
+	                "[HKEY_CLASSES_ROOT\\irc6\\shell]\r\n"
+	                "@=\"\"\r\n"
+	                "\r\n"
+	                "[HKEY_CLASSES_ROOT\\irc6\\shell\\open]\r\n"
+	                "\"EditFlags\"=hex:01,00,00,00\r\n"
+	                "\r\n"
+	                "[HKEY_CLASSES_ROOT\\irc6\\shell\\open\\command]\r\n"
+	                "@=\"\\\"@KVIRCEXECUTABLE@\\\" %1\"\r\n";
 
 	QString szKvircExec = g_pApp->m_szGlobalKvircDir;
 	szKvircExec.append("\\kvirc.exe");
-	szKvircExec.replace("\\","\\\\");
+	szKvircExec.replace("\\", "\\\\");
 
-	szReg.replace("@KVIRCEXECUTABLE@",QTextCodec::codecForLocale()->fromUnicode(szKvircExec));
+	szReg.replace("@KVIRCEXECUTABLE@", QTextCodec::codecForLocale()->fromUnicode(szKvircExec));
 
 	QString szRegFile = g_pApp->m_szGlobalKvircDir;
 	szRegFile.append("\\kvirc.reg");
 
-	KviFileUtils::writeFile(szRegFile,szReg,false);
+	KviFileUtils::writeFile(szRegFile, szReg, false);
 
 	QString szCmd = "regedit /S \"";
 	szCmd += szRegFile;
 	szCmd += "\"";
 
-	WinExec(QTextCodec::codecForLocale()->fromUnicode(szCmd).data(),SW_SHOW);
+	WinExec(QTextCodec::codecForLocale()->fromUnicode(szCmd).data(), SW_SHOW);
 #endif
 }
 
 void SetupWizard::reject()
 {
-	if(QMessageBox::warning(this,__tr2qs("Confirm Setup Abort - KVIrc Setup"),
-		__tr2qs("You have chosen to abort the setup.<br>KVIrc can't run until you complete this procedure.<br><br>Do you really wish to abort?"),
-		QMessageBox::Yes,QMessageBox::No|QMessageBox::Default|QMessageBox::Escape) != QMessageBox::Yes)return;
+	if(QMessageBox::warning(this, __tr2qs("Confirm Setup Abort - KVIrc Setup"),
+	       __tr2qs("You have chosen to abort the setup.<br>KVIrc can't run until you complete this procedure.<br><br>Do you really wish to abort?"),
+	       QMessageBox::Yes, QMessageBox::No | QMessageBox::Default | QMessageBox::Escape)
+	    != QMessageBox::Yes)
+		return;
 
 	KviTalWizard::reject();
 }
@@ -945,28 +955,32 @@ void SetupWizard::accept()
 
 	if(m_pDirUsePrev->isChecked())
 	{
-		bNeedToApplyDefaults=false;
-		g_pApp->m_szLocalKvircDir =  m_pOldDataPathEdit->text();
-	} else {
-		bNeedToApplyDefaults=true;
-		if(m_pDirUseNew->isChecked()) {
+		bNeedToApplyDefaults = false;
+		g_pApp->m_szLocalKvircDir = m_pOldDataPathEdit->text();
+	}
+	else
+	{
+		bNeedToApplyDefaults = true;
+		if(m_pDirUseNew->isChecked())
+		{
 			szDir = m_pDataPathEdit->text();
 		}
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-		else { //portable
-			szDir = g_pApp->applicationDirPath()+KVI_PATH_SEPARATOR_CHAR+"Settings";
+		else
+		{ //portable
+			szDir = g_pApp->applicationDirPath() + KVI_PATH_SEPARATOR_CHAR + "Settings";
 		}
 #endif
 
 		KviFileUtils::adjustFilePath(szDir);
-		KviQString::ensureLastCharIs(szDir,KVI_PATH_SEPARATOR_CHAR);
+		KviQString::ensureLastCharIs(szDir, KVI_PATH_SEPARATOR_CHAR);
 		if(!KviFileUtils::directoryExists(szDir))
 		{
 			if(!KviFileUtils::makeDir(szDir))
 			{
-				KviMessageBox::warning(__tr("Can't create directory %s.\n" \
-					"You may not have write permission " \
-					"for that path. Please go back and choose another directory."));
+				KviMessageBox::warning(__tr("Can't create directory %s.\n"
+				                            "You may not have write permission "
+				                            "for that path. Please go back and choose another directory."));
 				setCurrentPage(m_pDirectory);
 				return;
 			}
@@ -981,12 +995,14 @@ void SetupWizard::accept()
 		g_pApp->m_szLocalKvircDir = szDir;
 		KviFileUtils::adjustFilePath(g_pApp->m_szLocalKvircDir);
 
-		if(m_pDirUseNew->isChecked()) {
+		if(m_pDirUseNew->isChecked())
+		{
 			szDir = m_pIncomingPathEdit->text();
 		}
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-		else { //portable
-			szDir = g_pApp->applicationDirPath()+KVI_PATH_SEPARATOR_CHAR+"Downloads";
+		else
+		{ //portable
+			szDir = g_pApp->applicationDirPath() + KVI_PATH_SEPARATOR_CHAR + "Downloads";
 		}
 #endif
 
@@ -995,9 +1011,9 @@ void SetupWizard::accept()
 		{
 			if(!KviFileUtils::makeDir(szDir))
 			{
-				KviMessageBox::warning(__tr("Can't create directory %s.\n" \
-					"You may not have write permission for that path.\n" \
-					"Please go back and choose another directory."));
+				KviMessageBox::warning(__tr("Can't create directory %s.\n"
+				                            "You may not have write permission for that path.\n"
+				                            "Please go back and choose another directory."));
 				setCurrentPage(m_pDirectory);
 				return;
 			}
@@ -1010,7 +1026,7 @@ void SetupWizard::accept()
 		QString localPath = QString("%1/global").arg(g_pApp->m_szLocalKvircDir);
 		unlink(QTextCodec::codecForLocale()->fromUnicode(localPath).data());
 		int dummy; // make gcc happy
-		dummy = symlink(QTextCodec::codecForLocale()->fromUnicode(g_pApp->m_szGlobalKvircDir).data(),QTextCodec::codecForLocale()->fromUnicode(localPath).data());
+		dummy = symlink(QTextCodec::codecForLocale()->fromUnicode(g_pApp->m_szGlobalKvircDir).data(), QTextCodec::codecForLocale()->fromUnicode(localPath).data());
 		Q_UNUSED(dummy);
 #endif
 
@@ -1029,10 +1045,13 @@ void SetupWizard::accept()
 			if(m_pThemeHiRes->isChecked())
 			{
 				g_iThemeToApply = THEME_APPLY_HIRES;
-			} else if(m_pThemeLoRes->isChecked())
+			}
+			else if(m_pThemeLoRes->isChecked())
 			{
 				g_iThemeToApply = THEME_APPLY_LORES;
-			} else {
+			}
+			else
+			{
 				g_iThemeToApply = THEME_APPLY_NONE;
 			}
 		}
@@ -1048,7 +1067,8 @@ void SetupWizard::accept()
 			KVI_OPTION_STRING(KviOption_stringNickname1) = KVI_OPTION_STRING(KviOption_stringNickname1).trimmed();
 
 			if(KVI_OPTION_STRING(KviOption_stringNickname1).length() > 32)
-				KVI_OPTION_STRING(KviOption_stringNickname1).truncate(32);
+				KVI_OPTION_STRING(KviOption_stringNickname1)
+				    .truncate(32);
 
 			if(KVI_OPTION_STRING(KviOption_stringNickname1).isEmpty())
 				KVI_OPTION_STRING(KviOption_stringNickname1) = KVI_DEFAULT_NICKNAME1;
@@ -1057,7 +1077,9 @@ void SetupWizard::accept()
 			if(KVI_OPTION_STRING(KviOption_stringNickname1).length() < 31)
 			{
 				szNickPart = KVI_OPTION_STRING(KviOption_stringNickname1);
-			} else {
+			}
+			else
+			{
 				szNickPart = KVI_OPTION_STRING(KviOption_stringNickname1).left(30);
 			}
 
@@ -1068,26 +1090,31 @@ void SetupWizard::accept()
 			KVI_OPTION_STRING(KviOption_stringNickname4) = QString(KVI_DEFAULT_NICKNAME4).replace(KVI_DEFAULT_NICKNAME_TOKEN, szNickPart);
 
 			int i = m_pAgeCombo->currentIndex();
-			if(i < 0)i = 0;
-			if(i > 120)i = 120;
-			if(i <= 0)KVI_OPTION_STRING(KviOption_stringCtcpUserInfoAge) = "";
-			else KVI_OPTION_STRING(KviOption_stringCtcpUserInfoAge).setNum(i);
+			if(i < 0)
+				i = 0;
+			if(i > 120)
+				i = 120;
+			if(i <= 0)
+				KVI_OPTION_STRING(KviOption_stringCtcpUserInfoAge) = "";
+			else
+				KVI_OPTION_STRING(KviOption_stringCtcpUserInfoAge)
+				    .setNum(i);
 
 			switch(m_pGenderCombo->currentIndex())
 			{
 				case 1:
 					// this should be in English
 					KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender) = "Female";
-				break;
+					break;
 				case 2:
 					// this should be in English
 					KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender) = "Male";
-				break;
+					break;
 				default:
 					KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender) = "";
-				break;
+					break;
 			}
-			/*
+/*
 			m_pServerHostSelector->commit();
 			m_pServerUrlSelector->commit();
 			//m_pServerConfigSelector->commit();
@@ -1113,9 +1140,11 @@ void SetupWizard::accept()
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	if(m_pDirMakePortable->isChecked())
 	{
-		KviFileUtils::writeFile(g_pApp->applicationDirPath()+KVI_PATH_SEPARATOR_CHAR+"portable",QString("true"));
-                g_pApp->m_bPortable=true;
-	} else {
+		KviFileUtils::writeFile(g_pApp->applicationDirPath() + KVI_PATH_SEPARATOR_CHAR + "portable", QString("true"));
+		g_pApp->m_bPortable = true;
+	}
+	else
+	{
 #endif
 		g_pApp->saveKvircDirectory();
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
diff --git a/src/modules/setup/SetupWizard.h b/src/modules/setup/SetupWizard.h
index f5596a70c..9cec49c09 100644
--- a/src/modules/setup/SetupWizard.h
+++ b/src/modules/setup/SetupWizard.h
@@ -42,102 +42,102 @@
 
 class SetupWizard;
 
-
 class SetupPage : public QWidget
 {
 	Q_OBJECT
 public:
 	SetupPage(SetupWizard * w);
 	~SetupPage();
+
 public:
 	KviTalVBox * m_pVBox;
 	QLabel * m_pPixmapLabel;
 	QLabel * m_pTextLabel;
 };
 
-
 #define THEME_APPLY_NONE 0
 #define THEME_APPLY_HIRES 1
 #define THEME_APPLY_LORES 2
 
-class SetupWizard : public  KviTalWizard
+class SetupWizard : public KviTalWizard
 {
 	Q_OBJECT
 public:
 	SetupWizard();
 	~SetupWizard();
+
 public:
-	QPixmap       * m_pLabelPixmap;
+	QPixmap * m_pLabelPixmap;
 
-	SetupPage  * m_pWelcome;
-	SetupPage  * m_pLicense;
-	SetupPage  * m_pDirectory;
-	SetupPage  * m_pIdentity;
-	SetupPage  * m_pTheme;
-	SetupPage  * m_pDesktopIntegration;
-	SetupPage  * m_pServers;
+	SetupPage * m_pWelcome;
+	SetupPage * m_pLicense;
+	SetupPage * m_pDirectory;
+	SetupPage * m_pIdentity;
+	SetupPage * m_pTheme;
+	SetupPage * m_pDesktopIntegration;
+	SetupPage * m_pServers;
 
 	// Theme
-	QGroupBox  * m_pThemeButtonGroup;
+	QGroupBox * m_pThemeButtonGroup;
 
-	QRadioButton  * m_pThemeHiRes;
-	QRadioButton  * m_pThemeLoRes;
-	QRadioButton  * m_pThemeNone;
+	QRadioButton * m_pThemeHiRes;
+	QRadioButton * m_pThemeLoRes;
+	QRadioButton * m_pThemeNone;
 
 	// Welcome
-	QCheckBox     * m_pCreateUrlHandlers;
-	QCheckBox     * m_pCreateDesktopShortcut;
+	QCheckBox * m_pCreateUrlHandlers;
+	QCheckBox * m_pCreateDesktopShortcut;
 
 	//Dir
-	QLineEdit     * m_pDataPathEdit;
-	QLineEdit     * m_pIncomingPathEdit;
+	QLineEdit * m_pDataPathEdit;
+	QLineEdit * m_pIncomingPathEdit;
 	KviTalGroupBox * m_pDirButtonGroup;
-	QRadioButton  * m_pDirUsePrev;
-	QRadioButton  * m_pDirUseNew;
+	QRadioButton * m_pDirUsePrev;
+	QRadioButton * m_pDirUseNew;
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-	QRadioButton  * m_pDirMakePortable;
+	QRadioButton * m_pDirMakePortable;
 #endif
 	//QRadioButton  * m_pDirRestore;
-	QLineEdit     * m_pOldDataPathEdit;
-	KviTalHBox         * m_pOldPathBox;
-	KviTalHBox         * m_pNewPathBox;
-	KviTalHBox         * m_pNewIncomingBox;
+	QLineEdit * m_pOldDataPathEdit;
+	KviTalHBox * m_pOldPathBox;
+	KviTalHBox * m_pNewPathBox;
+	KviTalHBox * m_pNewIncomingBox;
 
 	//Identify
-	QComboBox        * m_pAgeCombo;
-	QComboBox        * m_pGenderCombo;
+	QComboBox * m_pAgeCombo;
+	QComboBox * m_pGenderCombo;
 
 	KviStringSelector * m_pNickSelector;
 	KviStringSelector * m_pRealNameSelector;
 	KviStringSelector * m_pLocationSelector;
 	KviStringSelector * m_pLanguagesSelector;
-	//KviStringSelector * m_pOtherInfoSelector;
+//KviStringSelector * m_pOtherInfoSelector;
 
-	//Servers
-	//KviTalGroupBox * m_pServersButtonGroup;
-	//QRadioButton  * m_pServersChooseFromList;
-	//QRadioButton  * m_pServersSpecifyManually;
-	//QRadioButton  * m_pServersOpenIrcUrl;
-	//QRadioButton  * m_pServersLoadConfig;
+//Servers
+//KviTalGroupBox * m_pServersButtonGroup;
+//QRadioButton  * m_pServersChooseFromList;
+//QRadioButton  * m_pServersSpecifyManually;
+//QRadioButton  * m_pServersOpenIrcUrl;
+//QRadioButton  * m_pServersLoadConfig;
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-	QString         m_szMircServerIniFile;
-	QCheckBox  * m_pUseMircServerList;
+	QString m_szMircServerIniFile;
+	QCheckBox * m_pUseMircServerList;
 #endif
 
-	QString		    m_szServerConfigFile;
-	QString		    m_szServerUrl;
-	QString		    m_szServerHost;
-	unsigned int        m_uServerPort;
+	QString m_szServerConfigFile;
+	QString m_szServerUrl;
+	QString m_szServerHost;
+	unsigned int m_uServerPort;
 
 	KviStringSelector * m_pServerHostSelector;
 	KviStringSelector * m_pServerUrlSelector;
 	//KviFileSelector   * m_pServerConfigSelector;
-	KviUIntSelector   *m_pServerPortSelector;
+	KviUIntSelector * m_pServerPortSelector;
 
 protected:
 	void makeLink();
 	void setUrlHandlers();
-	virtual void showEvent(QShowEvent *e);
+	virtual void showEvent(QShowEvent * e);
 	void enableOrDisableIdentityPageNextButton();
 public slots:
 	void chooseOldDataPath();
@@ -150,11 +150,10 @@ public slots:
 	void newDirClicked();
 	void portableClicked();
 
-	void nickSelectorTextChanged(const QString & );
-	void oldDataTextChanged(const QString & );
-	void newDataTextChanged(const QString & );
-	void newIncomingTextChanged(const QString & );
+	void nickSelectorTextChanged(const QString &);
+	void oldDataTextChanged(const QString &);
+	void newDataTextChanged(const QString &);
+	void newIncomingTextChanged(const QString &);
 };
 
-
 #endif //_SETUPWIZARD_H_
diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp
index 509bd1d3c..606ca9ac6 100644
--- a/src/modules/setup/libkvisetup.cpp
+++ b/src/modules/setup/libkvisetup.cpp
@@ -37,7 +37,6 @@
 #include <QString>
 #include <QFile>
 
-
 // this will be chosen during the setup process
 QString g_szChoosenIncomingDirectory;
 int g_iThemeToApply = THEME_APPLY_NONE;
@@ -48,9 +47,6 @@ QString szUrl;
 QString szMircServers;
 QString szMircIni;
 
-
-
-
 // this is called by KviApplication when no local kvirc directory has been found
 // we have nothing to rely on yet... (settings have not been loaded yet)
 KVIMODULEEXPORTFUNC bool setup_begin()
@@ -63,7 +59,6 @@ KVIMODULEEXPORTFUNC bool setup_begin()
 	return (retcode == QDialog::Accepted);
 }
 
-
 // this is called just after the first startup
 // all the subsystems are up and running (we even have a nice console
 // to write on if needed).
@@ -75,7 +70,7 @@ KVIMODULEEXPORTFUNC void setup_finish()
 		KVI_OPTION_STRING(KviOption_stringIncomingPath) = g_szChoosenIncomingDirectory;
 		// Reset the quit message and the real name... if they contain the KVIrc version
 		// then probably the user hasn't even edited them.
-		if(KVI_OPTION_STRING(KviOption_stringQuitMessage).indexOf("KVIrc",0,Qt::CaseInsensitive) != -1)
+		if(KVI_OPTION_STRING(KviOption_stringQuitMessage).indexOf("KVIrc", 0, Qt::CaseInsensitive) != -1)
 			KVI_OPTION_STRING(KviOption_stringQuitMessage) = KVI_DEFAULT_QUIT_MESSAGE;
 		// We deserve to change the user's part message in something nice :)
 		KVI_OPTION_STRING(KviOption_stringPartMessage) = KVI_DEFAULT_PART_MESSAGE;
@@ -89,18 +84,18 @@ KVIMODULEEXPORTFUNC void setup_finish()
 		switch(g_iThemeToApply)
 		{
 			case THEME_APPLY_HIRES:
-				KviTheme::apply("Aria-2.0.0",KviThemeInfo::Builtin,out);
-			break;
+				KviTheme::apply("Aria-2.0.0", KviThemeInfo::Builtin, out);
+				break;
 			case THEME_APPLY_LORES:
-				KviTheme::apply("MinimalDark-2.0.0",KviThemeInfo::Builtin,out);
-			break;
-			// default: no theme
+				KviTheme::apply("MinimalDark-2.0.0", KviThemeInfo::Builtin, out);
+				break;
+				// default: no theme
 		}
 
 		if(!szMircServers.isEmpty())
 		{
-			g_pServerDataBase->importFromMircIni(szMircServers,szMircIni,
-				KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers));
+			g_pServerDataBase->importFromMircIni(szMircServers, szMircIni,
+			    KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers));
 			g_pApp->saveIrcServerDataBase();
 		}
 
@@ -109,14 +104,16 @@ KVIMODULEEXPORTFUNC void setup_finish()
 		{
 			KviKvsVariantList * pParams = new KviKvsVariantList();
 			pParams->append(szUrl);
-			KviKvsScript::run("openurl $0",g_pActiveWindow,pParams);
+			KviKvsScript::run("openurl $0", g_pActiveWindow, pParams);
 			delete pParams;
 			KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = true;
-		} else if(!szHost.isEmpty()) {
+		}
+		else if(!szHost.isEmpty())
+		{
 			KviKvsVariantList * pParams = new KviKvsVariantList();
 			pParams->append(szHost);
 			pParams->append((kvs_int_t)uPort);
-			KviKvsScript::run("server $0 $1",g_pActiveWindow,pParams);
+			KviKvsScript::run("server $0 $1", g_pActiveWindow, pParams);
 			delete pParams;
 			KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = true;
 		}
@@ -125,7 +122,7 @@ KVIMODULEEXPORTFUNC void setup_finish()
 
 static bool setup_module_init(KviModule *)
 {
-	bNeedToApplyDefaults=true;
+	bNeedToApplyDefaults = true;
 	return true;
 }
 
@@ -140,13 +137,12 @@ static bool setup_module_can_unload(KviModule *)
 }
 
 KVIRC_MODULE(
-	"Setup Wizard",
-	"4.0.0",
-	"Szymon Stefanek <pragma at kvirc dot net>",
-	"First-time-run setup wizard",
-	setup_module_init,
-	setup_module_can_unload,
-	0,
-	setup_module_cleanup,
-	0
-)
+    "Setup Wizard",
+    "4.0.0",
+    "Szymon Stefanek <pragma at kvirc dot net>",
+    "First-time-run setup wizard",
+    setup_module_init,
+    setup_module_can_unload,
+    0,
+    setup_module_cleanup,
+    0)