Rename KInstance and KAboutData to avoid conflicts with KDE4

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/kofficecore/KoTemplates.h b/lib/kofficecore/KoTemplates.h
index d65fab446..481b9a94c 100644
--- a/lib/kofficecore/KoTemplates.h
+++ b/lib/kofficecore/KoTemplates.h
@@ -26,7 +26,7 @@
 #include <tqpixmap.h>
 #include <koffice_export.h>
 
-class KInstance;
+class TDEInstance;
 
 /** @internal */
 class KOFFICECORE_EXPORT KoTemplate {
@@ -46,7 +46,7 @@ public:
     TQString file() const { return m_file; }
     TQString picture() const { return m_picture; }
     TQString fileName() const { return m_fileName; }
-    const TQPixmap &loadPicture( KInstance* instance );
+    const TQPixmap &loadPicture( TDEInstance* instance );
 
     bool isHidden() const { return m_hidden; }
     void setHidden(bool hidden=true) { m_hidden=hidden; m_touched=true; }
@@ -108,12 +108,12 @@ private:
 class KoTemplateTree {
 
 public:
-    KoTemplateTree(const TQCString &templateType, KInstance *instance,
+    KoTemplateTree(const TQCString &templateType, TDEInstance *instance,
 		   bool readTree=false);
     ~KoTemplateTree() {}
 
     TQCString templateType() const { return m_templateType; }
-    KInstance *instance() const { return m_instance; }
+    TDEInstance *instance() const { return m_instance; }
     void readTemplateTree();
     void writeTemplateTree();
 
@@ -136,7 +136,7 @@ private:
 		       const TQString &localDir);
 
     TQCString m_templateType;
-    KInstance *m_instance;
+    TDEInstance *m_instance;
     TQPtrList<KoTemplateGroup> m_groups;
     KoTemplateGroup *m_defaultGroup;
     KoTemplate *m_defaultTemplate;