Commit 3638f589 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

We depend against qt5.15/kf5.90

parent d7a2055f
Pipeline #176750 failed with stage
in 4 minutes and 45 seconds
......@@ -18,11 +18,7 @@ SPDX-License-Identifier: MIT
#include <kfilterbase.h>
#include <karchive_version.h>
#if KARCHIVE_VERSION >= QT_VERSION_CHECK(5, 85, 0)
#include <KCompressionDevice>
#else
#include <KFilterDev>
#endif
#include "loggingcategory.h"
......@@ -64,11 +60,7 @@ FilterProtocol::FilterProtocol( const QByteArray & protocol, const QByteArray &p
(protocol == "zstd") ? QStringLiteral("application/zstd") :
QLatin1String("application/x-") + QLatin1String(protocol.constData());
#if KARCHIVE_VERSION >= QT_VERSION_CHECK(5, 85, 0)
filter = KCompressionDevice::filterForCompressionType(KCompressionDevice::compressionTypeForMimeType( mimetype ));
#else
filter = KCompressionDevice::filterForCompressionType(KFilterDev::compressionTypeForMimeType( mimetype ));
#endif
Q_ASSERT(filter);
}
......
......@@ -22,11 +22,7 @@
#include "man2html.h"
#include <karchive_version.h>
#if KARCHIVE_VERSION >= QT_VERSION_CHECK(5, 85, 0)
#include <KCompressionDevice>
#else
#include <KFilterDev>
#endif
using namespace KIO;
......@@ -585,11 +581,7 @@ char *MANProtocol::readManPage(const char *_filename)
qCDebug(KIO_MAN_LOG) << "resolved to " << filename;
}
#if KARCHIVE_VERSION >= QT_VERSION_CHECK(5, 85, 0)
KCompressionDevice fd(QFile::encodeName(filename));
#else
KFilterDev fd(QFile::encodeName(filename));
#endif
if (!fd.open(QIODevice::ReadOnly)) {
outputError(xi18nc("@info", "The man page <filename>%1</filename> could not be read.", QFile::decodeName(filename)));
......
......@@ -141,11 +141,7 @@
# include <QFileInfo>
# include <QDir>
# include <karchive_version.h>
# if KARCHIVE_VERSION >= QT_VERSION_CHECK(5, 85, 0)
# include <KCompressionDevice>
# else
# include <KFilterDev>
# endif
# define BYTEARRAY(x) x.constData()
#else
# include <KLocalizedString>
......@@ -6250,11 +6246,7 @@ void output_real(const char *insert)
char *read_man_page(const char *filename)
{
#if KARCHIVE_VERSION >= QT_VERSION_CHECK(5, 85, 0)
KCompressionDevice fd(QFile::decodeName(filename));
#else
KFilterDev fd(QFile::decodeName(filename));
#endif
if ( !fd.open(QIODevice::ReadOnly) )
{
std::cerr << "read_man_page: can not open " << filename << std::endl;
......
......@@ -9,13 +9,8 @@
#include "smburl.h"
#include <kdnssd_version.h>
#if KDNSSD_VERSION >= QT_VERSION_CHECK(5, 84, 0)
#include <KDNSSD/RemoteService>
#include <KDNSSD/ServiceBrowser>
#else
#include <DNSSD/RemoteService>
#include <DNSSD/ServiceBrowser>
#endif
#include <KIO/Job>
#include <KLocalizedString>
......
......@@ -784,11 +784,7 @@ bool ThumbnailProtocol::createSubThumbnail(QImage &thumbnail, const QString &fil
// The thumbnail has been created successfully. Check if we can store
// the thumbnail to the cache for future access.
#if KIO_VERSION >= QT_VERSION_CHECK(5, 83, 0)
if (subCreator->cacheThumbnail && metaData("cache").toInt() && !thumbnail.isNull()) {
#else
if (subCreator->cacheThumbnail && !thumbnail.isNull()) {
#endif
QString thumbPath;
const int wants = std::max(thumbnail.width(), thumbnail.height());
for (const auto &pool : pools) {
......
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