Rename KApplication to TDEApplication to avoid conflicts with KDE4

7 files changed, 8 insertions, 8 deletions

diff --git a/kresources/featureplan/benchmarkfeaturelist.cpp b/kresources/featureplan/benchmarkfeaturelist.cpp
index 1ce29998..106d8001 100644
--- a/kresources/featureplan/benchmarkfeaturelist.cpp
+++ b/kresources/featureplan/benchmarkfeaturelist.cpp
@@ -75,7 +75,7 @@ int main( int argc, char **argv )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kresources/featureplan/dumpfeaturelist.cpp b/kresources/featureplan/dumpfeaturelist.cpp
index 19e9a3fb..efab2cae 100644
--- a/kresources/featureplan/dumpfeaturelist.cpp
+++ b/kresources/featureplan/dumpfeaturelist.cpp
@@ -74,7 +74,7 @@ int main( int argc, char **argv )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp
index e38f00d0..cd66fc50 100644
--- a/kresources/groupwise/soap/ksslsocket.cpp
+++ b/kresources/groupwise/soap/ksslsocket.cpp
@@ -183,7 +183,7 @@ int KSSLSocket::messageBox( KIO::SlaveBase::MessageBoxType type, const TQString
 	}
 	if (!d->dcc->isApplicationRegistered("kio_uiserver"))
 	{
-		KApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList());
+		TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList());
 	}
 
 	d->dcc->call("kio_uiserver", "UIServer",
diff --git a/kresources/groupwise/soap/soapdebug.cpp b/kresources/groupwise/soap/soapdebug.cpp
index 036ed5e7..e47dd747 100644
--- a/kresources/groupwise/soap/soapdebug.cpp
+++ b/kresources/groupwise/soap/soapdebug.cpp
@@ -52,7 +52,7 @@ int main( int argc, char **argv )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
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" );
 
diff --git a/kresources/slox/testsloxaccounts.cpp b/kresources/slox/testsloxaccounts.cpp
index 55011f2f..77a91d71 100644
--- a/kresources/slox/testsloxaccounts.cpp
+++ b/kresources/slox/testsloxaccounts.cpp
@@ -41,7 +41,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();