From 119bb1250355503e9b7f71b294cc502e7a9d6d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 30 Jan 2020 14:18:10 +0100 Subject: [PATCH] Fix private API compatibility in TDEGlobalSettings. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit f29aa92d38e9e1f353ed48f7952150437db8c890) --- kdecore/kglobalsettings.cpp | 7 +++++++ kdecore/kglobalsettings.h | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/kdecore/kglobalsettings.cpp b/kdecore/kglobalsettings.cpp index da153aeb7..6240a6e56 100644 --- a/kdecore/kglobalsettings.cpp +++ b/kdecore/kglobalsettings.cpp @@ -590,6 +590,13 @@ TQFont KGlobalSettings::largeFont(const TQString &text) return *_largeFont; } +void KGlobalSettings::initStatic() +{ + // The method is primarily to ensure backward compatibility of the API. + // Don't put anything else here. + initPaths(); +} + void KGlobalSettings::initPaths() { if (s_desktopPath) diff --git a/kdecore/kglobalsettings.h b/kdecore/kglobalsettings.h index 546fac2b5..73bdd5b97 100644 --- a/kdecore/kglobalsettings.h +++ b/kdecore/kglobalsettings.h @@ -569,6 +569,12 @@ class KDECORE_EXPORT KGlobalSettings static int buttonLayout(); private: + /** + * global initialization - should only include paths initialization + * + * The method is primarily to ensure backward compatibility of the API. + */ + static void initStatic(); /** * reads in all paths from kdeglobals */