Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

4 files changed, 10 insertions, 10 deletions

diff --git a/tde-i18n-es/docs/tdebase/kinfocenter/samba/index.docbook b/tde-i18n-es/docs/tdebase/kinfocenter/samba/index.docbook
index ea9b7c221b1..a1e5a3ff1db 100644
--- a/tde-i18n-es/docs/tdebase/kinfocenter/samba/index.docbook
+++ b/tde-i18n-es/docs/tdebase/kinfocenter/samba/index.docbook
@@ -281,7 +281,7 @@
 <listitem
 ><para
 >Uso de <classname
->KProcess</classname
+>TDEProcess</classname
 > en sustitución de popen, y verificación de errores:</para>
 <para
 >&David.Faure; &David.Faure.mail;.</para
diff --git a/tde-i18n-es/docs/tdebase/ksplashml/index.docbook b/tde-i18n-es/docs/tdebase/ksplashml/index.docbook
index 8176df5c936..40133dc2267 100644
--- a/tde-i18n-es/docs/tdebase/ksplashml/index.docbook
+++ b/tde-i18n-es/docs/tdebase/ksplashml/index.docbook
@@ -1411,7 +1411,7 @@ void Theme2k::initUi()
   mText-&gt;setFixedHeight( 48 );
 
   setFixedSize( vbox-&gt;sizeHint() );
-  QRect rect(KGlobalSettings::splashScreenDesktopGeometry());
+  QRect rect(TDEGlobalSettings::splashScreenDesktopGeometry());
   move( rect.x() + (rect.width() - size().width())/2,
         rect.y() + (rect.height() - size().height())/2 );
 }
diff --git a/tde-i18n-es/docs/tdevelop/kdearch/index.docbook b/tde-i18n-es/docs/tdevelop/kdearch/index.docbook
index 8732c8b2d3b..283f0ccf455 100644
--- a/tde-i18n-es/docs/tdevelop/kdearch/index.docbook
+++ b/tde-i18n-es/docs/tdevelop/kdearch/index.docbook
@@ -237,8 +237,8 @@
 <listitem
 ><formalpara
 ><title
-><ulink url="kdeapi:tdecore/KGlobalSettings"
->KGlobalSettings</ulink
+><ulink url="kdeapi:tdecore/TDEGlobalSettings"
+>TDEGlobalSettings</ulink
 ></title>
 <para
 >Acceso cómodo a las preferencias que no son específicas de la aplicación. </para>
@@ -295,8 +295,8 @@
 <listitem
 ><formalpara
 ><title
-><ulink url="kdeapi:tdecore/KProcess"
->KProcess</ulink
+><ulink url="kdeapi:tdecore/TDEProcess"
+>TDEProcess</ulink
 ></title>
 <para
 >Invoca y controla procesos hijo. </para>
@@ -452,7 +452,7 @@
 <listitem
 ><formalpara
 ><title
-><ulink url="kdeapi:tdecore/KGlobalAccel"
+><ulink url="kdeapi:tdecore/TDEGlobalAccel"
 ></ulink
 ></title>
 <para
@@ -3366,7 +3366,7 @@ int kdemain(int argc, char **argv)
 {
     KLocale::setMainCatalogue("tdelibs");
     TDEInstance instance("kio_ftp");
-    (void) KGlobal::locale();
+    (void) TDEGlobal::locale();
 
     if (argc != 4) {
         fprintf(stderr, "Uso: kio_ftp protocol "
diff --git a/tde-i18n-es/messages/tdeadmin/kpackage.po b/tde-i18n-es/messages/tdeadmin/kpackage.po
index a9125294382..4f3b363cbcf 100644
--- a/tde-i18n-es/messages/tdeadmin/kpackage.po
+++ b/tde-i18n-es/messages/tdeadmin/kpackage.po
@@ -881,7 +881,7 @@ msgstr "Completado"
 
 #: procbuf.cpp:121
 msgid "Kprocess Failure"
-msgstr "Fallo en KProcess"
+msgstr "Fallo en TDEProcess"
 
 #: procbuf.cpp:139
 #, c-format
@@ -891,7 +891,7 @@ msgstr "Tiempo de espera %1"
 #: procbuf.cpp:145
 #, c-format
 msgid "Kprocess error:%1"
-msgstr "Fallo en KProcess: %1"
+msgstr "Fallo en TDEProcess: %1"
 
 #. i18n: file kpackageui.rc line 13
 #: rc.cpp:6