sigproxy: Modernize RPC calls (remote signals)

[quassel.git] / src / common / bufferviewmanager.h

diff --git a/src/common/bufferviewmanager.h b/src/common/bufferviewmanager.h
index a18cb35..9d5eba6 100644 (file)
--- a/src/common/bufferviewmanager.h
+++ b/src/common/bufferviewmanager.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,62 +18,56 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef BUFFERVIEWMANAGER_H
-#define BUFFERVIEWMANAGER_H
+#pragma once
 
-#include "syncableobject.h"
+#include "common-export.h"
 
-#include <QList>
 #include <QHash>
+#include <QList>
+
+#include "syncableobject.h"
 
 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;
+    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);
 
-    virtual inline void requestCreateBufferView(const QVariantMap &properties) { REQUEST(ARG(properties)) }
-    virtual inline void requestCreateBufferViews(const QVariantList &properties) { REQUEST(ARG(properties)) }
+    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)) }
-    virtual inline void requestDeleteBufferViews(const QVariantList &bufferViews) { REQUEST(ARG(bufferViews)) }
+    virtual inline void requestDeleteBufferViews(const QVariantList& bufferViews) { REQUEST(ARG(bufferViews)) }
 
-signals:
-    void bufferViewConfigAdded(int bufferViewConfigId);
+    signals : void bufferViewConfigAdded(int bufferViewConfigId);
     void bufferViewConfigDeleted(int bufferViewConfigId);
-//   void createBufferViewRequested(const QVariantMap &properties);
-//   void createBufferViewsRequested(const QVariantList &properties);
-//   void deleteBufferViewRequested(int bufferViewId);
-//   void deleteBufferViewsRequested(const QVariantList &bufferViews);
+    //   void createBufferViewRequested(const QVariantMap &properties);
+    //   void createBufferViewsRequested(const QVariantList &properties);
+    //   void deleteBufferViewRequested(int bufferViewId);
+    //   void deleteBufferViewsRequested(const QVariantList &bufferViews);
 
 protected:
-    typedef QHash<int, BufferViewConfig *> BufferViewConfigHash;
-    inline const BufferViewConfigHash &bufferViewConfigHash() { return _bufferViewConfigs; }
-    virtual BufferViewConfig *bufferViewConfigFactory(int bufferViewConfigId);
+    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;
+    SignalProxy* _proxy;
 };
-
-
-#endif // BUFFERVIEWMANAGER_H