Apply clang-format

1 files changed, 337 insertions, 301 deletions

diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp
index 0eff678ea..62159e7fb 100644
--- a/src/modules/options/OptionsWidget_identity.cpp
+++ b/src/modules/options/OptionsWidget_identity.cpp
@@ -53,92 +53,92 @@
 #include <QCloseEvent>
 #include <QFileInfo>
 
-NickAlternativesDialog::NickAlternativesDialog(QWidget * par,const QString &n1,const QString &n2,const QString &n3)
-: QDialog(par)
+NickAlternativesDialog::NickAlternativesDialog(QWidget * par, const QString & n1, const QString & n2, const QString & n3)
+    : QDialog(par)
 {
 	QGridLayout * g = new QGridLayout(this);
 
-	setWindowTitle(__tr2qs_ctx("Nickname Alternatives - KVIrc","options"));
+	setWindowTitle(__tr2qs_ctx("Nickname Alternatives - KVIrc", "options"));
 
 	QLabel * l = new QLabel(this);
-	l->setText(__tr2qs_ctx("Here you can choose up to three nickname " \
-		"alternatives to the primary one. KVIrc will use the alternatives " \
-		"if the primary nick is already used by someone else on a particular " \
-		"IRC network.","options"));
+	l->setText(__tr2qs_ctx("Here you can choose up to three nickname "
+	                       "alternatives to the primary one. KVIrc will use the alternatives "
+	                       "if the primary nick is already used by someone else on a particular "
+	                       "IRC network.",
+	    "options"));
 	l->setWordWrap(true);
 
-	g->addWidget(l,0,0,1,3);
+	g->addWidget(l, 0, 0, 1, 3);
 
 	l = new QLabel(this);
-	l->setText(__tr2qs_ctx("Alt. nickname 1:","options"));
-	g->addWidget(l,1,0);
+	l->setText(__tr2qs_ctx("Alt. nickname 1:", "options"));
+	g->addWidget(l, 1, 0);
 	m_pNickEdit1 = new QLineEdit(this);
-	g->addWidget(m_pNickEdit1,1,1,1,2);
+	g->addWidget(m_pNickEdit1, 1, 1, 1, 2);
 	m_pNickEdit1->setText(n1);
 
 	l = new QLabel(this);
-	l->setText(__tr2qs_ctx("Alt. nickname 2:","options"));
-	g->addWidget(l,2,0);
+	l->setText(__tr2qs_ctx("Alt. nickname 2:", "options"));
+	g->addWidget(l, 2, 0);
 	m_pNickEdit2 = new QLineEdit(this);
-	g->addWidget(m_pNickEdit2,2,1,1,2);
+	g->addWidget(m_pNickEdit2, 2, 1, 1, 2);
 	m_pNickEdit2->setText(n2);
 
 	l = new QLabel(this);
-	l->setText(__tr2qs_ctx("Alt. nickname 3:","options"));
-	g->addWidget(l,3,0);
+	l->setText(__tr2qs_ctx("Alt. nickname 3:", "options"));
+	g->addWidget(l, 3, 0);
 	m_pNickEdit3 = new QLineEdit(this);
-	g->addWidget(m_pNickEdit3,3,1,1,2);
+	g->addWidget(m_pNickEdit3, 3, 1, 1, 2);
 	m_pNickEdit3->setText(n3);
 	KviTalHBox * h = new KviTalHBox(this);
 	h->setSpacing(8);
-	g->addWidget(h,4,2);
+	g->addWidget(h, 4, 2);
 
-	QPushButton * pb = new QPushButton(__tr2qs_ctx("Cancel","options"),h);
-	connect(pb,SIGNAL(clicked()),this,SLOT(reject()));
+	QPushButton * pb = new QPushButton(__tr2qs_ctx("Cancel", "options"), h);
+	connect(pb, SIGNAL(clicked()), this, SLOT(reject()));
 
-	pb = new QPushButton(__tr2qs_ctx("OK","options"),h);
+	pb = new QPushButton(__tr2qs_ctx("OK", "options"), h);
 	pb->setDefault(true);
-	connect(pb,SIGNAL(clicked()),this,SLOT(accept()));
+	connect(pb, SIGNAL(clicked()), this, SLOT(accept()));
 
-	g->setColumnStretch(0,1);
+	g->setColumnStretch(0, 1);
 }
 
 NickAlternativesDialog::~NickAlternativesDialog()
 {
 }
 
-void NickAlternativesDialog::fill(QString &n1,QString &n2,QString &n3)
+void NickAlternativesDialog::fill(QString & n1, QString & n2, QString & n3)
 {
 	n1 = m_pNickEdit1->text();
 	n2 = m_pNickEdit2->text();
 	n3 = m_pNickEdit3->text();
 }
 
-
-AvatarDownloadDialog::AvatarDownloadDialog(QWidget * par,const QString &szUrl)
-: QDialog(par)
+AvatarDownloadDialog::AvatarDownloadDialog(QWidget * par, const QString & szUrl)
+    : QDialog(par)
 {
-	setWindowTitle(__tr2qs_ctx("Avatar Download - KVIrc","options"));
+	setWindowTitle(__tr2qs_ctx("Avatar Download - KVIrc", "options"));
 
 	m_szUrl = szUrl;
 
 	QGridLayout * g = new QGridLayout(this);
 
-	m_pOutput = new QLabel(__tr2qs_ctx("Please wait while the avatar is being downloaded","options"),this);
-	g->addWidget(m_pOutput,0,0,1,2);
+	m_pOutput = new QLabel(__tr2qs_ctx("Please wait while the avatar is being downloaded", "options"), this);
+	g->addWidget(m_pOutput, 0, 0, 1, 2);
 
-	QPushButton * b = new QPushButton(__tr2qs_ctx("Abort","options"),this);
-	g->addWidget(b,1,1);
-	connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked()));
+	QPushButton * b = new QPushButton(__tr2qs_ctx("Abort", "options"), this);
+	g->addWidget(b, 1, 1);
+	connect(b, SIGNAL(clicked()), this, SLOT(cancelClicked()));
 
 	m_pRequest = new KviHttpRequest();
 
-	QTimer::singleShot(0,this,SLOT(startDownload()));
+	QTimer::singleShot(0, this, SLOT(startDownload()));
 
-	g->setRowStretch(0,1);
-	g->setColumnStretch(0,1);
+	g->setRowStretch(0, 1);
+	g->setColumnStretch(0, 1);
 
-	setMinimumSize(250,120);
+	setMinimumSize(250, 120);
 }
 
 AvatarDownloadDialog::~AvatarDownloadDialog()
@@ -148,35 +148,35 @@ AvatarDownloadDialog::~AvatarDownloadDialog()
 
 void AvatarDownloadDialog::startDownload()
 {
-	connect(m_pRequest,SIGNAL(terminated(bool)),this,SLOT(downloadTerminated(bool)));
-	connect(m_pRequest,SIGNAL(status(const QString &)),this,SLOT(downloadMessage(const QString &)));
+	connect(m_pRequest, SIGNAL(terminated(bool)), this, SLOT(downloadTerminated(bool)));
+	connect(m_pRequest, SIGNAL(status(const QString &)), this, SLOT(downloadMessage(const QString &)));
 
 	QString tmp = m_szUrl;
 	g_pIconManager->urlToCachedFileName(tmp);
-	g_pApp->getLocalKvircDirectory(m_szLocalFileName,KviApplication::Avatars,tmp);
+	g_pApp->getLocalKvircDirectory(m_szLocalFileName, KviApplication::Avatars, tmp);
 
 	m_pRequest->setExistingFileAction(KviHttpRequest::RenameExisting);
-	if(!m_pRequest->get(KviUrl(m_szUrl),KviHttpRequest::StoreToFile,m_szLocalFileName.toUtf8().data()))
+	if(!m_pRequest->get(KviUrl(m_szUrl), KviHttpRequest::StoreToFile, m_szLocalFileName.toUtf8().data()))
 	{
-		m_szErrorMessage = __tr2qs_ctx("Failed to start the download","options");
+		m_szErrorMessage = __tr2qs_ctx("Failed to start the download", "options");
 		reject();
 	}
 }
 
 void AvatarDownloadDialog::closeEvent(QCloseEvent * e)
 {
-	m_szErrorMessage = __tr2qs_ctx("Download aborted by user","options");
+	m_szErrorMessage = __tr2qs_ctx("Download aborted by user", "options");
 	e->ignore();
 	reject();
 }
 
 void AvatarDownloadDialog::cancelClicked()
 {
-	m_szErrorMessage = __tr2qs_ctx("Download aborted by user","options");
+	m_szErrorMessage = __tr2qs_ctx("Download aborted by user", "options");
 	reject();
 }
 
-void AvatarDownloadDialog::downloadMessage(const QString &szMsg)
+void AvatarDownloadDialog::downloadMessage(const QString & szMsg)
 {
 	if(!szMsg.isEmpty())
 	{
@@ -190,23 +190,26 @@ void AvatarDownloadDialog::downloadTerminated(bool bSuccess)
 	if(bSuccess)
 	{
 		accept();
-	} else {
+	}
+	else
+	{
 		m_szErrorMessage = m_pRequest->lastError();
 		reject();
 	}
 }
 
-AvatarSelectionDialog::AvatarSelectionDialog(QWidget * par,const QString &szInitialPath)
-: QDialog(par)
+AvatarSelectionDialog::AvatarSelectionDialog(QWidget * par, const QString & szInitialPath)
+    : QDialog(par)
 {
-	setWindowTitle(__tr2qs_ctx("Choose Avatar - KVIrc","options"));
+	setWindowTitle(__tr2qs_ctx("Choose Avatar - KVIrc", "options"));
 
 	QVBoxLayout * layout = new QVBoxLayout(this);
 
-	QString msg = __tr2qs_ctx("Please select an avatar image.\n\n" \
-				"The full path to a local file or an image on the Web can be used.\n" \
-				"If you wish to use a local image file, click the \"Browse\" button to select the desired file.\n\n" \
-				"The full URL for an image (including http:// or https://) can also be entered manually.","options");
+	QString msg = __tr2qs_ctx("Please select an avatar image.\n\n"
+	                          "The full path to a local file or an image on the Web can be used.\n"
+	                          "If you wish to use a local image file, click the \"Browse\" button to select the desired file.\n\n"
+	                          "The full URL for an image (including http:// or https://) can also be entered manually.",
+	    "options");
 
 	QLabel * l = new QLabel(msg);
 	l->setMinimumWidth(250);
@@ -221,12 +224,12 @@ AvatarSelectionDialog::AvatarSelectionDialog(QWidget * par,const QString &szInit
 
 	QHBoxLayout * pLineEditLayout = new QHBoxLayout;
 
-	pLineEditLayout->addWidget(m_pLineEdit,1);
+	pLineEditLayout->addWidget(m_pLineEdit, 1);
 
-	QPushButton * b = new QPushButton(__tr2qs_ctx("&Browse...","options"));
+	QPushButton * b = new QPushButton(__tr2qs_ctx("&Browse...", "options"));
 	b->setFixedWidth(80);
-	connect(b,SIGNAL(clicked()),this,SLOT(chooseFileClicked()));
-	pLineEditLayout->addWidget(b,1);
+	connect(b, SIGNAL(clicked()), this, SLOT(chooseFileClicked()));
+	pLineEditLayout->addWidget(b, 1);
 
 	layout->addLayout(pLineEditLayout);
 
@@ -234,15 +237,15 @@ AvatarSelectionDialog::AvatarSelectionDialog(QWidget * par,const QString &szInit
 
 	h->setAlignment(Qt::AlignRight);
 	layout->addLayout(h);
-	b = new QPushButton(__tr2qs_ctx("&OK","options"));
+	b = new QPushButton(__tr2qs_ctx("&OK", "options"));
 	b->setFixedWidth(80);
 	b->setDefault(true);
-	connect(b,SIGNAL(clicked()),this,SLOT(okClicked()));
+	connect(b, SIGNAL(clicked()), this, SLOT(okClicked()));
 	h->addWidget(b);
 
-	b = new QPushButton(__tr2qs_ctx("Cancel","options"));
+	b = new QPushButton(__tr2qs_ctx("Cancel", "options"));
 	b->setFixedWidth(80);
-	connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked()));
+	connect(b, SIGNAL(clicked()), this, SLOT(cancelClicked()));
 	h->addWidget(b);
 }
 
@@ -264,7 +267,7 @@ void AvatarSelectionDialog::cancelClicked()
 void AvatarSelectionDialog::chooseFileClicked()
 {
 	QString tmp;
-	if(KviFileDialog::askForOpenFileName(tmp,__tr2qs_ctx("Select a File - KVIrc","options"),QString(),KVI_FILTER_IMAGE,false,true,this))
+	if(KviFileDialog::askForOpenFileName(tmp, __tr2qs_ctx("Select a File - KVIrc", "options"), QString(), KVI_FILTER_IMAGE, false, true, this))
 	{
 		m_pLineEdit->setText(tmp);
 	}
@@ -276,9 +279,8 @@ void AvatarSelectionDialog::closeEvent(QCloseEvent * e)
 	reject();
 }
 
-
 OptionsWidget_identity::OptionsWidget_identity(QWidget * parent)
-: KviOptionsWidget(parent)
+    : KviOptionsWidget(parent)
 {
 }
 
@@ -286,121 +288,128 @@ OptionsWidget_identity::~OptionsWidget_identity()
 {
 }
 
-
 KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent)
+    : KviOptionsWidget(parent)
 {
 	m_szAltNicknames[0] = KVI_OPTION_STRING(KviOption_stringNickname2);
 	m_szAltNicknames[1] = KVI_OPTION_STRING(KviOption_stringNickname3);
 	m_szAltNicknames[2] = KVI_OPTION_STRING(KviOption_stringNickname4);
 
-
 	createLayout();
 	layout()->setMargin(10);
 
-	KviTalGroupBox * gbox = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Basic Properties","options"));
+	KviTalGroupBox * gbox = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("Basic Properties", "options"));
 	KviTalHBox * hb = new KviTalHBox(gbox);
 
-	KviStringSelector * sel = addStringSelector(hb,__tr2qs_ctx("Nickname:","options"),KviOption_stringNickname1);
+	KviStringSelector * sel = addStringSelector(hb, __tr2qs_ctx("Nickname:", "options"), KviOption_stringNickname1);
 	sel->setMinimumLabelWidth(120);
-	mergeTip(sel,__tr2qs_ctx("Your <b>nickname</b> is your primary form of identification on IRC.<br>" \
-			"Since servers cannot accept multiple users sharing the same nickname " \
-			"(case insensitive), you can provide alternative nicknames to be used in case "\
-			"the server refuses to accept the default one.","options"));
+	mergeTip(sel, __tr2qs_ctx("Your <b>nickname</b> is your primary form of identification on IRC.<br>"
+	                          "Since servers cannot accept multiple users sharing the same nickname "
+	                          "(case insensitive), you can provide alternative nicknames to be used in case "
+	                          "the server refuses to accept the default one.",
+	                  "options"));
 
-	QValidator * v = new QRegExpValidator(QRegExp("[^-0-9 ][^ ]*"),hb);
+	QValidator * v = new QRegExpValidator(QRegExp("[^-0-9 ][^ ]*"), hb);
 	sel->setValidator(v);
 
-	QPushButton * pb = new QPushButton(__tr2qs_ctx("Alternatives...","options"),hb);
-	connect(pb,SIGNAL(clicked()),this,SLOT(setNickAlternatives()));
+	QPushButton * pb = new QPushButton(__tr2qs_ctx("Alternatives...", "options"), hb);
+	connect(pb, SIGNAL(clicked()), this, SLOT(setNickAlternatives()));
 
-	sel = addStringSelector(gbox,__tr2qs_ctx("Username:","options"),KviOption_stringUsername);
+	sel = addStringSelector(gbox, __tr2qs_ctx("Username:", "options"), KviOption_stringUsername);
 	sel->setMinimumLabelWidth(120);
-	mergeTip(sel,__tr2qs_ctx("This is the <b>username</b> that you will use to connect to the server.<br>" \
-				"In the past, it was used as a form of authentication, but it normally has no special use now.<br>" \
-				"In addition to your nickname, you are identified on IRC by your <b>username@hostname</b>.<br>" \
-				"Basically, you can enter any word you like here.","options"));
+	mergeTip(sel, __tr2qs_ctx("This is the <b>username</b> that you will use to connect to the server.<br>"
+	                          "In the past, it was used as a form of authentication, but it normally has no special use now.<br>"
+	                          "In addition to your nickname, you are identified on IRC by your <b>username@hostname</b>.<br>"
+	                          "Basically, you can enter any word you like here.",
+	                  "options"));
 
-	sel = addStringSelector(gbox,__tr2qs_ctx("Real name:","options"),KviOption_stringRealname);
+	sel = addStringSelector(gbox, __tr2qs_ctx("Real name:", "options"), KviOption_stringRealname);
 	sel->setMinimumLabelWidth(120);
 
-	mergeTip(sel,__tr2qs_ctx("This text will appear when someone does a /WHOIS on you.<br>" \
-				"It is intended to be your real name, but people tend to put random quotes and phrases here too.","options"));
-
+	mergeTip(sel, __tr2qs_ctx("This text will appear when someone does a /WHOIS on you.<br>"
+	                          "It is intended to be your real name, but people tend to put random quotes and phrases here too.",
+	                  "options"));
 
-	QString szOptionalCtcpUserInfo = __tr2qs_ctx("This field is optional and will appear as part of the CTCP USERINFO reply.","options");
+	QString szOptionalCtcpUserInfo = __tr2qs_ctx("This field is optional and will appear as part of the CTCP USERINFO reply.", "options");
 	QString szTrailing = "<br><br>" + szOptionalCtcpUserInfo;
 
-	gbox = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Profile","options"));
+	gbox = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("Profile", "options"));
 
 	hb = new KviTalHBox(gbox);
 
-	QLabel * l = new QLabel(__tr2qs_ctx("Age:","options"),hb);
+	QLabel * l = new QLabel(__tr2qs_ctx("Age:", "options"), hb);
 	l->setMinimumWidth(120);
 
 	m_pAgeCombo = new QComboBox(hb);
-	QString szTip1 = __tr2qs_ctx("Here you can specify your age.","options") + szTrailing;
-	KviTalToolTip::add(l,szTip1);
-	KviTalToolTip::add(m_pAgeCombo,szTip1);
-	m_pAgeCombo->addItem(__tr2qs_ctx("Unspecified","options"));
+	QString szTip1 = __tr2qs_ctx("Here you can specify your age.", "options") + szTrailing;
+	KviTalToolTip::add(l, szTip1);
+	KviTalToolTip::add(m_pAgeCombo, szTip1);
+	m_pAgeCombo->addItem(__tr2qs_ctx("Unspecified", "options"));
 	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);
 
-	l = new QLabel(__tr2qs_ctx("Gender:","options"),hb);
+	l = new QLabel(__tr2qs_ctx("Gender:", "options"), hb);
 	l->setMinimumWidth(120);
 
 	m_pGenderCombo = new QComboBox(hb);
-	QString szTip2 = __tr2qs_ctx("Here you can specify your gender.","options") + szTrailing;
-	KviTalToolTip::add(l,szTip2);
-	KviTalToolTip::add(m_pGenderCombo,szTip2);
-	m_pGenderCombo->addItem(__tr2qs_ctx("Unspecified","options"));
-	m_pGenderCombo->addItem(__tr2qs_ctx("Female","options"));
-	m_pGenderCombo->addItem(__tr2qs_ctx("Male","options"));
+	QString szTip2 = __tr2qs_ctx("Here you can specify your gender.", "options") + szTrailing;
+	KviTalToolTip::add(l, szTip2);
+	KviTalToolTip::add(m_pGenderCombo, szTip2);
+	m_pGenderCombo->addItem(__tr2qs_ctx("Unspecified", "options"));
+	m_pGenderCombo->addItem(__tr2qs_ctx("Female", "options"));
+	m_pGenderCombo->addItem(__tr2qs_ctx("Male", "options"));
 
-	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);
 
-	sel = addStringSelector(gbox,__tr2qs_ctx("Location:","options"),KviOption_stringCtcpUserInfoLocation);
+	sel = addStringSelector(gbox, __tr2qs_ctx("Location:", "options"), KviOption_stringCtcpUserInfoLocation);
 	sel->setMinimumLabelWidth(120);
-	mergeTip(sel, __tr2qs_ctx("You can describe here your approximate physical location. " \
-				"Something like \"Region, Country\" will be OK. Please note that this information will be viewable " \
-				"by anyone so putting more data (like the exact address), generally, <b>is not a good idea</b>.","options") + szTrailing);
+	mergeTip(sel, __tr2qs_ctx("You can describe here your approximate physical location. "
+	                          "Something like \"Region, Country\" will be OK. Please note that this information will be viewable "
+	                          "by anyone so putting more data (like the exact address), generally, <b>is not a good idea</b>.",
+	                  "options")
+	        + szTrailing);
 
-	sel = addStringSelector(gbox,__tr2qs_ctx("Languages:","options"),KviOption_stringCtcpUserInfoLanguages);
+	sel = addStringSelector(gbox, __tr2qs_ctx("Languages:", "options"), KviOption_stringCtcpUserInfoLanguages);
 	sel->setMinimumLabelWidth(120);
-	mergeTip(sel, __tr2qs_ctx("You can put here the short names of the languages you can speak. " \
-				"An example might be \"EN, IT\" that would mean that you speak both Italian and English.","options") + szTrailing);
+	mergeTip(sel, __tr2qs_ctx("You can put here the short names of the languages you can speak. "
+	                          "An example might be \"EN, IT\" that would mean that you speak both Italian and English.",
+	                  "options")
+	        + szTrailing);
 
-	sel = addStringSelector(gbox,__tr2qs_ctx("Other:","options"),KviOption_stringCtcpUserInfoOther);
+	sel = addStringSelector(gbox, __tr2qs_ctx("Other:", "options"), KviOption_stringCtcpUserInfoOther);
 	sel->setMinimumLabelWidth(120);
-	mergeTip(sel, __tr2qs_ctx("You can put here some additional personal data. " \
-				"It might be a funny quote or your homepage URL... " \
-				"Please note that this information will be viewable " \
-				"by anyone so <b>don't put any sensible data</b> (passwords, telephone or credit card numbers).","options") + szTrailing);
+	mergeTip(sel, __tr2qs_ctx("You can put here some additional personal data. "
+	                          "It might be a funny quote or your homepage URL... "
+	                          "Please note that this information will be viewable "
+	                          "by anyone so <b>don't put any sensible data</b> (passwords, telephone or credit card numbers).",
+	                  "options")
+	        + szTrailing);
 
-	addRowSpacer(0,2,0,2);
+	addRowSpacer(0, 2, 0, 2);
 }
 
 KviIdentityGeneralOptionsWidget::~KviIdentityGeneralOptionsWidget()
@@ -409,9 +418,10 @@ KviIdentityGeneralOptionsWidget::~KviIdentityGeneralOptionsWidget()
 
 void KviIdentityGeneralOptionsWidget::setNickAlternatives()
 {
-	NickAlternativesDialog * dlg = new NickAlternativesDialog(this,m_szAltNicknames[0],m_szAltNicknames[1],m_szAltNicknames[2]);
-	if(dlg->exec() != QDialog::Accepted)return;
-	dlg->fill(m_szAltNicknames[0],m_szAltNicknames[1],m_szAltNicknames[2]);
+	NickAlternativesDialog * dlg = new NickAlternativesDialog(this, m_szAltNicknames[0], m_szAltNicknames[1], m_szAltNicknames[2]);
+	if(dlg->exec() != QDialog::Accepted)
+		return;
+	dlg->fill(m_szAltNicknames[0], m_szAltNicknames[1], m_szAltNicknames[2]);
 	delete dlg;
 }
 
@@ -419,39 +429,44 @@ void KviIdentityGeneralOptionsWidget::commit()
 {
 	KviOptionsWidget::commit();
 
-	if(KVI_OPTION_STRING(KviOption_stringRealname).isEmpty()) KVI_OPTION_STRING(KviOption_stringRealname)=KVI_DEFAULT_REALNAME;
-	if(KVI_OPTION_STRING(KviOption_stringUsername).isEmpty()) KVI_OPTION_STRING(KviOption_stringUsername)=KVI_DEFAULT_USERNAME;
+	if(KVI_OPTION_STRING(KviOption_stringRealname).isEmpty())
+		KVI_OPTION_STRING(KviOption_stringRealname) = KVI_DEFAULT_REALNAME;
+	if(KVI_OPTION_STRING(KviOption_stringUsername).isEmpty())
+		KVI_OPTION_STRING(KviOption_stringUsername) = KVI_DEFAULT_USERNAME;
 
 	KVI_OPTION_STRING(KviOption_stringNickname2) = m_szAltNicknames[0];
 	KVI_OPTION_STRING(KviOption_stringNickname3) = m_szAltNicknames[1];
 	KVI_OPTION_STRING(KviOption_stringNickname4) = m_szAltNicknames[2];
 
-
 	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;
 	}
 }
 
-
 OptionsWidget_identityAvatar::OptionsWidget_identityAvatar(QWidget * parent)
-: KviOptionsWidget(parent)
+    : KviOptionsWidget(parent)
 {
 	createLayout();
 	layout()->setMargin(10);
@@ -460,42 +475,43 @@ OptionsWidget_identityAvatar::OptionsWidget_identityAvatar(QWidget * parent)
 
 	bool bHaveAvatar = (!KVI_OPTION_STRING(KviOption_stringMyAvatar).isEmpty()) && m_pLocalAvatar->pixmap();
 
-	QString szTip = __tr2qs_ctx("Here you can choose your avatar image.<br>" \
-		"It will be visible by other people that request it.<br>" \
-		"Choose a nice image of yourself, possibly avoiding obscenity and offending images.<br>" \
-		"A good idea is to choose a relatively small file of around 150 Kb max, because " \
-		"most clients have a limit on the size of avatars being downloaded.<br>" \
-		"The image also should be smaller than 800x600 pixels since it will have to be viewable in everyone's monitor.","options");
+	QString szTip = __tr2qs_ctx("Here you can choose your avatar image.<br>"
+	                            "It will be visible by other people that request it.<br>"
+	                            "Choose a nice image of yourself, possibly avoiding obscenity and offending images.<br>"
+	                            "A good idea is to choose a relatively small file of around 150 Kb max, because "
+	                            "most clients have a limit on the size of avatars being downloaded.<br>"
+	                            "The image also should be smaller than 800x600 pixels since it will have to be viewable in everyone's monitor.",
+	    "options");
 
-	m_pUseAvatarCheck = new QCheckBox(__tr2qs_ctx("Use avatar:","options"),this);
-	addWidgetToLayout(m_pUseAvatarCheck,0,0,0,0);
+	m_pUseAvatarCheck = new QCheckBox(__tr2qs_ctx("Use avatar:", "options"), this);
+	addWidgetToLayout(m_pUseAvatarCheck, 0, 0, 0, 0);
 	m_pUseAvatarCheck->setChecked(bHaveAvatar);
-	mergeTip(m_pUseAvatarCheck,szTip);
+	mergeTip(m_pUseAvatarCheck, szTip);
 
 	m_pAvatarPreview = new KviPixmapPreview(this);
-	addWidgetToLayout(m_pAvatarPreview,0,1,0,1);
+	addWidgetToLayout(m_pAvatarPreview, 0, 1, 0, 1);
 	m_pAvatarPreview->setPixmap(m_pLocalAvatar);
 	m_pAvatarPreview->setEnabled(bHaveAvatar);
-	connect(m_pUseAvatarCheck,SIGNAL(toggled(bool)),m_pAvatarPreview,SLOT(setEnabled(bool)));
-	mergeTip(m_pAvatarPreview,szTip);
+	connect(m_pUseAvatarCheck, SIGNAL(toggled(bool)), m_pAvatarPreview, SLOT(setEnabled(bool)));
+	mergeTip(m_pAvatarPreview, szTip);
 
 	KviTalHBox * hb = new KviTalHBox(this);
 	hb->setSpacing(4);
-	addWidgetToLayout(hb,0,2,0,2);
+	addWidgetToLayout(hb, 0, 2, 0, 2);
 
 	m_pAvatarNameEdit = new QLineEdit(hb);
 	m_pAvatarNameEdit->setReadOnly(true);
 	m_pAvatarNameEdit->setEnabled(bHaveAvatar);
 	m_pAvatarNameEdit->setText(KVI_OPTION_STRING(KviOption_stringMyAvatar));
-	connect(m_pUseAvatarCheck,SIGNAL(toggled(bool)),m_pAvatarNameEdit,SLOT(setEnabled(bool)));
+	connect(m_pUseAvatarCheck, SIGNAL(toggled(bool)), m_pAvatarNameEdit, SLOT(setEnabled(bool)));
 
-	m_pChooseAvatarButton = new QPushButton(__tr2qs_ctx("Choose...","options"),hb);
+	m_pChooseAvatarButton = new QPushButton(__tr2qs_ctx("Choose...", "options"), hb);
 	m_pChooseAvatarButton->setEnabled(bHaveAvatar);
-	connect(m_pUseAvatarCheck,SIGNAL(toggled(bool)),m_pChooseAvatarButton,SLOT(setEnabled(bool)));
+	connect(m_pUseAvatarCheck, SIGNAL(toggled(bool)), m_pChooseAvatarButton, SLOT(setEnabled(bool)));
 
-	connect(m_pChooseAvatarButton,SIGNAL(clicked()),this,SLOT(chooseAvatar()));
+	connect(m_pChooseAvatarButton, SIGNAL(clicked()), this, SLOT(chooseAvatar()));
 
-	layout()->setRowStretch(1,2);
+	layout()->setRowStretch(1, 2);
 }
 
 OptionsWidget_identityAvatar::~OptionsWidget_identityAvatar()
@@ -513,7 +529,9 @@ void OptionsWidget_identityAvatar::commit(void)
 	{
 		KVI_OPTION_STRING(KviOption_stringMyAvatar) = szAvatarName;
 		KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar) = *m_pLocalAvatar;
-	} else {
+	}
+	else
+	{
 		KVI_OPTION_STRING(KviOption_stringMyAvatar) = "";
 		KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar) = KviPixmap();
 	}
@@ -524,20 +542,21 @@ void OptionsWidget_identityAvatar::chooseAvatar()
 {
 	QString szCurrent = m_pAvatarNameEdit->text();
 
-	AvatarSelectionDialog dlg(this,szCurrent);
-	if(dlg.exec() != QDialog::Accepted)return;
+	AvatarSelectionDialog dlg(this, szCurrent);
+	if(dlg.exec() != QDialog::Accepted)
+		return;
 
 	szCurrent = dlg.avatarName().trimmed();
 
-	if(KviQString::equalCIN(szCurrent,"http://",7) || KviQString::equalCIN(szCurrent,"https://",8))
+	if(KviQString::equalCIN(szCurrent, "http://", 7) || KviQString::equalCIN(szCurrent, "https://", 8))
 	{
 		// this is a url
 		// first check if we have it in the cache
-		KviAvatar * a = g_pIconManager->getAvatar(QString(),szCurrent);
+		KviAvatar * a = g_pIconManager->getAvatar(QString(), szCurrent);
 		if(!a)
 		{
 			// no cache... try downloading
-			AvatarDownloadDialog dlg(this,szCurrent);
+			AvatarDownloadDialog dlg(this, szCurrent);
 			if(dlg.exec() == QDialog::Accepted)
 			{
 				// downloaded!
@@ -546,25 +565,35 @@ void OptionsWidget_identityAvatar::chooseAvatar()
 				{
 					// unloadable
 					szCurrent = "";
-					QMessageBox::warning(this,__tr2qs_ctx("Failed to Load Avatar - KVIrc","options"),
-						__tr2qs_ctx("Failed to load the avatar image.<br>" \
-							"It may be an inaccessible file or an " \
-							"unsupported image format.","options"),QMessageBox::Ok,QMessageBox::NoButton);
+					QMessageBox::warning(this, __tr2qs_ctx("Failed to Load Avatar - KVIrc", "options"),
+					    __tr2qs_ctx("Failed to load the avatar image.<br>"
+					                "It may be an inaccessible file or an "
+					                "unsupported image format.",
+					                         "options"),
+					    QMessageBox::Ok, QMessageBox::NoButton);
 				} // else loaded!
-			} else {
+			}
+			else
+			{
 				// unloadable
-				QString szTmp = QString(__tr2qs_ctx("Failed to download the avatar image.<br>" \
-					"<b>%1</b>","options")).arg(dlg.errorMessage());
-				QMessageBox::warning(this,__tr2qs_ctx("Avatar Download Failed - KVIrc","options"),szTmp,QMessageBox::Ok,QMessageBox::NoButton);
+				QString szTmp = QString(__tr2qs_ctx("Failed to download the avatar image.<br>"
+				                                    "<b>%1</b>",
+				                            "options"))
+				                    .arg(dlg.errorMessage());
+				QMessageBox::warning(this, __tr2qs_ctx("Avatar Download Failed - KVIrc", "options"), szTmp, QMessageBox::Ok, QMessageBox::NoButton);
 				szCurrent = "";
 				m_pLocalAvatar->setNull();
 			}
-		} else {
+		}
+		else
+		{
 			// else OK.. got it in the cache
-			m_pLocalAvatar->set(*(a->pixmap()),a->localPath());
+			m_pLocalAvatar->set(*(a->pixmap()), a->localPath());
 			delete a;
 		}
-	} else {
+	}
+	else
+	{
 		// this is a local path
 		if(m_pLocalAvatar->load(szCurrent))
 		{
@@ -582,12 +611,16 @@ void OptionsWidget_identityAvatar::chooseAvatar()
 				szCurrent = tmp.right(tmp.length() - (idx + 1));
 				tmp = szCurrent;
 			}
-		} else {
+		}
+		else
+		{
 			// unloadable
-			QMessageBox::warning(this,__tr2qs_ctx("Failed to Load Avatar - KVIrc","options"),
-					__tr2qs_ctx("Failed to load the avatar image.<br>" \
-						"It may be an inaccessible file or an " \
-						"unsupported image format.","options"),QMessageBox::Ok,QMessageBox::NoButton);
+			QMessageBox::warning(this, __tr2qs_ctx("Failed to Load Avatar - KVIrc", "options"),
+			    __tr2qs_ctx("Failed to load the avatar image.<br>"
+			                "It may be an inaccessible file or an "
+			                "unsupported image format.",
+			                         "options"),
+			    QMessageBox::Ok, QMessageBox::NoButton);
 			szCurrent = "";
 		}
 	}
@@ -597,32 +630,30 @@ void OptionsWidget_identityAvatar::chooseAvatar()
 		if((m_pLocalAvatar->pixmap()->width() > 1024) || (m_pLocalAvatar->pixmap()->height() > 768))
 		{
 			QMessageBox::warning(
-					this,
-					__tr2qs_ctx("File Dimensions - KVIrc","options"),
-					__tr2qs_ctx(
-							"The avatar you have chosen is bigger than 1024x768 pixels.<br>" \
-							"Such a big image will not be seen on all the user monitors<br>" \
-							"and will probably be scaled by the remote clients with poor quality<br>" \
-							"algorithms to improve performance. You *should* scale it manually<br>" \
-							"to a sane size (like 800x600) or choose a different image.",
-							"options"
-						)
-				);
-		} else {
+			    this,
+			    __tr2qs_ctx("File Dimensions - KVIrc", "options"),
+			    __tr2qs_ctx(
+			        "The avatar you have chosen is bigger than 1024x768 pixels.<br>"
+			        "Such a big image will not be seen on all the user monitors<br>"
+			        "and will probably be scaled by the remote clients with poor quality<br>"
+			        "algorithms to improve performance. You *should* scale it manually<br>"
+			        "to a sane size (like 800x600) or choose a different image.",
+			        "options"));
+		}
+		else
+		{
 			QFileInfo inf(m_pLocalAvatar->path());
 			if(inf.size() > 524288)
 			{
 				QMessageBox::warning(
-						this,
-						__tr2qs_ctx("File Size - KVIrc","options"),
-						__tr2qs_ctx(
-								"The avatar you have chosen is bigger than 500 KiB<br>" \
-								"and most clients will refuse to download it.<br>" \
-								"You *should* either scale it, use a different storage<br>" \
-								"format or choose a different image.",
-								"options"
-							)
-					);
+				    this,
+				    __tr2qs_ctx("File Size - KVIrc", "options"),
+				    __tr2qs_ctx(
+				        "The avatar you have chosen is bigger than 500 KiB<br>"
+				        "and most clients will refuse to download it.<br>"
+				        "You *should* either scale it, use a different storage<br>"
+				        "format or choose a different image.",
+				        "options"));
 			}
 		}
 	}
@@ -631,13 +662,12 @@ void OptionsWidget_identityAvatar::chooseAvatar()
 	m_pAvatarPreview->setPixmap(m_pLocalAvatar);
 }
 
-
 OptionsWidget_identityAdvanced::OptionsWidget_identityAdvanced(QWidget * parent)
-: KviOptionsWidget(parent)
+    : KviOptionsWidget(parent)
 {
-	m_pISelector=0;
-	m_pWSelector=0;
-	m_pSSelector=0;
+	m_pISelector = 0;
+	m_pWSelector = 0;
+	m_pSSelector = 0;
 
 	m_sModeStr = KVI_OPTION_STRING(KviOption_stringDefaultUserMode);
 	m_bI = m_sModeStr.contains('i');
@@ -647,25 +677,27 @@ OptionsWidget_identityAdvanced::OptionsWidget_identityAdvanced(QWidget * parent)
 	createLayout();
 	layout()->setMargin(10);
 
-	KviTalGroupBox * gbox = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("User Mode","options"));
-	m_pISelector = addBoolSelector(gbox,__tr2qs_ctx("Invisible (+i)","options"),&m_bI);
-	m_pSSelector = addBoolSelector(gbox,__tr2qs_ctx("Server notices (+s)","options"),&m_bS);
-	m_pWSelector = addBoolSelector(gbox,__tr2qs_ctx("WALLOPS (+w)","options"),&m_bW);
+	KviTalGroupBox * gbox = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("User Mode", "options"));
+	m_pISelector = addBoolSelector(gbox, __tr2qs_ctx("Invisible (+i)", "options"), &m_bI);
+	m_pSSelector = addBoolSelector(gbox, __tr2qs_ctx("Server notices (+s)", "options"), &m_bS);
+	m_pWSelector = addBoolSelector(gbox, __tr2qs_ctx("WALLOPS (+w)", "options"), &m_bW);
 
-	gbox = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Default Messages","options"));
+	gbox = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("Default Messages", "options"));
 
-	KviStringSelector * sel = addStringSelector(gbox, __tr2qs_ctx("Part message:","options"),KviOption_stringPartMessage);
+	KviStringSelector * sel = addStringSelector(gbox, __tr2qs_ctx("Part message:", "options"), KviOption_stringPartMessage);
 	sel->setMinimumLabelWidth(120);
 
-	mergeTip(sel,__tr2qs_ctx("This is the default part message that will be used when you " \
-			"leave a channel by closing a channel window.","options"));
+	mergeTip(sel, __tr2qs_ctx("This is the default part message that will be used when you "
+	                          "leave a channel by closing a channel window.",
+	                  "options"));
 
-	sel = addStringSelector(gbox, __tr2qs_ctx("Quit message:","options"),KviOption_stringQuitMessage);
+	sel = addStringSelector(gbox, __tr2qs_ctx("Quit message:", "options"), KviOption_stringQuitMessage);
 	sel->setMinimumLabelWidth(120);
-	mergeTip(sel,__tr2qs_ctx("This is the default quit message that will be used when you " \
-			"quit your IRC session by closing the console window or disconnecting by pressing the disconnect button.","options"));
+	mergeTip(sel, __tr2qs_ctx("This is the default quit message that will be used when you "
+	                          "quit your IRC session by closing the console window or disconnecting by pressing the disconnect button.",
+	                  "options"));
 
-	addRowSpacer(0,2,0,2);
+	addRowSpacer(0, 2, 0, 2);
 }
 
 OptionsWidget_identityAdvanced::~OptionsWidget_identityAdvanced()
@@ -677,14 +709,16 @@ void OptionsWidget_identityAdvanced::commit()
 	KviOptionsWidget::commit();
 
 	m_sModeStr = m_bI ? "i" : "";
-	if(m_bS)m_sModeStr += "s";
-	if(m_bW)m_sModeStr += "w";
+	if(m_bS)
+		m_sModeStr += "s";
+	if(m_bW)
+		m_sModeStr += "w";
 
 	KVI_OPTION_STRING(KviOption_stringDefaultUserMode) = m_sModeStr.ptr();
 }
 
 OptionsWidget_identityProfile::OptionsWidget_identityProfile(QWidget * pParent)
-: KviOptionsWidget(pParent)
+    : KviOptionsWidget(pParent)
 {
 	setObjectName("identity_profiles_option_widget");
 	m_pEditor = 0;
@@ -696,11 +730,11 @@ OptionsWidget_identityProfile::OptionsWidget_identityProfile(QWidget * pParent)
 	KviIdentityProfileSet * pSet = KviIdentityProfileSet::instance();
 	bool bEnabled = pSet ? (pSet->isEnabled() && !pSet->isEmpty()) : false;
 
-	m_pProfilesCheck = new QCheckBox(__tr2qs_ctx("Enable network profiles","options"),this);
-	KviTalToolTip::add(m_pProfilesCheck,__tr2qs_ctx("This check enables the use of network profiles","options"));
+	m_pProfilesCheck = new QCheckBox(__tr2qs_ctx("Enable network profiles", "options"), this);
+	KviTalToolTip::add(m_pProfilesCheck, __tr2qs_ctx("This check enables the use of network profiles", "options"));
 	m_pProfilesCheck->setChecked(bEnabled);
-	pLayout->addWidget(m_pProfilesCheck,0,0,1,3);
-	connect(m_pProfilesCheck,SIGNAL(toggled(bool)),this,SLOT(toggleControls()));
+	pLayout->addWidget(m_pProfilesCheck, 0, 0, 1, 3);
+	connect(m_pProfilesCheck, SIGNAL(toggled(bool)), this, SLOT(toggleControls()));
 
 	// Profiles list
 	m_pTreeWidget = new QTreeWidget(this);
@@ -708,36 +742,37 @@ OptionsWidget_identityProfile::OptionsWidget_identityProfile(QWidget * pParent)
 	m_pTreeWidget->setAllColumnsShowFocus(true);
 
 	QStringList labels;
-	labels.append(__tr2qs_ctx("Name","options"));
-	labels.append(__tr2qs_ctx("Network","options"));
-	labels.append(__tr2qs_ctx("Nickname","options"));
-	labels.append(__tr2qs_ctx("Alt. nickname","options"));
-	labels.append(__tr2qs_ctx("Username","options"));
-	labels.append(__tr2qs_ctx("Real name","options"));
+	labels.append(__tr2qs_ctx("Name", "options"));
+	labels.append(__tr2qs_ctx("Network", "options"));
+	labels.append(__tr2qs_ctx("Nickname", "options"));
+	labels.append(__tr2qs_ctx("Alt. nickname", "options"));
+	labels.append(__tr2qs_ctx("Username", "options"));
+	labels.append(__tr2qs_ctx("Real name", "options"));
 	m_pTreeWidget->setHeaderLabels(labels);
 
-	KviTalToolTip::add(m_pTreeWidget, \
-		__tr2qs_ctx("This is a set of rules to use profiles.<br>" \
-			"KVIrc will use them to handle the user connection " \
-			"data before the data is sent to the IRC server.<br>" \
-			"This is useful if a user wants to use different data " \
-			"on different networks without changing them at every " \
-			"connection attempt.","options"));
-	pLayout->addWidget(m_pTreeWidget,1,0,1,3);
-	connect(m_pTreeWidget,SIGNAL(itemSelectionChanged()),this,SLOT(toggleControls()));
+	KviTalToolTip::add(m_pTreeWidget,
+	    __tr2qs_ctx("This is a set of rules to use profiles.<br>"
+	                "KVIrc will use them to handle the user connection "
+	                "data before the data is sent to the IRC server.<br>"
+	                "This is useful if a user wants to use different data "
+	                "on different networks without changing them at every "
+	                "connection attempt.",
+	                       "options"));
+	pLayout->addWidget(m_pTreeWidget, 1, 0, 1, 3);
+	connect(m_pTreeWidget, SIGNAL(itemSelectionChanged()), this, SLOT(toggleControls()));
 
 	// Buttons box
 	KviTalHBox * pBtnBox = new KviTalHBox(this);
-	pLayout->addWidget(pBtnBox,2,0,1,3);
+	pLayout->addWidget(pBtnBox, 2, 0, 1, 3);
 
-	m_pBtnAddProfile = new QPushButton(__tr2qs_ctx("Add Profile","options"),pBtnBox);
-	connect(m_pBtnAddProfile,SIGNAL(clicked()),this,SLOT(addProfileEntry()));
+	m_pBtnAddProfile = new QPushButton(__tr2qs_ctx("Add Profile", "options"), pBtnBox);
+	connect(m_pBtnAddProfile, SIGNAL(clicked()), this, SLOT(addProfileEntry()));
 
-	m_pBtnEditProfile = new QPushButton(__tr2qs_ctx("Edit Profile","options"),pBtnBox);
-	connect(m_pBtnEditProfile,SIGNAL(clicked()),this,SLOT(editProfileEntry()));
+	m_pBtnEditProfile = new QPushButton(__tr2qs_ctx("Edit Profile", "options"), pBtnBox);
+	connect(m_pBtnEditProfile, SIGNAL(clicked()), this, SLOT(editProfileEntry()));
 
-	m_pBtnDelProfile = new QPushButton(__tr2qs_ctx("Delete Profile","options"),pBtnBox);
-	connect(m_pBtnDelProfile,SIGNAL(clicked()),this,SLOT(delProfileEntry()));
+	m_pBtnDelProfile = new QPushButton(__tr2qs_ctx("Delete Profile", "options"), pBtnBox);
+	connect(m_pBtnDelProfile, SIGNAL(clicked()), this, SLOT(delProfileEntry()));
 
 	// Fill in the treewidget
 	if(pSet && pSet->profiles())
@@ -747,12 +782,12 @@ OptionsWidget_identityProfile::OptionsWidget_identityProfile(QWidget * pParent)
 		for(KviIdentityProfile * pProfile = pList->first(); pProfile; pProfile = pList->next())
 		{
 			pItem = new QTreeWidgetItem(m_pTreeWidget);
-			pItem->setText(0,pProfile->name());
-			pItem->setText(1,pProfile->network());
-			pItem->setText(2,pProfile->nick());
-			pItem->setText(3,pProfile->altNick());
-			pItem->setText(4,pProfile->userName());
-			pItem->setText(5,pProfile->realName());
+			pItem->setText(0, pProfile->name());
+			pItem->setText(1, pProfile->network());
+			pItem->setText(2, pProfile->nick());
+			pItem->setText(3, pProfile->altNick());
+			pItem->setText(4, pProfile->userName());
+			pItem->setText(5, pProfile->realName());
 		}
 	}
 
@@ -786,12 +821,12 @@ void OptionsWidget_identityProfile::addProfileEntry()
 	if(m_pEditor->editProfile(&profile))
 	{
 		QTreeWidgetItem * pItem = new QTreeWidgetItem(m_pTreeWidget);
-		pItem->setText(0,profile.name());
-		pItem->setText(1,profile.network());
-		pItem->setText(2,profile.nick());
-		pItem->setText(3,profile.altNick());
-		pItem->setText(4,profile.userName());
-		pItem->setText(5,profile.realName());
+		pItem->setText(0, profile.name());
+		pItem->setText(1, profile.network());
+		pItem->setText(2, profile.nick());
+		pItem->setText(3, profile.altNick());
+		pItem->setText(4, profile.userName());
+		pItem->setText(5, profile.realName());
 	}
 }
 
@@ -810,29 +845,29 @@ void OptionsWidget_identityProfile::editProfileEntry()
 	profile.setUserName(pItem->text(4));
 	profile.setRealName(pItem->text(5));
 
-	m_iCurrentEditedProfile=m_pTreeWidget->indexOfTopLevelItem(pItem);
+	m_iCurrentEditedProfile = m_pTreeWidget->indexOfTopLevelItem(pItem);
 
 	if(m_pEditor)
 		delete m_pEditor;
 	m_pEditor = new IdentityProfileEditor(this);
 	if(m_pEditor->editProfile(&profile))
 	{
-		pItem->setText(0,profile.name());
-		pItem->setText(1,profile.network());
-		pItem->setText(2,profile.nick());
-		pItem->setText(3,profile.altNick());
-		pItem->setText(4,profile.userName());
-		pItem->setText(5,profile.realName());
+		pItem->setText(0, profile.name());
+		pItem->setText(1, profile.network());
+		pItem->setText(2, profile.nick());
+		pItem->setText(3, profile.altNick());
+		pItem->setText(4, profile.userName());
+		pItem->setText(5, profile.realName());
 	}
 }
 
 void OptionsWidget_identityProfile::editProfileOkPressed()
 {
-	for(int i=0; i < m_pTreeWidget->topLevelItemCount(); i++)
+	for(int i = 0; i < m_pTreeWidget->topLevelItemCount(); i++)
 	{
-		if(m_pEditor->m_pNameEdit->text() == m_pTreeWidget->topLevelItem(i)->text(0) && i!=m_iCurrentEditedProfile)
+		if(m_pEditor->m_pNameEdit->text() == m_pTreeWidget->topLevelItem(i)->text(0) && i != m_iCurrentEditedProfile)
 		{
-			QMessageBox::warning(this,__tr2qs_ctx("Invalid Profile Rule - KVIrc","options"),__tr2qs_ctx("There is already a profile with that name","options"),__tr2qs_ctx("OK","options"));
+			QMessageBox::warning(this, __tr2qs_ctx("Invalid Profile Rule - KVIrc", "options"), __tr2qs_ctx("There is already a profile with that name", "options"), __tr2qs_ctx("OK", "options"));
 			return;
 		}
 	}
@@ -857,7 +892,7 @@ void OptionsWidget_identityProfile::commit()
 	{
 		KviIdentityProfileSet::instance()->setEnabled(m_pProfilesCheck->isChecked());
 		QTreeWidgetItem * pItem;
-		for(int i=0; i < m_pTreeWidget->topLevelItemCount(); i++)
+		for(int i = 0; i < m_pTreeWidget->topLevelItemCount(); i++)
 		{
 			pItem = (QTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 
@@ -877,69 +912,69 @@ void OptionsWidget_identityProfile::commit()
 }
 
 IdentityProfileEditor::IdentityProfileEditor(QWidget * pParent)
-: QDialog(pParent)
+    : QDialog(pParent)
 {
 	setObjectName("identity_profile_editor");
-	setWindowTitle(__tr2qs_ctx("Profile Editor - KVIrc","options"));
+	setWindowTitle(__tr2qs_ctx("Profile Editor - KVIrc", "options"));
 
 	QGridLayout * pLayout = new QGridLayout(this);
 
-	QLabel * pLabel = new QLabel(__tr2qs_ctx("Profile name:","options"),this);
-	pLayout->addWidget(pLabel,0,0);
+	QLabel * pLabel = new QLabel(__tr2qs_ctx("Profile name:", "options"), this);
+	pLayout->addWidget(pLabel, 0, 0);
 
 	m_pNameEdit = new QLineEdit(this);
-	KviTalToolTip::add(m_pNameEdit,__tr2qs_ctx("Put here the name of the profile","options"));
-	pLayout->addWidget(m_pNameEdit,0,1,1,2);
-	connect(m_pNameEdit,SIGNAL(textChanged(const QString &)),this,SLOT(toggleButton()));
+	KviTalToolTip::add(m_pNameEdit, __tr2qs_ctx("Put here the name of the profile", "options"));
+	pLayout->addWidget(m_pNameEdit, 0, 1, 1, 2);
+	connect(m_pNameEdit, SIGNAL(textChanged(const QString &)), this, SLOT(toggleButton()));
 
-	pLabel = new QLabel(__tr2qs_ctx("Network name:","options"),this);
-	pLayout->addWidget(pLabel,1,0);
+	pLabel = new QLabel(__tr2qs_ctx("Network name:", "options"), this);
+	pLayout->addWidget(pLabel, 1, 0);
 
 	m_pNetworkEdit = new QLineEdit(this);
-	KviTalToolTip::add(m_pNetworkEdit,__tr2qs_ctx("Put here the name of the network","options"));
-	pLayout->addWidget(m_pNetworkEdit,1,1,1,2);
+	KviTalToolTip::add(m_pNetworkEdit, __tr2qs_ctx("Put here the name of the network", "options"));
+	pLayout->addWidget(m_pNetworkEdit, 1, 1, 1, 2);
 
-	pLabel = new QLabel(__tr2qs_ctx("Nickname:","options"),this);
-	pLayout->addWidget(pLabel,2,0);
+	pLabel = new QLabel(__tr2qs_ctx("Nickname:", "options"), this);
+	pLayout->addWidget(pLabel, 2, 0);
 
 	m_pNickEdit = new QLineEdit(this);
-	KviTalToolTip::add(m_pNickEdit,__tr2qs_ctx("Put here the nickname you want to use","options"));
-	pLayout->addWidget(m_pNickEdit,2,1,1,2);
+	KviTalToolTip::add(m_pNickEdit, __tr2qs_ctx("Put here the nickname you want to use", "options"));
+	pLayout->addWidget(m_pNickEdit, 2, 1, 1, 2);
 
-	pLabel = new QLabel(__tr2qs_ctx("Alt. nickname:","options"),this);
-	pLayout->addWidget(pLabel,3,0);
+	pLabel = new QLabel(__tr2qs_ctx("Alt. nickname:", "options"), this);
+	pLayout->addWidget(pLabel, 3, 0);
 
 	m_pAltNickEdit = new QLineEdit(this);
-	KviTalToolTip::add(m_pAltNickEdit,__tr2qs_ctx("Put here the alternative nickname you want to use","options"));
-	pLayout->addWidget(m_pAltNickEdit,3,1,1,2);
+	KviTalToolTip::add(m_pAltNickEdit, __tr2qs_ctx("Put here the alternative nickname you want to use", "options"));
+	pLayout->addWidget(m_pAltNickEdit, 3, 1, 1, 2);
 
-	pLabel = new QLabel(__tr2qs_ctx("Username:","options"),this);
-	pLayout->addWidget(pLabel,4,0);
+	pLabel = new QLabel(__tr2qs_ctx("Username:", "options"), this);
+	pLayout->addWidget(pLabel, 4, 0);
 
 	m_pUserNameEdit = new QLineEdit(this);
-	KviTalToolTip::add(m_pUserNameEdit,__tr2qs_ctx("Put here the username you want to use","options"));
-	pLayout->addWidget(m_pUserNameEdit,4,1,1,2);
+	KviTalToolTip::add(m_pUserNameEdit, __tr2qs_ctx("Put here the username you want to use", "options"));
+	pLayout->addWidget(m_pUserNameEdit, 4, 1, 1, 2);
 
-	pLabel = new QLabel(__tr2qs_ctx("Real name:","options"),this);
-	pLayout->addWidget(pLabel,5,0);
+	pLabel = new QLabel(__tr2qs_ctx("Real name:", "options"), this);
+	pLayout->addWidget(pLabel, 5, 0);
 
 	m_pRealNameEdit = new QLineEdit(this);
-	KviTalToolTip::add(m_pRealNameEdit,__tr2qs_ctx("Put here the real name you want to use","options"));
-	pLayout->addWidget(m_pRealNameEdit,5,1,1,2);
+	KviTalToolTip::add(m_pRealNameEdit, __tr2qs_ctx("Put here the real name you want to use", "options"));
+	pLayout->addWidget(m_pRealNameEdit, 5, 1, 1, 2);
 
 	KviTalHBox * pBox = new KviTalHBox(this);
 	pBox->setAlignment(Qt::AlignRight);
-	pLayout->addWidget(pBox,6,1,1,2);
+	pLayout->addWidget(pBox, 6, 1, 1, 2);
 
-	QPushButton * p = new QPushButton(__tr2qs_ctx("Cancel","options"),pBox);
+	QPushButton * p = new QPushButton(__tr2qs_ctx("Cancel", "options"), pBox);
 	//p->setMinimumWidth(100);
-	connect(p,SIGNAL(clicked()),this,SLOT(reject()));
+	connect(p, SIGNAL(clicked()), this, SLOT(reject()));
 
-	m_pBtnOk = new QPushButton(__tr2qs_ctx("OK","options"),pBox);
+	m_pBtnOk = new QPushButton(__tr2qs_ctx("OK", "options"), pBox);
 	m_pBtnOk->setEnabled(false);
-	connect(m_pBtnOk,SIGNAL(clicked()),pParent,SLOT(editProfileOkPressed()));
+	connect(m_pBtnOk, SIGNAL(clicked()), pParent, SLOT(editProfileOkPressed()));
 
-	pLayout->setColumnStretch(1,1);
+	pLayout->setColumnStretch(1, 1);
 
 	setMinimumWidth(250);
 
@@ -964,7 +999,8 @@ bool IdentityProfileEditor::editProfile(KviIdentityProfile * pProfile)
 	m_pNameEdit->selectAll();
 
 	// Show the dialog
-	if(exec() != QDialog::Accepted) return false;
+	if(exec() != QDialog::Accepted)
+		return false;
 
 	// Store data in the object
 	pProfile->setName(m_pNameEdit->text());