summaryrefslogtreecommitdiffstats
path: root/kutils/kcmoduleproxy.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:05 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:05 -0600
commitb19ddece21e102b8e4b292037ca7578f60b128fe (patch)
tree6572ca25aba80849cdfa7578bbbc9121d23afbc3 /kutils/kcmoduleproxy.h
parente729c6d549f12e27b358a1dad04ff254c033ac71 (diff)
downloadtdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz
tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kutils/kcmoduleproxy.h')
-rw-r--r--kutils/kcmoduleproxy.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/kutils/kcmoduleproxy.h b/kutils/kcmoduleproxy.h
index 11ae06dbb..633652955 100644
--- a/kutils/kcmoduleproxy.h
+++ b/kutils/kcmoduleproxy.h
@@ -27,10 +27,10 @@
#include <kservice.h>
#include <tdelibs_export.h>
-class KAboutData;
+class TDEAboutData;
class KCModule;
class KCModuleInfo;
-class KInstance;
+class TDEInstance;
class KProcess;
/**
@@ -155,7 +155,7 @@ public:
/**
* @return the module's aboutData()
*/
- const KAboutData * aboutData() const;
+ const TDEAboutData * aboutData() const;
/**
* @return what buttons the module
@@ -181,11 +181,11 @@ public:
// this one's available via moduleInfo()-> and realModule()->
/**
- * Returns the embedded KCModule's KInstance.
- * @return The module's KInstance.
+ * Returns the embedded KCModule's TDEInstance.
+ * @return The module's TDEInstance.
* @deprecated
*/
- KInstance * instance() const;
+ TDEInstance * instance() const;
//KDE4 remove. There's a limit for convenience functions,
// this one's available via realModule()