X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientsettings.cpp;h=171d7fe4c8058308d62518e8f0219177b78621c3;hp=ddeb9c1c23dc9b036dd3b884637f2537986b6b69;hb=3a3e844f9fcfd12235a0086af75ecd503b621ef4;hpb=f2e4560b71a1888599ca2153eee36a9b4136c902

diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp
index ddeb9c1c..171d7fe4 100644
--- a/src/client/clientsettings.cpp
+++ b/src/client/clientsettings.cpp
@@ -25,6 +25,7 @@
 #include <QHostAddress>
 #ifdef HAVE_SSL
 #include <QSslSocket>
+#include <utility>
 #endif
 
 #include "client.h"
@@ -42,9 +43,9 @@ ClientSettings::~ClientSettings()
 
 /***********************************************************************************************/
 
-CoreAccountSettings::CoreAccountSettings(const QString &subgroup)
+CoreAccountSettings::CoreAccountSettings(QString subgroup)
     : ClientSettings("CoreAccounts"),
-    _subgroup(subgroup)
+    _subgroup(std::move(subgroup))
 {
 }
 
@@ -320,7 +321,8 @@ void NotificationSettings::setHighlightNick(NotificationSettings::HighlightNickT
 
 NotificationSettings::HighlightNickType NotificationSettings::highlightNick()
 {
-    return (NotificationSettings::HighlightNickType)localValue("Highlights/HighlightNick", NoNick).toInt();
+    return (NotificationSettings::HighlightNickType)localValue("Highlights/HighlightNick",
+                                                               CurrentNick).toInt();
 }