From 95e28f5bcadbf0ac052c4f29d77b4ab5e6648d1b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:24:38 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- doc/kde_app_devel/index.docbook | 14 +++++++------- doc/kdearch/index.docbook | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'doc') diff --git a/doc/kde_app_devel/index.docbook b/doc/kde_app_devel/index.docbook index 188297f9..46114f6c 100644 --- a/doc/kde_app_devel/index.docbook +++ b/doc/kde_app_devel/index.docbook @@ -571,7 +571,7 @@ done. As an example, we'll discuss the changed version of the Qt example from ab int main( int argc, char **argv ) { -KApplication a( argc, argv ); +TDEApplication a( argc, argv ); QPushButton hello( "Hello world!", 0 ); hello.resize( 100, 30 ); @@ -586,9 +586,9 @@ return a.exec(); -You see that first we have changed from QApplication to KApplication +You see that first we have changed from QApplication to TDEApplication . Further, we had to change the previously used setMainWidget() method -to setTopWidget, which KApplication uses to set the main +to setTopWidget, which TDEApplication uses to set the main widget. That's it! Your first KDE application is ready - you only have to tell the compiler the KDE include path and the linker to link in the tdecore library with -ltdecore. @@ -601,10 +601,10 @@ mentioned before and see the effects. What you should have looked into additionally until now is the reference documentation for Qt, especially the QApplication, QWidget and QObject - class and the tdecore library documentation for the KApplication class. + class and the tdecore library documentation for the TDEApplication class. The KDE Library Reference handbook also covers a complete description about the invocation of the QApplication and -KApplication constructors including command-line argument processing. +TDEApplication constructors including command-line argument processing. @@ -861,7 +861,7 @@ by selecting the "Global Functions" folder. 5 about.addAuthor( "Your Name", 0, "you@you.com" ); 6 KCmdLineArgs::init(argc, argv, &about); 7 KCmdLineArgs::addCmdLineOptions(options); -8 KApplication app; +8 TDEApplication app; 9 10 // register ourselves as a dcop client 11 app.dcopClient()->registerAs(app.name(), false); @@ -896,7 +896,7 @@ by selecting the "Global Functions" folder. -Now, what happens first is the usual creation of a KApplication object, but we've +Now, what happens first is the usual creation of a TDEApplication object, but we've added some KDE methods that set program and author information for this application. diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook index 000cf9c3..65963503 100644 --- a/doc/kdearch/index.docbook +++ b/doc/kdearch/index.docbook @@ -109,7 +109,7 @@ Core application skeleton - classes needed by almost every application. -<ulink url="kdeapi:tdecore/KApplication">KApplication</ulink> +<ulink url="kdeapi:tdecore/TDEApplication">TDEApplication</ulink> Initializes and controls a KDE application. @@ -1809,7 +1809,7 @@ action->setWhatsThis(i18n("Deletes the marked file")) The invocation of KHelpCenter is encapsulated in the -KApplication +TDEApplication class. In order to show the manual of your application, just use @@ -2091,8 +2091,8 @@ name. As additional properties, it contains two lines: X-DCOP-ServiceType specifies the way the service is started. The value Unique says that the service must not be started more than once. This means, if you try to start this service (e.g. via - -KApplication::startServiceByName(), KDE looks whether it is already + +TDEApplication::startServiceByName(), KDE looks whether it is already registered with DCOP and uses the running service. If it is not registered yet, KDE will start it up and wait until is registered. Thus, you can immediately send DCOP calls to the service. In such a case, the service should be implemented @@ -2134,7 +2134,7 @@ X-TDE-StartupNotify=false Using DCOP services -A DCOP service is started with one of several methods in the KApplication +A DCOP service is started with one of several methods in the TDEApplication class: @@ -2143,7 +2143,7 @@ DCOPClient *client = kapp->dcopClient(); client->attach(); if (!client->isApplicationRegistered("kio_uiserver")) { QString error; - if (KApplication::startServiceByName("kio_uiserver", QStringList(), &error)) + if (TDEApplication::startServiceByName("kio_uiserver", QStringList(), &error)) cout << "Starting kioserver failed with message " << error << endl; } ... @@ -2165,10 +2165,10 @@ instead, because it is much simpler and less error prone. In the example given here, the service was started "by name", i.e. the -first argument to KApplication::startServiceByName() is +first argument to TDEApplication::startServiceByName() is the name is appearing in the Name line of the desktop file. An alternative is to use -KApplication::startServiceByDesktopName(), which takes +TDEApplication::startServiceByDesktopName(), which takes the file name of its desktop file as argument, i.e. in this case "kio_uiserver.desktop". -- cgit v1.2.3