X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientsettings.cpp;h=e4a76c3f719e785b9b618155472957df5d832b60;hp=91e6d07c03d57e302fee325daf3b8196305d5cfa;hb=HEAD;hpb=cc6e7c08709c4e761e2fd9c2e322751015497003

diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp
index 91e6d07c..f4caa2a3 100644
--- a/src/client/clientsettings.cpp
+++ b/src/client/clientsettings.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2019 by the Quassel Project                        *
+ *   Copyright (C) 2005-2022 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -23,10 +23,8 @@
 #include <utility>
 
 #include <QHostAddress>
+#include <QSslSocket>
 #include <QStringList>
-#ifdef HAVE_SSL
-#    include <QSslSocket>
-#endif
 
 #include "client.h"
 #include "quassel.h"
@@ -161,7 +159,7 @@ void CoreAccountSettings::setJumpKeyMap(const QHash<int, BufferId>& keyMap)
     QVariantMap variants;
     QHash<int, BufferId>::const_iterator mapIter = keyMap.constBegin();
     while (mapIter != keyMap.constEnd()) {
-        variants[QString::number(mapIter.key())] = qVariantFromValue(mapIter.value());
+        variants[QString::number(mapIter.key())] = QVariant::fromValue(mapIter.value());
         ++mapIter;
     }
     setAccountValue("JumpKeyMap", variants);
@@ -183,7 +181,7 @@ void CoreAccountSettings::setBufferViewOverlay(const QSet<int>& viewIds)
 {
     QVariantList variants;
     foreach (int viewId, viewIds) {
-        variants << qVariantFromValue(viewId);
+        variants << QVariant::fromValue(viewId);
     }
     setAccountValue("BufferViewOverlay", variants);
 }
@@ -298,7 +296,7 @@ void NotificationSettings::setHighlightNick(NotificationSettings::HighlightNickT
 
 NotificationSettings::HighlightNickType NotificationSettings::highlightNick() const
 {
-    return (NotificationSettings::HighlightNickType)localValue("Highlights/HighlightNick", CurrentNick).toInt();
+    return (NotificationSettings::HighlightNickType)localValue("Highlights/HighlightNick", NoNick).toInt();
 }
 
 void NotificationSettings::setNicksCaseSensitive(bool cs)