fixed default alternative nicknames

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

3 files changed, 11 insertions, 23 deletions

diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 1f886beb4..261f8ae75 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -106,8 +106,7 @@ static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCo
 			return false;
 		} else {
 			// -c or -n , grab a local nick from somewhere
-			d->szLocalNick  = KVI_OPTION_STRING(KviOption_stringNickname1);
-			d->szLocalNick.trimmed();
+			d->szLocalNick  = KVI_OPTION_STRING(KviOption_stringNickname1).trimmed();
 			if(d->szLocalNick.isEmpty())d->szLocalNick = KVI_DEFAULT_NICKNAME1;
 			d->szLocalUser  = __tr2qs_ctx("unknown","dcc"); // we can live without it
 			d->szLocalHost  = d->szLocalUser;  // we can live without it
@@ -1293,8 +1292,7 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c)
 		if(!(c->hasSwitch('c') || c->hasSwitch('n')))return c->notConnectedToServer();
 		else {
 			// -c or -n , grab a local nick from somewhere
-			d->szLocalNick  = KVI_OPTION_STRING(KviOption_stringNickname1);
-			d->szLocalNick.trimmed();
+			d->szLocalNick  = KVI_OPTION_STRING(KviOption_stringNickname1).trimmed();
 			if(d->szLocalNick.isEmpty())d->szLocalNick = KVI_DEFAULT_NICKNAME1;
 			d->szLocalUser  = __tr("unknown"); // we can live without it
 			d->szLocalHost  = d->szLocalUser;  // we can live without it
diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp
index 8a45ca237..4a3125307 100644
--- a/src/modules/options/optw_away.cpp
+++ b/src/modules/options/optw_away.cpp
@@ -50,7 +50,7 @@ KviAwayOptionsWidget::KviAwayOptionsWidget(QWidget * parent)
 	connect(m_pEnableAwayNick,SIGNAL(toggled(bool)),m_pEnableCustomAwayNick,SLOT(setEnabled(bool)));
 	connect(m_pEnableCustomAwayNick,SIGNAL(toggled(bool)),this,SLOT(enableCustomAwayText(bool)));
 
-	m_pCustomAwayNick = addStringSelector(g,__tr2qs_ctx("Custom nickname (%%nick%% means a current nick):","options"),KviOption_stringCustomAwayNick,KVI_OPTION_BOOL(KviOption_boolChangeNickAway) && !(KVI_OPTION_BOOL(KviOption_boolAutoGeneratedAwayNick)));
+	m_pCustomAwayNick = addStringSelector(g,__tr2qs_ctx("Custom nickname (%nick% means a current nick):","options"),KviOption_stringCustomAwayNick,KVI_OPTION_BOOL(KviOption_boolChangeNickAway) && !(KVI_OPTION_BOOL(KviOption_boolAutoGeneratedAwayNick)));
 
 	addRowSpacer(0,4,0,4);
 }
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;