Rename TDEApplication::kApplication() to TDEApplication::tdeApplication() and kapp to tdeApp.

Signed-off-by: Michele Calgaro <[email protected]>

9 files changed, 14 insertions, 14 deletions

diff --git a/tdeio/tests/getalltest.cpp b/tdeio/tests/getalltest.cpp
index 96d39c3c2..40a0ec934 100644
--- a/tdeio/tests/getalltest.cpp
+++ b/tdeio/tests/getalltest.cpp
@@ -7,7 +7,7 @@
 
 int main(int argc, char *argv[])
 {
-   TDEApplication k(argc,argv,"getalltest",false/*nostyle*/,false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
+   TDEApplication k(argc,argv,"getalltest",false/*nostyle*/,false/*noGUI*/); // KMessageBox needs TDEApp for makeStdCaption
 
 //for (int i = 0 ; i < 2 ; ++i ) { // test twice to see if they got deleted
    kdDebug() << "All services" << endl;
diff --git a/tdeio/tests/jobtest.cpp b/tdeio/tests/jobtest.cpp
index 15770c941..8a17b2aec 100644
--- a/tdeio/tests/jobtest.cpp
+++ b/tdeio/tests/jobtest.cpp
@@ -197,7 +197,7 @@ void JobTest::get()
     TDEIO::StoredTransferJob* job = TDEIO::storedGet( u );
     connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
             this, TQ_SLOT( slotGetResult( TDEIO::Job* ) ) );
-    kapp->eventLoop()->enterLoop();
+    tdeApp->eventLoop()->enterLoop();
     assert( m_result == 0 ); // no error
     assert( m_data.size() == 11 );
     assert( memcmp (m_data, "Hello world", m_data.size()) == 0 ); // m_data is not null-terminated
@@ -207,7 +207,7 @@ void JobTest::slotGetResult( TDEIO::Job* job )
 {
     m_result = job->error();
     m_data = static_cast<TDEIO::StoredTransferJob *>(job)->data();
-    kapp->eventLoop()->exitLoop();
+    tdeApp->eventLoop()->exitLoop();
 }
 
 ////
diff --git a/tdeio/tests/kdcopcheck.cpp b/tdeio/tests/kdcopcheck.cpp
index 728214487..632960031 100644
--- a/tdeio/tests/kdcopcheck.cpp
+++ b/tdeio/tests/kdcopcheck.cpp
@@ -40,9 +40,9 @@ TestService::TestService(const TQString &exec)
 
    proc.start();
 
-   connect(kapp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString&)),
+   connect(tdeApp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString&)),
            this, TQ_SLOT(newApp(const TQCString&)));
-   connect(kapp->dcopClient(), TQ_SIGNAL( applicationRemoved(const TQCString&)),
+   connect(tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved(const TQCString&)),
            this, TQ_SLOT(endApp(const TQCString&)));
    connect(&proc, TQ_SIGNAL(processExited(TDEProcess *)),
            this, TQ_SLOT(appExit()));
@@ -79,19 +79,19 @@ void TestService::appExit()
 
 void TestService::stop()
 {
-   kapp->exit_loop();
+   tdeApp->exit_loop();
 }
 
 int TestService::exec()
 {
-   kapp->enter_loop();
+   tdeApp->enter_loop();
    return result;
 }
 
 int main(int argc, char *argv[])
 {
    setenv("IGNORE_SYCOCA_VERSION", "true", true);
-   TDEApplication k(argc,argv,"whatever",false/*nostyle*/,false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
+   TDEApplication k(argc,argv,"whatever",false/*nostyle*/,false/*noGUI*/); // KMessageBox needs TDEApp for makeStdCaption
 
    k.dcopClient()->setNotifications(true);
 
diff --git a/tdeio/tests/kdefaultprogresstest.cpp b/tdeio/tests/kdefaultprogresstest.cpp
index b3f778772..fb4bc2bd3 100644
--- a/tdeio/tests/kdefaultprogresstest.cpp
+++ b/tdeio/tests/kdefaultprogresstest.cpp
@@ -29,7 +29,7 @@ int main(int argc, char **argv)
         {
             dlg->slotProcessedFiles( 0L, ++files );
         }
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
     dlg->slotInfoMessage( 0L, TQString::fromLatin1( "Done." ) );
 
diff --git a/tdeio/tests/kruntest.cpp b/tdeio/tests/kruntest.cpp
index c10a36898..8f4b6d075 100644
--- a/tdeio/tests/kruntest.cpp
+++ b/tdeio/tests/kruntest.cpp
@@ -56,7 +56,7 @@ Receiver::Receiver()
         start = new TQPushButton( "Launch KRuns", this );
         stop = new TQPushButton( "Stop those KRuns", this );
         stop->setEnabled(false);
-        TQObject::connect( h, TQ_SIGNAL(clicked()), kapp, TQ_SLOT(quit()) );
+        TQObject::connect( h, TQ_SIGNAL(clicked()), tdeApp, TQ_SLOT(quit()) );
         TQObject::connect( start, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStart()) );
         TQObject::connect( stop, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStop()) );
 
diff --git a/tdeio/tests/speed.cpp b/tdeio/tests/speed.cpp
index 0c517c808..1f2740527 100644
--- a/tdeio/tests/speed.cpp
+++ b/tdeio/tests/speed.cpp
@@ -54,7 +54,7 @@ void SpeedTest::entries(TDEIO::Job*, const UDSEntryList& list) {
 
 void SpeedTest::finished(Job*) {
     kdDebug() << "job finished" << endl;
-    kapp->quit();
+    tdeApp->quit();
 }
 
 static TDECmdLineOptions options[] =
diff --git a/tdeio/tests/tdeioslavetest.cpp b/tdeio/tests/tdeioslavetest.cpp
index bd5a1f1bb..7a44f5313 100644
--- a/tdeio/tests/tdeioslavetest.cpp
+++ b/tdeio/tests/tdeioslavetest.cpp
@@ -184,7 +184,7 @@ void KioslaveTest::slotQuit(){
   }
   if (slave)
     TDEIO::Scheduler::disconnectSlave(slave);
-  kapp->quit();
+  tdeApp->quit();
 }
 
 
diff --git a/tdeio/tests/tdesycocatest.cpp b/tdeio/tests/tdesycocatest.cpp
index f21402405..9747f2d0f 100644
--- a/tdeio/tests/tdesycocatest.cpp
+++ b/tdeio/tests/tdesycocatest.cpp
@@ -67,7 +67,7 @@ void debug(const char *format, const char *txt)
 
 int main(int argc, char *argv[])
 {
-   TDEApplication k(argc,argv,"whatever",true); // KMessageBox needs KApp for makeStdCaption
+   TDEApplication k(argc,argv,"whatever",true); // KMessageBox needs TDEApp for makeStdCaption
 
    TQCString instname = "kword";
    TQString desktopPath = TQString::fromLatin1( "Office/%1.desktop" ).arg( instname );
diff --git a/tdeio/tests/tdesycocaupdatetest.cpp b/tdeio/tests/tdesycocaupdatetest.cpp
index 5b390efa6..9b0f686b5 100644
--- a/tdeio/tests/tdesycocaupdatetest.cpp
+++ b/tdeio/tests/tdesycocaupdatetest.cpp
@@ -4,7 +4,7 @@
 
 int main(int argc, char *argv[])
 {
-   TDEApplication k(argc,argv,"whatever",true,true); // KMessageBox needs KApp for makeStdCaption
+   TDEApplication k(argc,argv,"whatever",true,true); // KMessageBox needs TDEApp for makeStdCaption
 
    KService::rebuildKSycoca(0);
    return 0;