From aa71e79b67fd801e4bf2dbafde9b067bc5b54a94 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:12:39 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- tde-i18n-sv/docs/tdevelop/kde_app_devel/index.docbook | 4 ++-- tde-i18n-sv/docs/tdevelop/kdearch/index.docbook | 6 +++--- tde-i18n-sv/docs/tdevelop/tdevelop/getting-started.docbook | 4 ++-- tde-i18n-sv/messages/tdelibs/tdelibs.po | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tde-i18n-sv') 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". 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, &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 @@ <ulink url="kdeapi:tdecore/KAboutData" ->KAboutData</ulink +><ulink url="kdeapi:tdecore/TDEAboutData" +>TDEAboutData</ulink > Innehåller information för dialogrutan Om. @@ -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. 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" ); 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." -- cgit v1.2.1