Rename KInstance and KAboutData to avoid conflicts with KDE4

2 files changed, 9 insertions, 9 deletions

diff --git a/Documentation/ConduitProgrammingTutorial/mal-factory.cc b/Documentation/ConduitProgrammingTutorial/mal-factory.cc
index a55a0e6..1fc5337 100644
--- a/Documentation/ConduitProgrammingTutorial/mal-factory.cc
+++ b/Documentation/ConduitProgrammingTutorial/mal-factory.cc
@@ -30,7 +30,7 @@ void *init_libmalconduit()
 
 
 // A number of static variables
-KAboutData *MALConduitFactory::fAbout = 0L;
+TDEAboutData *MALConduitFactory::fAbout = 0L;
 const char *MALConduitFactory::fGroup = "MAL-conduit";
 const char *MALConduitFactory::fLastSync = "Last MAL Sync";
 const char *MALConduitFactory::fSyncTime = "Sync Frequency";
@@ -45,12 +45,12 @@ MALConduitFactory::MALConduitFactory(TQObject *p, const char *n) :
 {
     FUNCTIONSETUP;
 
-    fInstance = new KInstance("MALconduit");
-    fAbout = new KAboutData("MALconduit",
+    fInstance = new TDEInstance("MALconduit");
+    fAbout = new TDEAboutData("MALconduit",
         I18N_NOOP("MAL Synchronization Conduit for KPilot"),
         KPILOT_VERSION,
         I18N_NOOP("Synchronizes the content from MAL Servers like AvantGo to the Handheld"),
-        KAboutData::License_GPL,
+        TDEAboutData::License_GPL,
         "(C) 2002, Reinhold Kainhofer");
     fAbout->addAuthor("Reinhold Kainhofer",
         I18N_NOOP("Primary Author"), "[email protected]", "http://reinhold.kainhofer.com/");
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,