/***************************************************************************
- * Copyright (C) 2005-2019 by the Quassel Project *
+ * Copyright (C) 2005-2022 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "bufferviewsettingspage.h"
+#include <algorithm>
#include <utility>
#include <QMessageBox>
// 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;
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);
}
else {
bufferIds = Client::networkModel()->allBufferIds();
- qSort(bufferIds);
+ std::sort(bufferIds.begin(), bufferIds.end());
config->setProperty("OriginalBufferList", toVariantList<BufferId>(bufferIds));
}
}