projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename setters to be more Qt-like
[quassel.git]
/
src
/
common
/
identity.cpp
diff --git
a/src/common/identity.cpp
b/src/common/identity.cpp
index
9359264
..
0569178
100644
(file)
--- a/
src/common/identity.cpp
+++ b/
src/common/identity.cpp
@@
-22,6
+22,7
@@
#include <QMetaProperty>
#include <QVariantMap>
#include <QMetaProperty>
#include <QVariantMap>
+#include <QString>
#ifdef Q_OS_MAC
# include <CoreServices/CoreServices.h>
#ifdef Q_OS_MAC
# include <CoreServices/CoreServices.h>
@@
-88,7
+89,10
@@
QString Identity::defaultNick() {
nick = shortUserName;
#elif defined(Q_OS_UNIX)
nick = shortUserName;
#elif defined(Q_OS_UNIX)
- QString userName = getlogin();
+ QString userName;
+ struct passwd *pwd = getpwuid(getuid());
+ if(pwd)
+ userName = pwd->pw_name;
if(!userName.isEmpty())
nick = userName;
if(!userName.isEmpty())
nick = userName;
@@
-108,7
+112,7
@@
QString Identity::defaultNick() {
#endif
// cleaning forbidden characters from nick
#endif
// cleaning forbidden characters from nick
- QRegExp rx(QString("(^[\\d-]+|[^A-Za-z\x5b-\x60\x7b-\x7d])"));
+ QRegExp rx(QString("(^[\\d-]+|[^A-Za-z
0-9
\x5b-\x60\x7b-\x7d])"));
nick.remove(rx);
return nick;
}
nick.remove(rx);
return nick;
}
@@
-123,7
+127,7
@@
QString Identity::defaultRealName() {
QString realName;
struct passwd *pwd = getpwuid(getuid());
if(pwd)
QString realName;
struct passwd *pwd = getpwuid(getuid());
if(pwd)
- realName =
pwd->pw_gecos
;
+ realName =
QString::fromUtf8(pwd->pw_gecos)
;
if(!realName.isEmpty())
return realName;
else
if(!realName.isEmpty())
return realName;
else
@@
-144,8
+148,7
@@
QString Identity::defaultRealName() {
void Identity::setToDefaults() {
setIdentityName(tr("<empty>"));
setRealName(defaultRealName());
void Identity::setToDefaults() {
setIdentityName(tr("<empty>"));
setRealName(defaultRealName());
- QStringList n;
- n << defaultNick() << defaultNick() + "_" << defaultNick() + "__";
+ QStringList n = QStringList() << defaultNick();
setNicks(n);
setAwayNick("");
setAwayNickEnabled(false);
setNicks(n);
setAwayNick("");
setAwayNickEnabled(false);