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

---
 kmid/channelview.cpp | 4 ++--
 kmid/kmidclient.h    | 2 +-
 kmid/kmidframe.h     | 2 +-
 kmid/main.cpp        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kmid')

diff --git a/kmid/channelview.cpp b/kmid/channelview.cpp
index 9a1f1e88..b810aa4e 100644
--- a/kmid/channelview.cpp
+++ b/kmid/channelview.cpp
@@ -121,7 +121,7 @@ int ChannelView::lookmode=0;
 
 int ChannelView::lookMode(void)
 {
-    KConfig *kcfg=(KApplication::kApplication())->config();
+    KConfig *kcfg=(TDEApplication::kApplication())->config();
 
     kcfg->setGroup("KMid");
     lookmode=kcfg->readNumEntry("ChannelViewLookMode",0);
@@ -131,7 +131,7 @@ int ChannelView::lookMode(void)
 
 void ChannelView::lookMode(int i)
 {
-    KConfig *kcfg=(KApplication::kApplication())->config();
+    KConfig *kcfg=(TDEApplication::kApplication())->config();
 
     lookmode=i;
 
diff --git a/kmid/kmidclient.h b/kmid/kmidclient.h
index 3f4bf7c7..cdb5d1fa 100644
--- a/kmid/kmidclient.h
+++ b/kmid/kmidclient.h
@@ -43,7 +43,7 @@
 class DeviceManager;
 
 
-class KApplication;
+class TDEApplication;
 class KConfig;
 class KLCDNumber;
 class TQLabel;
diff --git a/kmid/kmidframe.h b/kmid/kmidframe.h
index 21a173fb..1e3e08c6 100644
--- a/kmid/kmidframe.h
+++ b/kmid/kmidframe.h
@@ -32,7 +32,7 @@
 #include <tqtimer.h>
 #include <tdelibs_export.h>
 
-class KApplication;
+class TDEApplication;
 class KConfig;
 class kmidClient;
 class KToolBar;
diff --git a/kmid/main.cpp b/kmid/main.cpp
index 55596d3c..c368e523 100644
--- a/kmid/main.cpp
+++ b/kmid/main.cpp
@@ -65,7 +65,7 @@ int main(int argc, char **argv)
     };
     TDECmdLineArgs::addCmdLineOptions(options);
 
-    KApplication app;
+    TDEApplication app;
 
     kmidFrame *kmidframe=new kmidFrame("KMid");
 
-- 
cgit v1.2.1