summaryrefslogtreecommitdiffstats
path: root/tde-i18n-ru/docs/tdevelop/kdearch
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 20:12:39 -0600
committerTimothy Pearson <[email protected]>2013-01-22 20:12:39 -0600
commitaa71e79b67fd801e4bf2dbafde9b067bc5b54a94 (patch)
tree3d828165109389c8894236ff4a7e5ad88ca2781c /tde-i18n-ru/docs/tdevelop/kdearch
parent2bcacec247d71e883c4295f260583cb38505aacf (diff)
downloadtde-i18n-aa71e79b67fd801e4bf2dbafde9b067bc5b54a94.tar.gz
tde-i18n-aa71e79b67fd801e4bf2dbafde9b067bc5b54a94.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tde-i18n-ru/docs/tdevelop/kdearch')
-rw-r--r--tde-i18n-ru/docs/tdevelop/kdearch/index.docbook6
1 files changed, 3 insertions, 3 deletions
diff --git a/tde-i18n-ru/docs/tdevelop/kdearch/index.docbook b/tde-i18n-ru/docs/tdevelop/kdearch/index.docbook
index 12e5f89f4c6..396d1844d2d 100644
--- a/tde-i18n-ru/docs/tdevelop/kdearch/index.docbook
+++ b/tde-i18n-ru/docs/tdevelop/kdearch/index.docbook
@@ -173,8 +173,8 @@
<listitem
><formalpara
><title
-><ulink url="kdeapi:tdecore/KAboutData"
->KAboutData</ulink
+><ulink url="kdeapi:tdecore/TDEAboutData"
+>TDEAboutData</ulink
></title>
<para
>Хранение и отображение информации об авторах программы. </para>
@@ -3358,7 +3358,7 @@ Icon=ftp
int kdemain(int argc, char **argv)
{
KLocale::setMainCatalogue("tdelibs");
- KInstance instance("kio_ftp");
+ TDEInstance instance("kio_ftp");
(void) KGlobal::locale();
if (argc != 4) {