summaryrefslogtreecommitdiffstats
path: root/tde-i18n-it
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-it
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-it')
-rw-r--r--tde-i18n-it/docs/tdevelop/kde_app_devel/index.docbook4
-rw-r--r--tde-i18n-it/docs/tdevelop/kdearch/index.docbook6
-rw-r--r--tde-i18n-it/docs/tdevelop/tdevelop/getting-started.docbook4
-rw-r--r--tde-i18n-it/messages/tdelibs/tdelibs.po4
4 files changed, 9 insertions, 9 deletions
diff --git a/tde-i18n-it/docs/tdevelop/kde_app_devel/index.docbook b/tde-i18n-it/docs/tdevelop/kde_app_devel/index.docbook
index d82b4b3691c..444548eb8e1 100644
--- a/tde-i18n-it/docs/tdevelop/kde_app_devel/index.docbook
+++ b/tde-i18n-it/docs/tdevelop/kde_app_devel/index.docbook
@@ -994,8 +994,8 @@ return a.exec();
> di KScribble è implementata in main.cpp e può essere trovata utilizzando il browser delle classi selezionando la cartella "Funzioni Globali". <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, "you@you.com");
+3 TDEAboutData about("kscribble", I18N_NOOP("KScribble"), version, description,
+4 TDEAboutData::License_GPL, "(C) 2002 Your Name", 0, 0, "you@you.com");
5 about.addAuthor( "Your Name", 0, "you@you.com" );
6 TDECmdLineArgs::init(argc, argv, &amp;about);
7 TDECmdLineArgs::addCmdLineOptions(options);
diff --git a/tde-i18n-it/docs/tdevelop/kdearch/index.docbook b/tde-i18n-it/docs/tdevelop/kdearch/index.docbook
index c8e408d7053..7c7693d6a73 100644
--- a/tde-i18n-it/docs/tdevelop/kdearch/index.docbook
+++ b/tde-i18n-it/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
>Contiene i dati per la finestra delle informazioni. </para>
@@ -3359,7 +3359,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-it/docs/tdevelop/tdevelop/getting-started.docbook b/tde-i18n-it/docs/tdevelop/tdevelop/getting-started.docbook
index 04975817954..4bfdb133e55 100644
--- a/tde-i18n-it/docs/tdevelop/tdevelop/getting-started.docbook
+++ b/tde-i18n-it/docs/tdevelop/tdevelop/getting-started.docbook
@@ -1292,8 +1292,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-it/messages/tdelibs/tdelibs.po b/tde-i18n-it/messages/tdelibs/tdelibs.po
index d44dbcb091e..06af4e8c0af 100644
--- a/tde-i18n-it/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-it/messages/tdelibs/tdelibs.po
@@ -5316,10 +5316,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 ""
"Nessuna informazione disponibile.\n"
-"L'oggetto KAboutData fornito non esiste."
+"L'oggetto TDEAboutData fornito non esiste."
#: tdeui/kaboutapplication.cpp:107
msgid "A&uthor"