X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsettings.h;h=1a0fa6d7f9ee5bfd9198fc799c23326ed5a0b7b7;hb=f9efdde7f3a6004af8f834c409cfa6ae1d877692;hp=625291e838c7b3a43bfff397c2656e1023df9df5;hpb=ebbd0abc75dc8c1e9e5786e3e63d478233746dd9;p=quassel.git

diff --git a/src/common/settings.h b/src/common/settings.h
index 625291e8..1a0fa6d7 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -18,18 +18,20 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef SETTINGS_H
-#define SETTINGS_H
+#pragma once
+
+#include "common-export.h"
 
 #include <QCoreApplication>
 #include <QHash>
 #include <QSettings>
 #include <QString>
 #include <QVariant>
+#include <utility>
 
 #include "quassel.h"
 
-class SettingsChangeNotifier : public QObject
+class COMMON_EXPORT SettingsChangeNotifier : public QObject
 {
     Q_OBJECT
 
@@ -41,7 +43,7 @@ private:
 };
 
 
-class Settings
+class COMMON_EXPORT Settings
 {
 public:
     enum Mode { Default, Custom };
@@ -98,8 +100,8 @@ public:
     bool isWritable();
 
 protected:
-    inline Settings(QString group_, QString appName_) : group(group_), appName(appName_) {}
-    inline virtual ~Settings() {}
+    inline Settings(QString group_, QString appName_) : group(std::move(group_)), appName(std::move(appName_)) {}
+    inline virtual ~Settings() = default;
 
     inline void setGroup(const QString &group_) { group = group_; }
 
@@ -108,7 +110,7 @@ protected:
     virtual QStringList localChildGroups(const QString &rootkey = QString());
 
     virtual void setLocalValue(const QString &key, const QVariant &data);
-    virtual const QVariant &localValue(const QString &key, const QVariant &def = QVariant());
+    virtual QVariant localValue(const QString &key, const QVariant &def = QVariant());
 
     /**
      * Gets if a key exists in settings
@@ -222,6 +224,3 @@ private:
         return settingsChangeNotifier.contains(normKey);
     }
 };
-
-
-#endif