summaryrefslogtreecommitdiffstats
path: root/tdecore/kglobalsettings.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:21:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:21:02 -0600
commit8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a (patch)
tree19ff5ecf5e6b5168e5503677f18b85f3dfa91f95 /tdecore/kglobalsettings.h
parent5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 (diff)
downloadtdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.tar.gz
tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kglobalsettings.h')
-rw-r--r--tdecore/kglobalsettings.h8
1 files changed, 4 insertions, 4 deletions
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