modernize: Remove old-style slot usage in NetworkModelController

[quassel.git] / src / client / clientsettings.h

diff --git a/src/client/clientsettings.h b/src/client/clientsettings.h
index dd413e0..6c984ed 100644 (file)
--- a/src/client/clientsettings.h
+++ b/src/client/clientsettings.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,8 +18,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef CLIENTSETTINGS_H
-#define CLIENTSETTINGS_H
+#pragma once
+
+#include "client-export.h"
 
 #include "settings.h"
 
@@ -28,10 +29,8 @@
 class QHostAddress;
 class QSslSocket;
 
-class ClientSettings : public Settings
+class CLIENT_EXPORT ClientSettings : public Settings
 {
-public:
-    virtual ~ClientSettings();
 
 protected:
     ClientSettings(QString group = "General");
@@ -49,38 +48,38 @@ protected:
 //
 // Note that you'll get invalid data (and setting is ignored) if you are not connected to a core!
 
-class CoreAccountSettings : public ClientSettings
+class CLIENT_EXPORT CoreAccountSettings : public ClientSettings
 {
 public:
     // stores account-specific data in CoreAccounts/$ACCID/$SUBGROUP/$KEY)
-    CoreAccountSettings(const QString &subgroup = "General");
+    CoreAccountSettings(QString subgroup = "General");
 
-    virtual void notify(const QString &key, QObject *receiver, const char *slot);
+    void notify(const QString &key, QObject *receiver, const char *slot) const;  // shadows Settings::notify()
 
-    QList<AccountId> knownAccounts();
-    AccountId lastAccount();
+    QList<AccountId> knownAccounts() const;
+    AccountId lastAccount() const;
     void setLastAccount(AccountId);
-    AccountId autoConnectAccount();
+    AccountId autoConnectAccount() const;
     void setAutoConnectAccount(AccountId);
-    bool autoConnectOnStartup();
+    bool autoConnectOnStartup() const;
     void setAutoConnectOnStartup(bool);
-    bool autoConnectToFixedAccount();
+    bool autoConnectToFixedAccount() const;
     void setAutoConnectToFixedAccount(bool);
 
     void clearAccounts();
 
     void storeAccountData(AccountId id, const QVariantMap &data);
-    QVariantMap retrieveAccountData(AccountId);
+    QVariantMap retrieveAccountData(AccountId) const;
     void removeAccount(AccountId);
 
     void setJumpKeyMap(const QHash<int, BufferId> &keyMap);
-    QHash<int, BufferId> jumpKeyMap();
+    QHash<int, BufferId> jumpKeyMap() const;
 
     void setBufferViewOverlay(const QSet<int> &viewIds);
-    QSet<int> bufferViewOverlay();
+    QSet<int> bufferViewOverlay() const;
 
     void setAccountValue(const QString &key, const QVariant &data);
-    QVariant accountValue(const QString &key, const QVariant &def = QVariant());
+    QVariant accountValue(const QString &key, const QVariant &def = QVariant()) const;
 
 private:
     QString _subgroup;
@@ -90,7 +89,7 @@ private:
 // ========================================
 //  NotificationSettings
 // ========================================
-class NotificationSettings : public ClientSettings
+class CLIENT_EXPORT NotificationSettings : public ClientSettings
 {
 public:
     enum HighlightNickType {
@@ -101,18 +100,18 @@ public:
 
     NotificationSettings();
 
-    inline void setValue(const QString &key, const QVariant &data) { setLocalValue(key, data); }
-    inline QVariant value(const QString &key, const QVariant &def = QVariant()) { return localValue(key, def); }
-    inline void remove(const QString &key) { removeLocalKey(key); }
+    void setValue(const QString &key, const QVariant &data);
+    QVariant value(const QString &key, const QVariant &def = {}) const;
+    void remove(const QString &key);
 
     void setHighlightList(const QVariantList &highlightList);
-    QVariantList highlightList();
+    QVariantList highlightList() const;
 
     void setHighlightNick(HighlightNickType);
-    HighlightNickType highlightNick();
+    HighlightNickType highlightNick() const;
 
     void setNicksCaseSensitive(bool);
-    bool nicksCaseSensitive();
+    bool nicksCaseSensitive() const;
 };
 
 
@@ -120,7 +119,7 @@ public:
 // CoreConnectionSettings
 // ========================================
 
-class CoreConnectionSettings : public ClientSettings
+class CLIENT_EXPORT CoreConnectionSettings : public ClientSettings
 {
 public:
     enum NetworkDetectionMode {
@@ -132,16 +131,16 @@ public:
     CoreConnectionSettings();
 
     void setNetworkDetectionMode(NetworkDetectionMode mode);
-    NetworkDetectionMode networkDetectionMode();
+    NetworkDetectionMode networkDetectionMode() const;
 
     void setAutoReconnect(bool autoReconnect);
-    bool autoReconnect();
+    bool autoReconnect() const;
 
     void setPingTimeoutInterval(int interval);
-    int pingTimeoutInterval();
+    int pingTimeoutInterval() const;
 
     void setReconnectInterval(int interval);
-    int reconnectInterval();
+    int reconnectInterval() const;
 };
 
 
@@ -149,7 +148,7 @@ public:
 // TabCompletionSettings
 // ========================================
 
-class TabCompletionSettings : public ClientSettings
+class CLIENT_EXPORT TabCompletionSettings : public ClientSettings
 {
 public:
     enum SortMode {
@@ -160,33 +159,30 @@ public:
     TabCompletionSettings();
 
     void setCompletionSuffix(const QString &);
-    QString completionSuffix();
+    QString completionSuffix() const;
 
     void setAddSpaceMidSentence(bool);
-    bool addSpaceMidSentence();
+    bool addSpaceMidSentence() const;
 
     void setSortMode(SortMode);
-    SortMode sortMode();
+    SortMode sortMode() const;
 
     void setCaseSensitivity(Qt::CaseSensitivity);
-    Qt::CaseSensitivity caseSensitivity();
+    Qt::CaseSensitivity caseSensitivity() const;
 
     void setUseLastSpokenTo(bool);
-    bool useLastSpokenTo();
+    bool useLastSpokenTo() const;
 };
 
 
 // ========================================
 // ItemViewSettings
 // ========================================
-class ItemViewSettings : public ClientSettings
+class CLIENT_EXPORT ItemViewSettings : public ClientSettings
 {
 public:
     ItemViewSettings(const QString &group = "ItemViews");
 
-    bool displayTopicInTooltip();
-    bool mouseWheelChangesBuffer();
+    bool displayTopicInTooltip() const;
+    bool mouseWheelChangesBuffer() const;
 };
-
-
-#endif