projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sort sql.qrc when generating, emphasize script
[quassel.git]
/
src
/
core
/
coreusersettings.cpp
diff --git
a/src/core/coreusersettings.cpp
b/src/core/coreusersettings.cpp
index
69ef23e
..
89a9cd4
100644
(file)
--- a/
src/core/coreusersettings.cpp
+++ b/
src/core/coreusersettings.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
6
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-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();