X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fbufferviewsettingspage.cpp;h=233016b3ae9cdfb5a615f3b3c02fec350ffb9570;hp=f4b7fb904213ea84a357403bbb8aec3190a77736;hb=1f21c1f9613031ae263eeed0c4883bfcd5488343;hpb=c1cf157116de7fc3da96203aa6f03c38c7ebb650

diff --git a/src/qtui/settingspages/bufferviewsettingspage.cpp b/src/qtui/settingspages/bufferviewsettingspage.cpp
index f4b7fb90..233016b3 100644
--- a/src/qtui/settingspages/bufferviewsettingspage.cpp
+++ b/src/qtui/settingspages/bufferviewsettingspage.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,6 +20,7 @@
 
 #include "bufferviewsettingspage.h"
 
+#include <algorithm>
 #include <utility>
 
 #include <QMessageBox>
@@ -125,12 +126,12 @@ void BufferViewSettingsPage::load()
     // load network selector
     ui.networkSelector->clear();
     ui.networkSelector->addItem(tr("All"));
-    ui.networkSelector->setItemData(0, qVariantFromValue<NetworkId>(NetworkId()));
+    ui.networkSelector->setItemData(0, QVariant::fromValue(NetworkId()));
     const Network* net;
     foreach (NetworkId netId, Client::networkIds()) {
         net = Client::network(netId);
         ui.networkSelector->addItem(net->networkName());
-        ui.networkSelector->setItemData(ui.networkSelector->count() - 1, qVariantFromValue<NetworkId>(net->networkId()));
+        ui.networkSelector->setItemData(ui.networkSelector->count() - 1, QVariant::fromValue(net->networkId()));
     }
     _ignoreWidgetChanges = false;
 
@@ -205,7 +206,7 @@ void BufferViewSettingsPage::coreConnectionStateChanged(bool state)
 void BufferViewSettingsPage::addBufferView(BufferViewConfig* config)
 {
     auto* item = new QListWidgetItem(config->bufferViewName(), ui.bufferViewList);
-    item->setData(Qt::UserRole, qVariantFromValue<QObject*>(qobject_cast<QObject*>(config)));
+    item->setData(Qt::UserRole, QVariant::fromValue(qobject_cast<QObject*>(config)));
     connect(config, &SyncableObject::updatedRemotely, this, &BufferViewSettingsPage::updateBufferView);
     connect(config, &QObject::destroyed, this, &BufferViewSettingsPage::bufferViewDeleted);
     ui.deleteBufferView->setEnabled(ui.bufferViewList->count() > 1);
@@ -248,11 +249,11 @@ void BufferViewSettingsPage::newBufferView(const QString& bufferViewName)
         }
         else {
             bufferIds = Client::networkModel()->allBufferIds();
-            qSort(bufferIds);
+            std::sort(bufferIds.begin(), bufferIds.end());
             config->setProperty("OriginalBufferList", toVariantList<BufferId>(bufferIds));
         }
     }
-    config->initSetBufferList(bufferIds);
+    config->setBufferList(bufferIds);
 
     _newBufferViews << config;
     addBufferView(config);
@@ -484,7 +485,7 @@ void BufferViewSettingsPage::saveConfig(BufferViewConfig* config)
         Client::networkModel()->sortBufferIds(bufferIds);
 
     if (!_newBufferViews.contains(config) || config->addNewBuffersAutomatically())
-        config->initSetBufferList(bufferIds);
+        config->setBufferList(bufferIds);
 }
 
 void BufferViewSettingsPage::widgetHasChanged()