Rename KApplication to TDEApplication to avoid conflicts with KDE4

6 files changed, 24 insertions, 24 deletions

diff --git a/dcop/HOWTO b/dcop/HOWTO
index 071136a4f..5927f3716 100644
--- a/dcop/HOWTO
+++ b/dcop/HOWTO
@@ -74,18 +74,18 @@ compiler later.
 Establishing the Connection:
 ----------------------------
 
-KApplication has gained a method called "KApplication::dcopClient()"
+TDEApplication has gained a method called "TDEApplication::dcopClient()"
 which returns a pointer to a DCOPClient instance.  The first time this
 method is called, the client class will be created.  DCOPClients have
 unique identifiers attached to them which are based on what
-KApplication::name() returns.  In fact, if there is only a single
+TDEApplication::name() returns.  In fact, if there is only a single
 instance of the program running, the appId will be equal to
-KApplication::name().
+TDEApplication::name().
 
 To actually enable DCOP communication to begin, you must use
 DCOPClient::attach().  This will attempt to attach to the DCOP server.
 If no server is found or there is any other type of error, attach()
-will return false. KApplication will catch a dcop signal and display an
+will return false. TDEApplication will catch a dcop signal and display an
 appropriate error message box in that case.
 
 After connecting with the server via DCOPClient::attach(), you need to
@@ -100,7 +100,7 @@ case:
  */
 appId = client->registerAs(kApp->name());
 
-If you never retrieve the DCOPClient pointer from KApplication, the
+If you never retrieve the DCOPClient pointer from TDEApplication, the
 object will not be created and thus there will be no memory overhead.
 
 You may also detach from the server by calling DCOPClient::detach().
@@ -495,9 +495,9 @@ Code:
 
 int main(int argc, char **argv)
 {
-  KApplication *app;
+  TDEApplication *app;
 
-  app = new KApplication(argc, argv, "testit");
+  app = new TDEApplication(argc, argv, "testit");
   return app->exec();
 }
 
@@ -515,7 +515,7 @@ VmStk:        20 kB
 VmExe:         4 kB
 VmLib:      6588 kB
 
-If I create the KApplication's DCOPClient, and call attach() and
+If I create the TDEApplication's DCOPClient, and call attach() and
 registerAs(), it changes to this:
 
 VmSize:     8080 kB
@@ -531,8 +531,8 @@ resident, but no more data or stack.  So this will be shared between all
 processes, right?  100k to enable DCOP in all apps doesn't seem bad at
 all. :)
 
-OK now for some timings.  Just creating a KApplication and then exiting
-(i.e. removing the call to KApplication::exec) takes this much time:
+OK now for some timings.  Just creating a TDEApplication and then exiting
+(i.e. removing the call to TDEApplication::exec) takes this much time:
 
 0.28user 0.02system 0:00.32elapsed 92%CPU (0avgtext+0avgdata 0maxresident)k
 0inputs+0outputs (1084major+62minor)pagefaults 0swaps
diff --git a/dcop/Mainpage.dox b/dcop/Mainpage.dox
index a92fb4e50..423571280 100644
--- a/dcop/Mainpage.dox
+++ b/dcop/Mainpage.dox
@@ -38,18 +38,18 @@ The manual method is covered first, followed by the automatic IDL method.
 
 \section establish Establishing the Connection:
 
-KApplication has gained a method called \p KApplication::dcopClient()
+TDEApplication has gained a method called \p TDEApplication::dcopClient()
 which returns a pointer to a DCOPClient instance.  The first time this
 method is called, the client class will be created.  DCOPClients have
 unique identifiers attached to them which are based on what
-KApplication::name() returns.  In fact, if there is only a single
+TDEApplication::name() returns.  In fact, if there is only a single
 instance of the program running, the appId will be equal to
-KApplication::name().
+TDEApplication::name().
 
 To actually enable DCOP communication to begin, you must use
 \p DCOPClient::attach().  This will attempt to attach to the DCOP server.
 If no server is found or there is any other type of error, 
-DCOPClient::attach() will return false. KApplication will catch a dcop 
+DCOPClient::attach() will return false. TDEApplication will catch a dcop 
 signal and display an appropriate error message box in that case.
 
 After connecting with the server via DCOPClient::attach(), you need to
@@ -62,7 +62,7 @@ case:
 appId = client->registerAs(kapp->name());
 \endcode
 
-If you never retrieve the DCOPClient pointer from KApplication, the
+If you never retrieve the DCOPClient pointer from TDEApplication, the
 object will not be created and thus there will be no memory overhead.
 
 You may also detach from the server by calling DCOPClient::detach().
diff --git a/dcop/dcop_deadlock_test.cpp b/dcop/dcop_deadlock_test.cpp
index 66bd5088a..1ab43f730 100644
--- a/dcop/dcop_deadlock_test.cpp
+++ b/dcop/dcop_deadlock_test.cpp
@@ -71,8 +71,8 @@ tqWarning("%s: Got result '%s' %d:%06d", name(), result.latin1(), tv.tv_sec % 10
 
 int main(int argc, char **argv)
 {
-  TQCString myName = KApplication::dcopClient()->registerAs("testdcop", false);
-  KApplication app(argc, argv, "testdcop");
+  TQCString myName = TDEApplication::dcopClient()->registerAs("testdcop", false);
+  TDEApplication app(argc, argv, "testdcop");
 
   tqWarning("%d:I am '%s'", getpid(), app.dcopClient()->appId().data());
   
diff --git a/dcop/dcopclient.h b/dcop/dcopclient.h
index 7595cfc2b..8421c7b80 100644
--- a/dcop/dcopclient.h
+++ b/dcop/dcopclient.h
@@ -41,7 +41,7 @@ typedef TQValueList<TQCString> QCStringList;
  * for KDE applications.
  *
  * This class provides IPC and RPC for KDE applications.  Usually you
- * will not have to instantiate one yourself because KApplication
+ * will not have to instantiate one yourself because TDEApplication
  * contains a method to return a pointer to a DCOPClient object which
  * can be used for your whole application.
  *
@@ -62,7 +62,7 @@ typedef TQValueList<TQCString> QCStringList;
  *   client->send("someApp", "someObject", "someFunction(TQString)", data);
  * \endcode
  *
- * @see KApplication::dcopClient()
+ * @see TDEApplication::dcopClient()
  * @author Preston Brown <pbrown@kde.org>, Matthias Ettrich <ettrich@kde.org>
  */
 class DCOP_EXPORT DCOPClient : public TQObject
@@ -675,7 +675,7 @@ class DCOP_EXPORT DCOPClient : public TQObject
    * Returns the application's main dcop client. The main client can
    * be used by objects that do not have any specific access to a dcop
    * client. In KDE applications, the main client usually is the same
-   * as KApplication::dcopClient().
+   * as TDEApplication::dcopClient().
    * @return the application's main dcop client
    */
   static DCOPClient* mainClient();
@@ -684,7 +684,7 @@ class DCOP_EXPORT DCOPClient : public TQObject
    * Sets the application's main dcop client. The main client can
    * be used by objects that do not have any specific access to a dcop
    * client. In KDE applications, the main client usually is the same
-   * as KApplication::dcopClient().
+   * as TDEApplication::dcopClient().
    * @param mainClient the new main dcop client
    */
   static void setMainClient( DCOPClient* mainClient);
@@ -772,7 +772,7 @@ signals:
    * synchronous call. In that case, it will enter a local event
    * loop to keep the GUI updated until finally an answer arrives.
    *
-   * In KDE, the KApplication object connects to this signal to be
+   * In KDE, the TDEApplication object connects to this signal to be
    * able to block any user input (i.e. mouse and key events) while
    * we are waiting for an answer. If we did not do this, the
    * application might end up in an illegal state, as a keyboard
diff --git a/dcop/tests/driver.cpp b/dcop/tests/driver.cpp
index d0f73aa4e..eb953f1d7 100644
--- a/dcop/tests/driver.cpp
+++ b/dcop/tests/driver.cpp
@@ -54,7 +54,7 @@ int main(int argc, char** argv)
 	const char* appname = strdup( argv[ 1 ] );
 	argv[ 1 ] = 0; // sue me
 	TDECmdLineArgs::init( argc, argv, "TestAppDriver", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME
-	KApplication app;
+	TDEApplication app;
 	app.dcopClient()->attach(  );
 	app.dcopClient()->registerAs( "TestAppDriver" );
 	Driver * object = new Driver( appname );
diff --git a/dcop/tests/test.cpp b/dcop/tests/test.cpp
index cd62a59c0..2be39f601 100644
--- a/dcop/tests/test.cpp
+++ b/dcop/tests/test.cpp
@@ -32,7 +32,7 @@ int main(int argc, char** argv)
 		return 0;
 	}
 	TDECmdLineArgs::init( argc, argv, "TestApp", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME
-	KApplication app;
+	TDEApplication app;
 	if(!app.dcopClient()->attach(  ))
 		return 1;