Rename KApplication to TDEApplication to avoid conflicts with KDE4

3 files changed, 16 insertions, 16 deletions

diff --git a/tde-i18n-pt_BR/acinclude.m4 b/tde-i18n-pt_BR/acinclude.m4
index b8bf3a36f80..d44279c6768 100644
--- a/tde-i18n-pt_BR/acinclude.m4
+++ b/tde-i18n-pt_BR/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-pt_BR/docs/tdebase/faq/filemng.docbook b/tde-i18n-pt_BR/docs/tdebase/faq/filemng.docbook
index 4872bbf87e4..47059d8ecf8 100644
--- a/tde-i18n-pt_BR/docs/tdebase/faq/filemng.docbook
+++ b/tde-i18n-pt_BR/docs/tdebase/faq/filemng.docbook
@@ -209,9 +209,9 @@
 > <answer>
 <para
 >Eles são usados por todos os aplicativos do &kde; (pois estão implementados em <classname
->KApplication</classname
+>TDEApplication</classname
 > e todos os bons programas &kde; criam um objeto <classname
->KApplication</classname
+>TDEApplication</classname
 > mesmo antes de olharem para os argumentos da linha de comando).</para
 > <para
 >Uma linha de comando para um aplicativo &kde; normal assemelha-se a isto: <command
diff --git a/tde-i18n-pt_BR/docs/tdemultimedia/artsbuilder/mcop.docbook b/tde-i18n-pt_BR/docs/tdemultimedia/artsbuilder/mcop.docbook
index 12cc9e4ebe3..9d05ea075a2 100644
--- a/tde-i18n-pt_BR/docs/tdemultimedia/artsbuilder/mcop.docbook
+++ b/tde-i18n-pt_BR/docs/tdemultimedia/artsbuilder/mcop.docbook
@@ -1649,7 +1649,7 @@ struct TypeDef {
 >Uma vez que o &kde; abandonou o <acronym
 >CORBA</acronym
 > por completo e está usando o &DCOP; em todo o sistema, naturalmente a questão a se levantar é porque o &arts; não faz isso também. Afinal de contas, o suporte do &DCOP; está no <classname
->KApplication</classname
+>TDEApplication</classname
 >, é bem-mantido, supostamente integra-se bem com a libICE, entre outras coisas. </para>
 
 <para