From 885d90404a23b3a5036d64d99920cb8f7874bdd5 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:40:06 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 tde-i18n-ru/docs/tdevelop/kdearch/index.docbook | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'tde-i18n-ru/docs/tdevelop')

diff --git a/tde-i18n-ru/docs/tdevelop/kdearch/index.docbook b/tde-i18n-ru/docs/tdevelop/kdearch/index.docbook
index 396d1844d2d..33e6a07c4d4 100644
--- a/tde-i18n-ru/docs/tdevelop/kdearch/index.docbook
+++ b/tde-i18n-ru/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
 >Доступ к общим настройкам. </para>
@@ -295,8 +295,8 @@
 <listitem
 ><formalpara
 ><title
-><ulink url="kdeapi:tdecore/KProcess"
->KProcess</ulink
+><ulink url="kdeapi:tdecore/TDEProcess"
+>TDEProcess</ulink
 ></title>
 <para
 >Запуск и контроль дочерних процессов. </para>
@@ -452,7 +452,7 @@
 <listitem
 ><formalpara
 ><title
-><ulink url="kdeapi:tdecore/KGlobalAccel"
+><ulink url="kdeapi:tdecore/TDEGlobalAccel"
 ></ulink
 ></title>
 <para
@@ -3359,7 +3359,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, "Usage: kio_ftp protocol "
-- 
cgit v1.2.1