Commit bdd96138 authored by Laurent Montel's avatar Laurent Montel
Browse files

We depend against kf5.96

parent 09889e40
Pipeline #210013 passed with stage
in 3 minutes and 20 seconds
......@@ -13,7 +13,6 @@
#include <KLocalizedString>
#include <QCoreApplication>
#include <QDebug>
#include <kio_version.h>
#ifdef Q_OS_WIN
#include <Winsock2.h>
......@@ -164,13 +163,8 @@ void LDAPProtocol::LDAPErr(int err)
break;
default:
#if KIO_VERSION >= QT_VERSION_CHECK(5, 96, 0)
error(KIO::ERR_WORKER_DEFINED,
i18n("LDAP server returned the error: %1 %2\nThe LDAP URL was: %3", LdapConnection::errorString(err), extramsg, mServer.url().toDisplayString()));
#else
error(ERR_SLAVE_DEFINED,
i18n("LDAP server returned the error: %1 %2\nThe LDAP URL was: %3", LdapConnection::errorString(err), extramsg, mServer.url().toDisplayString()));
#endif
}
}
......@@ -683,11 +677,7 @@ void LDAPProtocol::put(const QUrl &_url, int, KIO::JobFlags flags)
break;
}
case Ldif::Err:
#if KIO_VERSION >= QT_VERSION_CHECK(5, 96, 0)
error(KIO::ERR_WORKER_DEFINED, i18n("Invalid Ldif file in line %1.", ldif.lineNumber()));
#else
error(ERR_SLAVE_DEFINED, i18n("Invalid Ldif file in line %1.", ldif.lineNumber()));
#endif
return;
}
} while (ret != Ldif::MoreData);
......
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