X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuisettings.h;h=2453758a58a8f83afad56aab1aeeaaa27db4ba79;hp=3fc627ebaabdf29a168c3773e58ed97fe0bf590d;hb=cc6e7c08709c4e761e2fd9c2e322751015497003;hpb=92fc8c5b119111a35ab8423c3cbde5b2a022badf

diff --git a/src/uisupport/uisettings.h b/src/uisupport/uisettings.h
index 3fc627eb..2453758a 100644
--- a/src/uisupport/uisettings.h
+++ b/src/uisupport/uisettings.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -28,10 +28,10 @@
 class UISUPPORT_EXPORT UiSettings : public ClientSettings
 {
 public:
-    UiSettings(const QString &group = "Ui");
+    UiSettings(QString group = "Ui");
 
-    virtual inline void setValue(const QString &key, const QVariant &data) { setLocalValue(key, data); }
-    virtual inline QVariant value(const QString &key, const QVariant &def = QVariant()) { return localValue(key, def); }
+    virtual void setValue(const QString& key, const QVariant& data);
+    virtual QVariant value(const QString& key, const QVariant& def = {}) const;
 
     /**
      * Gets if a value exists in settings
@@ -39,35 +39,33 @@ public:
      * @param[in] key ID of local settings key
      * @returns True if key exists in settings, otherwise false
      */
-    virtual inline bool valueExists(const QString &key) { return localKeyExists(key); }
+    bool valueExists(const QString& key) const;
 
-    inline void remove(const QString &key) { removeLocalKey(key); }
+    void remove(const QString& key);
 };
 
-
 class UISUPPORT_EXPORT UiStyleSettings : public UiSettings
 {
 public:
     UiStyleSettings();
-    UiStyleSettings(const QString &subGroup);
+    UiStyleSettings(const QString& subGroup);
 
-    void setCustomFormat(UiStyle::FormatType, QTextCharFormat);
-    QTextCharFormat customFormat(UiStyle::FormatType);
+    void setCustomFormat(UiStyle::FormatType, const QTextCharFormat& format);
+    QTextCharFormat customFormat(UiStyle::FormatType) const;
 
     void removeCustomFormat(UiStyle::FormatType);
-    QList<UiStyle::FormatType> availableFormats();
+    QList<UiStyle::FormatType> availableFormats() const;
 };
 
-
 class UISUPPORT_EXPORT SessionSettings : public UiSettings
 {
 public:
-    SessionSettings(const QString &sessionId, const QString &group = "Session");
+    SessionSettings(QString sessionId, QString group = "Session");
 
-    virtual void setValue(const QString &key, const QVariant &data);
-    virtual QVariant value(const QString &key, const QVariant &def = QVariant());
+    void setValue(const QString& key, const QVariant& data) override;
+    QVariant value(const QString& key, const QVariant& def = {}) const override;
 
-    void removeKey(const QString &key);
+    void removeKey(const QString& key);
     void removeSession();
 
     void cleanup();
@@ -75,14 +73,13 @@ public:
 
     int sessionAge();
     void setSessionAge(int age);
-    inline const QString sessionId() { return _sessionId; };
-    inline void setSessionId(const QString &sessionId) { _sessionId = sessionId; }
+    QString sessionId() const;
+    void setSessionId(QString sessionId);
 
 private:
     QString _sessionId;
 };
 
-
 class UISUPPORT_EXPORT ShortcutSettings : public UiSettings
 {
 public:
@@ -91,8 +88,8 @@ public:
     //! Remove all stored shortcuts
     void clear();
 
-    QStringList savedShortcuts();
+    QStringList savedShortcuts() const;
 
-    void saveShortcut(const QString &name, const QKeySequence &shortcut);
-    QKeySequence loadShortcut(const QString &name);
+    void saveShortcut(const QString& name, const QKeySequence& shortcut);
+    QKeySequence loadShortcut(const QString& name) const;
 };