summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-01-30 14:18:10 +0100
committerSlávek Banko <slavek.banko@axis.cz>2020-01-30 14:26:45 +0100
commit9c1e136983b9361291646002b2c6c1f733ee13d4 (patch)
tree32abcc53a950dd75ec567cfdfa97aa39449b0814
parentd46ec74e775617b150c3f54812e9ec203e3c727e (diff)
downloadtdelibs-9c1e136983b9361291646002b2c6c1f733ee13d4.tar.gz
tdelibs-9c1e136983b9361291646002b2c6c1f733ee13d4.zip
Fix private API compatibility in TDEGlobalSettings.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit f29aa92d38e9e1f353ed48f7952150437db8c890)
-rw-r--r--tdecore/tdeglobalsettings.cpp7
-rw-r--r--tdecore/tdeglobalsettings.h6
2 files changed, 13 insertions, 0 deletions
diff --git a/tdecore/tdeglobalsettings.cpp b/tdecore/tdeglobalsettings.cpp
index 241583caf..4941a9eda 100644
--- a/tdecore/tdeglobalsettings.cpp
+++ b/tdecore/tdeglobalsettings.cpp
@@ -590,6 +590,13 @@ TQFont TDEGlobalSettings::largeFont(const TQString &text)
return *_largeFont;
}
+void TDEGlobalSettings::initStatic()
+{
+ // The method is primarily to ensure backward compatibility of the API.
+ // Don't put anything else here.
+ initPaths();
+}
+
void TDEGlobalSettings::initPaths()
{
if (s_desktopPath)
diff --git a/tdecore/tdeglobalsettings.h b/tdecore/tdeglobalsettings.h
index a6208d0ec..74b0d77a8 100644
--- a/tdecore/tdeglobalsettings.h
+++ b/tdecore/tdeglobalsettings.h
@@ -570,6 +570,12 @@ class TDECORE_EXPORT TDEGlobalSettings
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
*/
static void initPaths();