Hello community, here is the log from the commit of package karchive for openSUSE:Factory checked in at 2018-05-18 14:18:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/karchive (Old) and /work/SRC/openSUSE:Factory/.karchive.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "karchive" Fri May 18 14:18:53 2018 rev:53 rq:607536 version:5.46.0 Changes: -------- --- /work/SRC/openSUSE:Factory/karchive/karchive.changes 2018-04-19 15:15:37.676602768 +0200 +++ /work/SRC/openSUSE:Factory/.karchive.new/karchive.changes 2018-05-18 14:20:11.895336677 +0200 @@ -1,0 +2,10 @@ +Sun May 13 21:03:00 UTC 2018 - [email protected] + +- Update to 5.46.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.46.0.php +- Changes since 5.45.0: + * Use override + +------------------------------------------------------------------- Old: ---- karchive-5.45.0.tar.xz New: ---- karchive-5.46.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ karchive.spec ++++++ --- /var/tmp/diff_new_pack.urzdZs/_old 2018-05-18 14:20:12.619310109 +0200 +++ /var/tmp/diff_new_pack.urzdZs/_new 2018-05-18 14:20:12.623309963 +0200 @@ -17,13 +17,13 @@ %define lname libKF5Archive5 -%define _tar_path 5.45 +%define _tar_path 5.46 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: karchive -Version: 5.45.0 +Version: 5.46.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} ++++++ karchive-5.45.0.tar.xz -> karchive-5.46.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.45.0/CMakeLists.txt new/karchive-5.46.0/CMakeLists.txt --- old/karchive-5.45.0/CMakeLists.txt 2018-04-07 09:46:37.000000000 +0200 +++ new/karchive-5.46.0/CMakeLists.txt 2018-05-05 14:38:16.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.45.0") # handled by release scripts +set(KF5_VERSION "5.46.0") # handled by release scripts project(KArchive VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.45.0 NO_MODULE) +find_package(ECM 5.46.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.45.0/src/k7zip.cpp new/karchive-5.46.0/src/k7zip.cpp --- old/karchive-5.45.0/src/k7zip.cpp 2018-04-07 09:46:37.000000000 +0200 +++ new/karchive-5.46.0/src/k7zip.cpp 2018-05-05 14:38:16.000000000 +0200 @@ -177,7 +177,7 @@ * @return the content of this file. * Call data() with care (only once per file), this data isn't cached. */ - QByteArray data() const Q_DECL_OVERRIDE; + QByteArray data() const override; /** * This method returns QIODevice (internal class: KLimitedIODevice) @@ -189,7 +189,7 @@ * The returned device auto-opens (in readonly mode), no need to open it. * @return the QIODevice of the file */ - QIODevice *createDevice() const Q_DECL_OVERRIDE; + QIODevice *createDevice() const override; private: const QByteArray m_data; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.45.0/src/k7zip.h new/karchive-5.46.0/src/k7zip.h --- old/karchive-5.45.0/src/k7zip.h 2018-04-07 09:46:37.000000000 +0200 +++ new/karchive-5.46.0/src/k7zip.h 2018-05-05 14:38:16.000000000 +0200 @@ -61,19 +61,19 @@ /// Reimplemented from KArchive bool doWriteSymLink(const QString &name, const QString &target, const QString &user, const QString &group, - mode_t perm, const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) Q_DECL_OVERRIDE; + mode_t perm, const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) override; /// Reimplemented from KArchive bool doWriteDir(const QString &name, const QString &user, const QString &group, - mode_t perm, const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) Q_DECL_OVERRIDE; + mode_t perm, const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) override; /// Reimplemented from KArchive bool doPrepareWriting(const QString &name, const QString &user, const QString &group, qint64 size, mode_t perm, - const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) Q_DECL_OVERRIDE; + const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) override; /// Reimplemented from KArchive - bool doFinishWriting(qint64 size) Q_DECL_OVERRIDE; + bool doFinishWriting(qint64 size) override; /// Reimplemented from KArchive - bool writeData(const char *data, qint64 size) Q_DECL_OVERRIDE; + bool writeData(const char *data, qint64 size) override; /** * Opens the archive for reading. @@ -81,11 +81,11 @@ * and creates the KArchiveDirectory/KArchiveFile entries. * @param mode the mode of the file */ - bool openArchive(QIODevice::OpenMode mode) Q_DECL_OVERRIDE; - bool closeArchive() Q_DECL_OVERRIDE; + bool openArchive(QIODevice::OpenMode mode) override; + bool closeArchive() override; protected: - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; + void virtual_hook(int id, void *data) override; private: class K7ZipPrivate; K7ZipPrivate *const d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.45.0/src/kar.h new/karchive-5.46.0/src/kar.h --- old/karchive-5.45.0/src/kar.h 2018-04-07 09:46:37.000000000 +0200 +++ new/karchive-5.46.0/src/kar.h 2018-05-05 14:38:16.000000000 +0200 @@ -60,24 +60,24 @@ * @return always false */ bool doPrepareWriting(const QString &name, const QString &user, const QString &group, qint64 size, - mode_t perm, const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) Q_DECL_OVERRIDE; + mode_t perm, const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) override; /* * Writing is not supported by this class, will always fail. * @return always false */ - bool doFinishWriting(qint64 size) Q_DECL_OVERRIDE; + bool doFinishWriting(qint64 size) override; /* * Writing is not supported by this class, will always fail. * @return always false */ bool doWriteDir(const QString &name, const QString &user, const QString &group, - mode_t perm, const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) Q_DECL_OVERRIDE; + mode_t perm, const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) override; bool doWriteSymLink(const QString &name, const QString &target, const QString &user, const QString &group, mode_t perm, - const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) Q_DECL_OVERRIDE; + const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) override; /** * Opens the archive for reading. @@ -85,11 +85,11 @@ * and creates the KArchiveDirectory/KArchiveFile entries. * */ - bool openArchive(QIODevice::OpenMode mode) Q_DECL_OVERRIDE; - bool closeArchive() Q_DECL_OVERRIDE; + bool openArchive(QIODevice::OpenMode mode) override; + bool closeArchive() override; protected: - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; + void virtual_hook(int id, void *data) override; private: class KArPrivate; KArPrivate *const d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.45.0/src/karchivedirectory.h new/karchive-5.46.0/src/karchivedirectory.h --- old/karchive-5.45.0/src/karchivedirectory.h 2018-04-07 09:46:37.000000000 +0200 +++ new/karchive-5.46.0/src/karchivedirectory.h 2018-05-05 14:38:16.000000000 +0200 @@ -106,7 +106,7 @@ * Checks whether this entry is a directory. * @return true, since this entry is a directory */ - bool isDirectory() const Q_DECL_OVERRIDE; + bool isDirectory() const override; /** * Extracts all entries in this archive directory to the directory @@ -118,7 +118,7 @@ bool copyTo(const QString &dest, bool recursive = true) const; protected: - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; + void virtual_hook(int id, void *data) override; private: KArchiveDirectoryPrivate *const d; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.45.0/src/karchivefile.h new/karchive-5.46.0/src/karchivefile.h --- old/karchive-5.45.0/src/karchivefile.h 2018-04-07 09:46:37.000000000 +0200 +++ new/karchive-5.46.0/src/karchivefile.h 2018-05-05 14:38:16.000000000 +0200 @@ -96,7 +96,7 @@ * Checks whether this entry is a file. * @return true, since this entry is a file */ - bool isFile() const Q_DECL_OVERRIDE; + bool isFile() const override; /** * Extracts the file to the directory @p dest @@ -106,7 +106,7 @@ bool copyTo(const QString &dest) const; protected: - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; + void virtual_hook(int id, void *data) override; private: KArchiveFilePrivate *const d; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.45.0/src/kbzip2filter.h new/karchive-5.46.0/src/kbzip2filter.h --- old/karchive-5.45.0/src/kbzip2filter.h 2018-04-07 09:46:37.000000000 +0200 +++ new/karchive-5.46.0/src/kbzip2filter.h 2018-05-05 14:38:16.000000000 +0200 @@ -36,24 +36,24 @@ KBzip2Filter(); virtual ~KBzip2Filter(); - bool init(int) Q_DECL_OVERRIDE; - int mode() const Q_DECL_OVERRIDE; - bool terminate() Q_DECL_OVERRIDE; - void reset() Q_DECL_OVERRIDE; - bool readHeader() Q_DECL_OVERRIDE + bool init(int) override; + int mode() const override; + bool terminate() override; + void reset() override; + bool readHeader() override { return true; // bzip2 handles it by itself ! Cool ! } - bool writeHeader(const QByteArray &) Q_DECL_OVERRIDE + bool writeHeader(const QByteArray &) override { return true; } - void setOutBuffer(char *data, uint maxlen) Q_DECL_OVERRIDE; - void setInBuffer(const char *data, uint size) Q_DECL_OVERRIDE; - int inBufferAvailable() const Q_DECL_OVERRIDE; - int outBufferAvailable() const Q_DECL_OVERRIDE; - Result uncompress() Q_DECL_OVERRIDE; - Result compress(bool finish) Q_DECL_OVERRIDE; + void setOutBuffer(char *data, uint maxlen) override; + void setInBuffer(const char *data, uint size) override; + int inBufferAvailable() const override; + int outBufferAvailable() const override; + Result uncompress() override; + Result compress(bool finish) override; private: class Private; Private *const d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.45.0/src/kcompressiondevice.h new/karchive-5.46.0/src/kcompressiondevice.h --- old/karchive-5.45.0/src/kcompressiondevice.h 2018-04-07 09:46:37.000000000 +0200 +++ new/karchive-5.46.0/src/kcompressiondevice.h 2018-05-05 14:38:16.000000000 +0200 @@ -77,12 +77,12 @@ /** * Open for reading or writing. */ - bool open(QIODevice::OpenMode mode) Q_DECL_OVERRIDE; + bool open(QIODevice::OpenMode mode) override; /** * Close after reading or writing. */ - void close() Q_DECL_OVERRIDE; + void close() override; /** * For writing gzip compressed files only: @@ -101,9 +101,9 @@ /** * That one can be quite slow, when going back. Use with care. */ - bool seek(qint64) Q_DECL_OVERRIDE; + bool seek(qint64) override; - bool atEnd() const Q_DECL_OVERRIDE; + bool atEnd() const override; /** * Call this to create the appropriate filter for the CompressionType @@ -116,8 +116,8 @@ protected: friend class K7Zip; - qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE; + qint64 readData(char *data, qint64 maxlen) override; + qint64 writeData(const char *data, qint64 len) override; KFilterBase *filterBase(); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.45.0/src/kgzipfilter.h new/karchive-5.46.0/src/kgzipfilter.h --- old/karchive-5.45.0/src/kgzipfilter.h 2018-04-07 09:46:37.000000000 +0200 +++ new/karchive-5.46.0/src/kgzipfilter.h 2018-05-05 14:38:16.000000000 +0200 @@ -35,7 +35,7 @@ KGzipFilter(); virtual ~KGzipFilter(); - bool init(int mode) Q_DECL_OVERRIDE; + bool init(int mode) override; // The top of zlib.h explains it: there are three cases. // - Raw deflate, no header (e.g. inside a ZIP file) @@ -50,18 +50,18 @@ GZipHeader = 2 }; bool init(int mode, Flag flag); // for direct users of KGzipFilter - int mode() const Q_DECL_OVERRIDE; - bool terminate() Q_DECL_OVERRIDE; - void reset() Q_DECL_OVERRIDE; - bool readHeader() Q_DECL_OVERRIDE; // this is about the GZIP header - bool writeHeader(const QByteArray &fileName) Q_DECL_OVERRIDE; + int mode() const override; + bool terminate() override; + void reset() override; + bool readHeader() override; // this is about the GZIP header + bool writeHeader(const QByteArray &fileName) override; void writeFooter(); - void setOutBuffer(char *data, uint maxlen) Q_DECL_OVERRIDE; - void setInBuffer(const char *data, uint size) Q_DECL_OVERRIDE; - int inBufferAvailable() const Q_DECL_OVERRIDE; - int outBufferAvailable() const Q_DECL_OVERRIDE; - Result uncompress() Q_DECL_OVERRIDE; - Result compress(bool finish) Q_DECL_OVERRIDE; + void setOutBuffer(char *data, uint maxlen) override; + void setInBuffer(const char *data, uint size) override; + int inBufferAvailable() const override; + int outBufferAvailable() const override; + Result uncompress() override; + Result compress(bool finish) override; private: Result uncompress_noop(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.45.0/src/klimitediodevice_p.h new/karchive-5.46.0/src/klimitediodevice_p.h --- old/karchive-5.45.0/src/klimitediodevice_p.h 2018-04-07 09:46:37.000000000 +0200 +++ new/karchive-5.46.0/src/klimitediodevice_p.h 2018-05-05 14:38:16.000000000 +0200 @@ -43,21 +43,21 @@ { } - bool isSequential() const Q_DECL_OVERRIDE; + bool isSequential() const override; - bool open(QIODevice::OpenMode m) Q_DECL_OVERRIDE; - void close() Q_DECL_OVERRIDE; + bool open(QIODevice::OpenMode m) override; + void close() override; - qint64 size() const Q_DECL_OVERRIDE; + qint64 size() const override; - qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 writeData(const char *, qint64) Q_DECL_OVERRIDE { + qint64 readData(char *data, qint64 maxlen) override; + qint64 writeData(const char *, qint64) override { return -1; // unsupported } //virtual qint64 pos() const { return m_dev->pos() - m_start; } - bool seek(qint64 pos) Q_DECL_OVERRIDE; - qint64 bytesAvailable() const Q_DECL_OVERRIDE; + bool seek(qint64 pos) override; + qint64 bytesAvailable() const override; private: QIODevice *m_dev; qint64 m_start; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.45.0/src/knonefilter.h new/karchive-5.46.0/src/knonefilter.h --- old/karchive-5.45.0/src/knonefilter.h 2018-04-07 09:46:37.000000000 +0200 +++ new/karchive-5.46.0/src/knonefilter.h 2018-05-05 14:38:16.000000000 +0200 @@ -38,18 +38,18 @@ KNoneFilter(); virtual ~KNoneFilter(); - bool init(int mode) Q_DECL_OVERRIDE; - int mode() const Q_DECL_OVERRIDE; - bool terminate() Q_DECL_OVERRIDE; - void reset() Q_DECL_OVERRIDE; - bool readHeader() Q_DECL_OVERRIDE; // this is about the GZIP header - bool writeHeader(const QByteArray &fileName) Q_DECL_OVERRIDE; - void setOutBuffer(char *data, uint maxlen) Q_DECL_OVERRIDE; - void setInBuffer(const char *data, uint size) Q_DECL_OVERRIDE; - int inBufferAvailable() const Q_DECL_OVERRIDE; - int outBufferAvailable() const Q_DECL_OVERRIDE; - Result uncompress() Q_DECL_OVERRIDE; - Result compress(bool finish) Q_DECL_OVERRIDE; + bool init(int mode) override; + int mode() const override; + bool terminate() override; + void reset() override; + bool readHeader() override; // this is about the GZIP header + bool writeHeader(const QByteArray &fileName) override; + void setOutBuffer(char *data, uint maxlen) override; + void setInBuffer(const char *data, uint size) override; + int inBufferAvailable() const override; + int outBufferAvailable() const override; + Result uncompress() override; + Result compress(bool finish) override; private: Result copyData(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.45.0/src/krcc.cpp new/karchive-5.46.0/src/krcc.cpp --- old/karchive-5.45.0/src/krcc.cpp 2018-04-07 09:46:37.000000000 +0200 +++ new/karchive-5.46.0/src/krcc.cpp 2018-05-05 14:38:16.000000000 +0200 @@ -54,7 +54,7 @@ { } - QByteArray data() const Q_DECL_OVERRIDE + QByteArray data() const override { QFile f(m_resourcePath); if (f.open(QIODevice::ReadOnly)) { @@ -63,7 +63,7 @@ qCWarning(KArchiveLog) << "Couldn't open" << m_resourcePath; return QByteArray(); } - QIODevice *createDevice() const Q_DECL_OVERRIDE + QIODevice *createDevice() const override { return new QFile(m_resourcePath); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.45.0/src/krcc.h new/karchive-5.46.0/src/krcc.h --- old/karchive-5.45.0/src/krcc.h 2018-04-07 09:46:37.000000000 +0200 +++ new/karchive-5.46.0/src/krcc.h 2018-05-05 14:38:16.000000000 +0200 @@ -55,20 +55,20 @@ * @return always false */ bool doPrepareWriting(const QString &name, const QString &user, const QString &group, qint64 size, - mode_t perm, const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) Q_DECL_OVERRIDE; + mode_t perm, const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) override; /* * Writing is not supported by this class, will always fail. * @return always false */ - bool doFinishWriting(qint64 size) Q_DECL_OVERRIDE; + bool doFinishWriting(qint64 size) override; /* * Writing is not supported by this class, will always fail. * @return always false */ bool doWriteDir(const QString &name, const QString &user, const QString &group, - mode_t perm, const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) Q_DECL_OVERRIDE; + mode_t perm, const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) override; /* * Writing is not supported by this class, will always fail. @@ -76,20 +76,20 @@ */ bool doWriteSymLink(const QString &name, const QString &target, const QString &user, const QString &group, mode_t perm, - const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) Q_DECL_OVERRIDE; + const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) override; /** * Registers the .rcc resource in the QResource system under a unique identifier, * then lists that, and creates the KArchiveFile/KArchiveDirectory entries. */ - bool openArchive(QIODevice::OpenMode mode) Q_DECL_OVERRIDE; + bool openArchive(QIODevice::OpenMode mode) override; /** * Unregisters the .rcc resource from the QResource system. */ - bool closeArchive() Q_DECL_OVERRIDE; + bool closeArchive() override; protected: - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; + void virtual_hook(int id, void *data) override; private: class KRccPrivate; KRccPrivate *const d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.45.0/src/ktar.h new/karchive-5.46.0/src/ktar.h --- old/karchive-5.45.0/src/ktar.h 2018-04-07 09:46:37.000000000 +0200 +++ new/karchive-5.46.0/src/ktar.h 2018-05-05 14:38:16.000000000 +0200 @@ -79,16 +79,16 @@ /// Reimplemented from KArchive bool doWriteSymLink(const QString &name, const QString &target, const QString &user, const QString &group, - mode_t perm, const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) Q_DECL_OVERRIDE; + mode_t perm, const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) override; /// Reimplemented from KArchive bool doWriteDir(const QString &name, const QString &user, const QString &group, - mode_t perm, const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) Q_DECL_OVERRIDE; + mode_t perm, const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) override; /// Reimplemented from KArchive bool doPrepareWriting(const QString &name, const QString &user, const QString &group, qint64 size, mode_t perm, - const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) Q_DECL_OVERRIDE; + const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) override; /// Reimplemented from KArchive - bool doFinishWriting(qint64 size) Q_DECL_OVERRIDE; + bool doFinishWriting(qint64 size) override; /** * Opens the archive for reading. @@ -96,15 +96,15 @@ * and creates the KArchiveDirectory/KArchiveFile entries. * @param mode the mode of the file */ - bool openArchive(QIODevice::OpenMode mode) Q_DECL_OVERRIDE; - bool closeArchive() Q_DECL_OVERRIDE; + bool openArchive(QIODevice::OpenMode mode) override; + bool closeArchive() override; - bool createDevice(QIODevice::OpenMode mode) Q_DECL_OVERRIDE; + bool createDevice(QIODevice::OpenMode mode) override; private: protected: - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; + void virtual_hook(int id, void *data) override; private: class KTarPrivate; KTarPrivate *const d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.45.0/src/kxzfilter.h new/karchive-5.46.0/src/kxzfilter.h --- old/karchive-5.45.0/src/kxzfilter.h 2018-04-07 09:46:37.000000000 +0200 +++ new/karchive-5.46.0/src/kxzfilter.h 2018-05-05 14:38:16.000000000 +0200 @@ -39,7 +39,7 @@ KXzFilter(); virtual ~KXzFilter(); - bool init(int) Q_DECL_OVERRIDE; + bool init(int) override; enum Flag { AUTO = 0, @@ -54,23 +54,23 @@ }; virtual bool init(int, Flag flag, const QVector<unsigned char> &props); - int mode() const Q_DECL_OVERRIDE; - bool terminate() Q_DECL_OVERRIDE; - void reset() Q_DECL_OVERRIDE; - bool readHeader() Q_DECL_OVERRIDE + int mode() const override; + bool terminate() override; + void reset() override; + bool readHeader() override { return true; // lzma handles it by itself ! Cool ! } - bool writeHeader(const QByteArray &) Q_DECL_OVERRIDE + bool writeHeader(const QByteArray &) override { return true; } - void setOutBuffer(char *data, uint maxlen) Q_DECL_OVERRIDE; - void setInBuffer(const char *data, uint size) Q_DECL_OVERRIDE; - int inBufferAvailable() const Q_DECL_OVERRIDE; - int outBufferAvailable() const Q_DECL_OVERRIDE; - Result uncompress() Q_DECL_OVERRIDE; - Result compress(bool finish) Q_DECL_OVERRIDE; + void setOutBuffer(char *data, uint maxlen) override; + void setInBuffer(const char *data, uint size) override; + int inBufferAvailable() const override; + int outBufferAvailable() const override; + Result uncompress() override; + Result compress(bool finish) override; private: class Private; Private *const d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.45.0/src/kzip.h new/karchive-5.46.0/src/kzip.h --- old/karchive-5.45.0/src/kzip.h 2018-04-07 09:46:37.000000000 +0200 +++ new/karchive-5.46.0/src/kzip.h 2018-05-05 14:38:16.000000000 +0200 @@ -127,24 +127,24 @@ * @param size the size of the chunk * @return true if successful, false otherwise */ - bool writeData(const char *data, qint64 size) Q_DECL_OVERRIDE; + bool writeData(const char *data, qint64 size) override; protected: /// Reimplemented from KArchive bool doWriteSymLink(const QString &name, const QString &target, const QString &user, const QString &group, - mode_t perm, const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) Q_DECL_OVERRIDE; + mode_t perm, const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) override; /// Reimplemented from KArchive bool doPrepareWriting(const QString &name, const QString &user, const QString &group, qint64 size, mode_t perm, - const QDateTime &atime, const QDateTime &mtime, const QDateTime &creationTime) Q_DECL_OVERRIDE; + const QDateTime &atime, const QDateTime &mtime, const QDateTime &creationTime) override; /** * Write data to a file that has been created using prepareWriting(). * @param size the size of the file * @return true if successful, false otherwise */ - bool doFinishWriting(qint64 size) Q_DECL_OVERRIDE; + bool doFinishWriting(qint64 size) override; /** * Opens the archive for reading. @@ -152,17 +152,17 @@ * and creates the KArchiveDirectory/KArchiveFile entries. * @param mode the mode of the file */ - bool openArchive(QIODevice::OpenMode mode) Q_DECL_OVERRIDE; + bool openArchive(QIODevice::OpenMode mode) override; /// Closes the archive - bool closeArchive() Q_DECL_OVERRIDE; + bool closeArchive() override; /// Reimplemented from KArchive bool doWriteDir(const QString &name, const QString &user, const QString &group, mode_t perm, - const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) Q_DECL_OVERRIDE; + const QDateTime &atime, const QDateTime &mtime, const QDateTime &ctime) override; protected: - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; + void virtual_hook(int id, void *data) override; private: class KZipPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.45.0/src/kzipfileentry.h new/karchive-5.46.0/src/kzipfileentry.h --- old/karchive-5.45.0/src/kzipfileentry.h 2018-04-07 09:46:37.000000000 +0200 +++ new/karchive-5.46.0/src/kzipfileentry.h 2018-05-05 14:38:16.000000000 +0200 @@ -64,7 +64,7 @@ * @return the content of this file. * Call data() with care (only once per file), this data isn't cached. */ - QByteArray data() const Q_DECL_OVERRIDE; + QByteArray data() const override; /** * This method returns a QIODevice to read the file contents. @@ -73,7 +73,7 @@ * who will have to delete it. * The returned device auto-opens (in readonly mode), no need to open it. */ - QIODevice *createDevice() const Q_DECL_OVERRIDE; + QIODevice *createDevice() const override; private: class KZipFileEntryPrivate;
