Commit c2427f3e authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Remove no longer needed code variants for older versions of KF5

parent 603a5e0f
......@@ -25,7 +25,6 @@
#include <KLocalizedString>
#include <kio/udsentry.h>
#include <kio_version.h>
#include <QCoreApplication>
#include <QFile>
......@@ -219,11 +218,7 @@ void DesktopProtocol::rename(const QUrl &_src, const QUrl &_dest, KIO::JobFlags
}
if (QFile(srcPath).rename(destPath)) {
#if KIO_VERSION >= QT_VERSION_CHECK(5, 20, 0)
org::kde::KDirNotify::emitFileRenamedWithLocalPath(_src, _dest, destPath);
#else
org::kde::KDirNotify::emitFileRenamed(_src, _dest);
#endif
finished();
} else {
error(KIO::ERR_CANNOT_RENAME, srcPath);
......
......@@ -25,7 +25,6 @@
#include <QTest>
#include <kio/job.h>
#include <kio/copyjob.h>
#include <kio_version.h>
class TestDesktop : public QObject
{
......@@ -98,15 +97,11 @@ private Q_SLOTS:
QVERIFY(!linkJob->exec());
QCOMPARE(linkJob->error(), (int)KIO::ERR_FILE_ALREADY_EXIST);
#if KIO_VERSION >= QT_VERSION_CHECK(5, 31, 0) // fixed since 5.30.0, actually, but playing it safe for pre-5.30-users
// Now try changing the link target, with Overwrite (bug 360487)
linkJob = KIO::symlink(m_testFileName + "3", desktopLink, KIO::Overwrite | KIO::HideProgressInfo);
QVERIFY(linkJob->exec());
QVERIFY(QFileInfo(localLink).isSymLink());
QCOMPARE(QFileInfo(localLink).symLinkTarget(), source + "3");
#else
QSKIP("Skipping symlink+Overwrite test, fixed in KIO 5.30.0");
#endif
}
void testRename_data()
......
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