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

---
 krdc/main.cpp         | 4 ++--
 krdc/main.h           | 6 +++---
 krdc/vnc/kvncview.cpp | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'krdc')

diff --git a/krdc/main.cpp b/krdc/main.cpp
index daf6d38d..e21c0dfa 100644
--- a/krdc/main.cpp
+++ b/krdc/main.cpp
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
 	TDECmdLineArgs::init( argc, argv, &aboutData );
 	TDECmdLineArgs::addCmdLineOptions( options );
 
-	KApplication a;
+	TDEApplication a;
 
 	TQString host = TQString();
 	Quality quality = QUALITY_UNKNOWN;
@@ -158,7 +158,7 @@ int main(int argc, char *argv[])
 	return mc.main();
 }
 
-MainController::MainController(KApplication *app, WindowMode wm,
+MainController::MainController(TDEApplication *app, WindowMode wm,
 			       const TQString &host,
 			       Quality quality,
 			       const TQString &encodings,
diff --git a/krdc/main.h b/krdc/main.h
index 95593651..39aa7690 100644
--- a/krdc/main.h
+++ b/krdc/main.h
@@ -23,7 +23,7 @@
 #include "kremoteview.h"
 #include "smartptr.h"
 
-class KApplication;
+class TDEApplication;
 
 class MainController : public TQObject {
 	Q_OBJECT
@@ -38,10 +38,10 @@ private:
 	TQString m_keymap;
 	Quality m_quality;
 
-	KApplication *m_app;
+	TDEApplication *m_app;
 
 public:
-	MainController(KApplication *app, WindowMode wm,
+	MainController(TDEApplication *app, WindowMode wm,
 		       const TQString &host,
 		       Quality quality,
 		       const TQString &encodings,
diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp
index 5337e16a..9763b351 100644
--- a/krdc/vnc/kvncview.cpp
+++ b/krdc/vnc/kvncview.cpp
@@ -200,7 +200,7 @@ void KVncView::configureApp(Quality q, const TQString specialEncodings) {
 bool KVncView::checkLocalKRfb() {
 	if ( m_host != "localhost" && !m_host.isEmpty() )
 		return true;
-	DCOPClient *d = KApplication::dcopClient();
+	DCOPClient *d = TDEApplication::dcopClient();
 
 	int portNum;
 	TQByteArray sdata, rdata;
@@ -803,9 +803,9 @@ extern int isQuitFlagSet() {
 }
 
 extern void DrawScreenRegion(int x, int y, int width, int height) {
-/*	KApplication::kApplication()->lock();
+/*	TDEApplication::kApplication()->lock();
 	kvncview->drawRegion(x, y, width, height);
-	KApplication::kApplication()->unlock();
+	TDEApplication::kApplication()->unlock();
 */
 	TQApplication::postEvent(kvncview, new ScreenRepaintEvent(x, y, width, height));
 }
-- 
cgit v1.2.1