Rename KApplication to TDEApplication to avoid conflicts with KDE4

24 files changed, 29 insertions, 29 deletions

diff --git a/kio/tests/getalltest.cpp b/kio/tests/getalltest.cpp
index 58c8d5a3f..07d8723ed 100644
--- a/kio/tests/getalltest.cpp
+++ b/kio/tests/getalltest.cpp
@@ -7,7 +7,7 @@
 
 int main(int argc, char *argv[])
 {
-   KApplication k(argc,argv,"getalltest",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
+   TDEApplication k(argc,argv,"getalltest",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
 
 //for (int i = 0 ; i < 2 ; ++i ) { // test twice to see if they got deleted
    kdDebug() << "All services" << endl;
diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp
index 34fe93677..cd9a99bb8 100644
--- a/kio/tests/jobtest.cpp
+++ b/kio/tests/jobtest.cpp
@@ -64,9 +64,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,"jobtest", 0, 0, 0, 0);
-    KApplication app;
+    TDEApplication app;
 
     JobTest test;
     test.setup();
diff --git a/kio/tests/kacltest.cpp b/kio/tests/kacltest.cpp
index b4bfc9f07..45ace585f 100644
--- a/kio/tests/kacltest.cpp
+++ b/kio/tests/kacltest.cpp
@@ -67,9 +67,9 @@ static bool check(const TQString& txt, T a, T b)
 
 int main(int argc, char *argv[])
 {
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
     TDECmdLineArgs::init(argc,argv,"kacltest", 0, 0, 0, 0);
-    KApplication app;
+    TDEApplication app;
 
     KACLTest test;
     test.setup();
diff --git a/kio/tests/kdcopcheck.cpp b/kio/tests/kdcopcheck.cpp
index 7d373824e..1626f2ebc 100644
--- a/kio/tests/kdcopcheck.cpp
+++ b/kio/tests/kdcopcheck.cpp
@@ -91,7 +91,7 @@ int TestService::exec()
 int main(int argc, char *argv[])
 {
    putenv("IGNORE_SYCOCA_VERSION=true");
-   KApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
+   TDEApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
 
    k.dcopClient()->setNotifications(true);
 
diff --git a/kio/tests/kdefaultprogresstest.cpp b/kio/tests/kdefaultprogresstest.cpp
index a831041e1..e62408204 100644
--- a/kio/tests/kdefaultprogresstest.cpp
+++ b/kio/tests/kdefaultprogresstest.cpp
@@ -7,7 +7,7 @@ using namespace KIO;
 
 int main(int argc, char **argv)
 {
-    KApplication app(argc, argv, "kdefaultprogresstest");
+    TDEApplication app(argc, argv, "kdefaultprogresstest");
 
     DefaultProgress* dlg = new DefaultProgress();
     KURL src("http://this.host.doesn't.exist/this/dir/neither/andthisfileneither");
diff --git a/kio/tests/kdirlistertest.cpp b/kio/tests/kdirlistertest.cpp
index 6137f5e71..01d0a36e9 100644
--- a/kio/tests/kdirlistertest.cpp
+++ b/kio/tests/kdirlistertest.cpp
@@ -151,7 +151,7 @@ void KDirListerTest::completed()
 
 int main ( int argc, char *argv[] )
 {
-  KApplication app( argc, argv, "kdirlistertest" );
+  TDEApplication app( argc, argv, "kdirlistertest" );
 
   KDirListerTest *test = new KDirListerTest( 0 );
   test->show();
diff --git a/kio/tests/kdirwatchtest.cpp b/kio/tests/kdirwatchtest.cpp
index 20676ee49..c741b20f0 100644
--- a/kio/tests/kdirwatchtest.cpp
+++ b/kio/tests/kdirwatchtest.cpp
@@ -28,9 +28,9 @@ int main (int argc, char **argv)
   TDECmdLineArgs::init(argc, argv, "KDirWatchTest",
 		     "Test for KDirWatch", "1.0");
   TDECmdLineArgs::addCmdLineOptions( options );
-  KApplication::addCmdLineOptions();
+  TDEApplication::addCmdLineOptions();
 
-  KApplication a;
+  TDEApplication a;
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   myTest testObject;
diff --git a/kio/tests/kionetrctest.cpp b/kio/tests/kionetrctest.cpp
index 95b0cf61a..82c669c74 100644
--- a/kio/tests/kionetrctest.cpp
+++ b/kio/tests/kionetrctest.cpp
@@ -48,7 +48,7 @@ int main(int argc, char **argv)
     TDECmdLineArgs::addCmdLineOptions( options );
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     int count = args->count();
-    KApplication app;
+    TDEApplication app;
 
     if ( !count )
         args->usage();
diff --git a/kio/tests/kiopassdlgtest.cpp b/kio/tests/kiopassdlgtest.cpp
index f1dd1a9b0..099ce468b 100644
--- a/kio/tests/kiopassdlgtest.cpp
+++ b/kio/tests/kiopassdlgtest.cpp
@@ -10,7 +10,7 @@ int main ( int argc, char** argv )
 {
     KAboutData aboutData("kiopassdlgtest", "KIO Password Dialog Test", "1.0");
     TDECmdLineArgs::init(argc, argv, &aboutData);
-    KApplication app;
+    TDEApplication app;
 
     TQString usr, pass, comment, label;
     label = "Site:";
diff --git a/kio/tests/kioslavetest.cpp b/kio/tests/kioslavetest.cpp
index 2e7e398e4..72a7ffb05 100644
--- a/kio/tests/kioslavetest.cpp
+++ b/kio/tests/kioslavetest.cpp
@@ -496,7 +496,7 @@ static KCmdLineOptions options[] =
 int main(int argc, char **argv) {
   TDECmdLineArgs::init( argc, argv, "kioslavetest", description, version );
   TDECmdLineArgs::addCmdLineOptions( options );
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kio/tests/kmimefromext.cpp b/kio/tests/kmimefromext.cpp
index bde2ff5ff..026d4173b 100644
--- a/kio/tests/kmimefromext.cpp
+++ b/kio/tests/kmimefromext.cpp
@@ -35,7 +35,7 @@ int main(int argc, char *argv[])
 
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   TQString fileName = args->arg( 0 );
diff --git a/kio/tests/kpropsdlgtest.cpp b/kio/tests/kpropsdlgtest.cpp
index 5d01384f6..02a4b6f37 100644
--- a/kio/tests/kpropsdlgtest.cpp
+++ b/kio/tests/kpropsdlgtest.cpp
@@ -17,7 +17,7 @@ int main ( int argc, char** argv )
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     if ( args->count() < 1 )
diff --git a/kio/tests/kprotocolinfotest.cpp b/kio/tests/kprotocolinfotest.cpp
index e8fd7850d..1f4dc95c6 100644
--- a/kio/tests/kprotocolinfotest.cpp
+++ b/kio/tests/kprotocolinfotest.cpp
@@ -30,7 +30,7 @@ int main(int argc, char **argv) {
                         "1.0");
 
     TDECmdLineArgs::init(argc, argv, &aboutData);
-    KApplication app;
+    TDEApplication app;
 
     KURL url;
     url.setPath("/tmp");
diff --git a/kio/tests/kruntest.cpp b/kio/tests/kruntest.cpp
index 673948374..d8f47859b 100644
--- a/kio/tests/kruntest.cpp
+++ b/kio/tests/kruntest.cpp
@@ -121,7 +121,7 @@ void checkPDE(const KService &service, const KURL::List &urls, bool hs, bool tf,
 
 int main(int argc, char **argv)
 {
-  KApplication app( argc, argv, "kruntest", true /* it _has_ a GUI ! */);
+  TDEApplication app( argc, argv, "kruntest", true /* it _has_ a GUI ! */);
 
   // First some non-interactive tests
   checkBN( "/usr/bin/ls", true, "ls");
diff --git a/kio/tests/kscantest.cpp b/kio/tests/kscantest.cpp
index 347993af8..14abd1b33 100644
--- a/kio/tests/kscantest.cpp
+++ b/kio/tests/kscantest.cpp
@@ -3,7 +3,7 @@
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "kscantest" );
+    TDEApplication app( argc, argv, "kscantest" );
     KScanDialog *dlg = KScanDialog::getScanDialog();
     if ( !dlg ) {
 	tqDebug("*** EEK, no Scan-service available, aborting!");
diff --git a/kio/tests/ksycocatest.cpp b/kio/tests/ksycocatest.cpp
index 086836f37..45f94ac3c 100644
--- a/kio/tests/ksycocatest.cpp
+++ b/kio/tests/ksycocatest.cpp
@@ -67,7 +67,7 @@ void debug(const char *format, const char *txt)
 
 int main(int argc, char *argv[])
 {
-   KApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
+   TDEApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
 
    TQCString instname = "kword";
    TQString desktopPath = TQString::fromLatin1( "Office/%1.desktop" ).arg( instname );
diff --git a/kio/tests/ksycocaupdatetest.cpp b/kio/tests/ksycocaupdatetest.cpp
index 1d9e3fcaa..e7778e056 100644
--- a/kio/tests/ksycocaupdatetest.cpp
+++ b/kio/tests/ksycocaupdatetest.cpp
@@ -4,7 +4,7 @@
 
 int main(int argc, char *argv[])
 {
-   KApplication k(argc,argv,"whatever"); // KMessageBox needs KApp for makeStdCaption
+   TDEApplication k(argc,argv,"whatever"); // KMessageBox needs KApp for makeStdCaption
 
    KService::rebuildKSycoca(0);
    return 0;
diff --git a/kio/tests/ktradertest.cpp b/kio/tests/ktradertest.cpp
index d2ceb4c00..b05444dfd 100644
--- a/kio/tests/ktradertest.cpp
+++ b/kio/tests/ktradertest.cpp
@@ -37,7 +37,7 @@ int main( int argc, char **argv )
 
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app( false, false ); // no GUI
+  TDEApplication app( false, false ); // no GUI
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp
index 6eb661c70..3dbd8c648 100644
--- a/kio/tests/kurifiltertest.cpp
+++ b/kio/tests/kurifiltertest.cpp
@@ -162,7 +162,7 @@ int main(int argc, char **argv)
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
     app.disableAutoDcopRegistration();
 
     // Allow testing of the search engine using both delimiters...
diff --git a/kio/tests/kurlcompletiontest.cpp b/kio/tests/kurlcompletiontest.cpp
index d777fe0df..c8dc99595 100644
--- a/kio/tests/kurlcompletiontest.cpp
+++ b/kio/tests/kurlcompletiontest.cpp
@@ -164,9 +164,9 @@ void KURLCompletionTest::testLocalURL()
 
 int main( int argc, char **argv )
 {
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
     TDECmdLineArgs::init(argc,argv,"kurlcompletiontest", 0, 0, 0, 0);
-    KApplication app;
+    TDEApplication app;
 
     {
         KURLCompletionTest test;
diff --git a/kio/tests/metatest.cpp b/kio/tests/metatest.cpp
index f450c46c1..034d740ed 100644
--- a/kio/tests/metatest.cpp
+++ b/kio/tests/metatest.cpp
@@ -187,9 +187,9 @@ int main( int argc, char **argv )
     TDECmdLineArgs::addCmdLineOptions( options );
 
     // Add options from other components
-    KApplication::addCmdLineOptions();
+    TDEApplication::addCmdLineOptions();
     
-    KApplication app;
+    TDEApplication app;
 
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kio/tests/netaccesstest.cpp b/kio/tests/netaccesstest.cpp
index 9fb0ff07a..a9aeb66d4 100644
--- a/kio/tests/netaccesstest.cpp
+++ b/kio/tests/netaccesstest.cpp
@@ -24,7 +24,7 @@
 
 int main(int argc, char **argv)
 {
-  KApplication app( argc, argv, "netaccesstest", true /* it _has_ a GUI ! */);
+  TDEApplication app( argc, argv, "netaccesstest", true /* it _has_ a GUI ! */);
 
   KURL srcURL( "ftp://ftp.kde.org/pub/kde/README" );
   KURL tmpURL( "file:/tmp/netaccesstest_README" );
diff --git a/kio/tests/previewtest.cpp b/kio/tests/previewtest.cpp
index f2b740224..52dea6ac7 100644
--- a/kio/tests/previewtest.cpp
+++ b/kio/tests/previewtest.cpp
@@ -55,7 +55,7 @@ void PreviewTest::slotFailed()
 
 int main(int argc, char **argv)
 {
-    KApplication app(argc, argv, "previewtest");
+    TDEApplication app(argc, argv, "previewtest");
     PreviewTest *w = new PreviewTest;
     w->show();
     app.setMainWidget(w);
diff --git a/kio/tests/speed.cpp b/kio/tests/speed.cpp
index 77cf13764..ae94d83e6 100644
--- a/kio/tests/speed.cpp
+++ b/kio/tests/speed.cpp
@@ -69,7 +69,7 @@ int main(int argc, char **argv) {
 
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();