cleanup: Clean up BufferViewConfig

Only mark methods as slots that need to be slots. Don't return const
refs. Un-inline everything. Rename the overload of initSetBufferList()
that isn't actually used as an init setter to simply setBufferList()
to avoid confusion.

diff --git a/src/client/clientbufferviewmanager.cpp b/src/client/clientbufferviewmanager.cpp
index c473132..4741b0d 100644 (file)
--- a/src/client/clientbufferviewmanager.cpp
+++ b/src/client/clientbufferviewmanager.cpp
@@ -52,7 +52,7 @@ void ClientBufferViewManager::setInitialized()
     if (bufferViewConfigs().isEmpty()) {
         BufferViewConfig config(-1);
         config.setBufferViewName(tr("All Chats"));
     if (bufferViewConfigs().isEmpty()) {
         BufferViewConfig config(-1);
         config.setBufferViewName(tr("All Chats"));

-        config.initSetBufferList(Client::networkModel()->allBufferIdsSorted());
+        config.setBufferList(Client::networkModel()->allBufferIdsSorted());

         requestCreateBufferView(config.toVariantMap());
     }
     BufferViewManager::setInitialized();
         requestCreateBufferView(config.toVariantMap());
     }
     BufferViewManager::setInitialized();

diff --git a/src/common/bufferviewconfig.cpp b/src/common/bufferviewconfig.cpp
index fff1ef1..91602a6 100644 (file)
--- a/src/common/bufferviewconfig.cpp
+++ b/src/common/bufferviewconfig.cpp
@@ -35,6 +35,138 @@ BufferViewConfig::BufferViewConfig(int bufferViewId, const QVariantMap& properti
     setObjectName(QString::number(bufferViewId));
 }
 
     setObjectName(QString::number(bufferViewId));
 }
 

+int BufferViewConfig::bufferViewId() const
+{
+    return _bufferViewId;
+}
+
+QString BufferViewConfig::bufferViewName() const
+{
+    return _bufferViewName;
+}
+
+NetworkId BufferViewConfig::networkId() const
+{
+    return _networkId;
+}
+
+bool BufferViewConfig::addNewBuffersAutomatically() const
+{
+    return _addNewBuffersAutomatically;
+}
+
+bool BufferViewConfig::sortAlphabetically() const
+{
+    return _sortAlphabetically;
+}
+
+bool BufferViewConfig::disableDecoration() const
+{
+    return _disableDecoration;
+}
+
+int BufferViewConfig::allowedBufferTypes() const
+{
+    return _allowedBufferTypes;
+}
+
+int BufferViewConfig::minimumActivity() const
+{
+    return _minimumActivity;
+}
+
+bool BufferViewConfig::hideInactiveBuffers() const
+{
+    return _hideInactiveBuffers;
+}
+
+bool BufferViewConfig::hideInactiveNetworks() const
+{
+    return _hideInactiveNetworks;
+}
+
+bool BufferViewConfig::showSearch() const
+{
+    return _showSearch;
+}
+
+QList<BufferId> BufferViewConfig::bufferList() const
+{
+    return _buffers;
+}
+
+QSet<BufferId> BufferViewConfig::removedBuffers() const
+{
+    return _removedBuffers;
+}
+
+QSet<BufferId> BufferViewConfig::temporarilyRemovedBuffers() const
+{
+    return _temporarilyRemovedBuffers;
+}
+
+QVariantList BufferViewConfig::initBufferList() const
+{
+    QVariantList buffers;
+
+    foreach (BufferId bufferId, _buffers) {
+        buffers << qVariantFromValue(bufferId);
+    }
+
+    return buffers;
+}
+
+void BufferViewConfig::initSetBufferList(const QVariantList& buffers)
+{
+    _buffers.clear();
+
+    foreach (QVariant buffer, buffers) {
+        _buffers << buffer.value<BufferId>();
+    }
+
+    emit configChanged();  // used to track changes in the settingspage
+}
+
+QVariantList BufferViewConfig::initRemovedBuffers() const
+{
+    QVariantList removedBuffers;
+
+    foreach (BufferId bufferId, _removedBuffers) {
+        removedBuffers << qVariantFromValue(bufferId);
+    }
+
+    return removedBuffers;
+}
+
+void BufferViewConfig::initSetRemovedBuffers(const QVariantList& buffers)
+{
+    _removedBuffers.clear();
+
+    foreach (QVariant buffer, buffers) {
+        _removedBuffers << buffer.value<BufferId>();
+    }
+}
+
+QVariantList BufferViewConfig::initTemporarilyRemovedBuffers() const
+{
+    QVariantList temporarilyRemovedBuffers;
+
+    foreach (BufferId bufferId, _temporarilyRemovedBuffers) {
+        temporarilyRemovedBuffers << qVariantFromValue(bufferId);
+    }
+
+    return temporarilyRemovedBuffers;
+}
+
+void BufferViewConfig::initSetTemporarilyRemovedBuffers(const QVariantList& buffers)
+{
+    _temporarilyRemovedBuffers.clear();
+
+    foreach (QVariant buffer, buffers) {
+        _temporarilyRemovedBuffers << buffer.value<BufferId>();
+    }
+}
+

 void BufferViewConfig::setBufferViewName(const QString& bufferViewName)
 {
     if (_bufferViewName == bufferViewName)
 void BufferViewConfig::setBufferViewName(const QString& bufferViewName)
 {
     if (_bufferViewName == bufferViewName)


@@ -136,77 +268,10 @@ void BufferViewConfig::setShowSearch(bool showSearch)
     emit configChanged();
 }
 
     emit configChanged();
 }
 

-QVariantList BufferViewConfig::initBufferList() const
-{
-    QVariantList buffers;
-
-    foreach (BufferId bufferId, _buffers) {
-        buffers << qVariantFromValue(bufferId);
-    }
-
-    return buffers;
-}
-
-void BufferViewConfig::initSetBufferList(const QVariantList& buffers)
+void BufferViewConfig::setBufferList(const QList<BufferId>& buffers)

 {
 {

-    _buffers.clear();
-
-    foreach (QVariant buffer, buffers) {
-        _buffers << buffer.value<BufferId>();
-    }
-
-    emit configChanged();  // used to track changes in the settingspage
-}
-
-void BufferViewConfig::initSetBufferList(const QList<BufferId>& buffers)
-{
-    _buffers.clear();
-
-    foreach (BufferId bufferId, buffers) {
-        _buffers << bufferId;
-    }
-
-    emit configChanged();  // used to track changes in the settingspage
-}
-
-QVariantList BufferViewConfig::initRemovedBuffers() const
-{
-    QVariantList removedBuffers;
-
-    foreach (BufferId bufferId, _removedBuffers) {
-        removedBuffers << qVariantFromValue(bufferId);
-    }
-
-    return removedBuffers;
-}
-
-void BufferViewConfig::initSetRemovedBuffers(const QVariantList& buffers)
-{
-    _removedBuffers.clear();
-
-    foreach (QVariant buffer, buffers) {
-        _removedBuffers << buffer.value<BufferId>();
-    }
-}
-
-QVariantList BufferViewConfig::initTemporarilyRemovedBuffers() const
-{
-    QVariantList temporarilyRemovedBuffers;
-
-    foreach (BufferId bufferId, _temporarilyRemovedBuffers) {
-        temporarilyRemovedBuffers << qVariantFromValue(bufferId);
-    }
-
-    return temporarilyRemovedBuffers;
-}
-
-void BufferViewConfig::initSetTemporarilyRemovedBuffers(const QVariantList& buffers)
-{
-    _temporarilyRemovedBuffers.clear();
-
-    foreach (QVariant buffer, buffers) {
-        _temporarilyRemovedBuffers << buffer.value<BufferId>();
-    }
+    _buffers = buffers;
+    emit configChanged();

 }
 
 void BufferViewConfig::addBuffer(const BufferId& bufferId, int pos)
 }
 
 void BufferViewConfig::addBuffer(const BufferId& bufferId, int pos)


@@ -275,3 +340,28 @@ void BufferViewConfig::removeBufferPermanently(const BufferId& bufferId)
     emit bufferPermanentlyRemoved(bufferId);
     emit configChanged();
 }
     emit bufferPermanentlyRemoved(bufferId);
     emit configChanged();
 }

+
+void BufferViewConfig::requestSetBufferViewName(const QString& bufferViewName)
+{
+    REQUEST(ARG(bufferViewName))
+}
+
+void BufferViewConfig::requestAddBuffer(const BufferId& bufferId, int pos)
+{
+    REQUEST(ARG(bufferId), ARG(pos))
+}
+
+void BufferViewConfig::requestMoveBuffer(const BufferId& bufferId, int pos)
+{
+    REQUEST(ARG(bufferId), ARG(pos))
+}
+
+void BufferViewConfig::requestRemoveBuffer(const BufferId& bufferId)
+{
+    REQUEST(ARG(bufferId))
+}
+
+void BufferViewConfig::requestRemoveBufferPermanently(const BufferId& bufferId)
+{
+    REQUEST(ARG(bufferId))
+}

diff --git a/src/common/bufferviewconfig.h b/src/common/bufferviewconfig.h
index 2d803de..a345cb5 100644 (file)
--- a/src/common/bufferviewconfig.h
+++ b/src/common/bufferviewconfig.h
@@ -46,85 +46,68 @@ public:
     BufferViewConfig(int bufferViewId, QObject* parent = nullptr);
     BufferViewConfig(int bufferViewId, const QVariantMap& properties, QObject* parent = nullptr);
 
     BufferViewConfig(int bufferViewId, QObject* parent = nullptr);
     BufferViewConfig(int bufferViewId, const QVariantMap& properties, QObject* parent = nullptr);
 

+public:
+    int bufferViewId() const;
+    QString bufferViewName() const;
+    NetworkId networkId() const;
+    bool addNewBuffersAutomatically() const;
+    bool sortAlphabetically() const;
+    bool disableDecoration() const;
+    int allowedBufferTypes() const;
+    int minimumActivity() const;
+    bool hideInactiveBuffers() const;
+    bool hideInactiveNetworks() const;
+    bool showSearch() const;
+
+    QList<BufferId> bufferList() const;
+    QSet<BufferId> removedBuffers() const;
+    QSet<BufferId> temporarilyRemovedBuffers() const;
+

 public slots:
 public slots:

-    inline int bufferViewId() const { return _bufferViewId; }
+    QVariantList initBufferList() const;
+    void initSetBufferList(const QVariantList& buffers);

 
 

-    inline const QString& bufferViewName() const { return _bufferViewName; }
-    void setBufferViewName(const QString& bufferViewName);
+    QVariantList initRemovedBuffers() const;
+    void initSetRemovedBuffers(const QVariantList& buffers);

 
 

-    inline const NetworkId& networkId() const { return _networkId; }
-    void setNetworkId(const NetworkId& networkId);
+    QVariantList initTemporarilyRemovedBuffers() const;
+    void initSetTemporarilyRemovedBuffers(const QVariantList& buffers);

 
 

-    inline bool addNewBuffersAutomatically() const { return _addNewBuffersAutomatically; }
+    void setBufferViewName(const QString& bufferViewName);
+    void setNetworkId(const NetworkId& networkId);

     void setAddNewBuffersAutomatically(bool addNewBuffersAutomatically);
     void setAddNewBuffersAutomatically(bool addNewBuffersAutomatically);

-
-    inline bool sortAlphabetically() const { return _sortAlphabetically; }

     void setSortAlphabetically(bool sortAlphabetically);
     void setSortAlphabetically(bool sortAlphabetically);

-
-    inline bool disableDecoration() const { return _disableDecoration; }

     void setDisableDecoration(bool disableDecoration);
     void setDisableDecoration(bool disableDecoration);

-
-    inline int allowedBufferTypes() const { return _allowedBufferTypes; }

     void setAllowedBufferTypes(int bufferTypes);
     void setAllowedBufferTypes(int bufferTypes);

-
-    inline int minimumActivity() const { return _minimumActivity; }

     void setMinimumActivity(int activity);
     void setMinimumActivity(int activity);

-
-    inline bool hideInactiveBuffers() const { return _hideInactiveBuffers; }

     void setHideInactiveBuffers(bool hideInactiveBuffers);
     void setHideInactiveBuffers(bool hideInactiveBuffers);

-
-    inline bool hideInactiveNetworks() const { return _hideInactiveNetworks; }

     void setHideInactiveNetworks(bool hideInactiveNetworks);
     void setHideInactiveNetworks(bool hideInactiveNetworks);

-
-    inline bool showSearch() const { return _showSearch; }

     void setShowSearch(bool showSearch);
 
     void setShowSearch(bool showSearch);
 

-    virtual inline void requestSetBufferViewName(const QString& bufferViewName) { REQUEST(ARG(bufferViewName)) }
-
-    const QList<BufferId>& bufferList() const { return _buffers; }
-    const QSet<BufferId>& removedBuffers() const { return _removedBuffers; }
-    const QSet<BufferId>& temporarilyRemovedBuffers() const { return _temporarilyRemovedBuffers; }
-
-    QVariantList initBufferList() const;
-    void initSetBufferList(const QVariantList& buffers);
-    void initSetBufferList(const QList<BufferId>& buffers);
-
-    QVariantList initRemovedBuffers() const;
-    void initSetRemovedBuffers(const QVariantList& buffers);
-
-    QVariantList initTemporarilyRemovedBuffers() const;
-    void initSetTemporarilyRemovedBuffers(const QVariantList& buffers);
+    void setBufferList(const QList<BufferId>& buffers);

 
     void addBuffer(const BufferId& bufferId, int pos);
 
     void addBuffer(const BufferId& bufferId, int pos);

-    virtual inline void requestAddBuffer(const BufferId& bufferId, int pos) { REQUEST(ARG(bufferId), ARG(pos)) }

     void moveBuffer(const BufferId& bufferId, int pos);
     void moveBuffer(const BufferId& bufferId, int pos);

-    virtual inline void requestMoveBuffer(const BufferId& bufferId, int pos) { REQUEST(ARG(bufferId), ARG(pos)) }

     void removeBuffer(const BufferId& bufferId);
     void removeBuffer(const BufferId& bufferId);

-    virtual inline void requestRemoveBuffer(const BufferId& bufferId) { REQUEST(ARG(bufferId)) }

     void removeBufferPermanently(const BufferId& bufferId);
     void removeBufferPermanently(const BufferId& bufferId);

-    virtual inline void requestRemoveBufferPermanently(const BufferId& bufferId){REQUEST(ARG(bufferId))}

 
 

-    signals : void bufferViewNameSet(const QString& bufferViewName);  // invalidate
+    virtual void requestSetBufferViewName(const QString& bufferViewName);
+    virtual void requestAddBuffer(const BufferId& bufferId, int pos);
+    virtual void requestMoveBuffer(const BufferId& bufferId, int pos);
+    virtual void requestRemoveBuffer(const BufferId& bufferId);
+    virtual void requestRemoveBufferPermanently(const BufferId& bufferId);
+
+signals:

     void configChanged();
     void configChanged();

+
+    void bufferViewNameSet(const QString& bufferViewName);

     void networkIdSet(const NetworkId& networkId);
     void networkIdSet(const NetworkId& networkId);

-    //   void addNewBuffersAutomaticallySet(bool addNewBuffersAutomatically); // invalidate
-    //   void sortAlphabeticallySet(bool sortAlphabetically); // invalidate
-    //   //  void disableDecorationSet(bool disableDecoration); // invalidate
-    //   void allowedBufferTypesSet(int allowedBufferTypes); // invalidate
-    //   void minimumActivitySet(int activity); // invalidate
-    //   void hideInactiveBuffersSet(bool hideInactiveBuffers); // invalidate
-    void bufferListSet();  // invalidate
+    void bufferListSet();

 
     void bufferAdded(const BufferId& bufferId, int pos);
 
     void bufferAdded(const BufferId& bufferId, int pos);

-    //   void addBufferRequested(const BufferId &bufferId, int pos);

     void bufferMoved(const BufferId& bufferId, int pos);
     void bufferMoved(const BufferId& bufferId, int pos);

-    //   void moveBufferRequested(const BufferId &bufferId, int pos);

     void bufferRemoved(const BufferId& bufferId);
     void bufferPermanentlyRemoved(const BufferId& bufferId);
     void bufferRemoved(const BufferId& bufferId);
     void bufferPermanentlyRemoved(const BufferId& bufferId);

-    //   void removeBufferRequested(const BufferId &bufferId);
-    //   void removeBufferPermanentlyRequested(const BufferId &bufferId);
-
-    //   void setBufferViewNameRequested(const QString &bufferViewName);

 
 private:
     int _bufferViewId = 0;         ///< ID of the associated BufferView
 
 private:
     int _bufferViewId = 0;         ///< ID of the associated BufferView

diff --git a/src/qtui/settingspages/bufferviewsettingspage.cpp b/src/qtui/settingspages/bufferviewsettingspage.cpp
index f4b7fb9..83323b2 100644 (file)
--- a/src/qtui/settingspages/bufferviewsettingspage.cpp
+++ b/src/qtui/settingspages/bufferviewsettingspage.cpp
@@ -252,7 +252,7 @@ void BufferViewSettingsPage::newBufferView(const QString& bufferViewName)
             config->setProperty("OriginalBufferList", toVariantList<BufferId>(bufferIds));
         }
     }
             config->setProperty("OriginalBufferList", toVariantList<BufferId>(bufferIds));
         }
     }

-    config->initSetBufferList(bufferIds);
+    config->setBufferList(bufferIds);

 
     _newBufferViews << config;
     addBufferView(config);
 
     _newBufferViews << config;
     addBufferView(config);


@@ -484,7 +484,7 @@ void BufferViewSettingsPage::saveConfig(BufferViewConfig* config)
         Client::networkModel()->sortBufferIds(bufferIds);
 
     if (!_newBufferViews.contains(config) || config->addNewBuffersAutomatically())
         Client::networkModel()->sortBufferIds(bufferIds);
 
     if (!_newBufferViews.contains(config) || config->addNewBuffersAutomatically())

-        config->initSetBufferList(bufferIds);
+        config->setBufferList(bufferIds);

 }
 
 void BufferViewSettingsPage::widgetHasChanged()
 }
 
 void BufferViewSettingsPage::widgetHasChanged()

diff --git a/src/qtui/settingspages/chatmonitorsettingspage.cpp b/src/qtui/settingspages/chatmonitorsettingspage.cpp
index 22ee305..16a4ca9 100644 (file)
--- a/src/qtui/settingspages/chatmonitorsettingspage.cpp
+++ b/src/qtui/settingspages/chatmonitorsettingspage.cpp
@@ -116,12 +116,12 @@ void ChatMonitorSettingsPage::load()
             allBufferIds.removeAll(v.value<BufferId>());
         }
         Client::networkModel()->sortBufferIds(bufferIdsFromConfig);
             allBufferIds.removeAll(v.value<BufferId>());
         }
         Client::networkModel()->sortBufferIds(bufferIdsFromConfig);

-        _configActive->initSetBufferList(bufferIdsFromConfig);
+        _configActive->setBufferList(bufferIdsFromConfig);

     }
     ui.activeBuffers->setFilteredModel(Client::bufferModel(), _configActive);
 
     Client::networkModel()->sortBufferIds(allBufferIds);
     }
     ui.activeBuffers->setFilteredModel(Client::bufferModel(), _configActive);
 
     Client::networkModel()->sortBufferIds(allBufferIds);

-    _configAvailable->initSetBufferList(allBufferIds);
+    _configAvailable->setBufferList(allBufferIds);

     ui.availableBuffers->setFilteredModel(Client::bufferModel(), _configAvailable);
 
     setChangedState(false);
     ui.availableBuffers->setFilteredModel(Client::bufferModel(), _configAvailable);
 
     setChangedState(false);