projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
389c572
)
purging default nick from forbidden characters
author
Marcus Eggenberger
<egs@quassel-irc.org>
Sat, 7 Feb 2009 18:40:00 +0000
(19:40 +0100)
committer
Marcus Eggenberger
<egs@quassel-irc.org>
Sat, 7 Feb 2009 18:40:00 +0000
(19:40 +0100)
src/common/identity.cpp
patch
|
blob
|
history
diff --git
a/src/common/identity.cpp
b/src/common/identity.cpp
index
aafb1fa
..
40b0b2b
100644
(file)
--- a/
src/common/identity.cpp
+++ b/
src/common/identity.cpp
@@
-74,28
+74,29
@@
void Identity::init() {
}
QString Identity::defaultNick() {
}
QString Identity::defaultNick() {
- QString
generalDefault
= QString("quassel%1").arg(qrand() & 0xff); // FIXME provide more sensible default nicks
+ QString
nick
= QString("quassel%1").arg(qrand() & 0xff); // FIXME provide more sensible default nicks
#ifdef Q_OS_MAC
#ifdef Q_OS_MAC
- return CFStringToQString(CSCopyUserName(true));
+ QString shortUserName = CFStringToQString(CSCopyUserName(true));
+ if(!shortUserName.isEmpty())
+ nick = shortUserName;
#elif defined(Q_OS_WIN32)
TCHAR infoBuf[128];
DWORD bufCharCount = 128;
//if(GetUserNameEx(/* NameSamCompatible */ 1, infoBuf, &bufCharCount))
#elif defined(Q_OS_WIN32)
TCHAR infoBuf[128];
DWORD bufCharCount = 128;
//if(GetUserNameEx(/* NameSamCompatible */ 1, infoBuf, &bufCharCount))
- if(!GetUserNameEx(NameSamCompatible, infoBuf, &bufCharCount))
- return generalDefault;
-
- QString nickName(infoBuf);
- int lastBs = nickName.lastIndexOf('\\');
- if(lastBs != -1) {
- nickName = nickName.mid(lastBs + 1);
+ if(GetUserNameEx(NameSamCompatible, infoBuf, &bufCharCount)) {
+ QString nickName(infoBuf);
+ int lastBs = nickName.lastIndexOf('\\');
+ if(lastBs != -1) {
+ nickName = nickName.mid(lastBs + 1);
+ }
+ if(!nickName.isEmpty())
+ nick = nickName;
}
}
- if(nickName.isEmpty())
- return generalDefault;
- else
- return nickName;
-#else
- return generalDefault;
#endif
#endif
+ // cleaning forbidden characters from nick
+ QRegExp rx(QString("(^[\\d-]+|[^A-Za-z\x5b-\x60\x7b-\x7d])"));
+ nick.remove(rx);
+ return nick;
}
QString Identity::defaultRealName() {
}
QString Identity::defaultRealName() {