diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
| commit | 703fb0c89c2eee56a1e613e67a446db9d4287929 (patch) | |
| tree | dd8c5ca66075cd89c2638a2b48cf78386a9870a7 /tdecore/kglobal.h | |
| parent | 818e7abec3d5d3809b6b77293558678371c16b71 (diff) | |
| download | tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kglobal.h')
| -rw-r--r-- | tdecore/kglobal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdecore/kglobal.h b/tdecore/kglobal.h index 361129e2b..22877c8ce 100644 --- a/tdecore/kglobal.h +++ b/tdecore/kglobal.h @@ -22,7 +22,7 @@ #include <kinstance.h> // KDE4: class TDEInstance is enough here class KCharsets; -class KConfig; +class TDEConfig; class KSharedConfig; class KIconLoader; class TDEHardwareDevices; @@ -65,7 +65,7 @@ public: * Returns the general config object. * @return the global configuration object. */ - static KConfig *config(); + static TDEConfig *config(); /** * Returns the general config object. |