Rename KInstance and KAboutData to avoid conflicts with KDE4

1 files changed, 5 insertions, 5 deletions

diff --git a/Documentation/ConduitProgrammingTutorial/mal-factory.h b/Documentation/ConduitProgrammingTutorial/mal-factory.h
index f38cb5c..dac91d0 100644
--- a/Documentation/ConduitProgrammingTutorial/mal-factory.h
+++ b/Documentation/ConduitProgrammingTutorial/mal-factory.h
@@ -9,8 +9,8 @@
 
 #include <klibloader.h>
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 class MALConduitFactory : public KLibFactory
 {
@@ -20,7 +20,7 @@ public:
     MALConduitFactory(TQObject * = 0L,const char * = 0L);
     virtual ~MALConduitFactory();
 
-    static KAboutData *about() { return fAbout; } ;
+    static TDEAboutData *about() { return fAbout; } ;
     static const char *lastSync() { return fLastSync; };
     static const char *syncTime() {return fSyncTime;};
     static const char *proxyType() {return fProxyType;};
@@ -39,8 +39,8 @@ protected:
         const char* classname = "TQObject",
         const TQStringList &args = TQStringList() );
 private:
-    KInstance *fInstance;
-    static KAboutData *fAbout;
+    TDEInstance *fInstance;
+    static TDEAboutData *fAbout;
     // KConfig entry keys.
     static const char *fGroup;
     static const char *fLastSync, *fSyncTime,