diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:40:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:40:06 -0600 |
| commit | 885d90404a23b3a5036d64d99920cb8f7874bdd5 (patch) | |
| tree | bd876b447715b3987c7b6c2c77ca04b3d870e515 /tde-i18n-ru/docs | |
| parent | fbd0d7aacf83e98be86e714d220941dc7b5c5e0b (diff) | |
| download | tde-i18n-885d90404a23b3a5036d64d99920cb8f7874bdd5.tar.gz tde-i18n-885d90404a23b3a5036d64d99920cb8f7874bdd5.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tde-i18n-ru/docs')
| -rw-r--r-- | tde-i18n-ru/docs/tdebase/kinfocenter/samba/index.docbook | 2 | ||||
| -rw-r--r-- | tde-i18n-ru/docs/tdebase/ksplashml/index.docbook | 2 | ||||
| -rw-r--r-- | tde-i18n-ru/docs/tdevelop/kdearch/index.docbook | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tde-i18n-ru/docs/tdebase/kinfocenter/samba/index.docbook b/tde-i18n-ru/docs/tdebase/kinfocenter/samba/index.docbook index 015f7a93753..68e7e52d619 100644 --- a/tde-i18n-ru/docs/tdebase/kinfocenter/samba/index.docbook +++ b/tde-i18n-ru/docs/tdebase/kinfocenter/samba/index.docbook @@ -273,7 +273,7 @@ <listitem ><para >Использование <classname ->KProcess</classname +>TDEProcess</classname > вместо popen и дополнительная проверка ошибок:</para> <para >&David.Faure; &David.Faure.mail;</para diff --git a/tde-i18n-ru/docs/tdebase/ksplashml/index.docbook b/tde-i18n-ru/docs/tdebase/ksplashml/index.docbook index 46d64345b85..d326cd6ee8a 100644 --- a/tde-i18n-ru/docs/tdebase/ksplashml/index.docbook +++ b/tde-i18n-ru/docs/tdebase/ksplashml/index.docbook @@ -1423,7 +1423,7 @@ void Theme2k::initUi() mText->setFixedHeight( 48 ); setFixedSize( vbox->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-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 " |