From 8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:21:02 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- tdecore/kglobalsettings.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tdecore/kglobalsettings.h') diff --git a/tdecore/kglobalsettings.h b/tdecore/kglobalsettings.h index 5fef2f67a..5fad8fa5a 100644 --- a/tdecore/kglobalsettings.h +++ b/tdecore/kglobalsettings.h @@ -543,15 +543,15 @@ private: */ static void initColors(); /** - * drop cached values for fonts (called by KApplication) + * drop cached values for fonts (called by TDEApplication) */ static void rereadFontSettings(); /** - * drop cached values for paths (called by KApplication) + * drop cached values for paths (called by TDEApplication) */ static void rereadPathSettings(); /** - * drop cached values for mouse settings (called by KApplication) + * drop cached values for mouse settings (called by TDEApplication) */ static void rereadMouseSettings(); @@ -578,7 +578,7 @@ private: static TQColor * alternateColor; static KMouseSettings *s_mouseSettings; - friend class KApplication; + friend class TDEApplication; }; #endif -- cgit v1.2.1