Rename KApplication to TDEApplication to avoid conflicts with KDE4

11 files changed, 20 insertions, 20 deletions

diff --git a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp
index bb91885..dc0e132 100644
--- a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp
+++ b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp
@@ -62,7 +62,7 @@ TQObject* FreeverbPluginFactory::createObject(TQObject *parent, const char* name
 
 
 // Plugin Constructor
-FreeverbPlugin::FreeverbPlugin(TQObject *parent, const char* name) //, KApplication *Appl)
+FreeverbPlugin::FreeverbPlugin(TQObject *parent, const char* name) //, TDEApplication *Appl)
  : FXPlugin(parent, name) //, m_Appl(Appl)
 {
     m_config = new KSimpleConfig("ksayit_freeverbrc");
@@ -76,7 +76,7 @@ FreeverbPlugin::~FreeverbPlugin()
 
 /** sets the Main application object
 */
-void FreeverbPlugin::setApplication(KApplication *Appl)
+void FreeverbPlugin::setApplication(TDEApplication *Appl)
 {
     m_Appl = Appl;
 }
diff --git a/ksayit/Freeverb_plugin/ksayitfreeverblib.h b/ksayit/Freeverb_plugin/ksayitfreeverblib.h
index 834d180..8c224fc 100644
--- a/ksayit/Freeverb_plugin/ksayitfreeverblib.h
+++ b/ksayit/Freeverb_plugin/ksayitfreeverblib.h
@@ -54,14 +54,14 @@ Q_OBJECT
   
 public: 
     // Constructor
-    FreeverbPlugin(TQObject *parent=0, const char* name=0); //, KApplication *Appl=0);
+    FreeverbPlugin(TQObject *parent=0, const char* name=0); //, TDEApplication *Appl=0);
     
     // Destructor
     ~FreeverbPlugin();    
     
     /** sets the Main application object
     */
-    void setApplication(KApplication *Appl);
+    void setApplication(TDEApplication *Appl);
     
     /** returns the Name of the Plugin
     */
@@ -87,7 +87,7 @@ public:
                                
 
 private:
-    KApplication *m_Appl;
+    TDEApplication *m_Appl;
     KSimpleConfig *m_config;
 
 };
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;
     
diff --git a/ksayit/src/fxpluginhandler.cpp b/ksayit/src/fxpluginhandler.cpp
index 25fc7a9..61d0491 100644
--- a/ksayit/src/fxpluginhandler.cpp
+++ b/ksayit/src/fxpluginhandler.cpp
@@ -125,7 +125,7 @@ void FXPluginHandler::readConfiguration()
             if ( factory ){
                 plugin.p = static_cast<FXPlugin*>( factory->create( (TQObject*)this, (plugin.name).latin1() ) );
                 if ( plugin.p ){ // Plugin found
-                    plugin.p->setApplication( KApplication::kApplication() );
+                    plugin.p->setApplication( TDEApplication::kApplication() );
                     plugin.description = plugin.p->getDescription_KS();
                     // append to list of active plugins
                     m_lstActivePlugins.append( plugin.name );
@@ -158,7 +158,7 @@ void FXPluginHandler::showEffectGUI(const TQString &pname)
             if ( factory ){
                 plugin.p = static_cast<FXPlugin*>( factory->create( (TQObject*)this, (plugin.name).latin1() ) );
                 if ( plugin.p ){ // Plugin found
-                    plugin.p->setApplication( KApplication::kApplication() );
+                    plugin.p->setApplication( TDEApplication::kApplication() );
                     plugin.description = plugin.p->getDescription_KS();
                     // append to list of active plugins
                     m_lstActivePlugins.append( plugin.name );
diff --git a/ksayit/src/ksayit.h b/ksayit/src/ksayit.h
index 20a7dba..14a79f3 100644
--- a/ksayit/src/ksayit.h
+++ b/ksayit/src/ksayit.h
@@ -60,7 +60,7 @@ class KSayItBookmarkHandler;
   * KSayItApp reimplements the methods that KMainWindow provides for main window handling and supports
   * full session management as well as using KActions.
   * @see KMainWindow
-  * @see KApplication
+  * @see TDEApplication
   * @see KConfig
   *
   * @author Robert Vogl
diff --git a/ksayit/src/ksayit_fxplugin.h b/ksayit/src/ksayit_fxplugin.h
index 4e7ebd7..87ff053 100644
--- a/ksayit/src/ksayit_fxplugin.h
+++ b/ksayit/src/ksayit_fxplugin.h
@@ -29,7 +29,7 @@ using namespace Arts;
  *  If you would like to implement a plugin, simply make a class
  *  derived from FXPlugin, include 'ksayit_fxplugin.h' and reimplement all the
  *  pure virtual functions provided herein.
- *  *Appl is a pointer to the main application as delivered by \p KApplication::kApplication().
+ *  *Appl is a pointer to the main application as delivered by \p TDEApplication::kApplication().
  *  It can be used for any reason i.e. to install a TQt translator.\n
  \author Robert Vogl
  */
@@ -42,7 +42,7 @@ public:
        
     /** Sets the Main application object. Useful for config objects etc.
      */
-    virtual void setApplication(KApplication *Appl) = 0;
+    virtual void setApplication(TDEApplication *Appl) = 0;
     
     /** Returns the name of the plugin. This name is the unique identifier
      *  for the plugin. A expressive name is recommended because this name
diff --git a/ksayit/src/ksayit_ttsplugin.h b/ksayit/src/ksayit_ttsplugin.h
index 68179d7..0125ff1 100644
--- a/ksayit/src/ksayit_ttsplugin.h
+++ b/ksayit/src/ksayit_ttsplugin.h
@@ -36,14 +36,14 @@
  *  In addition you must implement two class factories:\n
  *  \p createPlugin() returns a pointer to an instance of your class.
  *  The Plugin Handler of KSayIt calls this function with a parameter pointing
- *  to the main application instance, as delivered by \p KApplication::kApplication().
+ *  to the main application instance, as delivered by \p TDEApplication::kApplication().
  *  This pointer can be used for any reason i.e. to install a TQt translator.\n
  *  An instance of your class should be deleted by use of \p destroyPlugin().\n
  *  Example:
  \code
     extern "C"
     {
-        TTSPlugin* createPlugin(KApplication *Appl)
+        TTSPlugin* createPlugin(TDEApplication *Appl)
         {
             return new MyNewPlugin(Appl);
         }
@@ -155,7 +155,7 @@ public:
 };
 
 // Types of the class factories
-typedef TTSPlugin* (*create_ttspi)(KApplication *Appl);
+typedef TTSPlugin* (*create_ttspi)(TDEApplication *Appl);
 typedef void (*destroy_ttspi)(TTSPlugin *p);
 
 
diff --git a/ksayit/src/main.cpp b/ksayit/src/main.cpp
index 921c3a1..c7c9b26 100644
--- a/ksayit/src/main.cpp
+++ b/ksayit/src/main.cpp
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
   aboutData.addAuthor("Robert Vogl",0, "voglrobe@web.de");
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
     // setup MCOP
     KArtsDispatcher dispatcher;