Commit 130c1019 authored by Christoph Cullmann's avatar Christoph Cullmann 🐮
Browse files

remove more guards for KF < 5.90

parent a273bee4
Pipeline #155407 passed with stage
in 5 minutes and 8 seconds
......@@ -142,13 +142,6 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor(KateExternalTool *t
ui.setupUi(this);
ui.btnIcon->setIconSize(KIconLoader::SizeSmall);
#if KTEXTEDITOR_VERSION < QT_VERSION_CHECK(5, 90, 0)
{
auto v = qobject_cast<QListView *>(ui.cmbTrigger->view());
v->setRowHidden(1, true);
}
#endif
connect(ui.buttonBox, &QDialogButtonBox::accepted, this, &KateExternalToolServiceEditor::slotOKClicked);
connect(ui.buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
connect(ui.btnMimeType, &QToolButton::clicked, this, &KateExternalToolServiceEditor::showMTDlg);
......
......@@ -18,11 +18,7 @@
#include <KConfigGroup>
#include <KLocalizedString>
#if KCOREADDONS_VERSION >= QT_VERSION_CHECK(5, 85, 0)
#include <KNetworkMounts>
#endif
#include <KSharedConfig>
#include <QCoreApplication>
......@@ -272,9 +268,7 @@ bool KateProjectPlugin::closeProject(KateProject *project)
KateProject *KateProjectPlugin::projectForUrl(const QUrl &url)
{
if (url.isEmpty() || !url.isLocalFile()
#if KCOREADDONS_VERSION >= QT_VERSION_CHECK(5, 85, 0)
|| KNetworkMounts::self()->isOptionEnabledForPath(url.toLocalFile(), KNetworkMounts::MediumSideEffectsOptimizations)
#endif
) {
return nullptr;
}
......
......@@ -15,11 +15,7 @@
#include <KConfigGui>
#include <KLocalizedString>
#include <KMessageBox>
#if KCOREADDONS_VERSION >= QT_VERSION_CHECK(5, 85, 0)
#include <KNetworkMounts>
#endif
#include <KSharedConfig>
#include <KStartupInfo>
#include <KWindowInfo>
......@@ -213,9 +209,7 @@ bool KateApp::startupKate()
// this file is no local dir, open it, else warn
bool noDir = !info.url.isLocalFile()
#if KCOREADDONS_VERSION >= QT_VERSION_CHECK(5, 85, 0)
|| KNetworkMounts::self()->isOptionEnabledForPath(info.url.toLocalFile(), KNetworkMounts::LowSideEffectsOptimizations)
#endif
|| !QFileInfo(info.url.toLocalFile()).isDir();
if (noDir) {
......@@ -317,9 +311,7 @@ KTextEditor::Document *KateApp::openDocUrl(const QUrl &url, const QString &encod
// this file is no local dir, open it, else warn
bool noDir = !url.isLocalFile()
#if KCOREADDONS_VERSION >= QT_VERSION_CHECK(5, 85, 0)
|| KNetworkMounts::self()->isOptionEnabledForPath(url.toLocalFile(), KNetworkMounts::LowSideEffectsOptimizations)
#endif
|| !QFileInfo(url.toLocalFile()).isDir();
KTextEditor::Document *doc = nullptr;
......
......@@ -22,11 +22,8 @@
#include <KIO/DeleteJob>
#include <KLocalizedString>
#include <KMessageBox>
#include <KSharedConfig>
#if KCOREADDONS_VERSION >= QT_VERSION_CHECK(5, 85, 0)
#include <KNetworkMounts>
#endif
#include <KSharedConfig>
#include <QApplication>
#include <QFileDialog>
......@@ -113,9 +110,7 @@ static QUrl normalizeUrl(const QUrl &url)
{
// Resolve symbolic links for local files (done anyway in KTextEditor)
if (url.isLocalFile()
#if KCOREADDONS_VERSION >= QT_VERSION_CHECK(5, 85, 0)
&& !KNetworkMounts::self()->isOptionEnabledForPath(url.toLocalFile(), KNetworkMounts::StrongSideEffectsOptimizations)
#endif
) {
QString normalizedUrl = QFileInfo(url.toLocalFile()).canonicalFilePath();
if (!normalizedUrl.isEmpty()) {
......
Supports Markdown
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