Rename KApplication to TDEApplication to avoid conflicts with KDE4

3 files changed, 16 insertions, 16 deletions

diff --git a/tde-i18n-de/acinclude.m4 b/tde-i18n-de/acinclude.m4
index b8bf3a36f80..d44279c6768 100644
--- a/tde-i18n-de/acinclude.m4
+++ b/tde-i18n-de/acinclude.m4
@@ -2003,20 +2003,20 @@ cat > conftest.$ac_ext <<EOF
 #include <kapp.h>
 
 int main() {
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
+    printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
+    printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
+    printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
+    printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
+    printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
+    printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
+    printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
+    printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
+    printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
+    printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
     printf("kde_wallpaperdir=\\"%s\\"\n",
-	KApplication::kde_wallpaperdir().data());
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
+	TDEApplication::kde_wallpaperdir().data());
+    printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
+    printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
     printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
     printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
     printf("kde_moduledir=\\"/tmp/dummy\\"\n");
diff --git a/tde-i18n-de/docs/tdebase/faq/filemng.docbook b/tde-i18n-de/docs/tdebase/faq/filemng.docbook
index d5b7a355873..1cbea963ff7 100644
--- a/tde-i18n-de/docs/tdebase/faq/filemng.docbook
+++ b/tde-i18n-de/docs/tdebase/faq/filemng.docbook
@@ -209,9 +209,9 @@
 > <answer>
 <para
 >Diese Platzhalter werden von allen &kde;-Anwendungen benutzt (da sie in <classname
->KApplication</classname
+>TDEApplication</classname
 > implementiert sind und alle guten &kde;-Programme ein Objekt der Klasse <classname
->KApplication</classname
+>TDEApplication</classname
 > anlegen, noch bevor sie die Befehlszeilen-Argumente auswerten).</para
 > <para
 >Eine Standardzeile für eine &kde;-Anwendung sieht so aus: <userinput
diff --git a/tde-i18n-de/docs/tdemultimedia/artsbuilder/mcop.docbook b/tde-i18n-de/docs/tdemultimedia/artsbuilder/mcop.docbook
index d0d09518b55..b0aebb32760 100644
--- a/tde-i18n-de/docs/tdemultimedia/artsbuilder/mcop.docbook
+++ b/tde-i18n-de/docs/tdemultimedia/artsbuilder/mcop.docbook
@@ -1581,7 +1581,7 @@ struct TypeDef {
 > Since &kde; dropped <acronym
 >CORBA</acronym
 > completely, and is using &DCOP; everywhere instead, naturally the question arises why &arts; isn't doing so. After all, &DCOP; support is in <classname
->KApplication</classname
+>TDEApplication</classname
 >, is well-maintained, supposed to integrate greatly with libICE, and whatever else. </para>
 
 <para