Rename KApplication to TDEApplication to avoid conflicts with KDE4

4 files changed, 6 insertions, 6 deletions

diff --git a/ksayit/KTTSD_Lib/kttsdlib.cpp b/ksayit/KTTSD_Lib/kttsdlib.cpp
index 4643b35..a3a0269 100644
--- a/ksayit/KTTSD_Lib/kttsdlib.cpp
+++ b/ksayit/KTTSD_Lib/kttsdlib.cpp
@@ -27,7 +27,7 @@
 #include "kttsdlibsetupimpl.h"
 
 
-KTTSDLib::KTTSDLib(TQObject *parent, const char *name, KApplication *Appl)
+KTTSDLib::KTTSDLib(TQObject *parent, const char *name, TDEApplication *Appl)
  : TQObject(parent, name), m_Appl(Appl)
 {
     KGlobal::locale()->insertCatalogue("libKTTSD");
diff --git a/ksayit/KTTSD_Lib/kttsdlib.h b/ksayit/KTTSD_Lib/kttsdlib.h
index be23c84..52b3272 100644
--- a/ksayit/KTTSD_Lib/kttsdlib.h
+++ b/ksayit/KTTSD_Lib/kttsdlib.h
@@ -71,7 +71,7 @@ public slots:
     void slotTextStarted(const uint job);
     
 public:
-    KTTSDLib(TQObject *parent=0, const char *name=0, KApplication *Appl=0);
+    KTTSDLib(TQObject *parent=0, const char *name=0, TDEApplication *Appl=0);
 
     ~KTTSDLib();
 
@@ -109,7 +109,7 @@ private slots:
     void removeAllJobsFromList();  
     
 private:
-    KApplication *m_Appl;
+    TDEApplication *m_Appl;
     kttsdlibtalker2 *m_talker;
     uint m_curJobNum;
     typedef queue<uint> jobListType;
diff --git a/ksayit/KTTSD_Lib/kttsdlibtalker2.cpp b/ksayit/KTTSD_Lib/kttsdlibtalker2.cpp
index c91f394..f20b09c 100644
--- a/ksayit/KTTSD_Lib/kttsdlibtalker2.cpp
+++ b/ksayit/KTTSD_Lib/kttsdlibtalker2.cpp
@@ -46,7 +46,7 @@ kttsdlibtalker2::~kttsdlibtalker2()
 }
 
 
-void kttsdlibtalker2::KTTSD_init(KApplication *Appl)
+void kttsdlibtalker2::KTTSD_init(TDEApplication *Appl)
 {
     kdDebug(100200) << "kttsdlibtalker2::KTTSD_init()" << endl;
 
diff --git a/ksayit/KTTSD_Lib/kttsdlibtalker2.h b/ksayit/KTTSD_Lib/kttsdlibtalker2.h
index 7479d4d..e3a6104 100644
--- a/ksayit/KTTSD_Lib/kttsdlibtalker2.h
+++ b/ksayit/KTTSD_Lib/kttsdlibtalker2.h
@@ -43,7 +43,7 @@ public:
     
     /** Intializes the DCOP interface.
      */
-    void KTTSD_init(KApplication *Appl);
+    void KTTSD_init(TDEApplication *Appl);
     
     /** See \p KSpeech Class Reference. Returns the job number.
      */
@@ -92,7 +92,7 @@ protected:
     
 private:
     TQCString m_objID;
-    KApplication *m_Appl;
+    TDEApplication *m_Appl;
     DCOPClient *m_client;
     uint m_jobNum;