Hello community, here is the log from the commit of package kservice for openSUSE:Factory checked in at 2018-06-22 13:23:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kservice (Old) and /work/SRC/openSUSE:Factory/.kservice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice" Fri Jun 22 13:23:21 2018 rev:59 rq:616786 version:5.47.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kservice/kservice.changes 2018-05-18 14:23:36.887813763 +0200 +++ /work/SRC/openSUSE:Factory/.kservice.new/kservice.changes 2018-06-22 13:23:29.609017207 +0200 @@ -1,0 +2,10 @@ +Tue Jun 12 21:26:07 UTC 2018 - [email protected] + +- Update to 5.47.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.47.0.php +- Changes since 5.46.0: + * Use override + +------------------------------------------------------------------- Old: ---- kservice-5.46.0.tar.xz New: ---- kservice-5.47.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.UNijjE/_old 2018-06-22 13:23:31.252956459 +0200 +++ /var/tmp/diff_new_pack.UNijjE/_new 2018-06-22 13:23:31.256956311 +0200 @@ -17,13 +17,13 @@ %bcond_without lang -%define _tar_path 5.46 +%define _tar_path 5.47 # 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: kservice -Version: 5.46.0 +Version: 5.47.0 Release: 0 %define kf5_version %{version} BuildRequires: bison ++++++ kservice-5.46.0.tar.xz -> kservice-5.47.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.46.0/CMakeLists.txt new/kservice-5.47.0/CMakeLists.txt --- old/kservice-5.46.0/CMakeLists.txt 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/CMakeLists.txt 2018-06-02 20:05:33.000000000 +0200 @@ -1,13 +1,13 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.46.0") # handled by release scripts -set(KF5_DEP_VERSION "5.46.0") # handled by release scripts +set(KF5_VERSION "5.47.0") # handled by release scripts +set(KF5_DEP_VERSION "5.47.0") # handled by release scripts project(KService VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.46.0 NO_MODULE) +find_package(ECM 5.47.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/kservice-5.46.0/autotests/kmimeassociationstest.cpp new/kservice-5.47.0/autotests/kmimeassociationstest.cpp --- old/kservice-5.46.0/autotests/kmimeassociationstest.cpp 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/autotests/kmimeassociationstest.cpp 2018-06-02 20:05:33.000000000 +0200 @@ -43,7 +43,7 @@ FakeServiceFactory(KSycoca *db) : KServiceFactory(db) {} ~FakeServiceFactory(); - KService::Ptr findServiceByMenuId(const QString &name) Q_DECL_OVERRIDE + KService::Ptr findServiceByMenuId(const QString &name) override { //qDebug() << name; KService::Ptr result = m_cache.value(name); @@ -54,7 +54,7 @@ //qDebug() << name << result.data(); return result; } - KService::Ptr findServiceByDesktopPath(const QString &name) Q_DECL_OVERRIDE + KService::Ptr findServiceByDesktopPath(const QString &name) override { KService::Ptr result = m_cache.value(name); // yeah, same cache, I don't care :) if (!result) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.46.0/autotests/ksycocathreadtest.cpp new/kservice-5.47.0/autotests/ksycocathreadtest.cpp --- old/kservice-5.46.0/autotests/ksycocathreadtest.cpp 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/autotests/ksycocathreadtest.cpp 2018-06-02 20:05:33.000000000 +0200 @@ -161,7 +161,7 @@ { m_stop = false; } - void run() Q_DECL_OVERRIDE + void run() override { WorkerObject wo; while (!m_stop) { @@ -185,7 +185,7 @@ { Q_OBJECT public: - void run() Q_DECL_OVERRIDE + void run() override { // WorkerObject must belong to this thread, this is why we don't // have the slot work() in WorkerThread itself. Typical QThread trap! @@ -195,7 +195,7 @@ timer.start(100); exec(); } - void stop() Q_DECL_OVERRIDE + void stop() override { quit(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.46.0/po/id/kservice5.po new/kservice-5.47.0/po/id/kservice5.po --- old/kservice-5.46.0/po/id/kservice5.po 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/po/id/kservice5.po 2018-06-02 20:05:33.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-07 08:40+0100\n" -"PO-Revision-Date: 2018-04-03 06:32+0700\n" +"PO-Revision-Date: 2018-05-31 22:01+0700\n" "Last-Translator: Wantoyo <[email protected]>\n" "Language-Team: Indonesian <[email protected]>\n" "Language: id\n" @@ -39,7 +39,7 @@ #, kde-format msgctxt "application description" msgid "Rebuilds the system configuration cache." -msgstr "Bangun ulang singgahan konfigurasi sistem." +msgstr "Bangun ulang cache konfigurasi sistem." #: kbuildsycoca/kbuildsycoca_main.cpp:60 #, kde-format @@ -131,7 +131,7 @@ "Error launching %1. Either KLauncher is not running anymore, or it failed to " "start the application." msgstr "" -"Galat menjalankan %1. Entah KLauncher tidak berjalan lagi, atau KLauncher " +"Error menjalankan %1. Entah KLauncher tidak berjalan lagi, atau KLauncher " "gagal menjalankan aplikasi." #: kdeinit/ktoolinvocation.cpp:106 @@ -140,7 +140,7 @@ "KLauncher could not be reached via D-Bus. Error when calling %1:\n" "%2\n" msgstr "" -"KLauncher tak dapat dicapai via D-Bus. Galat ketika memanggil %1:\n" +"KLauncher tak dapat dicapai via D-Bus. Error ketika memanggil %1:\n" "%2\n" #: kdeinit/ktoolinvocation_x11.cpp:251 @@ -204,7 +204,7 @@ #: services/kservice.cpp:1019 #, kde-format msgid "The provided service is not valid" -msgstr "Layanan yang diberikan tidak sah" +msgstr "Layanan yang diberikan tidak absah" #: services/kservice.cpp:1023 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.46.0/po/zh_CN/kservice5.po new/kservice-5.47.0/po/zh_CN/kservice5.po --- old/kservice-5.46.0/po/zh_CN/kservice5.po 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/po/zh_CN/kservice5.po 2018-06-02 20:05:33.000000000 +0200 @@ -16,7 +16,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-07 08:40+0100\n" -"PO-Revision-Date: 2018-04-26 05:22-0400\n" +"PO-Revision-Date: 2018-05-18 06:23-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.46.0/src/services/kmimetypefactory.cpp new/kservice-5.47.0/src/services/kmimetypefactory.cpp --- old/kservice-5.46.0/src/services/kmimetypefactory.cpp 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/src/services/kmimetypefactory.cpp 2018-06-02 20:05:33.000000000 +0200 @@ -127,11 +127,11 @@ { s >> m_name >> m_serviceOffersOffset; } - QString name() const Q_DECL_OVERRIDE + QString name() const override { return m_name; } - void save(QDataStream &s) Q_DECL_OVERRIDE; + void save(QDataStream &s) override; QString m_name; int m_serviceOffersOffset; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.46.0/src/services/kmimetypefactory_p.h new/kservice-5.47.0/src/services/kmimetypefactory_p.h --- old/kservice-5.46.0/src/services/kmimetypefactory_p.h 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/src/services/kmimetypefactory_p.h 2018-06-02 20:05:33.000000000 +0200 @@ -45,12 +45,12 @@ */ KMimeTypeFactory(KSycoca *db); - ~KMimeTypeFactory() Q_DECL_OVERRIDE; + ~KMimeTypeFactory() override; /** * Not meant to be called at this level */ - KSycocaEntry *createEntry(const QString &) const Q_DECL_OVERRIDE + KSycocaEntry *createEntry(const QString &) const override { assert(0); return nullptr; @@ -103,7 +103,7 @@ MimeTypeEntry::Ptr findMimeTypeEntryByName(const QString &name); protected: - MimeTypeEntry *createEntry(int offset) const Q_DECL_OVERRIDE; + MimeTypeEntry *createEntry(int offset) const override; private: // d pointer: useless since this header is not installed //class KMimeTypeFactoryPrivate* d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.46.0/src/services/kservice_p.h new/kservice-5.47.0/src/services/kservice_p.h --- old/kservice-5.46.0/src/services/kservice_p.h 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/src/services/kservice_p.h 2018-06-02 20:05:33.000000000 +0200 @@ -45,14 +45,14 @@ void parseActions(const KDesktopFile *config, KService *q); void load(QDataStream &); - void save(QDataStream &) Q_DECL_OVERRIDE; + void save(QDataStream &) override; - QString name() const Q_DECL_OVERRIDE + QString name() const override { return m_strName; } - QString storageId() const Q_DECL_OVERRIDE + QString storageId() const override { if (!menuId.isEmpty()) { return menuId; @@ -60,14 +60,14 @@ return path; } - bool isValid() const Q_DECL_OVERRIDE + bool isValid() const override { return m_bValid; } - QVariant property(const QString &name) const Q_DECL_OVERRIDE; + QVariant property(const QString &name) const override; - QStringList propertyNames() const Q_DECL_OVERRIDE; + QStringList propertyNames() const override; QVariant property(const QString &_name, QVariant::Type t) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.46.0/src/services/kservicefactory_p.h new/kservice-5.47.0/src/services/kservicefactory_p.h --- old/kservice-5.46.0/src/services/kservicefactory_p.h 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/src/services/kservicefactory_p.h 2018-06-02 20:05:33.000000000 +0200 @@ -51,7 +51,7 @@ /** * Construct a KService from a config file. */ - KSycocaEntry *createEntry(const QString &) const Q_DECL_OVERRIDE + KSycocaEntry *createEntry(const QString &) const override { assert(0); return nullptr; @@ -116,7 +116,7 @@ static KServiceFactory *self(); protected: - KService *createEntry(int offset) const Q_DECL_OVERRIDE; + KService *createEntry(int offset) const override; // All those variables are used by KBuildServiceFactory too int m_offerListOffset; @@ -128,7 +128,7 @@ int m_menuIdDictOffset; protected: - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; + void virtual_hook(int id, void *data) override; private: class KServiceFactoryPrivate *d; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.46.0/src/services/kservicegroup.cpp new/kservice-5.47.0/src/services/kservicegroup.cpp --- old/kservice-5.46.0/src/services/kservicegroup.cpp 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/src/services/kservicegroup.cpp 2018-06-02 20:05:33.000000000 +0200 @@ -704,7 +704,7 @@ { } - QString name() const Q_DECL_OVERRIDE; + QString name() const override; }; QString KServiceSeparatorPrivate::name() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.46.0/src/services/kservicegroup_p.h new/kservice-5.47.0/src/services/kservicegroup_p.h --- old/kservice-5.46.0/src/services/kservicegroup_p.h 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/src/services/kservicegroup_p.h 2018-06-02 20:05:33.000000000 +0200 @@ -44,9 +44,9 @@ { } - void save(QDataStream &s) Q_DECL_OVERRIDE; + void save(QDataStream &s) override; - QString name() const Q_DECL_OVERRIDE + QString name() const override { return path; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.46.0/src/services/kservicegroupfactory_p.h new/kservice-5.47.0/src/services/kservicegroupfactory_p.h --- old/kservice-5.46.0/src/services/kservicegroupfactory_p.h 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/src/services/kservicegroupfactory_p.h 2018-06-02 20:05:33.000000000 +0200 @@ -48,7 +48,7 @@ /** * Construct a KServiceGroup from a config file. */ - KSycocaEntry *createEntry(const QString &) const Q_DECL_OVERRIDE + KSycocaEntry *createEntry(const QString &) const override { assert(0); return nullptr; @@ -70,12 +70,12 @@ static KServiceGroupFactory *self(); protected: KServiceGroup *createGroup(int offset, bool deep) const; - KServiceGroup *createEntry(int offset) const Q_DECL_OVERRIDE; + KServiceGroup *createEntry(int offset) const override; KSycocaDict *m_baseGroupDict; int m_baseGroupDictOffset; protected: - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; + void virtual_hook(int id, void *data) override; private: class KServiceGroupFactoryPrivate *d; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.46.0/src/services/kservicetype_p.h new/kservice-5.47.0/src/services/kservicetype_p.h --- old/kservice-5.46.0/src/services/kservicetype_p.h 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/src/services/kservicetype_p.h 2018-06-02 20:05:33.000000000 +0200 @@ -43,16 +43,16 @@ virtual ~KServiceTypePrivate() {} - void save(QDataStream &) Q_DECL_OVERRIDE; + void save(QDataStream &) override; - QString name() const Q_DECL_OVERRIDE + QString name() const override { return m_strName; } - QVariant property(const QString &name) const Q_DECL_OVERRIDE; + QVariant property(const QString &name) const override; - QStringList propertyNames() const Q_DECL_OVERRIDE; + QStringList propertyNames() const override; virtual QString comment() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.46.0/src/services/kservicetypefactory_p.h new/kservice-5.47.0/src/services/kservicetypefactory_p.h --- old/kservice-5.46.0/src/services/kservicetypefactory_p.h 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/src/services/kservicetypefactory_p.h 2018-06-02 20:05:33.000000000 +0200 @@ -47,12 +47,12 @@ */ KServiceTypeFactory(KSycoca *db); - ~KServiceTypeFactory() Q_DECL_OVERRIDE; + ~KServiceTypeFactory() override; /** * Not meant to be called at this level */ - KSycocaEntry *createEntry(const QString &) const Q_DECL_OVERRIDE + KSycocaEntry *createEntry(const QString &) const override { assert(0); return nullptr; @@ -86,13 +86,13 @@ static KServiceTypeFactory *self(); protected: - KServiceType *createEntry(int offset) const Q_DECL_OVERRIDE; + KServiceType *createEntry(int offset) const override; // protected for KBuildServiceTypeFactory QMap<QString, int> m_propertyTypeDict; protected: - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; + void virtual_hook(int id, void *data) override; private: class KServiceTypeFactoryPrivate *d = nullptr; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.46.0/src/services/ktraderparsetree_p.h new/kservice-5.47.0/src/services/ktraderparsetree_p.h --- old/kservice-5.46.0/src/services/ktraderparsetree_p.h 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/src/services/ktraderparsetree_p.h 2018-06-02 20:05:33.000000000 +0200 @@ -130,7 +130,7 @@ m_pRight = _ptr2; } - bool eval(ParseContext *_context) const Q_DECL_OVERRIDE; + bool eval(ParseContext *_context) const override; protected: ParseTreeBase::Ptr m_pLeft; @@ -149,7 +149,7 @@ m_pRight = _ptr2; } - bool eval(ParseContext *_context) const Q_DECL_OVERRIDE; + bool eval(ParseContext *_context) const override; protected: ParseTreeBase::Ptr m_pLeft; @@ -169,7 +169,7 @@ m_cmd = _i; } - bool eval(ParseContext *_context) const Q_DECL_OVERRIDE; + bool eval(ParseContext *_context) const override; protected: ParseTreeBase::Ptr m_pLeft; @@ -191,7 +191,7 @@ { } - bool eval(ParseContext *_context) const Q_DECL_OVERRIDE; + bool eval(ParseContext *_context) const override; protected: ParseTreeBase::Ptr m_pLeft; @@ -213,7 +213,7 @@ m_cs = cs; } - bool eval(ParseContext *_context) const Q_DECL_OVERRIDE; + bool eval(ParseContext *_context) const override; protected: ParseTreeBase::Ptr m_pLeft; @@ -234,7 +234,7 @@ m_cmd = _i; } - bool eval(ParseContext *_context) const Q_DECL_OVERRIDE; + bool eval(ParseContext *_context) const override; protected: ParseTreeBase::Ptr m_pLeft; @@ -253,7 +253,7 @@ m_pLeft = _ptr; } - bool eval(ParseContext *_context) const Q_DECL_OVERRIDE; + bool eval(ParseContext *_context) const override; protected: ParseTreeBase::Ptr m_pLeft; @@ -270,7 +270,7 @@ m_pLeft = _ptr; } - bool eval(ParseContext *_context) const Q_DECL_OVERRIDE; + bool eval(ParseContext *_context) const override; protected: ParseTreeBase::Ptr m_pLeft; @@ -287,7 +287,7 @@ m_id = QString::fromUtf8(_id); } - bool eval(ParseContext *_context) const Q_DECL_OVERRIDE; + bool eval(ParseContext *_context) const override; protected: QString m_id; @@ -304,7 +304,7 @@ m_str = QString::fromUtf8(arg); } - bool eval(ParseContext *_context) const Q_DECL_OVERRIDE; + bool eval(ParseContext *_context) const override; protected: QString m_str; @@ -321,7 +321,7 @@ m_str = QString::fromUtf8(arg); } - bool eval(ParseContext *_context) const Q_DECL_OVERRIDE; + bool eval(ParseContext *_context) const override; protected: QString m_str; @@ -338,7 +338,7 @@ m_int = arg; } - bool eval(ParseContext *_context) const Q_DECL_OVERRIDE; + bool eval(ParseContext *_context) const override; protected: int m_int; @@ -355,7 +355,7 @@ m_double = arg; } - bool eval(ParseContext *_context) const Q_DECL_OVERRIDE; + bool eval(ParseContext *_context) const override; protected: double m_double; @@ -372,7 +372,7 @@ m_bool = arg; } - bool eval(ParseContext *_context) const Q_DECL_OVERRIDE; + bool eval(ParseContext *_context) const override; protected: bool m_bool; @@ -389,7 +389,7 @@ m_strId = QString::fromUtf8(_id); } - bool eval(ParseContext *_context) const Q_DECL_OVERRIDE; + bool eval(ParseContext *_context) const override; protected: QString m_strId; @@ -406,7 +406,7 @@ m_strId = QString::fromUtf8(_id); } - bool eval(ParseContext *_context) const Q_DECL_OVERRIDE; + bool eval(ParseContext *_context) const override; protected: QString m_strId; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.46.0/src/sycoca/kctimefactory_p.h new/kservice-5.47.0/src/sycoca/kctimefactory_p.h --- old/kservice-5.46.0/src/sycoca/kctimefactory_p.h 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/src/sycoca/kctimefactory_p.h 2018-06-02 20:05:33.000000000 +0200 @@ -63,18 +63,18 @@ /** * Write out header information */ - void saveHeader(QDataStream &str) Q_DECL_OVERRIDE; + void saveHeader(QDataStream &str) override; /** * Write out data */ - void save(QDataStream &str) Q_DECL_OVERRIDE; + void save(QDataStream &str) override; - KSycocaEntry *createEntry(const QString &) const Q_DECL_OVERRIDE + KSycocaEntry *createEntry(const QString &) const override { return nullptr; } - KSycocaEntry *createEntry(int) const Q_DECL_OVERRIDE + KSycocaEntry *createEntry(int) const override { return nullptr; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.46.0/src/sycoca/kmemfile_p.h new/kservice-5.47.0/src/sycoca/kmemfile_p.h --- old/kservice-5.46.0/src/sycoca/kmemfile_p.h 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/src/sycoca/kmemfile_p.h 2018-06-02 20:05:33.000000000 +0200 @@ -55,29 +55,29 @@ * * @reimp */ - void close() Q_DECL_OVERRIDE; + void close() override; /** * As KMemFile is a random access device, it returns false * * @reimp */ - bool isSequential() const Q_DECL_OVERRIDE; + bool isSequential() const override; /** * @reimp * @param mode only QIODevice::ReadOnly is accepted */ - bool open(OpenMode mode) Q_DECL_OVERRIDE; + bool open(OpenMode mode) override; /** * Sets the current read/write position to pos * @reimp * @param pos the new read/write position */ - bool seek(qint64 pos) Q_DECL_OVERRIDE; + bool seek(qint64 pos) override; /** * Returns the size of the file * @reimp */ - qint64 size() const Q_DECL_OVERRIDE; + qint64 size() const override; /** * This static function updates the internal information about the file * loaded into shared memory. The next time the file is opened, the file is @@ -86,9 +86,9 @@ static void fileContentsChanged(const QString &filename); protected: /** @reimp */ - qint64 readData(char *data, qint64 maxSize) Q_DECL_OVERRIDE; + qint64 readData(char *data, qint64 maxSize) override; /** @reimp */ - qint64 writeData(const char *data, qint64 maxSize) Q_DECL_OVERRIDE; + qint64 writeData(const char *data, qint64 maxSize) override; private: class Private; friend class Private; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.46.0/src/sycoca/ksycoca.h new/kservice-5.47.0/src/sycoca/ksycoca.h --- old/kservice-5.46.0/src/sycoca/ksycoca.h 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/src/sycoca/ksycoca.h 2018-06-02 20:05:33.000000000 +0200 @@ -230,7 +230,7 @@ friend class KSycocaFactory; friend class KSycocaDict; - void connectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE; + void connectNotify(const QMetaMethod &signal) override; private: /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.46.0/src/sycoca/ksycocadevices_p.h new/kservice-5.47.0/src/sycoca/ksycocadevices_p.h --- old/kservice-5.46.0/src/sycoca/ksycocadevices_p.h 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/src/sycoca/ksycocadevices_p.h 2018-06-02 20:05:33.000000000 +0200 @@ -60,8 +60,8 @@ { public: KSycocaMmapDevice(const char *sycoca_mmap, size_t sycoca_size); - ~KSycocaMmapDevice() Q_DECL_OVERRIDE; - QIODevice *device() Q_DECL_OVERRIDE; + ~KSycocaMmapDevice() override; + QIODevice *device() override; private: QBuffer *m_buffer; }; @@ -72,8 +72,8 @@ { public: KSycocaFileDevice(const QString &path); - ~KSycocaFileDevice() Q_DECL_OVERRIDE; - QIODevice *device() Q_DECL_OVERRIDE; + ~KSycocaFileDevice() override; + QIODevice *device() override; private: QFile *m_database; }; @@ -84,8 +84,8 @@ { public: KSycocaMemFileDevice(const QString &path); - ~KSycocaMemFileDevice() Q_DECL_OVERRIDE; - QIODevice *device() Q_DECL_OVERRIDE; + ~KSycocaMemFileDevice() override; + QIODevice *device() override; private: KMemFile *m_database; }; @@ -96,8 +96,8 @@ { public: KSycocaBufferDevice(); - ~KSycocaBufferDevice() Q_DECL_OVERRIDE; - QIODevice *device() Q_DECL_OVERRIDE; + ~KSycocaBufferDevice() override; + QIODevice *device() override; private: QBuffer *m_buffer; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.46.0/src/sycoca/ksycocaentry_p.h new/kservice-5.47.0/src/sycoca/ksycocaentry_p.h --- old/kservice-5.46.0/src/sycoca/ksycocaentry_p.h 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/src/sycoca/ksycocaentry_p.h 2018-06-02 20:05:33.000000000 +0200 @@ -22,8 +22,8 @@ #include "ksycocaentry.h" #define K_SYCOCATYPE( type, baseclass ) \ - bool isType(KSycocaType t) const Q_DECL_OVERRIDE { if (t == type) return true; return baseclass::isType(t);} \ - KSycocaType sycocaType() const Q_DECL_OVERRIDE { return type; } + bool isType(KSycocaType t) const override { if (t == type) return true; return baseclass::isType(t);} \ + KSycocaType sycocaType() const override { return type; } class KSycocaEntryPrivate { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.46.0/src/sycoca/ksycocatype.h new/kservice-5.47.0/src/sycoca/ksycocatype.h --- old/kservice-5.46.0/src/sycoca/ksycocatype.h 2018-05-05 15:00:03.000000000 +0200 +++ new/kservice-5.47.0/src/sycoca/ksycocatype.h 2018-06-02 20:05:33.000000000 +0200 @@ -55,7 +55,7 @@ #define K_SYCOCAFACTORY( factory_id ) \ public: \ - KSycocaFactoryId factoryId() const Q_DECL_OVERRIDE { return factory_id; } \ + KSycocaFactoryId factoryId() const override { return factory_id; } \ private: #endif
