X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fsettingspages%2Fchatmonitorsettingspage.cpp;h=16c3627fbfa1c310ccda289abd93f221969c4846;hb=673ded0d543cbdc2cf6e746b6bee7c1d21af8f90;hp=22ee3056233af5ad2285328de59d923dba0f254f;hpb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;p=quassel.git

diff --git a/src/qtui/settingspages/chatmonitorsettingspage.cpp b/src/qtui/settingspages/chatmonitorsettingspage.cpp
index 22ee3056..16c3627f 100644
--- a/src/qtui/settingspages/chatmonitorsettingspage.cpp
+++ b/src/qtui/settingspages/chatmonitorsettingspage.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -30,6 +30,7 @@
 #include "client.h"
 #include "icon.h"
 #include "networkmodel.h"
+#include "util.h"
 
 ChatMonitorSettingsPage::ChatMonitorSettingsPage(QWidget* parent)
     : SettingsPage(tr("Interface"), tr("Chat Monitor"), parent)
@@ -116,12 +117,12 @@ void ChatMonitorSettingsPage::load()
             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);
-    _configAvailable->initSetBufferList(allBufferIds);
+    _configAvailable->setBufferList(allBufferIds);
     ui.availableBuffers->setFilteredModel(Client::bufferModel(), _configAvailable);
 
     setChangedState(false);
@@ -156,7 +157,7 @@ void ChatMonitorSettingsPage::save()
     // save list of active buffers
     QVariantList saveableBufferIdList;
     foreach (BufferId id, _configActive->bufferList()) {
-        saveableBufferIdList << QVariant::fromValue<BufferId>(id);
+        saveableBufferIdList << QVariant::fromValue(id);
     }
 
     chatViewSettings.setValue("Buffers", saveableBufferIdList);
@@ -189,7 +190,7 @@ bool ChatMonitorSettingsPage::testHasChanged()
     if (_configActive->bufferList().count() != settings["Buffers"].toList().count())
         return true;
 
-    QSet<BufferId> uiBufs = _configActive->bufferList().toSet();
+    QSet<BufferId> uiBufs = toQSet(_configActive->bufferList());
     QSet<BufferId> settingsBufs;
     foreach (QVariant v, settings["Buffers"].toList())
         settingsBufs << v.value<BufferId>();