diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:12:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:12:39 -0600 |
| commit | aa71e79b67fd801e4bf2dbafde9b067bc5b54a94 (patch) | |
| tree | 3d828165109389c8894236ff4a7e5ad88ca2781c /tde-i18n-ru | |
| parent | 2bcacec247d71e883c4295f260583cb38505aacf (diff) | |
| download | tde-i18n-aa71e79b67fd801e4bf2dbafde9b067bc5b54a94.tar.gz tde-i18n-aa71e79b67fd801e4bf2dbafde9b067bc5b54a94.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tde-i18n-ru')
4 files changed, 9 insertions, 9 deletions
diff --git a/tde-i18n-ru/docs/tdevelop/kde_app_devel/index.docbook b/tde-i18n-ru/docs/tdevelop/kde_app_devel/index.docbook index 7dacd93ff3b..5f1b904f903 100644 --- a/tde-i18n-ru/docs/tdevelop/kde_app_devel/index.docbook +++ b/tde-i18n-ru/docs/tdevelop/kde_app_devel/index.docbook @@ -994,8 +994,8 @@ return a.exec(); >. Она прописана в файле main.cpp, её можно найти через "Обзор классов", в ветке "Глобальные функции". <programlisting >1 int main(int argc, char **argv) 2 { -3 KAboutData about("kscribble", I18N_NOOP("KScribble"), version, description, -4 KAboutData::License_GPL, "(C) 2002 Your Name", 0, 0, "[email protected]"); +3 TDEAboutData about("kscribble", I18N_NOOP("KScribble"), version, description, +4 TDEAboutData::License_GPL, "(C) 2002 Your Name", 0, 0, "[email protected]"); 5 about.addAuthor( "Your Name", 0, "[email protected]" ); 6 TDECmdLineArgs::init(argc, argv, &about); 7 TDECmdLineArgs::addCmdLineOptions(options); 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) { diff --git a/tde-i18n-ru/docs/tdevelop/tdevelop/getting-started.docbook b/tde-i18n-ru/docs/tdevelop/tdevelop/getting-started.docbook index fe08bdea3f2..59cddc4bd30 100644 --- a/tde-i18n-ru/docs/tdevelop/tdevelop/getting-started.docbook +++ b/tde-i18n-ru/docs/tdevelop/tdevelop/getting-started.docbook @@ -1250,8 +1250,8 @@ Keep lines at 80 characters length maximum. <programlisting >int main(int argc, char **argv) { - KAboutData about("hello", I18N_NOOP("Hello"), version, description, - KAboutData::License_GPL, "(C) 2006 Joe User", 0, 0, + TDEAboutData about("hello", I18N_NOOP("Hello"), version, description, + TDEAboutData::License_GPL, "(C) 2006 Joe User", 0, 0, about.addAuthor( "Joe User", 0, "[email protected]" ); </programlisting> diff --git a/tde-i18n-ru/messages/tdelibs/tdelibs.po b/tde-i18n-ru/messages/tdelibs/tdelibs.po index 601cb1718cb..4284e7b31bc 100644 --- a/tde-i18n-ru/messages/tdelibs/tdelibs.po +++ b/tde-i18n-ru/messages/tdelibs/tdelibs.po @@ -5278,10 +5278,10 @@ msgstr "??" #: tdeui/kaboutapplication.cpp:67 msgid "" "No information available.\n" -"The supplied KAboutData object does not exist." +"The supplied TDEAboutData object does not exist." msgstr "" "К сожалению, информация отсутствует.\n" -"Программа не предоставила объекта KAboutData." +"Программа не предоставила объекта TDEAboutData." #: tdeui/kaboutapplication.cpp:107 msgid "A&uthor" |