Commit 46e84c48 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

We depend against new qt/kf5 version

parent f26e870a
......@@ -61,11 +61,7 @@ KGpgRootNode::addGroups(const QStringList &groups)
if (parts.count() < 2)
continue;
const QString groupName = parts.first();
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
new KGpgGroupNode(this, groupName, parts.at(1).split(QLatin1Char(';'), QString::SkipEmptyParts));
#else
new KGpgGroupNode(this, groupName, parts.at(1).split(QLatin1Char(';'), Qt::SkipEmptyParts));
#endif
}
}
......
......@@ -187,11 +187,7 @@ void KgpgTextEdit::slotEncode()
if (KGpgSettings::allowCustomEncryptionOptions()) {
const QString customoptions = dialog->getCustomOptions();
if (!customoptions.isEmpty())
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
options << customoptions.split(QLatin1Char(' '), QString::SkipEmptyParts);
#else
options << customoptions.split(QLatin1Char(' '), Qt::SkipEmptyParts);
#endif
}
if (KGpgSettings::pgpCompatibility())
......
......@@ -422,13 +422,8 @@ KeysManager::KeysManager(QWidget *parent)
KConfigGroup cg = KConfigGroup(KSharedConfig::openConfig().data(), "KeyView");
iview->restoreLayout(cg);
#if KWIDGETSADDONS_VERSION < QT_VERSION_CHECK(5, 78, 0)
connect(photoProps, QOverload<int>::of(&KSelectAction::triggered), this, &KeysManager::slotSetPhotoSize);
connect(trustProps, QOverload<int>::of(&KSelectAction::triggered), this, &KeysManager::slotSetTrustFilter);
#else
connect(photoProps, &KSelectAction::indexTriggered, this, &KeysManager::slotSetPhotoSize);
connect(trustProps, &KSelectAction::indexTriggered, this, &KeysManager::slotSetTrustFilter);
#endif
QLabel *searchLabel = new QLabel(i18n("Search:"), this);
m_listviewsearch = new QLineEdit(this);
......@@ -2736,11 +2731,7 @@ KeysManager::clipEncrypt()
QStringList options;
if (!dialog->getCustomOptions().isEmpty() && KGpgSettings::allowCustomEncryptionOptions())
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
options = dialog->getCustomOptions().split(QLatin1Char(' '), QString::SkipEmptyParts);
#else
options = dialog->getCustomOptions().split(QLatin1Char(' '), Qt::SkipEmptyParts);
#endif
if (dialog->getUntrusted())
encOptions |= KGpgEncrypt::AllowUntrustedEncryption;
......
......@@ -105,11 +105,7 @@ void KGpgExternalActions::slotEncryptionKeySelected()
const QString customopts = dialog->getCustomOptions();
if (!customopts.isEmpty())
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
opts << customopts.split(QLatin1Char(' '), QString::SkipEmptyParts);
#else
opts << customopts.split(QLatin1Char(' '), Qt::SkipEmptyParts);
#endif
}
QStringList keys = dialog->selectedKeys();
......@@ -185,11 +181,7 @@ void KGpgExternalActions::startFolderEncode()
QStringList selec = dialog->selectedKeys();
KGpgEncrypt::EncryptOptions encOptions = KGpgEncrypt::DefaultEncryption;
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
const QStringList encryptOptions = dialog->getCustomOptions().split(QLatin1Char(' '), QString::SkipEmptyParts);
#else
const QStringList encryptOptions = dialog->getCustomOptions().split(QLatin1Char(' '), Qt::SkipEmptyParts);
#endif
if (dialog->getSymmetric()) {
selec.clear();
} else {
......
......@@ -54,11 +54,7 @@ KGpgDecrypt::command() const
if (!m_outFilename.isEmpty())
ret << QLatin1String("-o") << m_outFilename;
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
ret << KGpgSettings::customDecrypt().simplified().split(QLatin1Char(' '), QString::SkipEmptyParts);
#else
ret << KGpgSettings::customDecrypt().simplified().split(QLatin1Char(' '), Qt::SkipEmptyParts);
#endif
return ret;
}
......
......@@ -324,11 +324,7 @@ bool KGpgTransactionPrivate::keyConsidered(const QString& line)
if (!line.startsWith(QLatin1String("[GNUPG:] KEY_CONSIDERED ")))
return false;
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
const QStringList &parts = line.split(QLatin1Char(' '), QString::SkipEmptyParts);
#else
const QStringList &parts = line.split(QLatin1Char(' '), Qt::SkipEmptyParts);
#endif
if (parts.count() < 3)
m_parent->setSuccess(KGpgTransaction::TS_MSG_SEQUENCE);
else if (!m_expectedFingerprints.isEmpty() &&
......
......@@ -122,11 +122,7 @@ KGpgVerify::getReport(const QStringList &log, const KGpgItemModel *model)
// VALIDSIG <fingerprint in hex> <sig_creation_date> <sig-timestamp>
// <expire-timestamp> <sig-version> <reserved> <pubkey-algo>
// <hash-algo> <sig-class> <primary-key-fpr>
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
const QStringList vsig = msg.mid(9).split(QLatin1Char(' '), QString::SkipEmptyParts);
#else
const QStringList vsig = msg.mid(9).split(QLatin1Char(' '), Qt::SkipEmptyParts);
#endif
Q_ASSERT(vsig.count() >= 10);
const KGpgKeyNode *node = model->findKeyNode(vsig[9]);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment