X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoreusersettings.cpp;h=e0f4e9e7620a930cabf2ccd09d47a7f08063e8f9;hb=e7352d23bb54ce36dd4f9aac59a93e2c0a6297f6;hp=5fbd15d53db9afba8a96d8797e9114b66f415ad1;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce;p=quassel.git diff --git a/src/core/coreusersettings.cpp b/src/core/coreusersettings.cpp index 5fbd15d5..e0f4e9e7 100644 --- a/src/core/coreusersettings.cpp +++ b/src/core/coreusersettings.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "coreusersettings.h" @@ -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())); - if (qVariantCanConvert(v)) { + if (v.canConvert()) { return v.value(); } return Identity();