no longer adding nick alternatives with trailing underscores to the default nicks

[quassel.git] / src / common / identity.cpp

diff --git a/src/common/identity.cpp b/src/common/identity.cpp
index 9359264..2652098 100644 (file)
--- a/src/common/identity.cpp
+++ b/src/common/identity.cpp
@@ -108,7 +108,7 @@ QString Identity::defaultNick() {
 #endif
 
   // cleaning forbidden characters from nick
-  QRegExp rx(QString("(^[\\d-]+|[^A-Za-z\x5b-\x60\x7b-\x7d])"));
+  QRegExp rx(QString("(^[\\d-]+|[^A-Za-z0-9\x5b-\x60\x7b-\x7d])"));
   nick.remove(rx);
   return nick;
 }
@@ -144,8 +144,7 @@ QString Identity::defaultRealName() {
 void Identity::setToDefaults() {
   setIdentityName(tr("<empty>"));
   setRealName(defaultRealName());
-  QStringList n;
-  n << defaultNick() << defaultNick() + "_" << defaultNick() + "__";
+  QStringList n = QStringList() << defaultNick();
   setNicks(n);
   setAwayNick("");
   setAwayNickEnabled(false);