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

---
 kresources/scalix/kioslave/scalix.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kresources/scalix/kioslave/scalix.cpp')

diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp
index 208fd3523..52384afad 100644
--- a/kresources/scalix/kioslave/scalix.cpp
+++ b/kresources/scalix/kioslave/scalix.cpp
@@ -49,11 +49,11 @@ static const KCmdLineOptions options[] =
 int kdemain( int argc, char **argv )
 {
   putenv( strdup( "SESSION_MANAGER=" ) );
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication::disableAutoDcopRegistration();
 
   TDECmdLineArgs::init( argc, argv, "kio_scalix", 0, 0, 0, 0 );
   TDECmdLineArgs::addCmdLineOptions( options );
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   Scalix slave( args->arg( 0 ), args->arg( 1 ), args->arg( 2 ) );
-- 
cgit v1.2.1