From 3a044decb0a5d7be822c888b2d5374573d7df96e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:23:50 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- doc/kde_app_devel/index.docbook | 4 ++-- doc/kdearch/index.docbook | 4 ++-- doc/tdevelop/getting-started.docbook | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/doc/kde_app_devel/index.docbook b/doc/kde_app_devel/index.docbook index 92652bbc..bfade594 100644 --- a/doc/kde_app_devel/index.docbook +++ b/doc/kde_app_devel/index.docbook @@ -856,8 +856,8 @@ by selecting the "Global Functions" folder. 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, &about); 7 TDECmdLineArgs::addCmdLineOptions(options); diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook index 353bb436..f288f588 100644 --- a/doc/kdearch/index.docbook +++ b/doc/kdearch/index.docbook @@ -122,7 +122,7 @@ Makes sure only one instance of an application can run simultaneously. -<ulink url="kdeapi:tdecore/KAboutData">KAboutData</ulink> +<ulink url="kdeapi:tdecore/TDEAboutData">TDEAboutData</ulink> Holds information for the about box. @@ -3120,7 +3120,7 @@ extern "C" { int kdemain(int argc, char **argv); } 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/doc/tdevelop/getting-started.docbook b/doc/tdevelop/getting-started.docbook index 33bfee94..9a5937bd 100644 --- a/doc/tdevelop/getting-started.docbook +++ b/doc/tdevelop/getting-started.docbook @@ -1006,8 +1006,8 @@ below. 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" ); -- cgit v1.2.1