squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-22 08:27:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11739 from Chocobo1/qt5_14

Browse Source 
Migrate away from deprecated API in Qt 5.14
This commit is contained in:
Mike Tzou
2019-12-26 12:43:04 +08:00
committed by GitHub
parent e62b550bfe f5f3dc2ba1
commit 5c3c1e07df
8 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/advancedsettings.cpp
View File

@@ -294,7 +294,7 @@ void AdvancedSettings::updateInterfaceAddressCombo()
m_comboBoxInterfaceAddress.addItem(tr("All IPv4 addresses"), QLatin1String("0.0.0.0"));
m_comboBoxInterfaceAddress.addItem(tr("All IPv6 addresses"), QLatin1String("::"));
const auto populateCombo = [this, &currentAddress](const QHostAddress &addr)
const auto populateCombo = [this](const QHostAddress &addr)
{
if (addr.protocol() == QAbstractSocket::IPv4Protocol) {
const QString str = addr.toString();

4
src/gui/qtnotify/notifications.h
View File

@@ -39,7 +39,7 @@ public Q_SLOTS: // METHODS
inline QDBusPendingReply<> CloseNotification(uint id)
{
QList<QVariant> argumentList;
argumentList << qVariantFromValue(id);
argumentList << QVariant::fromValue(id);
return asyncCallWithArgumentList(QLatin1String("CloseNotification"), argumentList);
}
@@ -69,7 +69,7 @@ public Q_SLOTS: // METHODS
inline QDBusPendingReply<uint> Notify(const QString &app_name, uint id, const QString &icon, const QString &summary, const QString &body, const QStringList &actions, const QVariantMap &hints, int timeout)
{
QList<QVariant> argumentList;
argumentList << qVariantFromValue(app_name) << qVariantFromValue(id) << qVariantFromValue(icon) << qVariantFromValue(summary) << qVariantFromValue(body) << qVariantFromValue(actions) << qVariantFromValue(hints) << qVariantFromValue(timeout);
argumentList << QVariant::fromValue(app_name) << QVariant::fromValue(id) << QVariant::fromValue(icon) << QVariant::fromValue(summary) << QVariant::fromValue(body) << QVariant::fromValue(actions) << QVariant::fromValue(hints) << QVariant::fromValue(timeout);
return asyncCallWithArgumentList(QLatin1String("Notify"), argumentList);
}

3
src/gui/transferlistsortmodel.cpp
View File

@@ -32,6 +32,7 @@
#include <QStringList>
#include "base/bittorrent/torrenthandle.h"
#include "base/global.h"
#include "base/types.h"
#include "base/utils/string.h"
#include "transferlistmodel.h"
@@ -73,7 +74,7 @@ void TransferListSortModel::disableTagFilter()
void TransferListSortModel::setTrackerFilter(const QStringList &hashes)
{
if (m_filter.setHashSet(hashes.toSet()))
if (m_filter.setHashSet(List::toSet(hashes)))
invalidateFilter();
}

2
src/gui/transferlistwidget.cpp
View File

@@ -1219,7 +1219,7 @@ void TransferListWidget::displayListMenu(const QPoint &)
}
// Tag Menu
QStringList tags(BitTorrent::Session::instance()->tags().toList());
QStringList tags(BitTorrent::Session::instance()->tags().values());
std::sort(tags.begin(), tags.end(), Utils::String::naturalLessThan<Qt::CaseInsensitive>);
QMenu *tagsMenu = listMenu->addMenu(UIThemeManager::instance()->getIcon("view-categories"), tr("Tags"));