Rename KApplication to TDEApplication to avoid conflicts with KDE4

4 files changed, 8 insertions, 8 deletions

diff --git a/kioslave/media/kio_media.cpp b/kioslave/media/kio_media.cpp
index dc9542cd1..113d1b311 100644
--- a/kioslave/media/kio_media.cpp
+++ b/kioslave/media/kio_media.cpp
@@ -42,11 +42,11 @@ static const KCmdLineOptions options[] =
 extern "C" {
 	int KDE_EXPORT kdemain( int argc, char **argv )
 	{
-		// KApplication is necessary to use other ioslaves
+		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));
 		TDECmdLineArgs::init(argc, argv, "kio_media", 0, 0, 0, 0);
 		TDECmdLineArgs::addCmdLineOptions( options );
-		KApplication app( false, false );
+		TDEApplication app( false, false );
 		// We want to be anonymous even if we use DCOP
 		app.dcopClient()->attach();
 
diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.cpp b/kioslave/media/mounthelper/kio_media_mounthelper.cpp
index 6289a85fc..23a207fab 100644
--- a/kioslave/media/mounthelper/kio_media_mounthelper.cpp
+++ b/kioslave/media/mounthelper/kio_media_mounthelper.cpp
@@ -61,7 +61,7 @@ const Medium MountHelper::findMedium(const KURL &url)
 	}
 }
 
-MountHelper::MountHelper() : KApplication()
+MountHelper::MountHelper() : TDEApplication()
 {
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
@@ -269,10 +269,10 @@ int main(int argc, char **argv)
 
 	TDECmdLineArgs::addCmdLineOptions( options );
 	KGlobal::locale()->setMainCatalogue("kio_media");
-	KApplication::addCmdLineOptions();
+	TDEApplication::addCmdLineOptions();
 
 	if (TDECmdLineArgs::parsedArgs()->count()==0) TDECmdLineArgs::usage();
-	KApplication *app = new  MountHelper();
+	TDEApplication *app = new  MountHelper();
 
 	KStartupInfo::appStarted();
 	app->dcopClient()->attach();
diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.h b/kioslave/media/mounthelper/kio_media_mounthelper.h
index 4779c75ec..ffb5d1dba 100644
--- a/kioslave/media/mounthelper/kio_media_mounthelper.h
+++ b/kioslave/media/mounthelper/kio_media_mounthelper.h
@@ -30,7 +30,7 @@
 
 class Dialog;
 
-class MountHelper : public KApplication
+class MountHelper : public TDEApplication
 {
         Q_OBJECT
 public:
diff --git a/kioslave/media/testmedia.cpp b/kioslave/media/testmedia.cpp
index 9bc8ac071..eb0871f6f 100644
--- a/kioslave/media/testmedia.cpp
+++ b/kioslave/media/testmedia.cpp
@@ -46,9 +46,9 @@ static bool check(const TQString& txt, TQString a, TQString b)
 
 int main(int argc, char *argv[])
 {
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
     TDECmdLineArgs::init(argc,argv,"testmedia", 0, 0, 0, 0);
-    KApplication app;
+    TDEApplication app;
 
     TestMedia test;
     test.setup();