Hello community, here is the log from the commit of package kdelibs4support for openSUSE:Factory checked in at 2018-07-21 10:12:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs4support (Old) and /work/SRC/openSUSE:Factory/.kdelibs4support.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs4support" Sat Jul 21 10:12:03 2018 rev:56 rq:623273 version:5.48.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs4support/kdelibs4support.changes 2018-06-22 13:19:35.773664657 +0200 +++ /work/SRC/openSUSE:Factory/.kdelibs4support.new/kdelibs4support.changes 2018-07-21 10:12:03.379145098 +0200 @@ -1,0 +2,13 @@ +Mon Jul 16 04:37:38 UTC 2018 - [email protected] + +- Update to 5.48.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.48.0.php +- Changes since 5.47.0: + * Set QT_USE_FAST_OPERATOR_PLUS ourselves + * Don't export kf5-config to the CMake config file + * Remove unused entry X-KDE-DBus-ModuleName from the kded plugin metadata + * Use override + +------------------------------------------------------------------- Old: ---- kdelibs4support-5.47.0.tar.xz New: ---- kdelibs4support-5.48.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4support.spec ++++++ --- /var/tmp/diff_new_pack.3QqjsE/_old 2018-07-21 10:12:03.927144971 +0200 +++ /var/tmp/diff_new_pack.3QqjsE/_new 2018-07-21 10:12:03.927144971 +0200 @@ -18,15 +18,14 @@ %bcond_without lang %define lname libKF5KDELibs4Support5 -%define _tar_path 5.47 +%define _tar_path 5.48 # 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}')} +%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kdelibs4support -Version: 5.47.0 +Version: 5.48.0 Release: 0 -%define kf5_version %{version} BuildRequires: NetworkManager-devel BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} ++++++ kdelibs4support-5.47.0.tar.xz -> kdelibs4support-5.48.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/CMakeLists.txt new/kdelibs4support-5.48.0/CMakeLists.txt --- old/kdelibs4support-5.47.0/CMakeLists.txt 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/CMakeLists.txt 2018-07-08 00:30:03.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.47.0") # handled by release scripts -set(KF5_DEP_VERSION "5.47.0") # handled by release scripts +set(KF5_VERSION "5.48.0") # handled by release scripts +set(KF5_DEP_VERSION "5.48.0") # handled by release scripts project(KDELibs4Support VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.47.0 NO_MODULE) +find_package(ECM 5.48.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) @@ -75,6 +75,8 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) remove_definitions(-DQT_USE_QSTRINGBUILDER) +# TODO: use QT_USE_QSTRINGBUILDER instead of deprecated & undocumented QT_USE_FAST_OPERATOR_PLUS +add_definitions(-DQT_USE_FAST_OPERATOR_PLUS) # This one won't be needed when CMake 2.8.13 is depended on. add_definitions( @@ -91,7 +93,7 @@ target_link_libraries(kf5-config KF5::CoreAddons KF5::I18n KF5::ConfigCore KF5::KDELibs4Support) target_include_directories(kf5-config PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../..") -install(TARGETS kf5-config EXPORT KF5KDELibs4SupportTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ) # put this for now into the export set KDELibs4SupportTargets, so that it exists and is not empty +install(TARGETS kf5-config ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) # create a Config.cmake and a ConfigVersion.cmake file and install them diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/autotests/kfilemetainfotest.cpp new/kdelibs4support-5.48.0/autotests/kfilemetainfotest.cpp --- old/kdelibs4support-5.47.0/autotests/kfilemetainfotest.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/autotests/kfilemetainfotest.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -38,7 +38,7 @@ KFileMetaInfoThread(const QString &fileName); protected: - void run() Q_DECL_OVERRIDE; + void run() override; private: QString m_fileName; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/autotests/kmimetype_nomimetypes.cpp new/kdelibs4support-5.48.0/autotests/kmimetype_nomimetypes.cpp --- old/kdelibs4support-5.47.0/autotests/kmimetype_nomimetypes.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/autotests/kmimetype_nomimetypes.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -29,7 +29,7 @@ class KTestMessageHandler : public KMessageHandler { public: - void message(KMessage::MessageType type, const QString &text, const QString &caption) Q_DECL_OVERRIDE + void message(KMessage::MessageType type, const QString &text, const QString &caption) override { Q_UNUSED(type); Q_UNUSED(caption); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/autotests/kuniqueapptest.cpp new/kdelibs4support-5.48.0/autotests/kuniqueapptest.cpp --- old/kdelibs4support-5.47.0/autotests/kuniqueapptest.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/autotests/kuniqueapptest.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -33,7 +33,7 @@ Q_OBJECT public: TestApp() : KUniqueApplication("TestApp"), m_callCount(0) { } - int newInstance() Q_DECL_OVERRIDE; + int newInstance() override; int callCount() const { return m_callCount; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/po/id/kdelibs4support.po new/kdelibs4support-5.48.0/po/id/kdelibs4support.po --- old/kdelibs4support-5.47.0/po/id/kdelibs4support.po 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/po/id/kdelibs4support.po 2018-07-08 00:30:03.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-12-19 03:03+0100\n" -"PO-Revision-Date: 2018-05-31 22:03+0700\n" +"PO-Revision-Date: 2018-06-16 08:03+0700\n" "Last-Translator: Wantoyo <[email protected]>\n" "Language-Team: Indonesian <[email protected]>\n" "Language: id\n" @@ -2338,7 +2338,7 @@ #: kdebugdialog/kdebugdialog.ui:151 kdebugdialog/kdebugdialog.ui:186 #, kde-format msgid "Output to:" -msgstr "Keluaran ke:" +msgstr "Output ke:" #. i18n: ectx: property (text), widget (QLabel, label_3) #. i18n: ectx: property (text), widget (QLabel, label_9) @@ -2366,7 +2366,7 @@ #: kdebugdialog/kdebugdialog.ui:138 kdebugdialog/klistdebugdialog.cpp:77 #, kde-format msgid "Disable all debug output" -msgstr "Nonaktifkan semua keluaran debug" +msgstr "Nonaktifkan semua output debug" #. i18n: ectx: property (title), widget (QGroupBox, pWarnGroup) #: kdebugdialog/kdebugdialog.ui:145 @@ -2398,7 +2398,7 @@ #: kdebugdialog/main.cpp:101 #, kde-format msgid "A dialog box for setting preferences for debug output" -msgstr "Sebuah kotak dialog untuk menyetel preferensi atas keluaran debug" +msgstr "Sebuah kotak dialog untuk menyetel preferensi atas output debug" #: kdebugdialog/main.cpp:102 #, kde-format @@ -7198,7 +7198,7 @@ "values are onthespot, overthespot, offthespot and\n" "root" msgstr "" -"mengatur gaya masukan XIM (X Input Method). Kemungkinan\n" +"mengatur gaya input XIM (X Input Method). Kemungkinan\n" "nilai meliputi onthespot, overthespot, offthespot dan\n" "root" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/po/se/kdelibs4support.po new/kdelibs4support-5.48.0/po/se/kdelibs4support.po --- old/kdelibs4support-5.47.0/po/se/kdelibs4support.po 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/po/se/kdelibs4support.po 2018-07-08 00:30:03.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-02-27 03:55+0100\n" +"POT-Creation-Date: 2017-12-19 03:03+0100\n" "PO-Revision-Date: 2012-05-30 23:19+0200\n" "Last-Translator: Børre Gaup <[email protected]>\n" "Language-Team: Northern Sami <[email protected]>\n" @@ -11875,7 +11875,7 @@ msgid "Comment" msgstr "Kommeanta" -#: kdeui/kapplication.cpp:753 +#: kdeui/kapplication.cpp:746 #, kde-format msgid "The style '%1' was not found" msgstr "Stiila «%1» ii gávdnon" @@ -13006,89 +13006,89 @@ msgid "SSL Signers" msgstr "SSL-vuolláičállit" -#: kssl/ksslcertificate.cpp:199 +#: kssl/ksslcertificate.cpp:202 #, kde-format msgid "Signature Algorithm: " msgstr "Vuolláičállinalgoritma: " -#: kssl/ksslcertificate.cpp:200 +#: kssl/ksslcertificate.cpp:203 #, kde-format msgid "Unknown" msgstr "Amas" -#: kssl/ksslcertificate.cpp:203 +#: kssl/ksslcertificate.cpp:206 #, kde-format msgid "Signature Contents:" msgstr "Vuolláicála sisdoallu:" -#: kssl/ksslcertificate.cpp:337 +#: kssl/ksslcertificate.cpp:341 #, fuzzy, kde-format msgctxt "Unknown" msgid "Unknown key algorithm" msgstr "Amas čoavddaaltoritma" -#: kssl/ksslcertificate.cpp:341 +#: kssl/ksslcertificate.cpp:347 #, kde-format msgid "Key type: RSA (%1 bit)" msgstr "Čoavddašládja: RSA (%1 bihttá)" -#: kssl/ksslcertificate.cpp:343 +#: kssl/ksslcertificate.cpp:349 #, kde-format msgid "Modulus: " msgstr "" -#: kssl/ksslcertificate.cpp:356 +#: kssl/ksslcertificate.cpp:362 #, kde-format msgid "Exponent: 0x" msgstr "Eksponeanta: 0x" -#: kssl/ksslcertificate.cpp:365 +#: kssl/ksslcertificate.cpp:374 #, kde-format msgid "Key type: DSA (%1 bit)" msgstr "Čoavddašládja: DSA (%1 bihttá)" -#: kssl/ksslcertificate.cpp:367 +#: kssl/ksslcertificate.cpp:376 #, kde-format msgid "Prime: " msgstr "" -#: kssl/ksslcertificate.cpp:380 +#: kssl/ksslcertificate.cpp:389 #, kde-format msgid "160 bit prime factor: " msgstr "" -#: kssl/ksslcertificate.cpp:406 +#: kssl/ksslcertificate.cpp:417 #, kde-format msgid "Public key: " msgstr "Almmolaš čoavdda: " -#: kssl/ksslcertificate.cpp:1054 +#: kssl/ksslcertificate.cpp:1065 #, fuzzy, kde-format msgid "The certificate is valid." msgstr "Duođaštus gusto." -#: kssl/ksslcertificate.cpp:1056 +#: kssl/ksslcertificate.cpp:1067 #, kde-format msgid "" "Retrieval of the issuer certificate failed. This means the CA's (Certificate " "Authority) certificate can not be found." msgstr "" -#: kssl/ksslcertificate.cpp:1058 +#: kssl/ksslcertificate.cpp:1069 #, kde-format msgid "" "Retrieval of the CRL (Certificate Revocation List) failed. This means the " "CA's (Certificate Authority) CRL can not be found." msgstr "" -#: kssl/ksslcertificate.cpp:1060 +#: kssl/ksslcertificate.cpp:1071 #, kde-format msgid "" "The decryption of the certificate's signature failed. This means it could " "not even be calculated as opposed to just not matching the expected result." msgstr "" -#: kssl/ksslcertificate.cpp:1062 +#: kssl/ksslcertificate.cpp:1073 #, kde-format msgid "" "The decryption of the CRL's (Certificate Revocation List) signature failed. " @@ -13096,7 +13096,7 @@ "the expected result." msgstr "" -#: kssl/ksslcertificate.cpp:1064 +#: kssl/ksslcertificate.cpp:1075 #, kde-format msgid "" "The decoding of the public key of the issuer failed. This means that the " @@ -13104,7 +13104,7 @@ "certificate you wanted to use." msgstr "" -#: kssl/ksslcertificate.cpp:1066 +#: kssl/ksslcertificate.cpp:1077 #, fuzzy, kde-format msgid "" "The certificate's signature is invalid. This means that the certificate can " @@ -13113,58 +13113,58 @@ "Duođaštusa vuolláičála ii gusto. Dát máksá ahte duođaštusa ii leat vejolaš " "duođaštit." -#: kssl/ksslcertificate.cpp:1068 +#: kssl/ksslcertificate.cpp:1079 #, kde-format msgid "" "The CRL's (Certificate Revocation List) signature is invalid. This means " "that the CRL can not be verified." msgstr "" -#: kssl/ksslcertificate.cpp:1070 +#: kssl/ksslcertificate.cpp:1081 #, fuzzy, kde-format msgid "The certificate is not valid, yet." msgstr "Duođaštus ii gusto vel." -#: kssl/ksslcertificate.cpp:1072 +#: kssl/ksslcertificate.cpp:1083 #, fuzzy, kde-format msgid "The certificate is not valid, any more." msgstr "Duođaštus ii šat gusto." -#: kssl/ksslcertificate.cpp:1074 kssl/ksslcertificate.cpp:1076 +#: kssl/ksslcertificate.cpp:1085 kssl/ksslcertificate.cpp:1087 #, kde-format msgid "The CRL (Certificate Revocation List) is not valid, yet." msgstr "" -#: kssl/ksslcertificate.cpp:1078 +#: kssl/ksslcertificate.cpp:1089 #, kde-format msgid "The time format of the certificate's 'notBefore' field is invalid." msgstr "" -#: kssl/ksslcertificate.cpp:1080 +#: kssl/ksslcertificate.cpp:1091 #, kde-format msgid "The time format of the certificate's 'notAfter' field is invalid." msgstr "" -#: kssl/ksslcertificate.cpp:1082 +#: kssl/ksslcertificate.cpp:1093 #, kde-format msgid "" "The time format of the CRL's (Certificate Revocation List) 'lastUpdate' " "field is invalid." msgstr "" -#: kssl/ksslcertificate.cpp:1084 +#: kssl/ksslcertificate.cpp:1095 #, kde-format msgid "" "The time format of the CRL's (Certificate Revocation List) 'nextUpdate' " "field is invalid." msgstr "" -#: kssl/ksslcertificate.cpp:1086 +#: kssl/ksslcertificate.cpp:1097 #, kde-format msgid "The OpenSSL process ran out of memory." msgstr "OpenSSL-proseassas nogai muitu." -#: kssl/ksslcertificate.cpp:1088 +#: kssl/ksslcertificate.cpp:1099 #, kde-format msgid "" "The certificate is self-signed and not in the list of trusted certificates. " @@ -13175,21 +13175,21 @@ "ge. Jus háliidat dohkkehit dán duođaštusa, sisafievrrit dan luohtehahtti " "duođaštusaid vuorkái." -#: kssl/ksslcertificate.cpp:1091 +#: kssl/ksslcertificate.cpp:1102 #, kde-format msgid "" "The certificate is self-signed. While the trust chain could be built up, the " "root CA's (Certificate Authority) certificate can not be found." msgstr "" -#: kssl/ksslcertificate.cpp:1093 +#: kssl/ksslcertificate.cpp:1104 #, kde-format msgid "" "The CA's (Certificate Authority) certificate can not be found. Most likely, " "your trust chain is broken." msgstr "" -#: kssl/ksslcertificate.cpp:1095 +#: kssl/ksslcertificate.cpp:1106 #, kde-format msgid "" "The certificate can not be verified as it is the only certificate in the " @@ -13200,64 +13200,64 @@ "luohttinviđjis ja ii leat iešvuolláičállon ge. Jus iešvuolláičálát " "duođaštusa, de sisafievrrit dan luohtehahtti duođaštusaid vuorkái." -#: kssl/ksslcertificate.cpp:1097 +#: kssl/ksslcertificate.cpp:1108 #, kde-format msgid "The certificate chain is longer than the maximum depth specified." msgstr "" -#: kssl/ksslcertificate.cpp:1100 +#: kssl/ksslcertificate.cpp:1111 #, fuzzy, kde-format msgid "The certificate has been revoked." msgstr "Duođaštus lea gessejuvvon ruovttoluotta." -#: kssl/ksslcertificate.cpp:1102 +#: kssl/ksslcertificate.cpp:1113 #, kde-format msgid "The certificate's CA (Certificate Authority) is invalid." msgstr "" -#: kssl/ksslcertificate.cpp:1104 +#: kssl/ksslcertificate.cpp:1115 #, kde-format msgid "" "The length of the trust chain exceeded one of the CA's (Certificate " "Authority) 'pathlength' parameters, making all subsequent signatures invalid." msgstr "" -#: kssl/ksslcertificate.cpp:1106 +#: kssl/ksslcertificate.cpp:1117 #, kde-format msgid "" "The certificate has not been signed for the purpose you tried to use it for. " "This means the CA (Certificate Authority) does not allow this usage." msgstr "" -#: kssl/ksslcertificate.cpp:1109 +#: kssl/ksslcertificate.cpp:1120 #, kde-format msgid "" "The root CA (Certificate Authority) is not trusted for the purpose you tried " "to use this certificate for." msgstr "" -#: kssl/ksslcertificate.cpp:1112 +#: kssl/ksslcertificate.cpp:1123 #, kde-format msgid "" "The root CA (Certificate Authority) has been marked to be rejected for the " "purpose you tried to use it for." msgstr "" -#: kssl/ksslcertificate.cpp:1114 +#: kssl/ksslcertificate.cpp:1125 #, kde-format msgid "" "The certificate's CA (Certificate Authority) does not match the CA name of " "the certificate." msgstr "" -#: kssl/ksslcertificate.cpp:1116 +#: kssl/ksslcertificate.cpp:1127 #, kde-format msgid "" "The CA (Certificate Authority) certificate's key ID does not match the key " "ID in the 'Issuer' section of the certificate you are trying to use." msgstr "" -#: kssl/ksslcertificate.cpp:1118 +#: kssl/ksslcertificate.cpp:1129 #, kde-format msgid "" "The CA (Certificate Authority) certificate's key ID and name do not match " @@ -13265,19 +13265,19 @@ "trying to use." msgstr "" -#: kssl/ksslcertificate.cpp:1120 +#: kssl/ksslcertificate.cpp:1131 #, kde-format msgid "" "The certificate's CA (Certificate Authority) is not allowed to sign " "certificates." msgstr "" -#: kssl/ksslcertificate.cpp:1122 +#: kssl/ksslcertificate.cpp:1133 #, kde-format msgid "OpenSSL could not be verified." msgstr "" -#: kssl/ksslcertificate.cpp:1126 +#: kssl/ksslcertificate.cpp:1137 #, kde-format msgid "" "The signature test for this certificate failed. This could mean that the " @@ -13288,7 +13288,7 @@ "messages." msgstr "" -#: kssl/ksslcertificate.cpp:1128 +#: kssl/ksslcertificate.cpp:1139 #, kde-format msgid "" "This certificate, any in its trust path or its CA's (Certificate Authority) " @@ -13298,34 +13298,34 @@ "more specific error messages." msgstr "" -#: kssl/ksslcertificate.cpp:1134 +#: kssl/ksslcertificate.cpp:1145 #, kde-format msgid "" "Certificate signing authority root files could not be found so the " "certificate is not verified." msgstr "" -#: kssl/ksslcertificate.cpp:1136 +#: kssl/ksslcertificate.cpp:1147 #, fuzzy, kde-format msgid "SSL support was not found." msgstr "Ii gávdnan SSL-doarjaga." -#: kssl/ksslcertificate.cpp:1138 +#: kssl/ksslcertificate.cpp:1149 #, fuzzy, kde-format msgid "Private key test failed." msgstr "Priváhtačoavdda iskkos filtii." -#: kssl/ksslcertificate.cpp:1140 +#: kssl/ksslcertificate.cpp:1151 #, fuzzy, kde-format msgid "The certificate has not been issued for this host." msgstr "Dát duođaštus ii leat ráhkaduvvon dán guossoheaddjái." -#: kssl/ksslcertificate.cpp:1142 +#: kssl/ksslcertificate.cpp:1153 #, fuzzy, kde-format msgid "This certificate is not relevant." msgstr "Dát duođaštus ii gula dása." -#: kssl/ksslcertificate.cpp:1147 +#: kssl/ksslcertificate.cpp:1158 #, fuzzy, kde-format msgid "The certificate is invalid." msgstr "Duođaštus lea gustomeahttun." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/po/zh_CN/kdelibs4support.po new/kdelibs4support-5.48.0/po/zh_CN/kdelibs4support.po --- old/kdelibs4support-5.47.0/po/zh_CN/kdelibs4support.po 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/po/zh_CN/kdelibs4support.po 2018-07-08 00:30:03.000000000 +0200 @@ -17,7 +17,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-12-19 03:03+0100\n" -"PO-Revision-Date: 2018-05-18 06:23-0400\n" +"PO-Revision-Date: 2018-07-03 17:34\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -12117,7 +12117,7 @@ #: kdeui/ksystemtrayicon.cpp:226 #, kde-format msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>" -msgstr "<qt>您确定想要退出 <b>%1</b> 吗？</qt>" +msgstr "<qt>您确定要退出 <b>%1</b> 吗？</qt>" #: kdeui/ksystemtrayicon.cpp:229 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/src/kdecore/k3resolverstandardworkers.cpp new/kdelibs4support-5.48.0/src/kdecore/k3resolverstandardworkers.cpp --- old/kdelibs4support-5.47.0/src/kdecore/k3resolverstandardworkers.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/src/kdecore/k3resolverstandardworkers.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -405,12 +405,12 @@ ~GetAddrInfoThread() { } - bool preprocess() Q_DECL_OVERRIDE + bool preprocess() override { return true; } - bool run() Q_DECL_OVERRIDE; + bool run() override; void processResults(addrinfo *ai, int ret_code, KResolverResults &rr); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/src/kdecore/k3reverseresolver.cpp new/kdelibs4support-5.48.0/src/kdecore/k3reverseresolver.cpp --- old/kdelibs4support-5.47.0/src/kdecore/k3reverseresolver.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/src/kdecore/k3reverseresolver.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -63,12 +63,12 @@ virtual ~ReverseThread() { } - bool preprocess() Q_DECL_OVERRIDE + bool preprocess() override { return true; } - bool run() Q_DECL_OVERRIDE; - bool postprocess() Q_DECL_OVERRIDE; + bool run() override; + bool postprocess() override; // input: KSocketAddress m_addr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/src/kdecore/kcalendarsystemethiopian.cpp new/kdelibs4support-5.48.0/src/kdecore/kcalendarsystemethiopian.cpp --- old/kdelibs4support-5.47.0/src/kdecore/kcalendarsystemethiopian.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/src/kdecore/kcalendarsystemethiopian.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -38,9 +38,9 @@ { } - void loadDefaultEraList() Q_DECL_OVERRIDE; - QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const Q_DECL_OVERRIDE; - QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const Q_DECL_OVERRIDE; + void loadDefaultEraList() override; + QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const override; + QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const override; }; void KCalendarSystemEthiopianPrivate::loadDefaultEraList() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/src/kdecore/kcalendarsystemhebrew.cpp new/kdelibs4support-5.48.0/src/kdecore/kcalendarsystemhebrew.cpp --- old/kdelibs4support-5.47.0/src/kdecore/kcalendarsystemhebrew.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/src/kdecore/kcalendarsystemhebrew.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -243,22 +243,22 @@ virtual ~KCalendarSystemHebrewPrivate(); // Virtual methods each calendar system must re-implement - void loadDefaultEraList() Q_DECL_OVERRIDE; - int monthsInYear(int year) const Q_DECL_OVERRIDE; - int daysInMonth(int year, int month) const Q_DECL_OVERRIDE; - int daysInYear(int year) const Q_DECL_OVERRIDE; - bool isLeapYear(int year) const Q_DECL_OVERRIDE; - bool hasLeapMonths() const Q_DECL_OVERRIDE; - bool hasYearZero() const Q_DECL_OVERRIDE; - int maxMonthsInYear() const Q_DECL_OVERRIDE; - int earliestValidYear() const Q_DECL_OVERRIDE; - int latestValidYear() const Q_DECL_OVERRIDE; - QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const Q_DECL_OVERRIDE; - QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const Q_DECL_OVERRIDE; + void loadDefaultEraList() override; + int monthsInYear(int year) const override; + int daysInMonth(int year, int month) const override; + int daysInYear(int year) const override; + bool isLeapYear(int year) const override; + bool hasLeapMonths() const override; + bool hasYearZero() const override; + int maxMonthsInYear() const override; + int earliestValidYear() const override; + int latestValidYear() const override; + QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const override; + QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const override; - int integerFromString(const QString &string, int maxLength, int &readLength) const Q_DECL_OVERRIDE; - QString stringFromInteger(int number, int padWidth = 0, QChar padChar = QLatin1Char('0')) const Q_DECL_OVERRIDE; - QString stringFromInteger(int number, int padWidth, QChar padChar, KLocale::DigitSet digitSet) const Q_DECL_OVERRIDE; + int integerFromString(const QString &string, int maxLength, int &readLength) const override; + QString stringFromInteger(int number, int padWidth = 0, QChar padChar = QLatin1Char('0')) const override; + QString stringFromInteger(int number, int padWidth, QChar padChar, KLocale::DigitSet digitSet) const override; virtual int monthNumberToMonthIndex(int year, int month) const; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/src/kdecore/kcalendarsystemindiannational.cpp new/kdelibs4support-5.48.0/src/kdecore/kcalendarsystemindiannational.cpp --- old/kdelibs4support-5.47.0/src/kdecore/kcalendarsystemindiannational.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/src/kdecore/kcalendarsystemindiannational.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -34,18 +34,18 @@ virtual ~KCalendarSystemIndianNationalPrivate(); // Virtual methods each calendar system must re-implement - void loadDefaultEraList() Q_DECL_OVERRIDE; - int monthsInYear(int year) const Q_DECL_OVERRIDE; - int daysInMonth(int year, int month) const Q_DECL_OVERRIDE; - int daysInYear(int year) const Q_DECL_OVERRIDE; - bool isLeapYear(int year) const Q_DECL_OVERRIDE; - bool hasLeapMonths() const Q_DECL_OVERRIDE; - bool hasYearZero() const Q_DECL_OVERRIDE; - int maxMonthsInYear() const Q_DECL_OVERRIDE; - int earliestValidYear() const Q_DECL_OVERRIDE; - int latestValidYear() const Q_DECL_OVERRIDE; - QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const Q_DECL_OVERRIDE; - QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const Q_DECL_OVERRIDE; + void loadDefaultEraList() override; + int monthsInYear(int year) const override; + int daysInMonth(int year, int month) const override; + int daysInYear(int year) const override; + bool isLeapYear(int year) const override; + bool hasLeapMonths() const override; + bool hasYearZero() const override; + int maxMonthsInYear() const override; + int earliestValidYear() const override; + int latestValidYear() const override; + QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const override; + QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const override; }; // Shared d pointer base class definitions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/src/kdecore/kcalendarsystemislamiccivil.cpp new/kdelibs4support-5.48.0/src/kdecore/kcalendarsystemislamiccivil.cpp --- old/kdelibs4support-5.47.0/src/kdecore/kcalendarsystemislamiccivil.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/src/kdecore/kcalendarsystemislamiccivil.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -34,18 +34,18 @@ virtual ~KCalendarSystemIslamicCivilPrivate(); // Virtual methods each calendar system must re-implement - void loadDefaultEraList() Q_DECL_OVERRIDE; - int monthsInYear(int year) const Q_DECL_OVERRIDE; - int daysInMonth(int year, int month) const Q_DECL_OVERRIDE; - int daysInYear(int year) const Q_DECL_OVERRIDE; - bool isLeapYear(int year) const Q_DECL_OVERRIDE; - bool hasLeapMonths() const Q_DECL_OVERRIDE; - bool hasYearZero() const Q_DECL_OVERRIDE; - int maxMonthsInYear() const Q_DECL_OVERRIDE; - int earliestValidYear() const Q_DECL_OVERRIDE; - int latestValidYear() const Q_DECL_OVERRIDE; - QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const Q_DECL_OVERRIDE; - QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const Q_DECL_OVERRIDE; + void loadDefaultEraList() override; + int monthsInYear(int year) const override; + int daysInMonth(int year, int month) const override; + int daysInYear(int year) const override; + bool isLeapYear(int year) const override; + bool hasLeapMonths() const override; + bool hasYearZero() const override; + int maxMonthsInYear() const override; + int earliestValidYear() const override; + int latestValidYear() const override; + QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const override; + QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const override; }; // Shared d pointer base class definitions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/src/kdecore/kcalendarsystemjalali.cpp new/kdelibs4support-5.48.0/src/kdecore/kcalendarsystemjalali.cpp --- old/kdelibs4support-5.47.0/src/kdecore/kcalendarsystemjalali.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/src/kdecore/kcalendarsystemjalali.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -42,18 +42,18 @@ virtual ~KCalendarSystemJalaliPrivate(); // Virtual methods each calendar system must re-implement - void loadDefaultEraList() Q_DECL_OVERRIDE; - int monthsInYear(int year) const Q_DECL_OVERRIDE; - int daysInMonth(int year, int month) const Q_DECL_OVERRIDE; - int daysInYear(int year) const Q_DECL_OVERRIDE; - bool isLeapYear(int year) const Q_DECL_OVERRIDE; - bool hasLeapMonths() const Q_DECL_OVERRIDE; - bool hasYearZero() const Q_DECL_OVERRIDE; - int maxMonthsInYear() const Q_DECL_OVERRIDE; - int earliestValidYear() const Q_DECL_OVERRIDE; - int latestValidYear() const Q_DECL_OVERRIDE; - QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const Q_DECL_OVERRIDE; - QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const Q_DECL_OVERRIDE; + void loadDefaultEraList() override; + int monthsInYear(int year) const override; + int daysInMonth(int year, int month) const override; + int daysInYear(int year) const override; + bool isLeapYear(int year) const override; + bool hasLeapMonths() const override; + bool hasYearZero() const override; + int maxMonthsInYear() const override; + int earliestValidYear() const override; + int latestValidYear() const override; + QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const override; + QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const override; }; // Shared d pointer base class definitions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/src/kdecore/kcalendarsystemjapanese.cpp new/kdelibs4support-5.48.0/src/kdecore/kcalendarsystemjapanese.cpp --- old/kdelibs4support-5.47.0/src/kdecore/kcalendarsystemjapanese.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/src/kdecore/kcalendarsystemjapanese.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -32,8 +32,8 @@ KDELIBS4SUPPORT_DEPRECATED explicit KCalendarSystemJapanesePrivate(KCalendarSystemJapanese *q); virtual ~KCalendarSystemJapanesePrivate(); - void loadDefaultEraList() Q_DECL_OVERRIDE; - int earliestValidYear() const Q_DECL_OVERRIDE; + void loadDefaultEraList() override; + int earliestValidYear() const override; }; //Override only a few of the Gregorian private methods diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/src/kdecore/kcalendarsystemjulian.cpp new/kdelibs4support-5.48.0/src/kdecore/kcalendarsystemjulian.cpp --- old/kdelibs4support-5.47.0/src/kdecore/kcalendarsystemjulian.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/src/kdecore/kcalendarsystemjulian.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -35,18 +35,18 @@ virtual ~KCalendarSystemJulianPrivate(); // Virtual methods each calendar system must re-implement - void loadDefaultEraList() Q_DECL_OVERRIDE; - int monthsInYear(int year) const Q_DECL_OVERRIDE; - int daysInMonth(int year, int month) const Q_DECL_OVERRIDE; - int daysInYear(int year) const Q_DECL_OVERRIDE; - bool isLeapYear(int year) const Q_DECL_OVERRIDE; - bool hasLeapMonths() const Q_DECL_OVERRIDE; - bool hasYearZero() const Q_DECL_OVERRIDE; - int maxMonthsInYear() const Q_DECL_OVERRIDE; - int earliestValidYear() const Q_DECL_OVERRIDE; - int latestValidYear() const Q_DECL_OVERRIDE; - QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const Q_DECL_OVERRIDE; - QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const Q_DECL_OVERRIDE; + void loadDefaultEraList() override; + int monthsInYear(int year) const override; + int daysInMonth(int year, int month) const override; + int daysInYear(int year) const override; + bool isLeapYear(int year) const override; + bool hasLeapMonths() const override; + bool hasYearZero() const override; + int maxMonthsInYear() const override; + int earliestValidYear() const override; + int latestValidYear() const override; + QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const override; + QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const override; bool m_useCommonEra; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/src/kdecore/kcalendarsystemminguo.cpp new/kdelibs4support-5.48.0/src/kdecore/kcalendarsystemminguo.cpp --- old/kdelibs4support-5.47.0/src/kdecore/kcalendarsystemminguo.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/src/kdecore/kcalendarsystemminguo.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -32,11 +32,11 @@ KDELIBS4SUPPORT_DEPRECATED explicit KCalendarSystemMinguoPrivate(KCalendarSystemMinguo *q); virtual ~KCalendarSystemMinguoPrivate(); - void loadDefaultEraList() Q_DECL_OVERRIDE; - int daysInMonth(int year, int month) const Q_DECL_OVERRIDE; - int daysInYear(int year) const Q_DECL_OVERRIDE; - bool isLeapYear(int year) const Q_DECL_OVERRIDE; - int earliestValidYear() const Q_DECL_OVERRIDE; + void loadDefaultEraList() override; + int daysInMonth(int year, int month) const override; + int daysInYear(int year) const override; + bool isLeapYear(int year) const override; + int earliestValidYear() const override; }; //Override only a few of the Gregorian private methods diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/src/kdecore/kcalendarsystemthai.cpp new/kdelibs4support-5.48.0/src/kdecore/kcalendarsystemthai.cpp --- old/kdelibs4support-5.47.0/src/kdecore/kcalendarsystemthai.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/src/kdecore/kcalendarsystemthai.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -32,12 +32,12 @@ KDELIBS4SUPPORT_DEPRECATED explicit KCalendarSystemThaiPrivate(KCalendarSystemThai *q); virtual ~KCalendarSystemThaiPrivate(); - void loadDefaultEraList() Q_DECL_OVERRIDE; - int daysInMonth(int year, int month) const Q_DECL_OVERRIDE; - int daysInYear(int year) const Q_DECL_OVERRIDE; - bool isLeapYear(int year) const Q_DECL_OVERRIDE; - bool hasYearZero() const Q_DECL_OVERRIDE; - int earliestValidYear() const Q_DECL_OVERRIDE; + void loadDefaultEraList() override; + int daysInMonth(int year, int month) const override; + int daysInYear(int year) const override; + bool isLeapYear(int year) const override; + bool hasYearZero() const override; + int earliestValidYear() const override; }; //Override only a few of the Gregorian private methods diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/src/kdecore/kdebug.cpp new/kdelibs4support-5.48.0/src/kdecore/kdebug.cpp --- old/kdelibs4support-5.47.0/src/kdecore/kdebug.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/src/kdecore/kdebug.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -112,19 +112,19 @@ { open(WriteOnly); } - bool isSequential() const Q_DECL_OVERRIDE + bool isSequential() const override { return true; } - qint64 readData(char *, qint64) Q_DECL_OVERRIDE + qint64 readData(char *, qint64) override { return 0; /* eof */ } - qint64 readLineData(char *, qint64) Q_DECL_OVERRIDE + qint64 readLineData(char *, qint64) override { return 0; /* eof */ } - qint64 writeData(const char *, qint64 len) Q_DECL_OVERRIDE + qint64 writeData(const char *, qint64 len) override { return len; } @@ -147,7 +147,7 @@ { // Q_OBJECT public: - qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE + qint64 writeData(const char *data, qint64 len) override { if (len) { // not using fromRawData because we need a terminating NUL @@ -179,7 +179,7 @@ { // Q_OBJECT public: - qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE + qint64 writeData(const char *data, qint64 len) override { if (len) { QFile aOutputFile(m_fileName); @@ -208,7 +208,7 @@ { // Q_OBJECT public: - qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE + qint64 writeData(const char *data, qint64 len) override { if (len) { // Since we are in kdecore here, we cannot use KMsgBox @@ -229,7 +229,7 @@ { // Q_OBJECT public: - qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE + qint64 writeData(const char *data, qint64 len) override { QByteArray buf = QByteArray::fromRawData(data, len); qt_message_output(QtDebugMsg, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/src/kdeui/kcolordialog.cpp new/kdelibs4support-5.48.0/src/kdeui/kcolordialog.cpp --- old/kdelibs4support-5.47.0/src/kdeui/kcolordialog.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/src/kdeui/kcolordialog.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -138,7 +138,7 @@ { public: KColorCellsItemDelegate(KColorCells *parent): QStyledItemDelegate(parent) {} - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override { QStyleOptionViewItemV4 opt(option); initStyleOption(&opt, index); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/src/kdeui/kfontcombobox.cpp new/kdelibs4support-5.48.0/src/kdeui/kfontcombobox.cpp --- old/kdelibs4support-5.47.0/src/kdeui/kfontcombobox.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/src/kdeui/kfontcombobox.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -56,10 +56,10 @@ void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; QIcon truetype; QIcon bitmap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/src/kdeui/kmenu.cpp new/kdelibs4support-5.48.0/src/kdeui/kmenu.cpp --- old/kdelibs4support-5.47.0/src/kdeui/kmenu.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/src/kdeui/kmenu.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -63,7 +63,7 @@ * * @author Rafael Fernández López <[email protected]> */ - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE + bool eventFilter(QObject *object, QEvent *event) override { Q_UNUSED(object); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/src/kdeui/kpixmapcache.cpp new/kdelibs4support-5.48.0/src/kdeui/kpixmapcache.cpp --- old/kdelibs4support-5.47.0/src/kdeui/kpixmapcache.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/src/kdeui/kpixmapcache.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -138,7 +138,7 @@ KPCMemoryDevice(char *start, quint32 *size, quint32 available); virtual ~KPCMemoryDevice(); - qint64 size() const Q_DECL_OVERRIDE + qint64 size() const override { return *mSize; } @@ -146,11 +146,11 @@ { *mSize = s; } - bool seek(qint64 pos) Q_DECL_OVERRIDE; + bool seek(qint64 pos) override; protected: - qint64 readData(char *data, qint64 maxSize) Q_DECL_OVERRIDE; - qint64 writeData(const char *data, qint64 maxSize) Q_DECL_OVERRIDE; + qint64 readData(char *data, qint64 maxSize) override; + qint64 writeData(const char *data, qint64 maxSize) override; private: char *mMemory; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/src/kssl/kcm/cacertificatespage.cpp new/kdelibs4support-5.48.0/src/kssl/kcm/cacertificatespage.cpp --- old/kdelibs4support-5.47.0/src/kssl/kcm/cacertificatespage.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/src/kssl/kcm/cacertificatespage.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -71,7 +71,7 @@ setEnabled(isEnabled); } - QVariant data(int column, int role) const Q_DECL_OVERRIDE + QVariant data(int column, int role) const override { switch (role) { case Qt::DisplayRole: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/src/solid-networkstatus/kded/networkstatus.desktop new/kdelibs4support-5.48.0/src/solid-networkstatus/kded/networkstatus.desktop --- old/kdelibs4support-5.47.0/src/solid-networkstatus/kded/networkstatus.desktop 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/src/solid-networkstatus/kded/networkstatus.desktop 2018-07-08 00:30:03.000000000 +0200 @@ -142,7 +142,6 @@ X-KDE-ServiceTypes=KDEDModule X-KDE-ModuleType=Library X-KDE-Library=kf5/kded/networkstatus -X-KDE-DBus-ModuleName=networkstatus X-KDE-Kded-autoload=true X-KDE-Kded-load-on-demand=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdelibs4support-5.47.0/tests/kprogressdialogtest.cpp new/kdelibs4support-5.48.0/tests/kprogressdialogtest.cpp --- old/kdelibs4support-5.47.0/tests/kprogressdialogtest.cpp 2018-06-02 19:52:27.000000000 +0200 +++ new/kdelibs4support-5.48.0/tests/kprogressdialogtest.cpp 2018-07-08 00:30:03.000000000 +0200 @@ -30,7 +30,7 @@ int steps; - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *) override; }; void MyWidget::timerEvent(QTimerEvent *)
