From 98ed486e2f25cfd58e6cc036862bcac0e988f361 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 20 Jan 2013 00:14:36 -0600
Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4

---
 ksayit/src/fxpluginhandler.cpp | 4 ++--
 ksayit/src/ksayit.h            | 2 +-
 ksayit/src/ksayit_fxplugin.h   | 4 ++--
 ksayit/src/ksayit_ttsplugin.h  | 6 +++---
 ksayit/src/main.cpp            | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'ksayit/src')

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;
-- 
cgit v1.2.1