summaryrefslogtreecommitdiffstats
path: root/tde-i18n-sv
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-sv
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-sv')
-rw-r--r--tde-i18n-sv/docs/tdevelop/kde_app_devel/index.docbook4
-rw-r--r--tde-i18n-sv/docs/tdevelop/kdearch/index.docbook6
-rw-r--r--tde-i18n-sv/docs/tdevelop/tdevelop/getting-started.docbook4
-rw-r--r--tde-i18n-sv/messages/tdelibs/tdelibs.po2
4 files changed, 8 insertions, 8 deletions
diff --git a/tde-i18n-sv/docs/tdevelop/kde_app_devel/index.docbook b/tde-i18n-sv/docs/tdevelop/kde_app_devel/index.docbook
index a3e6ce9e6e8..8c587b25b73 100644
--- a/tde-i18n-sv/docs/tdevelop/kde_app_devel/index.docbook
+++ b/tde-i18n-sv/docs/tdevelop/kde_app_devel/index.docbook
@@ -996,8 +996,8 @@ return a.exec();
> i KScribble är implementerad i filen main.cpp, och kan också hittas genom att använda klassbläddraren och välja mappen "Globala funktioner". <programlisting
>1 int main(int argc, char **argv)
2 {
-3 KAboutData about("kscribble", I18N_NOOP("KScribble"), version, description,
-4 KAboutData::License_GPL, "(C) 2002 Ditt Namn", 0, 0, "du@du.se");
+3 TDEAboutData about("kscribble", I18N_NOOP("KScribble"), version, description,
+4 TDEAboutData::License_GPL, "(C) 2002 Ditt Namn", 0, 0, "du@du.se");
5 about.addAuthor( "Ditt Namn", 0, "du@du.se" );
6 TDECmdLineArgs::init(argc, argv, &amp;about);
7 TDECmdLineArgs::addCmdLineOptions(options);
diff --git a/tde-i18n-sv/docs/tdevelop/kdearch/index.docbook b/tde-i18n-sv/docs/tdevelop/kdearch/index.docbook
index 0ca9b48fb79..c3fde2c43f4 100644
--- a/tde-i18n-sv/docs/tdevelop/kdearch/index.docbook
+++ b/tde-i18n-sv/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
>Innehåller information för dialogrutan Om. </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-sv/docs/tdevelop/tdevelop/getting-started.docbook b/tde-i18n-sv/docs/tdevelop/tdevelop/getting-started.docbook
index 96049034010..b5844904999 100644
--- a/tde-i18n-sv/docs/tdevelop/tdevelop/getting-started.docbook
+++ b/tde-i18n-sv/docs/tdevelop/tdevelop/getting-started.docbook
@@ -1290,8 +1290,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 Ditt Namn", 0, 0,
+ TDEAboutData about("hello", I18N_NOOP("Hello"), version, description,
+ TDEAboutData::License_GPL, "(C) 2006 Ditt Namn", 0, 0,
"ditt.namn@adress.se");
about.addAuthor( "Ditt Namn", 0, "ditt.namn@adress.se" );
</programlisting>
diff --git a/tde-i18n-sv/messages/tdelibs/tdelibs.po b/tde-i18n-sv/messages/tdelibs/tdelibs.po
index a5c8a78359a..8b9d1bc9ef6 100644
--- a/tde-i18n-sv/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-sv/messages/tdelibs/tdelibs.po
@@ -5295,7 +5295,7 @@ 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 ""
"Ingen information tillgänglig.\n"
"Det givna Kaboutdata-objektet existerar inte."