From 382ace9c6987945480576a186014d13cb6984784 Mon Sep 17 00:00:00 2001 From: Albert Vaca Cintora Date: Thu, 20 Jul 2023 18:23:45 +0200 Subject: [PATCH] Remove check for Qt > 5.14 when minimum is 5.15 --- core/kdeconnectplugin.cpp | 5 +---- plugins/sftp/sftpplugin.cpp | 4 ---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/core/kdeconnectplugin.cpp b/core/kdeconnectplugin.cpp index 213ecbe54..b02be221d 100644 --- a/core/kdeconnectplugin.cpp +++ b/core/kdeconnectplugin.cpp @@ -23,12 +23,9 @@ KdeConnectPlugin::KdeConnectPlugin(QObject *parent, const QVariantList &args) d->m_device = qvariant_cast(args.at(0)); d->m_pluginName = args.at(1).toString(); -#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) const QStringList cap = args.at(2).toStringList(); d->m_outgoingCapabilties = QSet(cap.begin(), cap.end()); -#else - d->m_outgoingCapabilties = args.at(2).toStringList().toSet(); -#endif + d->m_config = nullptr; d->iconName = args.at(3).toString(); } diff --git a/plugins/sftp/sftpplugin.cpp b/plugins/sftp/sftpplugin.cpp index f98e45d83..a7f52caf5 100644 --- a/plugins/sftp/sftpplugin.cpp +++ b/plugins/sftp/sftpplugin.cpp @@ -123,12 +123,8 @@ bool SftpPlugin::startBrowsing() bool SftpPlugin::receivePacket(const NetworkPacket &np) { -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - const auto keys = np.body().keys().toSet(); -#else const QStringList keysList = np.body().keys(); const auto keys = QSet(keysList.begin(), keysList.end()); -#endif if (!(fields_c - keys).isEmpty() && !np.has(QStringLiteral("errorMessage"))) { // packet is invalid return false;