Rename KInstance and KAboutData to avoid conflicts with KDE4

1 files changed, 3 insertions, 3 deletions

diff --git a/kword/KWMailMergeDataSource.h b/kword/KWMailMergeDataSource.h
index 4d5a2508..3cf5eea1 100644
--- a/kword/KWMailMergeDataSource.h
+++ b/kword/KWMailMergeDataSource.h
@@ -49,13 +49,13 @@ class KWORD_EXPORT KWMailMergeDataSource: public TQObject, public DCOPObject
 //    
     K_DCOP
     public:
-    KWMailMergeDataSource(KInstance* inst,TQObject *parent);
+    KWMailMergeDataSource(TDEInstance* inst,TQObject *parent);
     virtual ~KWMailMergeDataSource(){;}
     virtual class TQString getValue( const class TQString &name, int record = -1 ) const=0;
 
     const TQMap< TQString, TQString > &getRecordEntries() const;
 
-    KInstance *KWInstance(){return m_instance;}
+    TDEInstance *KWInstance(){return m_instance;}
     virtual  bool showConfigDialog(class TQWidget*,int) =0;
 
     virtual void save(TQDomDocument&, TQDomElement&)=0;
@@ -66,7 +66,7 @@ class KWORD_EXPORT KWMailMergeDataSource: public TQObject, public DCOPObject
     protected:
     DbRecord sampleRecord;
     private:
-    KInstance *m_instance;
+    TDEInstance *m_instance;
 k_dcop:
     virtual  int getNumRecords() const =0;
 };