From fe52f645fd58a8c0309a37360507c1b13361a348 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 19 Jan 2013 23:54:46 -0600
Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4

---
 src/kreplacements/kreplacements.cpp | 14 +++++++-------
 src/kreplacements/kreplacements.h   | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/kreplacements')

diff --git a/src/kreplacements/kreplacements.cpp b/src/kreplacements/kreplacements.cpp
index 084faf6..9b20e49 100644
--- a/src/kreplacements/kreplacements.cpp
+++ b/src/kreplacements/kreplacements.cpp
@@ -978,9 +978,9 @@ bool TDECmdLineArgs::isSet(const TQString& s)
 }
 
 ///////////////////
-KApplication* kapp;
+TDEApplication* kapp;
 
-KApplication::KApplication()
+TDEApplication::TDEApplication()
 : TQApplication( s_argc,s_argv )
 {
    kapp = this;
@@ -1109,22 +1109,22 @@ KApplication::KApplication()
    }
 }
 
-KConfig* KApplication::config()
+KConfig* TDEApplication::config()
 {
    return &m_config;
 }
 
-bool KApplication::isRestored()
+bool TDEApplication::isRestored()
 {
    return false;
 }
 
-KApplication* KApplication::kApplication()
+TDEApplication* TDEApplication::kApplication()
 {
    return kapp;
 }
 
-KIconLoader* KApplication::iconLoader()
+KIconLoader* TDEApplication::iconLoader()
 {
    return &m_iconLoader;
 }
@@ -1150,7 +1150,7 @@ KActionCollection* KParts::Part::actionCollection()
    return 0;
 }
 
-KApplication* KParts::Part::instance()
+TDEApplication* KParts::Part::instance()
 {
    return kapp;
 }
diff --git a/src/kreplacements/kreplacements.h b/src/kreplacements/kreplacements.h
index e56f9bd..42993e1 100644
--- a/src/kreplacements/kreplacements.h
+++ b/src/kreplacements/kreplacements.h
@@ -375,19 +375,19 @@ public:
    TQPixmap loadIcon(const TQString& name, int);
 };
 
-class KApplication : public TQApplication
+class TDEApplication : public TQApplication
 {
    KConfig m_config;
    KIconLoader m_iconLoader;
 public:
-   KApplication();
-   static KApplication* kApplication();
+   TDEApplication();
+   static TDEApplication* kApplication();
    KIconLoader* iconLoader();
    KConfig* config();
    bool isRestored();
 };
 
-extern KApplication* kapp;
+extern TDEApplication* kapp;
 
 class KLibFactory : public TQObject
 {
@@ -473,7 +473,7 @@ namespace KParts
    {
    public:
       KActionCollection* actionCollection();
-      KApplication* instance();
+      TDEApplication* instance();
       void setWidget( TQWidget* w ){ m_pWidget=w; }
       TQWidget* widget(){return m_pWidget;}
       void setXMLFile(const TQString&){}
-- 
cgit v1.2.1