From 59ea7131b34cafad6181711d490cceafe0d0e87b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 20 Jan 2013 00:23:41 -0600
Subject: [PATCH] Rename KApplication to TDEApplication to avoid conflicts with
 KDE4

---
 kodo/kodometer.cpp               | 2 +-
 kteatime/main.cpp                | 2 +-
 kteatime/toplevel.cpp            | 2 +-
 ktux/spritemisc.cpp              | 2 +-
 kweather/kweather.cpp            | 4 ++--
 kweather/reportmain.cpp          | 4 ++--
 kweather/serviceconfigwidget.cpp | 2 +-
 kweather/weatherbutton.cpp       | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/kodo/kodometer.cpp b/kodo/kodometer.cpp
index 811c90d..a6a0761 100644
--- a/kodo/kodometer.cpp
+++ b/kodo/kodometer.cpp
@@ -56,7 +56,7 @@ Kodometer::Kodometer(TQWidget* parent, const char* name)
 	pollInterval(10),
 	saveFrequency(10)
 {
-	display = KApplication::kApplication()->getDisplay();
+	display = TDEApplication::kApplication()->getDisplay();
 	FindAllScreens();
 
 	root = RootWindow(display, DefaultScreen(display));
diff --git a/kteatime/main.cpp b/kteatime/main.cpp
index d9d31d5..1c374d2 100644
--- a/kteatime/main.cpp
+++ b/kteatime/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
   aboutData.addCredit("Daniel Teske", I18N_NOOP("Many patches"), "teske@bigfoot.com");
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   TopLevel toplevel;
   KWin::setSystemTrayWindowFor(toplevel.winId(), 0);
diff --git a/kteatime/toplevel.cpp b/kteatime/toplevel.cpp
index 5deb404..0d4928e 100644
--- a/kteatime/toplevel.cpp
+++ b/kteatime/toplevel.cpp
@@ -182,7 +182,7 @@ TopLevel::TopLevel() : KSystemTray()
 	stop();                         // reset timer, disable some menu entries, etc.
 }
 
-/* slot: signal shutDown() from KApplication */
+/* slot: signal shutDown() from TDEApplication */
 /* (not currently needed)
 void TopLevel::queryExit()
 {
diff --git a/ktux/spritemisc.cpp b/ktux/spritemisc.cpp
index 4b239a6..80a1a2f 100644
--- a/ktux/spritemisc.cpp
+++ b/ktux/spritemisc.cpp
@@ -21,7 +21,7 @@ int SpriteRange::random() const
 
     if (mMax != mMin)
     {
-        val = (KApplication::random()%(mMax-mMin)) + mMin;
+        val = (TDEApplication::random()%(mMax-mMin)) + mMin;
     }
 
     return val;
diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp
index 9dd5def..c864d44 100644
--- a/kweather/kweather.cpp
+++ b/kweather/kweather.cpp
@@ -101,7 +101,7 @@ void kweather::initContextMenu()
 void kweather::initDCOP()
 {
     if ( !mClient )
-        mClient = KApplication::dcopClient();
+        mClient = TDEApplication::dcopClient();
     
     if(!mClient->isAttached())
         mClient->attach();
@@ -388,7 +388,7 @@ bool kweather::attach()
     {
         kdDebug(12004) << "Could not find service so I am starting it..."
             << endl;
-        if (!KApplication::startServiceByDesktopName("kweatherservice",
+        if (!TDEApplication::startServiceByDesktopName("kweatherservice",
             TQStringList(), &error))
         {
             kdDebug(12004) << "Starting KWeatherService failed with message: "
diff --git a/kweather/reportmain.cpp b/kweather/reportmain.cpp
index 15c2534..fbff590 100644
--- a/kweather/reportmain.cpp
+++ b/kweather/reportmain.cpp
@@ -37,14 +37,14 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
         return -1;
     }
 
-    KApplication app;
+    TDEApplication app;
 
     DCOPClient *client = app.dcopClient();
     client->attach();
     TQString error;
     if (!client->isApplicationRegistered("KWeatherService"))
     {
-        if (KApplication::startServiceByDesktopName("kweatherservice",
+        if (TDEApplication::startServiceByDesktopName("kweatherservice",
             TQStringList(), &error))
         {
             kdDebug() << "Starting kweatherservice failed: " << error << endl;
diff --git a/kweather/serviceconfigwidget.cpp b/kweather/serviceconfigwidget.cpp
index a71d4b6..e606031 100644
--- a/kweather/serviceconfigwidget.cpp
+++ b/kweather/serviceconfigwidget.cpp
@@ -208,7 +208,7 @@ bool ServiceConfigWidget::dcopActive()
   bool isGood = true;
   DCOPClient *client = kapp->dcopClient();
   if ( !client->isApplicationRegistered( "KWeatherService" ) ) {
-    if ( KApplication::startServiceByDesktopName( "kweatherservice", TQStringList(), &error, &appID ) )
+    if ( TDEApplication::startServiceByDesktopName( "kweatherservice", TQStringList(), &error, &appID ) )
       isGood = false;
   }
 
diff --git a/kweather/weatherbutton.cpp b/kweather/weatherbutton.cpp
index ee88962..33e4563 100644
--- a/kweather/weatherbutton.cpp
+++ b/kweather/weatherbutton.cpp
@@ -42,7 +42,7 @@ WeatherButton::WeatherButton( TQWidget *parent, const char *name )
     kapp->addKipcEventMask( KIPC::SettingsChanged );
     kapp->addKipcEventMask( KIPC::IconChanged );
 
-    slotSettingsChanged( KApplication::SETTINGS_MOUSE );
+    slotSettingsChanged( TDEApplication::SETTINGS_MOUSE );
 }
 
 void WeatherButton::drawButton( TQPainter *p )
@@ -108,7 +108,7 @@ void WeatherButton::generateIcons()
 
 void WeatherButton::slotSettingsChanged( int category )
 {
-    if ( category != KApplication::SETTINGS_MOUSE ) return;
+    if ( category != TDEApplication::SETTINGS_MOUSE ) return;
 
     bool changeCursor = KGlobalSettings::changeCursorOverIcon();