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

---
 twin/main.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'twin/main.cpp')

diff --git a/twin/main.cpp b/twin/main.cpp
index df2470c3e..d53578caf 100644
--- a/twin/main.cpp
+++ b/twin/main.cpp
@@ -82,7 +82,7 @@ int x11ErrorHandler(Display *d, XErrorEvent *e)
     }
 
 Application::Application( )
-: KApplication( ), owner( screen_number )
+: TDEApplication( ), owner( screen_number )
     {
 #ifdef USE_QT4
     // I'm special...
@@ -216,7 +216,7 @@ bool Application::x11EventFilter( XEvent *e )
     {
     if ( Workspace::self()->workspaceEvent( e ) )
              return TRUE;
-    return KApplication::x11EventFilter( e );
+    return TDEApplication::x11EventFilter( e );
     }
     
 static void sighandler(int) 
@@ -327,7 +327,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
     if (signal(SIGHUP, KWinInternal::sighandler) == SIG_IGN)
         signal(SIGHUP, SIG_IGN);
 
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
     KWinInternal::Application a;
     KWinInternal::SessionManaged weAreIndeed;
     KWinInternal::SessionSaveDoneHelper helper;
-- 
cgit v1.2.1