X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientsettings.h;h=c22eef8cf48b4119e5fd6e3d3e7c49e1456d8b60;hp=d2c3c4d71e17b8587d0a4f6fed12b3465c53eb81;hb=c194ed5fb3d15e14b9364f9796d3521910dc72fe;hpb=04315f46a16fc3627218377071e008b6b9744992

diff --git a/src/client/clientsettings.h b/src/client/clientsettings.h
index d2c3c4d7..c22eef8c 100644
--- a/src/client/clientsettings.h
+++ b/src/client/clientsettings.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 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,13 +48,13 @@ 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) override;
 
     QList<AccountId> knownAccounts();
     AccountId lastAccount();
@@ -90,7 +89,7 @@ private:
 // ========================================
 //  NotificationSettings
 // ========================================
-class NotificationSettings : public ClientSettings
+class CLIENT_EXPORT NotificationSettings : public ClientSettings
 {
 public:
     enum HighlightNickType {
@@ -120,11 +119,11 @@ public:
 // CoreConnectionSettings
 // ========================================
 
-class CoreConnectionSettings : public ClientSettings
+class CLIENT_EXPORT CoreConnectionSettings : public ClientSettings
 {
 public:
     enum NetworkDetectionMode {
-        UseSolid,
+        UseQNetworkConfigurationManager = 1, // UseSolid is gone
         UsePingTimeout,
         NoActiveDetection
     };
@@ -149,7 +148,7 @@ public:
 // TabCompletionSettings
 // ========================================
 
-class TabCompletionSettings : public ClientSettings
+class CLIENT_EXPORT TabCompletionSettings : public ClientSettings
 {
 public:
     enum SortMode {
@@ -179,7 +178,7 @@ public:
 // ========================================
 // ItemViewSettings
 // ========================================
-class ItemViewSettings : public ClientSettings
+class CLIENT_EXPORT ItemViewSettings : public ClientSettings
 {
 public:
     ItemViewSettings(const QString &group = "ItemViews");
@@ -187,6 +186,3 @@ public:
     bool displayTopicInTooltip();
     bool mouseWheelChangesBuffer();
 };
-
-
-#endif