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

diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp
index ddeb9c1c..cf0cb8d7 100644
--- a/src/client/clientsettings.cpp
+++ b/src/client/clientsettings.cpp
@@ -18,6 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
+#include <utility>
+
 #include <QStringList>
 
 #include "clientsettings.h"
@@ -42,9 +44,9 @@ ClientSettings::~ClientSettings()
 
 /***********************************************************************************************/
 
-CoreAccountSettings::CoreAccountSettings(const QString &subgroup)
+CoreAccountSettings::CoreAccountSettings(QString subgroup)
     : ClientSettings("CoreAccounts"),
-    _subgroup(subgroup)
+    _subgroup(std::move(subgroup))
 {
 }
 
@@ -320,7 +322,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();
 }