summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:08:40 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:08:40 -0600
commit0bfbc1f2cf4221fa2e7d24ca5a690d9fcaf6bcc9 (patch)
treec88f84b4a77d17de9ee41eb26364733127306c5e
parentfe1fc00450d8d43b71e6816e7b70fb6b1f10451b (diff)
downloadknetload-0bfbc1f2cf4221fa2e7d24ca5a690d9fcaf6bcc9.tar.gz
knetload-0bfbc1f2cf4221fa2e7d24ca5a690d9fcaf6bcc9.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
-rw-r--r--knetload/statpopup.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/knetload/statpopup.h b/knetload/statpopup.h
index e7286e7..be6d8c9 100644
--- a/knetload/statpopup.h
+++ b/knetload/statpopup.h
@@ -18,7 +18,7 @@
class KAction;
class KActionCollection;
-class KConfig;
+class TDEConfig;
class KPopupMenu;
class KRadioAction;
class KSelectAction;
@@ -235,7 +235,7 @@ protected:
/**
* Configuration and GUI elements.
*/
- KConfig* config;
+ TDEConfig* config;
/**< The configuration for the underlying application. */
StatDock* dock[2];
/**< The two system tray windows maintained by this pop-up.