From d6d75dc9ff326e0bd6fc673adae71d53277fb8e4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson 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 ++-- kresources/scalix/scalixadmin/main.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kresources/scalix') diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp index 208fd352..52384afa 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 ) ); diff --git a/kresources/scalix/scalixadmin/main.cpp b/kresources/scalix/scalixadmin/main.cpp index 133da8ec..b455d963 100644 --- a/kresources/scalix/scalixadmin/main.cpp +++ b/kresources/scalix/scalixadmin/main.cpp @@ -40,7 +40,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; KGlobal::locale()->insertCatalogue( "scalixadmin" ); -- cgit v1.2.3