aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/setup/setupwizard.cpp
diff options
context:
space:
mode:
authorGravatar Fabio Bas2010-03-23 15:39:47 +0000
committerGravatar Fabio Bas2010-03-23 15:39:47 +0000
commitb5e5738e9b62756ca6ce1b1fde41412ad934be58 (patch)
tree026fbf56df60188ffb3ec887d1f0afa8a646f6c7 /src/modules/setup/setupwizard.cpp
parentFixed rename class in classeditor (diff)
downloadKVIrc-b5e5738e9b62756ca6ce1b1fde41412ad934be58.tar.gz
KVIrc-b5e5738e9b62756ca6ce1b1fde41412ad934be58.tar.bz2
KVIrc-b5e5738e9b62756ca6ce1b1fde41412ad934be58.zip
fixed default alternative nicknames
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4209 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/setup/setupwizard.cpp')
-rw-r--r--src/modules/setup/setupwizard.cpp26
1 files changed, 8 insertions, 18 deletions
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index 2ab756fd5..adbe20879 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -1060,16 +1060,13 @@ void KviSetupWizard::accept()
m_pLanguagesSelector->commit();
//m_pOtherInfoSelector->commit();
- KVI_OPTION_STRING(KviOption_stringNickname1).trimmed();
- KVI_OPTION_STRING(KviOption_stringNickname1).replace(" ","");
+ KVI_OPTION_STRING(KviOption_stringNickname1) = KVI_OPTION_STRING(KviOption_stringNickname1).trimmed();
if(KVI_OPTION_STRING(KviOption_stringNickname1).length() > 32)
- {
- QString tmp = KVI_OPTION_STRING(KviOption_stringNickname1).left(32);
- KVI_OPTION_STRING(KviOption_stringNickname1) = tmp;
- }
+ KVI_OPTION_STRING(KviOption_stringNickname1).truncate(32);
- if(KVI_OPTION_STRING(KviOption_stringNickname1).isEmpty())KVI_OPTION_STRING(KviOption_stringNickname1) = "newbie";
+ if(KVI_OPTION_STRING(KviOption_stringNickname1).isEmpty())
+ KVI_OPTION_STRING(KviOption_stringNickname1) = KVI_DEFAULT_NICKNAME1;
QString szNickPart;
if(KVI_OPTION_STRING(KviOption_stringNickname1).length() < 31)
@@ -1079,18 +1076,11 @@ void KviSetupWizard::accept()
szNickPart = KVI_OPTION_STRING(KviOption_stringNickname1).left(30);
}
- QString alt = szNickPart;
- alt.prepend("|"); // <-- this is an erroneous nickname on IrcNet :/
- alt.append("|");
if(!g_bFoundMirc)
- KVI_OPTION_STRING(KviOption_stringNickname2) = alt;
- alt = szNickPart;
- alt.prepend("_");
- alt.append("_");
- KVI_OPTION_STRING(KviOption_stringNickname3) = alt;
- alt = szNickPart;
- alt.append("2");
- KVI_OPTION_STRING(KviOption_stringNickname4) = alt;
+ KVI_OPTION_STRING(KviOption_stringNickname2) = QString(KVI_DEFAULT_NICKNAME2).replace(KVI_DEFAULT_NICKNAME_TOKEN, szNickPart);
+
+ KVI_OPTION_STRING(KviOption_stringNickname3) = QString(KVI_DEFAULT_NICKNAME3).replace(KVI_DEFAULT_NICKNAME_TOKEN, szNickPart);
+ 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;