summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:07:15 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:07:15 -0600
commit7ea3838832ac9872b96488f56a90d07f47411be9 (patch)
tree2bf699ae71187c1cbbb08ee2284321eff391c8f9
parent67799121a2843f131fab7da2c1b11d180d908f07 (diff)
downloadkcpuload-7ea3838832ac9872b96488f56a90d07f47411be9.tar.gz
kcpuload-7ea3838832ac9872b96488f56a90d07f47411be9.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
-rw-r--r--kcpuload/kcpuload/statpopup.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/kcpuload/kcpuload/statpopup.h b/kcpuload/kcpuload/statpopup.h
index 9d57b66..a3be814 100644
--- a/kcpuload/kcpuload/statpopup.h
+++ b/kcpuload/kcpuload/statpopup.h
@@ -19,7 +19,7 @@
class KAction;
class KActionCollection;
-class KConfig;
+class TDEConfig;
class KPopupMenu;
class KRadioAction;
class KSelectAction;
@@ -222,7 +222,7 @@ protected:
/**
* Configuration and GUI elements.
*/
- KConfig* config;
+ TDEConfig* config;
/**< The configuration for the underlying application. */
/**