summaryrefslogtreecommitdiffstats
path: root/kparts/factory.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 /kparts/factory.h
parente729c6d549f12e27b358a1dad04ff254c033ac71 (diff)
downloadtdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz
tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kparts/factory.h')
-rw-r--r--kparts/factory.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/kparts/factory.h b/kparts/factory.h
index 26c53b9dc..05b23d9d9 100644
--- a/kparts/factory.h
+++ b/kparts/factory.h
@@ -75,12 +75,12 @@ public:
/**
* If you have a part contained in a shared library you might want to query
- * for meta-information like the about-data, or the KInstance in general.
+ * for meta-information like the about-data, or the TDEInstance in general.
* If the part is exported using KParts::GenericFactory then this method will
* return the instance that belongs to the part without the need to instantiate
* the part component.
*/
- const KInstance *partInstance();
+ const TDEInstance *partInstance();
/**
* A convenience method for partInstance() that takes care of retrieving
@@ -88,7 +88,7 @@ public:
*
* @param libraryName name of the library to query the instance from
*/
- static const KInstance *partInstanceFromLibrary( const TQCString &libraryName );
+ static const TDEInstance *partInstanceFromLibrary( const TQCString &libraryName );
protected:
@@ -129,7 +129,7 @@ protected:
enum { VIRTUAL_QUERY_INSTANCE_PARAMS = 0x10 };
struct QueryInstanceParams
{
- const KInstance *instance;
+ const TDEInstance *instance;
};
};