projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #81 from otih/master
[quassel.git]
/
src
/
core
/
coreusersettings.cpp
diff --git
a/src/core/coreusersettings.cpp
b/src/core/coreusersettings.cpp
index
69ef23e
..
52ddd24
100644
(file)
--- a/
src/core/coreusersettings.cpp
+++ b/
src/core/coreusersettings.cpp
@@
-28,7
+28,7
@@
CoreUserSettings::CoreUserSettings(UserId uid) : CoreSettings(QString("CoreUser/
Identity CoreUserSettings::identity(IdentityId id)
{
QVariant v = localValue(QString("Identities/%1").arg(id.toInt()));
Identity CoreUserSettings::identity(IdentityId id)
{
QVariant v = localValue(QString("Identities/%1").arg(id.toInt()));
- if (
qVariantCanConvert<Identity>(v
)) {
+ if (
v.canConvert<Identity>(
)) {
return v.value<Identity>();
}
return Identity();
return v.value<Identity>();
}
return Identity();