summaryrefslogtreecommitdiffstats
path: root/tde-i18n-et
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:12:39 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:12:39 -0600
commitaa71e79b67fd801e4bf2dbafde9b067bc5b54a94 (patch)
tree3d828165109389c8894236ff4a7e5ad88ca2781c /tde-i18n-et
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-et')
-rw-r--r--tde-i18n-et/docs/tdevelop/kde_app_devel/index.docbook4
-rw-r--r--tde-i18n-et/docs/tdevelop/kdearch/index.docbook6
-rw-r--r--tde-i18n-et/docs/tdevelop/tdevelop/getting-started.docbook4
-rw-r--r--tde-i18n-et/messages/tdelibs/tdelibs.po4
4 files changed, 9 insertions, 9 deletions
diff --git a/tde-i18n-et/docs/tdevelop/kde_app_devel/index.docbook b/tde-i18n-et/docs/tdevelop/kde_app_devel/index.docbook
index e0be45e59a6..a0e91f93c6a 100644
--- a/tde-i18n-et/docs/tdevelop/kde_app_devel/index.docbook
+++ b/tde-i18n-et/docs/tdevelop/kde_app_devel/index.docbook
@@ -996,8 +996,8 @@ return a.exec();
> on teostatud failis main.cpp ja selle leiab ka klassisirvijast, kui valida kataloog "Globaalsed funktsioonid". <programlisting
>1 int main(int argc, char **argv)
2 {
-3 KAboutData about("kscribble", I18N_NOOP("KScribble"), version, description,
-4 KAboutData::License_GPL, "(C) 2002 Sinu nimi", 0, 0, "sina@sina.ee");
+3 TDEAboutData about("kscribble", I18N_NOOP("KScribble"), version, description,
+4 TDEAboutData::License_GPL, "(C) 2002 Sinu nimi", 0, 0, "sina@sina.ee");
5 about.addAuthor( "Sinu nimi", 0, "sina@sina.ee" );
6 TDECmdLineArgs::init(argc, argv, &amp;about);
7 TDECmdLineArgs::addCmdLineOptions(options);
diff --git a/tde-i18n-et/docs/tdevelop/kdearch/index.docbook b/tde-i18n-et/docs/tdevelop/kdearch/index.docbook
index 6b47d959954..c6e2b4f217b 100644
--- a/tde-i18n-et/docs/tdevelop/kdearch/index.docbook
+++ b/tde-i18n-et/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
>Sisaldab infokasti infot. </para>
@@ -3361,7 +3361,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-et/docs/tdevelop/tdevelop/getting-started.docbook b/tde-i18n-et/docs/tdevelop/tdevelop/getting-started.docbook
index 5a4272f3fc9..20b91128e81 100644
--- a/tde-i18n-et/docs/tdevelop/tdevelop/getting-started.docbook
+++ b/tde-i18n-et/docs/tdevelop/tdevelop/getting-started.docbook
@@ -1294,8 +1294,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,
"joe@user.com");
about.addAuthor( "Joe User", 0, "joe@user.com" );
</programlisting>
diff --git a/tde-i18n-et/messages/tdelibs/tdelibs.po b/tde-i18n-et/messages/tdelibs/tdelibs.po
index f921c39f3f2..6a00b69b511 100644
--- a/tde-i18n-et/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-et/messages/tdelibs/tdelibs.po
@@ -5270,10 +5270,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 ""
"Info puudub.\n"
-"Infot pakkuvat KAboutData objekti ei eksisteeri."
+"Infot pakkuvat TDEAboutData objekti ei eksisteeri."
#: tdeui/kaboutapplication.cpp:107
msgid "A&uthor"