Rename KApplication to TDEApplication to avoid conflicts with KDE4

2 files changed, 15 insertions, 15 deletions

diff --git a/doc/kde_app_devel/index.docbook b/doc/kde_app_devel/index.docbook
index 188297f9..46114f6c 100644
--- a/doc/kde_app_devel/index.docbook
+++ b/doc/kde_app_devel/index.docbook
@@ -571,7 +571,7 @@ done. As an example, we'll discuss the changed version of the Qt example from ab
 
 int main( int argc, char **argv )
 {
-KApplication a( argc, argv );
+TDEApplication a( argc, argv );
 
 QPushButton hello( "Hello world!", 0 );
 hello.resize( 100, 30 );
@@ -586,9 +586,9 @@ return a.exec();
 </programlisting>
 </para> 
 <para>
-You see that first we have changed from <classname>QApplication</classname> to <classname>KApplication
+You see that first we have changed from <classname>QApplication</classname> to <classname>TDEApplication
 </classname>. Further, we had to change the previously used <methodname>setMainWidget()</methodname> method 
-to <methodname>setTopWidget</methodname>, which <classname>KApplication</classname> uses to set the main 
+to <methodname>setTopWidget</methodname>, which <classname>TDEApplication</classname> uses to set the main 
 widget. That's it! Your first KDE application is ready - you only have to tell the compiler the KDE 
 include path and the linker to link in the tdecore library with -ltdecore. 
 </para>
@@ -601,10 +601,10 @@ mentioned before and see the effects.
 <para>
 What you should have looked into additionally until now is the reference documentation for Qt, 
 especially the <classname>QApplication</classname>, <classname>QWidget</classname> and <classname>QObject
-</classname> class and the tdecore library documentation for the <classname>KApplication</classname> class. 
+</classname> class and the tdecore library documentation for the <classname>TDEApplication</classname> class. 
 The <ulink url="developer.kde.org/documentation/library/libraryref.html">KDE Library Reference handbook</ulink> 
 also covers a complete description about the invocation of the <classname>QApplication</classname> and 
-<classname>KApplication</classname> constructors including command-line argument processing. 
+<classname>TDEApplication</classname> constructors including command-line argument processing. 
 </para>
 </sect2>
 </sect1>
@@ -861,7 +861,7 @@ by selecting the "Global Functions" folder.
 5      about.addAuthor( "Your Name", 0, "you@you.com" );
 6      KCmdLineArgs::init(argc, argv, &amp;about);
 7      KCmdLineArgs::addCmdLineOptions(options);
-8      KApplication app;
+8      TDEApplication app;
 9  
 10    // register ourselves as a dcop client
 11    app.dcopClient()->registerAs(app.name(), false);
@@ -896,7 +896,7 @@ by selecting the "Global Functions" folder.
 </programlisting>
 </para> 
 <para>
-Now, what happens first is the usual creation of a <classname>KApplication</classname> object, but we've
+Now, what happens first is the usual creation of a <classname>TDEApplication</classname> object, but we've
 added some KDE methods that set program and author information for this application.
 </para>
 </sect2>
diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook
index 000cf9c3..65963503 100644
--- a/doc/kdearch/index.docbook
+++ b/doc/kdearch/index.docbook
@@ -109,7 +109,7 @@ Core application skeleton - classes needed by almost every application.
 <itemizedlist>
 
 <listitem><formalpara>
-<title><ulink url="kdeapi:tdecore/KApplication">KApplication</ulink></title>
+<title><ulink url="kdeapi:tdecore/TDEApplication">TDEApplication</ulink></title>
 <para>
 Initializes and controls a KDE application.
 </para>
@@ -1809,7 +1809,7 @@ action->setWhatsThis(i18n("Deletes the marked file"))
 
 <para>
 The invocation of <application>KHelpCenter</application> is encapsulated in the
-<ulink url="kdeapi:tdecore/KApplication">KApplication</ulink>
+<ulink url="kdeapi:tdecore/TDEApplication">TDEApplication</ulink>
 class. In order to show the manual of your application, just use 
 </para>
 
@@ -2091,8 +2091,8 @@ name. As additional properties, it contains two lines:
 <literal>X-DCOP-ServiceType</literal> specifies the way the service is
 started. The value <literal>Unique</literal> says that the service must not be
 started more than once. This means, if you try to start this service (e.g. via 
-<ulink url="kdeapi:tdecore/KApplication.html#startServiceByName">
-KApplication::startServiceByName()</ulink>, KDE looks whether it is already 
+<ulink url="kdeapi:tdecore/TDEApplication.html#startServiceByName">
+TDEApplication::startServiceByName()</ulink>, KDE looks whether it is already 
 registered with DCOP and uses the running service. If it is not registered yet, 
 KDE will start it up and wait until is registered. Thus, you can immediately 
 send DCOP calls to the service. In such a case, the service should be implemented
@@ -2134,7 +2134,7 @@ X-TDE-StartupNotify=false
 <title>Using DCOP services</title>
 
 <para>
-A DCOP service is started with one of several methods in the KApplication
+A DCOP service is started with one of several methods in the TDEApplication
 class:
 </para>
 
@@ -2143,7 +2143,7 @@ DCOPClient *client = kapp->dcopClient();
 client->attach();
 if (!client->isApplicationRegistered("kio_uiserver")) {
     QString error;
-    if (KApplication::startServiceByName("kio_uiserver", QStringList(), &amp;error))
+    if (TDEApplication::startServiceByName("kio_uiserver", QStringList(), &amp;error))
         cout &lt;&lt; "Starting kioserver failed with message " &lt;&lt; error &lt;&lt; endl;
 }
 ...
@@ -2165,10 +2165,10 @@ instead, because it is much simpler and less error prone.
 
 <para>
 In the example given here, the service was started "by name", i.e. the
-first argument to <function>KApplication::startServiceByName()</function> is
+first argument to <function>TDEApplication::startServiceByName()</function> is
 the name is appearing in the <literal>Name</literal> line of the desktop
 file. An alternative is to use
-<function>KApplication::startServiceByDesktopName()</function>, which takes
+<function>TDEApplication::startServiceByDesktopName()</function>, which takes
 the file name of its desktop file as argument, i.e. in this case
 <literal>"kio_uiserver.desktop"</literal>.
 </para>