X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbufferviewmanager.h;h=c066d77d643bf115072beb2ed9182afb727dbba8;hp=bf3f95fe8e33cec16360556fbcb7981981f11c63;hb=8582c2ad5708a1972c85bea1cf8d81ad3ece4814;hpb=9fc57dc2c000e80fb8bd746a090e2e8210e1278e

diff --git a/src/common/bufferviewmanager.h b/src/common/bufferviewmanager.h
index bf3f95fe..c066d77d 100644
--- a/src/common/bufferviewmanager.h
+++ b/src/common/bufferviewmanager.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 BUFFERVIEWMANAGER_H
-#define BUFFERVIEWMANAGER_H
+#pragma once
+
+#include "common-export.h"
 
 #include "syncableobject.h"
 
@@ -29,29 +30,24 @@
 class BufferViewConfig;
 class SignalProxy;
 
-class BufferViewManager : public SyncableObject
+class COMMON_EXPORT BufferViewManager : public SyncableObject
 {
+    Q_OBJECT
     SYNCABLE_OBJECT
-        Q_OBJECT
 
 public:
-    BufferViewManager(SignalProxy *proxy, QObject *parent = 0);
-
-    inline virtual const QMetaObject *syncMetaObject() const { return &staticMetaObject; }
+    BufferViewManager(SignalProxy *proxy, QObject *parent = nullptr);
 
     inline QList<BufferViewConfig *> bufferViewConfigs() const { return _bufferViewConfigs.values(); }
     BufferViewConfig *bufferViewConfig(int bufferViewId) const;
 
 public slots:
-    void addBufferViewConfig(BufferViewConfig *config);
-    void addBufferViewConfig(int bufferViewConfigId);
-    inline void newBufferViewConfig(int bufferViewConfigId)  { addBufferViewConfig(bufferViewConfigId); }
-
-    void deleteBufferViewConfig(int bufferViewConfigId);
-
     QVariantList initBufferViewIds() const;
     void initSetBufferViewIds(const QVariantList bufferViewIds);
 
+    void addBufferViewConfig(int bufferViewConfigId);
+    void deleteBufferViewConfig(int bufferViewConfigId);
+
     virtual inline void requestCreateBufferView(const QVariantMap &properties) { REQUEST(ARG(properties)) }
     virtual inline void requestCreateBufferViews(const QVariantList &properties) { REQUEST(ARG(properties)) }
     virtual inline void requestDeleteBufferView(int bufferViewId) { REQUEST(ARG(bufferViewId)) }
@@ -66,14 +62,13 @@ signals:
 //   void deleteBufferViewsRequested(const QVariantList &bufferViews);
 
 protected:
-    typedef QHash<int, BufferViewConfig *> BufferViewConfigHash;
+    using  BufferViewConfigHash = QHash<int, BufferViewConfig *>;
     inline const BufferViewConfigHash &bufferViewConfigHash() { return _bufferViewConfigs; }
     virtual BufferViewConfig *bufferViewConfigFactory(int bufferViewConfigId);
 
+    void addBufferViewConfig(BufferViewConfig *config);
+
 private:
     BufferViewConfigHash _bufferViewConfigs;
     SignalProxy *_proxy;
 };
-
-
-#endif // BUFFERVIEWMANAGER_H