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

---
 kdcop/kdcop.cpp       |  2 +-
 kdcop/kdcopwindow.cpp | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kdcop')

diff --git a/kdcop/kdcop.cpp b/kdcop/kdcop.cpp
index 0db66161f..9ab6d4428 100644
--- a/kdcop/kdcop.cpp
+++ b/kdcop/kdcop.cpp
@@ -27,7 +27,7 @@ int main( int argc, char ** argv )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication a;
+  TDEApplication a;
 
   KDCOPWindow* kdcopwindow = new KDCOPWindow;
   a.setMainWidget( kdcopwindow );
diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp
index c8fc89720..716b77077 100644
--- a/kdcop/kdcopwindow.cpp
+++ b/kdcop/kdcopwindow.cpp
@@ -157,7 +157,7 @@ DCOPBrowserApplicationItem::setOpen(bool o)
   void
 DCOPBrowserApplicationItem::populate()
 {
-  KApplication::setOverrideCursor(tqwaitCursor);
+  TDEApplication::setOverrideCursor(tqwaitCursor);
 
   bool ok = false;
   bool isDefault = false;
@@ -175,7 +175,7 @@ DCOPBrowserApplicationItem::populate()
     isDefault = false;
   }
 
-  KApplication::restoreOverrideCursor();
+  TDEApplication::restoreOverrideCursor();
 }
 
 void DCOPBrowserApplicationItem::slotGotWindowName(int /*callId*/, const TQCString& /*replyType*/, const TQByteArray &replyData)
@@ -240,7 +240,7 @@ DCOPBrowserInterfaceItem::setOpen(bool o)
   void
 DCOPBrowserInterfaceItem::populate()
 {
-  KApplication::setOverrideCursor(tqwaitCursor);
+  TDEApplication::setOverrideCursor(tqwaitCursor);
 
   bool ok = false;
 
@@ -250,7 +250,7 @@ DCOPBrowserInterfaceItem::populate()
     if ((*it) != "QCStringList functions()")
       new DCOPBrowserFunctionItem(this, app_, object_, *it);
 
-  KApplication::restoreOverrideCursor();
+  TDEApplication::restoreOverrideCursor();
 }
 
 // ------------------------------------------------------------------------
@@ -902,7 +902,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
 
 void KDCOPWindow::slotFillApplications()
 {
-  KApplication::setOverrideCursor(tqwaitCursor);
+  TDEApplication::setOverrideCursor(tqwaitCursor);
 
   QCStringList apps = dcopClient->registeredApplications();
   TQCString appId = dcopClient->appId();
@@ -917,7 +917,7 @@ void KDCOPWindow::slotFillApplications()
     }
   }
 
-  KApplication::restoreOverrideCursor();
+  TDEApplication::restoreOverrideCursor();
 }
 
 bool KDCOPWindow::demarshal
-- 
cgit v1.2.1