Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kconfig for openSUSE:Factory checked in at 2021-05-10 15:35:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kconfig (Old) and /work/SRC/openSUSE:Factory/.kconfig.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kconfig" Mon May 10 15:35:19 2021 rev:94 rq:891734 version:5.82.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kconfig/kconfig.changes 2021-04-12 12:35:54.629253306 +0200 +++ /work/SRC/openSUSE:Factory/.kconfig.new.2988/kconfig.changes 2021-05-10 15:36:50.434165488 +0200 @@ -1,0 +2,19 @@ +Sat May 1 16:40:39 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.82.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.82.0 +- Changes since 5.81.0: + * Make the docs state that KConfig::reparseConfiguration() calls + sync() if needed + * Use new version-controlled enumerator deprecation warning macros + * Deprecate KDesktopFile::readDevice() + * Remove stray tick from readme + * KConfig: rename kconfigdata.h to kconfigdata_p.h + * Relicense to LGPL-2.0-or-later + * kconfig_compiler: add override to generated destructors + * autotests: look for cmd, not bash, on Windows +- Rebase kconfig-desktop-translations.patch + +------------------------------------------------------------------- Old: ---- kconfig-5.81.0.tar.xz kconfig-5.81.0.tar.xz.sig New: ---- kconfig-5.82.0.tar.xz kconfig-5.82.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kconfig.spec ++++++ --- /var/tmp/diff_new_pack.hRwlV1/_old 2021-05-10 15:36:50.978163382 +0200 +++ /var/tmp/diff_new_pack.hRwlV1/_new 2021-05-10 15:36:50.982163366 +0200 @@ -17,14 +17,14 @@ %define sonum 5 -%define _tar_path 5.81 +%define _tar_path 5.82 # 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: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kconfig -Version: 5.81.0 +Version: 5.82.0 Release: 0 Summary: Advanced configuration system License: LGPL-2.1-or-later AND GPL-2.0-or-later @@ -41,12 +41,12 @@ BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem -BuildRequires: cmake(Qt5Core) >= 5.14.0 -BuildRequires: cmake(Qt5DBus) >= 5.14.0 -BuildRequires: cmake(Qt5Gui) >= 5.14.0 -BuildRequires: cmake(Qt5Xml) >= 5.14.0 +BuildRequires: cmake(Qt5Core) >= 5.15.0 +BuildRequires: cmake(Qt5DBus) >= 5.15.0 +BuildRequires: cmake(Qt5Gui) >= 5.15.0 +BuildRequires: cmake(Qt5Xml) >= 5.15.0 %if %{with lang} -BuildRequires: cmake(Qt5LinguistTools) >= 5.14.0 +BuildRequires: cmake(Qt5LinguistTools) >= 5.15.0 %endif %description @@ -110,8 +110,8 @@ Requires: kconf_update5 = %{version} Requires: libKF5ConfigCore%{sonum} = %{version} Requires: libKF5ConfigGui%{sonum} = %{version} -Requires: cmake(Qt5DBus) >= 5.14.0 -Requires: cmake(Qt5Xml) >= 5.14.0 +Requires: cmake(Qt5DBus) >= 5.15.0 +Requires: cmake(Qt5Xml) >= 5.15.0 %description devel KConfig provides an advanced configuration system. It is made of two parts: @@ -134,12 +134,12 @@ %autosetup -p1 %build - %cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert - %cmake_build +%cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert +%cmake_build %install - %kf5_makeinstall -C build - %fdupes %{buildroot} +%kf5_makeinstall -C build +%fdupes %{buildroot} %if %{with lang} %find_lang %{name}5 --with-qt --without-mo ++++++ kconfig-5.81.0.tar.xz -> kconfig-5.82.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/.gitignore new/kconfig-5.82.0/.gitignore --- old/kconfig-5.81.0/.gitignore 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/.gitignore 2021-05-01 14:30:13.000000000 +0200 @@ -22,3 +22,6 @@ .cmake/ /.clang-format /compile_commands.json +.clangd +.idea +/cmake-build* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/CMakeLists.txt new/kconfig-5.82.0/CMakeLists.txt --- old/kconfig-5.81.0/CMakeLists.txt 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/CMakeLists.txt 2021-05-01 14:30:13.000000000 +0200 @@ -1,16 +1,16 @@ cmake_minimum_required(VERSION 3.5) -set(KF_VERSION "5.81.0") # handled by release scripts +set(KF_VERSION "5.82.0") # handled by release scripts project(KConfig VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.81.0 NO_MODULE) +find_package(ECM 5.82.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -set(REQUIRED_QT_VERSION 5.14.0) +set(REQUIRED_QT_VERSION 5.15.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Xml) option(KCONFIG_USE_GUI "Build components using Qt5Gui" ON) @@ -52,7 +52,7 @@ SOVERSION 5) add_definitions(-DQT_NO_FOREACH) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) add_subdirectory(src) if (BUILD_TESTING) @@ -60,9 +60,7 @@ endif() include (ECMPoQmTools) -if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") - ecm_install_po_files_as_qm(po) -endif() +ecm_install_po_files_as_qm(po) # create a Config.cmake and a ConfigVersion.cmake file and install them diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/DESIGN new/kconfig-5.82.0/DESIGN --- old/kconfig-5.81.0/DESIGN 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/DESIGN 2021-05-01 14:30:13.000000000 +0200 @@ -1,7 +1,7 @@ If you add a major new feature, suggest using it in http://techbase.kde.org/Development/Tutorials/KConfig -kconfigdata.h contains definitions of the data formats used by kconfig. +kconfigdata_p.h contains definitions of the data formats used by kconfig. Configuration entries are stored as "KEntry". They are indexed with "KEntryKey". The primary store is a "KEntryMap" which is defined as a QMap from "KEntryKey" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/README.md new/kconfig-5.82.0/README.md --- old/kconfig-5.81.0/README.md 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/README.md 2021-05-01 14:30:13.000000000 +0200 @@ -10,7 +10,7 @@ KConfigCore provides access to the configuration files themselves. It features: - Code generation: describe your configuration in an XML file, and use - `kconfig_compiler to generate classes that read and write configuration + kconfig_compiler to generate classes that read and write configuration entries. - Cascading configuration files (global settings overridden by local settings). - Optional shell expansion support (see [docs/options.md](@ref options)). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test1.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test1.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test1.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test1.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -19,7 +19,7 @@ }; Test1( const QString & transport, const QString & folder, QObject *parent = nullptr ); - ~Test1(); + ~Test1() override; /** Set One option diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test10.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test10.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test10.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test10.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -12,7 +12,7 @@ public: static Test10 *self(); - ~Test10(); + ~Test10() override; /** Get foo bar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test11.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test11.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test11.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test11.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -23,7 +23,7 @@ enum MailClient { sendmail, kmail }; Test11( QObject *parent = nullptr ); - ~Test11(); + ~Test11() override; /** Set Enable automatic saving of calendar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test11a.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test11a.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test11a.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test11a.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -23,7 +23,7 @@ enum MailClient { sendmail, kmail }; Test11a( ); - ~Test11a(); + ~Test11a() override; /** Set Enable automatic saving of calendar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test12.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test12.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test12.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test12.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -13,7 +13,7 @@ public: Test12( ); - ~Test12(); + ~Test12() override; /** Get RnRSource diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test13.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test13.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test13.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test13.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -14,7 +14,7 @@ public: Test13( ); - ~Test13(); + ~Test13() override; Q_PROPERTY(QUrl picturesDir READ picturesDir CONSTANT) Q_PROPERTY(bool isPicturesDirImmutable READ isPicturesDirImmutable CONSTANT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test2.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test2.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test2.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test2.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -16,7 +16,7 @@ enum EnumDestination { standardDestination, askDestination, argl1, argl2, argl3 }; Test2( ); - ~Test2(); + ~Test2() override; /** Set Enable automatic saving of calendar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test3.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test3.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test3.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test3.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -15,7 +15,7 @@ public: Test3( ); - ~Test3(); + ~Test3() override; /** Set Enable automatic saving of calendar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test3a.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test3a.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test3a.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test3a.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -16,7 +16,7 @@ public: Test3a( ); - ~Test3a(); + ~Test3a() override; /** Set Enable automatic saving of calendar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test4.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test4.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test4.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test4.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -23,7 +23,7 @@ }; static Test4 *self(); - ~Test4(); + ~Test4() override; /** Set Block colors. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test5.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test5.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test5.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test5.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -15,7 +15,7 @@ static const char* const EnumButtonToString[]; static Test5 *self(); - ~Test5(); + ~Test5() override; /** Set Block colors. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test6.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test6.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test6.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test6.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -12,7 +12,7 @@ public: Test6( const QString & Number ); - ~Test6(); + ~Test6() override; /** Set Block colors. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test7.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test7.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test7.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test7.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -12,7 +12,7 @@ public: Test7( int Number ); - ~Test7(); + ~Test7() override; /** Set Block colors. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test8a.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test8a.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test8a.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test8a.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -13,7 +13,7 @@ public: Test8a( KSharedConfig::Ptr config = KSharedConfig::openConfig(), QObject *parent = nullptr ); - ~Test8a(); + ~Test8a() override; /** Set Font diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test8b.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test8b.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test8b.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test8b.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -14,7 +14,7 @@ public: static Test8b *self(); - ~Test8b(); + ~Test8b() override; /** Set Something diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test8c.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test8c.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test8c.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test8c.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -14,7 +14,7 @@ static Test8c *self(); static void instance(const QString& cfgfilename); static void instance(KSharedConfig::Ptr config); - ~Test8c(); + ~Test8c() override; /** Set Font diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test9.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test9.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test9.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test9.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -14,7 +14,7 @@ public: Test9( const QString & transport, const QString & folder ); - ~Test9(); + ~Test9() override; /** Set MyStringList diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test_dpointer.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test_dpointer.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test_dpointer.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test_dpointer.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -19,7 +19,7 @@ }; static TestDPointer *self(); - ~TestDPointer(); + ~TestDPointer() override; /** Set Enable automatic saving of calendar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test_emptyentries.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test_emptyentries.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test_emptyentries.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test_emptyentries.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -15,7 +15,7 @@ static QMakeBuilderSettings *self(); static void instance(const QString& cfgfilename); static void instance(KSharedConfig::Ptr config); - ~QMakeBuilderSettings(); + ~QMakeBuilderSettings() override; protected: QMakeBuilderSettings(KSharedConfig::Ptr config); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test_notifiers.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test_notifiers.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test_notifiers.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test_notifiers.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -12,7 +12,7 @@ public: TestNotifiers( int Number ); - ~TestNotifiers(); + ~TestNotifiers() override; /** Set Block colors. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test_param_minmax.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test_param_minmax.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test_param_minmax.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test_param_minmax.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -13,7 +13,7 @@ public: TestParamMinMax( KSharedConfig::Ptr config = KSharedConfig::openConfig() ); - ~TestParamMinMax(); + ~TestParamMinMax() override; /** Set foo_#$(myparam) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test_properties_minmax.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test_properties_minmax.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test_properties_minmax.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test_properties_minmax.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -14,7 +14,7 @@ public: TestPropertiesMinMax( KSharedConfig::Ptr config = KSharedConfig::openConfig() ); - ~TestPropertiesMinMax(); + ~TestPropertiesMinMax() override; /** Set bar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test_qdebugcategory.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test_qdebugcategory.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test_qdebugcategory.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test_qdebugcategory.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -14,7 +14,7 @@ public: TestQCategory( int Number ); - ~TestQCategory(); + ~TestQCategory() override; /** Set Block colors. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test_signal.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test_signal.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test_signal.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test_signal.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -13,7 +13,7 @@ public: static TestSignal *self(); - ~TestSignal(); + ~TestSignal() override; /** Set Current emoticon theme. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test_subgroups.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test_subgroups.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test_subgroups.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test_subgroups.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -12,7 +12,7 @@ public: TestSubgroups( const QString & GeneralGroup, const QString & SubGroup, const QString & AnotherSubGroup ); - ~TestSubgroups(); + ~TestSubgroups() override; /** Get Foo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test_translation_kde.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test_translation_kde.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test_translation_kde.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test_translation_kde.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -15,7 +15,7 @@ public: TestTranslationKde( ); - ~TestTranslationKde(); + ~TestTranslationKde() override; /** Get Enable automatic saving of calendar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test_translation_kde_domain.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test_translation_kde_domain.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test_translation_kde_domain.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test_translation_kde_domain.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -15,7 +15,7 @@ public: TestTranslationKdeDomain( ); - ~TestTranslationKdeDomain(); + ~TestTranslationKdeDomain() override; /** Get Enable automatic saving of calendar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kconfig_compiler/test_translation_qt.h.ref new/kconfig-5.82.0/autotests/kconfig_compiler/test_translation_qt.h.ref --- old/kconfig-5.81.0/autotests/kconfig_compiler/test_translation_qt.h.ref 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kconfig_compiler/test_translation_qt.h.ref 2021-05-01 14:30:13.000000000 +0200 @@ -15,7 +15,7 @@ public: TestTranslationQt( ); - ~TestTranslationQt(); + ~TestTranslationQt() override; /** Get Enable automatic saving of calendar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kdesktopfiletest.cpp new/kconfig-5.82.0/autotests/kdesktopfiletest.cpp --- old/kconfig-5.81.0/autotests/kdesktopfiletest.cpp 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kdesktopfiletest.cpp 2021-05-01 14:30:13.000000000 +0200 @@ -227,8 +227,13 @@ "Type=Application\n" "Name=My Application\n" "Exec=kfoo\n" - "TryExec=bash\n" - "X-KDE-AuthorizeAction=someAction" + "TryExec="; +#ifdef Q_OS_WIN + ts << "cmd\n"; +#else + ts << "bash\n"; +#endif + ts << "X-KDE-AuthorizeAction=someAction" "\n"; file.close(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/autotests/kentrymaptest.h new/kconfig-5.82.0/autotests/kentrymaptest.h --- old/kconfig-5.81.0/autotests/kentrymaptest.h 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/autotests/kentrymaptest.h 2021-05-01 14:30:13.000000000 +0200 @@ -7,7 +7,7 @@ #ifndef KENTRYMAPTEST_H #define KENTRYMAPTEST_H -#include "kconfigdata.h" +#include "kconfigdata_p.h" #include <QObject> class KEntryMapTest : public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/docs/DESIGN.kconfig new/kconfig-5.82.0/docs/DESIGN.kconfig --- old/kconfig-5.81.0/docs/DESIGN.kconfig 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/docs/DESIGN.kconfig 2021-05-01 14:30:13.000000000 +0200 @@ -1,4 +1,4 @@ -kconfigdata.h contains definitions of the data formats used by kconfig. +kconfigdata_p.h contains definitions of the data formats used by kconfig. Configuration entries are stored as "KEntry". They are indexed with "KEntryKey". The primary store is a "KEntryMap" which is defined as a QMap from "KEntryKey" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/docs/Doxyfile.local new/kconfig-5.82.0/docs/Doxyfile.local --- old/kconfig-5.81.0/docs/Doxyfile.local 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/docs/Doxyfile.local 2021-05-01 14:30:13.000000000 +0200 @@ -5,6 +5,12 @@ "KCONFIGCORE_ENABLE_DEPRECATED_SINCE(x, y)=1" \ "KCONFIGCORE_BUILD_DEPRECATED_SINCE(x, y)=1" \ "KCONFIGCORE_DEPRECATED_VERSION(x, y, t)=" \ + "KCONFIGCORE_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)=" \ + "KCONFIGCORE_ENUMERATOR_DEPRECATED_VERSION(x, y, t)=" \ + "KCONFIGCORE_ENUMERATOR_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)=" \ "KCONFIGGUI_ENABLE_DEPRECATED_SINCE(x, y)=1" \ "KCONFIGGUI_BUILD_DEPRECATED_SINCE(x, y)=1" \ - "KCONFIGGUI_DEPRECATED_VERSION(x, y, t)=" + "KCONFIGGUI_DEPRECATED_VERSION(x, y, t)=" \ + "KCONFIGGUI_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)=" \ + "KCONFIGGUI_ENUMERATOR_DEPRECATED_VERSION(x, y, t)=" \ + "KCONFIGGUI_ENUMERATOR_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)=" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/po/de/kconfig5_qt.po new/kconfig-5.82.0/po/de/kconfig5_qt.po --- old/kconfig-5.81.0/po/de/kconfig5_qt.po 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/po/de/kconfig5_qt.po 2021-05-01 14:30:13.000000000 +0200 @@ -1,14 +1,14 @@ # Thomas Diehl <[email protected]>, 2003. # Thomas Reitelbach <[email protected]>, 2006, 2007, 2008. # Frederik Schwarzer <[email protected]>, 2012, 2014, 2015, 2016, 2020. -# Burkhard L??ck <[email protected]>, 2014, 2015, 2016, 2017, 2018, 2019. +# Burkhard L??ck <[email protected]>, 2014, 2015, 2016, 2017, 2018, 2019, 2021. msgid "" msgstr "" "Project-Id-Version: kwriteconfig\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2020-09-06 12:38+0200\n" -"Last-Translator: Frederik Schwarzer <[email protected]>\n" +"PO-Revision-Date: 2021-04-14 06:29+0200\n" +"Last-Translator: Burkhard L??ck <[email protected]>\n" "Language-Team: German <[email protected]>\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -16,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -"X-Generator: Lokalize 20.08.1\n" +"X-Generator: Lokalize 19.12.3\n" #: core/kconfig.cpp:918 msgctxt "KConfig|" @@ -438,7 +438,7 @@ #: gui/kstandardshortcut.cpp:377 msgctxt "KStandardShortcut|@action" msgid "Move to Trash" -msgstr "In den Papierkorb werfen" +msgstr "In den Papierkorb verschieben" #: gui/kstandardshortcut.cpp:383 msgctxt "KStandardShortcut|@action" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/po/id/kconfig5_qt.po new/kconfig-5.82.0/po/id/kconfig5_qt.po --- old/kconfig-5.81.0/po/id/kconfig5_qt.po 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/po/id/kconfig5_qt.po 2021-05-01 14:30:13.000000000 +0200 @@ -3,14 +3,14 @@ # This file is distributed under the same license as the kwriteconfig package. # Gian Giovani <[email protected]>, 2010. # Andhika Padmawan <[email protected]>, 2014. -# Wantoyo <[email protected]>, 2017, 2018, 2019, 2020. +# Wantoyo <[email protected]>, 2017, 2018, 2019, 2020, 2021. # msgid "" msgstr "" "Project-Id-Version: kwriteconfig\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2020-04-29 20:28+0700\n" +"PO-Revision-Date: 2021-04-18 00:40+0700\n" "Last-Translator: Wantoyo <[email protected]>\n" "Language-Team: Indonesian <[email protected]>\n" "Language: id\n" @@ -18,7 +18,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 19.12.1\n" +"X-Generator: Lokalize 20.12.1\n" "X-Qt-Contexts: true\n" #: core/kconfig.cpp:918 @@ -371,7 +371,7 @@ #: gui/kstandardshortcut.cpp:326 msgctxt "KStandardShortcut|@action" msgid "Show Toolbar" -msgstr "Tampilkan Bilah Alat" +msgstr "Tampilkan Toolbar" #: gui/kstandardshortcut.cpp:327 msgctxt "KStandardShortcut|@action" @@ -396,7 +396,7 @@ #: gui/kstandardshortcut.cpp:345 msgctxt "KStandardShortcut|@action" msgid "Configure Toolbars" -msgstr "Konfigurasikan Bilah Alat" +msgstr "Konfigurasikan Toolbar" #: gui/kstandardshortcut.cpp:353 msgctxt "KStandardShortcut|@action" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/po/zh_CN/kconfig5_qt.po new/kconfig-5.82.0/po/zh_CN/kconfig5_qt.po --- old/kconfig-5.81.0/po/zh_CN/kconfig5_qt.po 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/po/zh_CN/kconfig5_qt.po 2021-05-01 14:30:13.000000000 +0200 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2021-03-27 17:28\n" +"PO-Revision-Date: 2021-04-24 15:42\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/src/CMakeLists.txt new/kconfig-5.82.0/src/CMakeLists.txt --- old/kconfig-5.81.0/src/CMakeLists.txt 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/src/CMakeLists.txt 2021-05-01 14:30:13.000000000 +0200 @@ -37,10 +37,16 @@ KCONFIGCORE_DEPRECATED_EXPORT KCONFIGCORE_DEPRECATED "KCONFIGCORE_DEPRECATED_VERSION(x, y, t)" + "KCONFIGCORE_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)" + "KCONFIGCORE_ENUMERATOR_DEPRECATED_VERSION(x, y, t)" + "KCONFIGCORE_ENUMERATOR_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)" KCONFIGGUI_EXPORT KCONFIGGUI_DEPRECATED_EXPORT KCONFIGGUI_DEPRECATED "KCONFIGGUI_DEPRECATED_VERSION(x, y, t)" + "KCONFIGGUI_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)" + "KCONFIGGUI_ENUMERATOR_DEPRECATED_VERSION(x, y, t)" + "KCONFIGGUI_ENUMERATOR_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)" TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} COMPONENT Devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/src/core/CMakeLists.txt new/kconfig-5.82.0/src/core/CMakeLists.txt --- old/kconfig-5.81.0/src/core/CMakeLists.txt 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/src/core/CMakeLists.txt 2021-05-01 14:30:13.000000000 +0200 @@ -31,7 +31,7 @@ GROUP_BASE_NAME KF VERSION ${KF_VERSION} DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 4.0 5.0 5.24 5.42 + DEPRECATION_VERSIONS 4.0 5.0 5.24 5.42 5.82 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/src/core/kconfig.h new/kconfig-5.82.0/src/core/kconfig.h --- old/kconfig-5.81.0/src/core/kconfig.h 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/src/core/kconfig.h 2021-05-01 14:30:13.000000000 +0200 @@ -233,6 +233,8 @@ /** * Updates the state of this object to match the persistent storage. + * Note that if this object has pending changes, this method will + * call sync() first so as not to lose those changes. */ void reparseConfiguration(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/src/core/kconfig_p.h new/kconfig-5.82.0/src/core/kconfig_p.h --- old/kconfig-5.81.0/src/core/kconfig_p.h 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/src/core/kconfig_p.h 2021-05-01 14:30:13.000000000 +0200 @@ -12,7 +12,7 @@ #define KCONFIG_P_H #include "kconfigbackend_p.h" -#include "kconfigdata.h" +#include "kconfigdata_p.h" #include "kconfiggroup.h" #include <QDir> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/src/core/kconfigbackend.cpp new/kconfig-5.82.0/src/core/kconfigbackend.cpp --- old/kconfig-5.81.0/src/core/kconfigbackend.cpp 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/src/core/kconfigbackend.cpp 2021-05-01 14:30:13.000000000 +0200 @@ -16,7 +16,7 @@ #include <QHash> #include <QStringList> -#include "kconfigdata.h" +#include "kconfigdata_p.h" #include "kconfigini_p.h" typedef QExplicitlySharedDataPointer<KConfigBackend> BackendPtr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/src/core/kconfigdata.cpp new/kconfig-5.82.0/src/core/kconfigdata.cpp --- old/kconfig-5.81.0/src/core/kconfigdata.cpp 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/src/core/kconfigdata.cpp 2021-05-01 14:30:13.000000000 +0200 @@ -7,7 +7,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#include <kconfigdata.h> +#include "kconfigdata_p.h" QDebug operator<<(QDebug dbg, const KEntryKey &key) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/src/core/kconfigdata.h new/kconfig-5.82.0/src/core/kconfigdata.h --- old/kconfig-5.81.0/src/core/kconfigdata.h 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/src/core/kconfigdata.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,253 +0,0 @@ -/* - This file is part of the KDE libraries - SPDX-FileCopyrightText: 2006, 2007 Thomas Braxton <[email protected]> - SPDX-FileCopyrightText: 1999-2000 Preston Brown <[email protected]> - SPDX-FileCopyrightText: 1996-2000 Matthias Kalle Dalheimer <[email protected]> - - SPDX-License-Identifier: LGPL-2.0-or-later -*/ - -#ifndef KCONFIGDATA_H -#define KCONFIGDATA_H - -#include <QByteArray> -#include <QDebug> -#include <QMap> -#include <QString> - -/** - * map/dict/list config node entry. - * @internal - */ -struct KEntry { - /** Constructor. @internal */ - KEntry() - : mValue() - , bDirty(false) - , bGlobal(false) - , bImmutable(false) - , bDeleted(false) - , bExpand(false) - , bReverted(false) - , bLocalizedCountry(false) - , bNotify(false) - , bOverridesGlobal(false) - { - } - /** @internal */ - QByteArray mValue; - /** - * Must the entry be written back to disk? - */ - bool bDirty : 1; - /** - * Entry should be written to the global config file - */ - bool bGlobal : 1; - /** - * Entry can not be modified. - */ - bool bImmutable : 1; - /** - * Entry has been deleted. - */ - bool bDeleted : 1; - /** - * Whether to apply dollar expansion or not. - */ - bool bExpand : 1; - /** - * Entry has been reverted to its default value (from a more global file). - */ - bool bReverted : 1; - /** - * Entry is for a localized key. If @c false the value references just language e.g. "de", - * if @c true the value references language and country, e.g. "de_DE". - **/ - bool bLocalizedCountry : 1; - - bool bNotify : 1; - - /** - * Entry will need to be written on a non global file even if it matches default value - */ - bool bOverridesGlobal : 1; -}; - -// These operators are used to check whether an entry which is about -// to be written equals the previous value. As such, this intentionally -// omits the dirty/notify flag from the comparison. -inline bool operator==(const KEntry &k1, const KEntry &k2) -{ - /* clang-format off */ - return k1.bGlobal == k2.bGlobal - && k1.bImmutable == k2.bImmutable - && k1.bDeleted == k2.bDeleted - && k1.bExpand == k2.bExpand - && k1.mValue == k2.mValue; - /* clang-format on */ -} - -inline bool operator!=(const KEntry &k1, const KEntry &k2) -{ - return !(k1 == k2); -} - -/** - * key structure holding both the actual key and the group - * to which it belongs. - * @internal - */ -struct KEntryKey { - /** Constructor. @internal */ - KEntryKey(const QByteArray &_group = QByteArray(), const QByteArray &_key = QByteArray(), bool isLocalized = false, bool isDefault = false) - : mGroup(_group) - , mKey(_key) - , bLocal(isLocalized) - , bDefault(isDefault) - , bRaw(false) - { - ; - } - /** - * The "group" to which this EntryKey belongs - */ - QByteArray mGroup; - /** - * The _actual_ key of the entry in question - */ - QByteArray mKey; - /** - * Entry is localised or not - */ - bool bLocal : 1; - /** - * Entry indicates if this is a default value. - */ - bool bDefault : 1; - /** @internal - * Key is a raw unprocessed key. - * @warning this should only be set during merging, never for normal use. - */ - bool bRaw : 1; -}; - -/** - * Compares two KEntryKeys (needed for QMap). The order is localized, localized-default, - * non-localized, non-localized-default - * @internal - */ -inline bool operator<(const KEntryKey &k1, const KEntryKey &k2) -{ - int result = qstrcmp(k1.mGroup.data(), k2.mGroup.data()); - if (result != 0) { - return result < 0; - } - - result = qstrcmp(k1.mKey.data(), k2.mKey.data()); - if (result != 0) { - return result < 0; - } - - if (k1.bLocal != k2.bLocal) { - return k1.bLocal; - } - return (!k1.bDefault && k2.bDefault); -} - -QDebug operator<<(QDebug dbg, const KEntryKey &key); -QDebug operator<<(QDebug dbg, const KEntry &entry); - -/** - * \relates KEntry - * type specifying a map of entries (key,value pairs). - * The keys are actually a key in a particular config file group together - * with the group name. - * @internal - */ -class KEntryMap : public QMap<KEntryKey, KEntry> -{ -public: - enum SearchFlag { - SearchDefaults = 1, - SearchLocalized = 2, - }; - Q_DECLARE_FLAGS(SearchFlags, SearchFlag) - - enum EntryOption { - EntryDirty = 1, - EntryGlobal = 2, - EntryImmutable = 4, - EntryDeleted = 8, - EntryExpansion = 16, - EntryRawKey = 32, - EntryLocalizedCountry = 64, - EntryNotify = 128, - EntryDefault = (SearchDefaults << 16), - EntryLocalized = (SearchLocalized << 16), - }; - Q_DECLARE_FLAGS(EntryOptions, EntryOption) - - Iterator findExactEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()); - - Iterator findEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()); - - ConstIterator findEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()) const - { - return constFindEntry(group, key, flags); - } - - ConstIterator constFindEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()) const; - - /** - * Returns true if the entry gets dirtied or false in other case - */ - bool setEntry(const QByteArray &group, const QByteArray &key, const QByteArray &value, EntryOptions options); - - void setEntry(const QByteArray &group, const QByteArray &key, const QString &value, EntryOptions options) - { - setEntry(group, key, value.toUtf8(), options); - } - - QString getEntry(const QByteArray &group, - const QByteArray &key, - const QString &defaultValue = QString(), - SearchFlags flags = SearchFlags(), - bool *expand = nullptr) const; - - bool hasEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()) const; - - bool getEntryOption(const ConstIterator &it, EntryOption option) const; - bool getEntryOption(const QByteArray &group, const QByteArray &key, SearchFlags flags, EntryOption option) const - { - return getEntryOption(findEntry(group, key, flags), option); - } - - void setEntryOption(Iterator it, EntryOption option, bool bf); - void setEntryOption(const QByteArray &group, const QByteArray &key, SearchFlags flags, EntryOption option, bool bf) - { - setEntryOption(findEntry(group, key, flags), option, bf); - } - - bool revertEntry(const QByteArray &group, const QByteArray &key, EntryOptions options, SearchFlags flags = SearchFlags()); -}; -Q_DECLARE_OPERATORS_FOR_FLAGS(KEntryMap::SearchFlags) -Q_DECLARE_OPERATORS_FOR_FLAGS(KEntryMap::EntryOptions) - -/** - * \relates KEntry - * type for iterating over keys in a KEntryMap in sorted order. - * @internal - */ -typedef QMap<KEntryKey, KEntry>::Iterator KEntryMapIterator; - -/** - * \relates KEntry - * type for iterating over keys in a KEntryMap in sorted order. - * It is const, thus you cannot change the entries in the iterator, - * only examine them. - * @internal - */ -typedef QMap<KEntryKey, KEntry>::ConstIterator KEntryMapConstIterator; - -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/src/core/kconfigdata_p.h new/kconfig-5.82.0/src/core/kconfigdata_p.h --- old/kconfig-5.81.0/src/core/kconfigdata_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kconfig-5.82.0/src/core/kconfigdata_p.h 2021-05-01 14:30:13.000000000 +0200 @@ -0,0 +1,253 @@ +/* + This file is part of the KDE libraries + SPDX-FileCopyrightText: 2006, 2007 Thomas Braxton <[email protected]> + SPDX-FileCopyrightText: 1999-2000 Preston Brown <[email protected]> + SPDX-FileCopyrightText: 1996-2000 Matthias Kalle Dalheimer <[email protected]> + + SPDX-License-Identifier: LGPL-2.0-or-later +*/ + +#ifndef KCONFIGDATA_P_H +#define KCONFIGDATA_P_H + +#include <QByteArray> +#include <QDebug> +#include <QMap> +#include <QString> + +/** + * map/dict/list config node entry. + * @internal + */ +struct KEntry { + /** Constructor. @internal */ + KEntry() + : mValue() + , bDirty(false) + , bGlobal(false) + , bImmutable(false) + , bDeleted(false) + , bExpand(false) + , bReverted(false) + , bLocalizedCountry(false) + , bNotify(false) + , bOverridesGlobal(false) + { + } + /** @internal */ + QByteArray mValue; + /** + * Must the entry be written back to disk? + */ + bool bDirty : 1; + /** + * Entry should be written to the global config file + */ + bool bGlobal : 1; + /** + * Entry can not be modified. + */ + bool bImmutable : 1; + /** + * Entry has been deleted. + */ + bool bDeleted : 1; + /** + * Whether to apply dollar expansion or not. + */ + bool bExpand : 1; + /** + * Entry has been reverted to its default value (from a more global file). + */ + bool bReverted : 1; + /** + * Entry is for a localized key. If @c false the value references just language e.g. "de", + * if @c true the value references language and country, e.g. "de_DE". + **/ + bool bLocalizedCountry : 1; + + bool bNotify : 1; + + /** + * Entry will need to be written on a non global file even if it matches default value + */ + bool bOverridesGlobal : 1; +}; + +// These operators are used to check whether an entry which is about +// to be written equals the previous value. As such, this intentionally +// omits the dirty/notify flag from the comparison. +inline bool operator==(const KEntry &k1, const KEntry &k2) +{ + /* clang-format off */ + return k1.bGlobal == k2.bGlobal + && k1.bImmutable == k2.bImmutable + && k1.bDeleted == k2.bDeleted + && k1.bExpand == k2.bExpand + && k1.mValue == k2.mValue; + /* clang-format on */ +} + +inline bool operator!=(const KEntry &k1, const KEntry &k2) +{ + return !(k1 == k2); +} + +/** + * key structure holding both the actual key and the group + * to which it belongs. + * @internal + */ +struct KEntryKey { + /** Constructor. @internal */ + KEntryKey(const QByteArray &_group = QByteArray(), const QByteArray &_key = QByteArray(), bool isLocalized = false, bool isDefault = false) + : mGroup(_group) + , mKey(_key) + , bLocal(isLocalized) + , bDefault(isDefault) + , bRaw(false) + { + ; + } + /** + * The "group" to which this EntryKey belongs + */ + QByteArray mGroup; + /** + * The _actual_ key of the entry in question + */ + QByteArray mKey; + /** + * Entry is localised or not + */ + bool bLocal : 1; + /** + * Entry indicates if this is a default value. + */ + bool bDefault : 1; + /** @internal + * Key is a raw unprocessed key. + * @warning this should only be set during merging, never for normal use. + */ + bool bRaw : 1; +}; + +/** + * Compares two KEntryKeys (needed for QMap). The order is localized, localized-default, + * non-localized, non-localized-default + * @internal + */ +inline bool operator<(const KEntryKey &k1, const KEntryKey &k2) +{ + int result = qstrcmp(k1.mGroup.data(), k2.mGroup.data()); + if (result != 0) { + return result < 0; + } + + result = qstrcmp(k1.mKey.data(), k2.mKey.data()); + if (result != 0) { + return result < 0; + } + + if (k1.bLocal != k2.bLocal) { + return k1.bLocal; + } + return (!k1.bDefault && k2.bDefault); +} + +QDebug operator<<(QDebug dbg, const KEntryKey &key); +QDebug operator<<(QDebug dbg, const KEntry &entry); + +/** + * \relates KEntry + * type specifying a map of entries (key,value pairs). + * The keys are actually a key in a particular config file group together + * with the group name. + * @internal + */ +class KEntryMap : public QMap<KEntryKey, KEntry> +{ +public: + enum SearchFlag { + SearchDefaults = 1, + SearchLocalized = 2, + }; + Q_DECLARE_FLAGS(SearchFlags, SearchFlag) + + enum EntryOption { + EntryDirty = 1, + EntryGlobal = 2, + EntryImmutable = 4, + EntryDeleted = 8, + EntryExpansion = 16, + EntryRawKey = 32, + EntryLocalizedCountry = 64, + EntryNotify = 128, + EntryDefault = (SearchDefaults << 16), + EntryLocalized = (SearchLocalized << 16), + }; + Q_DECLARE_FLAGS(EntryOptions, EntryOption) + + Iterator findExactEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()); + + Iterator findEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()); + + ConstIterator findEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()) const + { + return constFindEntry(group, key, flags); + } + + ConstIterator constFindEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()) const; + + /** + * Returns true if the entry gets dirtied or false in other case + */ + bool setEntry(const QByteArray &group, const QByteArray &key, const QByteArray &value, EntryOptions options); + + void setEntry(const QByteArray &group, const QByteArray &key, const QString &value, EntryOptions options) + { + setEntry(group, key, value.toUtf8(), options); + } + + QString getEntry(const QByteArray &group, + const QByteArray &key, + const QString &defaultValue = QString(), + SearchFlags flags = SearchFlags(), + bool *expand = nullptr) const; + + bool hasEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()) const; + + bool getEntryOption(const ConstIterator &it, EntryOption option) const; + bool getEntryOption(const QByteArray &group, const QByteArray &key, SearchFlags flags, EntryOption option) const + { + return getEntryOption(findEntry(group, key, flags), option); + } + + void setEntryOption(Iterator it, EntryOption option, bool bf); + void setEntryOption(const QByteArray &group, const QByteArray &key, SearchFlags flags, EntryOption option, bool bf) + { + setEntryOption(findEntry(group, key, flags), option, bf); + } + + bool revertEntry(const QByteArray &group, const QByteArray &key, EntryOptions options, SearchFlags flags = SearchFlags()); +}; +Q_DECLARE_OPERATORS_FOR_FLAGS(KEntryMap::SearchFlags) +Q_DECLARE_OPERATORS_FOR_FLAGS(KEntryMap::EntryOptions) + +/** + * \relates KEntry + * type for iterating over keys in a KEntryMap in sorted order. + * @internal + */ +typedef QMap<KEntryKey, KEntry>::Iterator KEntryMapIterator; + +/** + * \relates KEntry + * type for iterating over keys in a KEntryMap in sorted order. + * It is const, thus you cannot change the entries in the iterator, + * only examine them. + * @internal + */ +typedef QMap<KEntryKey, KEntry>::ConstIterator KEntryMapConstIterator; + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/src/core/kconfiggroup.cpp new/kconfig-5.82.0/src/core/kconfiggroup.cpp --- old/kconfig-5.81.0/src/core/kconfiggroup.cpp 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/src/core/kconfiggroup.cpp 2021-05-01 14:30:13.000000000 +0200 @@ -13,7 +13,7 @@ #include "kconfig.h" #include "kconfig_core_log_settings.h" #include "kconfig_p.h" -#include "kconfigdata.h" +#include "kconfigdata_p.h" #include "ksharedconfig.h" #include <QDate> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/src/core/kconfigini.cpp new/kconfig-5.82.0/src/core/kconfigini.cpp --- old/kconfig-5.81.0/src/core/kconfigini.cpp 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/src/core/kconfigini.cpp 2021-05-01 14:30:13.000000000 +0200 @@ -13,7 +13,7 @@ #include "kconfig.h" #include "kconfig_core_log_settings.h" #include "kconfigbackend_p.h" -#include "kconfigdata.h" +#include "kconfigdata_p.h" #include <QDateTime> #include <QDebug> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/src/core/kdesktopfile.cpp new/kconfig-5.82.0/src/core/kdesktopfile.cpp --- old/kconfig-5.81.0/src/core/kdesktopfile.cpp 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/src/core/kdesktopfile.cpp 2021-05-01 14:30:13.000000000 +0200 @@ -206,11 +206,13 @@ return d->desktopGroup.readEntry("Path", QString()); } +#if KCONFIGCORE_BUILD_DEPRECATED_SINCE(5, 82) QString KDesktopFile::readDevice() const { Q_D(const KDesktopFile); return d->desktopGroup.readEntry("Dev", QString()); } +#endif QString KDesktopFile::readUrl() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/src/core/kdesktopfile.h new/kconfig-5.82.0/src/core/kdesktopfile.h --- old/kconfig-5.81.0/src/core/kdesktopfile.h 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/src/core/kdesktopfile.h 2021-05-01 14:30:13.000000000 +0200 @@ -129,11 +129,16 @@ */ QString readPath() const; +#if KCONFIGCORE_ENABLE_DEPRECATED_SINCE(5, 82) /** * Returns the value of the "Dev=" entry. * @return the device or QString() if not specified + * @deprecated since 5.82, for lack of usage, the FSDevice .desktop template + * hadn't been installed for a long time. */ + KCONFIGCORE_DEPRECATED_VERSION(5, 82, "For lack of usage.") QString readDevice() const; +#endif /** * Returns the value of the "URL=" entry. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/src/core/kemailsettings.h new/kconfig-5.82.0/src/core/kemailsettings.h --- old/kconfig-5.81.0/src/core/kemailsettings.h 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/src/core/kemailsettings.h 2021-05-01 14:30:13.000000000 +0200 @@ -52,15 +52,15 @@ /** * @deprecated since 5.0 */ - OutServerType, + OutServerType KCONFIGCORE_ENUMERATOR_DEPRECATED_VERSION_BELATED(5, 82, 5, 0, "No known users"), /** * @deprecated since 5.0 */ - OutServerCommand, + OutServerCommand KCONFIGCORE_ENUMERATOR_DEPRECATED_VERSION_BELATED(5, 82, 5, 0, "No known users"), /** * @deprecated since 5.0 */ - OutServerTLS, + OutServerTLS KCONFIGCORE_ENUMERATOR_DEPRECATED_VERSION_BELATED(5, 82, 5, 0, "No known users"), #else OutServerType_DEPRECATED_DO_NOT_USE, OutServerCommand_DEPRECATED_DO_NOT_USE, @@ -73,15 +73,15 @@ /** * @deprecated since 5.0 */ - InServerType, + InServerType KCONFIGCORE_ENUMERATOR_DEPRECATED_VERSION_BELATED(5, 82, 5, 0, "No known users"), /** * @deprecated since 5.0 */ - InServerMBXType, + InServerMBXType KCONFIGCORE_ENUMERATOR_DEPRECATED_VERSION_BELATED(5, 82, 5, 0, "No known users"), /** * @deprecated since 5.0 */ - InServerTLS + InServerTLS KCONFIGCORE_ENUMERATOR_DEPRECATED_VERSION_BELATED(5, 82, 5, 0, "No known users") #endif }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/src/gui/CMakeLists.txt new/kconfig-5.82.0/src/gui/CMakeLists.txt --- old/kconfig-5.81.0/src/gui/CMakeLists.txt 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/src/gui/CMakeLists.txt 2021-05-01 14:30:13.000000000 +0200 @@ -15,7 +15,7 @@ GROUP_BASE_NAME KF VERSION ${KF_VERSION} DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 5.11 5.39 5.71 + DEPRECATION_VERSIONS 5.11 5.39 5.71 5.82 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/src/gui/kstandardshortcut.cpp new/kconfig-5.82.0/src/gui/kstandardshortcut.cpp --- old/kconfig-5.81.0/src/gui/kstandardshortcut.cpp 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/src/gui/kstandardshortcut.cpp 2021-05-01 14:30:13.000000000 +0200 @@ -4,7 +4,7 @@ SPDX-FileCopyrightText: 2000 Nicolas Hadacek <[email protected]> SPDX-FileCopyrightText: 2001, 2002 Ellis Whitehead <[email protected]> - SPDX-License-Identifier: LGPL-2.0-only + SPDX-License-Identifier: LGPL-2.0-or-later */ #include "kstandardshortcut.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/src/gui/kstandardshortcut.h new/kconfig-5.82.0/src/gui/kstandardshortcut.h --- old/kconfig-5.81.0/src/gui/kstandardshortcut.h 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/src/gui/kstandardshortcut.h 2021-05-01 14:30:13.000000000 +0200 @@ -4,7 +4,7 @@ SPDX-FileCopyrightText: 2000 Nicolas Hadacek <[email protected]> SPDX-FileCopyrightText: 2001, 2002 Ellis Whitehead <[email protected]> - SPDX-License-Identifier: LGPL-2.0-only + SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef KSTANDARDSHORTCUT_H #define KSTANDARDSHORTCUT_H @@ -123,7 +123,8 @@ ShowToolbar, ///< Show/Hide the toolbar. ShowStatusbar, ///< Show/Hide the statusbar. #if KCONFIGGUI_ENABLE_DEPRECATED_SINCE(5, 39) - SaveOptions, ///< @deprecated since 5.39 + SaveOptions ///< @deprecated since 5.39 + KCONFIGGUI_ENUMERATOR_DEPRECATED_VERSION_BELATED(5, 82, 5, 39, "No known users"), #else SaveOptions_DEPRECATED_DO_NOT_USE, #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.81.0/src/kconfig_compiler/KConfigHeaderGenerator.cpp new/kconfig-5.82.0/src/kconfig_compiler/KConfigHeaderGenerator.cpp --- old/kconfig-5.81.0/src/kconfig_compiler/KConfigHeaderGenerator.cpp 2021-04-04 13:38:37.000000000 +0200 +++ new/kconfig-5.82.0/src/kconfig_compiler/KConfigHeaderGenerator.cpp 2021-05-01 14:30:13.000000000 +0200 @@ -347,7 +347,7 @@ void KConfigHeaderGenerator::createDestructor() { - stream() << whitespace() << "~" << cfg().className << "();\n\n"; + stream() << whitespace() << "~" << cfg().className << "() override;\n\n"; } void KConfigHeaderGenerator::createForwardDeclarations() ++++++ kconfig-desktop-translations.patch ++++++ --- /var/tmp/diff_new_pack.hRwlV1/_old 2021-05-10 15:36:51.166162654 +0200 +++ /var/tmp/diff_new_pack.hRwlV1/_new 2021-05-10 15:36:51.166162654 +0200 @@ -5,7 +5,7 @@ @@ -976,6 +976,20 @@ } } - + +QByteArray KConfigPrivate::lookupExactData(const QByteArray &group, const char *key, + KEntryMap::SearchFlags flags) const +{ @@ -32,17 +32,17 @@ QString lookupData(const QByteArray &group, const char *key, KEntryMap::SearchFlags flags, bool *expand) const; QByteArray lookupData(const QByteArray &group, const char *key, KEntryMap::SearchFlags flags) const; + QByteArray lookupExactData(const QByteArray &group, const char *key, KEntryMap::SearchFlags flags) const; - + void putData(const QByteArray &group, const char *key, const QByteArray &value, KConfigBase::WriteConfigFlags flags, bool expand = false); void revertEntry(const QByteArray &group, const char *key, KConfigBase::WriteConfigFlags flags); -Index: kconfig-5.62.0git.20210306T013509~d5ca63b/src/core/kconfigdata.h +Index: kconfig-5.62.0git.20210306T013509~d5ca63b/src/core/kconfigdata_p.h =================================================================== ---- kconfig-5.62.0git.20210306T013509~d5ca63b.orig/src/core/kconfigdata.h 2021-03-06 00:35:09.000000000 +0100 -+++ kconfig-5.62.0git.20210306T013509~d5ca63b/src/core/kconfigdata.h 2021-03-08 00:03:57.177743371 +0100 +--- kconfig-5.62.0git.20210306T013509~d5ca63b.orig/src/core/kconfigdata_p.h 2021-03-06 00:35:09.000000000 +0100 ++++ kconfig-5.62.0git.20210306T013509~d5ca63b/src/core/kconfigdata_p.h 2021-03-08 00:03:57.177743371 +0100 @@ -192,6 +192,20 @@ - + Iterator findEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()); - + + ConstIterator findExactEntry(const QByteArray &group, const QByteArray &key = QByteArray(), + SearchFlags flags = SearchFlags()) const + { @@ -67,7 +67,7 @@ @@ -1162,6 +1162,18 @@ return !config()->d_func()->lookupData(d->fullName(), key, flags).isNull(); } - + +bool KConfigGroup::hasTranslatedKey(const char *key) const +{ + Q_ASSERT_X(isValid(), "KConfigGroup::hasTranslatedKey", "accessing an invalid group"); @@ -90,7 +90,7 @@ @@ -699,6 +699,11 @@ */ QMap<QString, QString> entryMap() const; - + + /** + * @internal + */ @@ -108,13 +108,13 @@ #include <QStandardPaths> #include <QUrl> +#include <libintl.h> - + #ifndef Q_OS_WIN #include <unistd.h> @@ -166,6 +167,33 @@ return false; } - + +QString KDesktopFile::translatedEntry(const char *key) const +{ + Q_D(const KDesktopFile); @@ -146,28 +146,28 @@ { Q_D(const KDesktopFile); @@ -180,20 +208,17 @@ - + QString KDesktopFile::readName() const { - Q_D(const KDesktopFile); - return d->desktopGroup.readEntry("Name", QString()); + return translatedEntry("Name"); } - + QString KDesktopFile::readComment() const { - Q_D(const KDesktopFile); - return d->desktopGroup.readEntry("Comment", QString()); + return translatedEntry("Comment"); } - + QString KDesktopFile::readGenericName() const { - Q_D(const KDesktopFile); - return d->desktopGroup.readEntry("GenericName", QString()); + return translatedEntry("GenericName"); } - + QString KDesktopFile::readPath() const Index: kconfig-5.62.0git.20210306T013509~d5ca63b/src/core/kdesktopfile.h =================================================================== @@ -181,5 +181,5 @@ + QString translatedEntry(const char *) const; + Q_DISABLE_COPY(KDesktopFile) - + Q_DECLARE_PRIVATE(KDesktopFile)
