From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:35:07 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- tdecore/kinstance.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tdecore/kinstance.h') diff --git a/tdecore/kinstance.h b/tdecore/kinstance.h index 775fe3bdf..8178fe9c5 100644 --- a/tdecore/kinstance.h +++ b/tdecore/kinstance.h @@ -20,7 +20,7 @@ class KStandardDirs; class TDEAboutData; -class KConfig; +class TDEConfig; class KIconLoader; class KCharsets; class TQFont; @@ -86,13 +86,13 @@ class TDECORE_EXPORT TDEInstance /** * Returns the general config object ("appnamerc"). - * @return the KConfig object for the instance. + * @return the TDEConfig object for the instance. */ - KConfig *config() const; + TDEConfig *config() const; /** * Returns the general config object ("appnamerc"). - * @return the KConfig object for the instance. + * @return the TDEConfig object for the instance. */ KSharedConfig *sharedConfig() const; @@ -165,7 +165,7 @@ protected: private: mutable KStandardDirs *_dirs; - mutable KConfig *_config; + mutable TDEConfig *_config; mutable KIconLoader *_iconLoader; mutable TDEHardwareDevices *_hardwaredevices; -- cgit v1.2.1