From 94c9dc38220d50d037075127ad46add8a264ef26 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:23:32 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- kapptemplate/kapp/app_client.cpp | 2 +- kapptemplate/kapp/main.cpp | 2 +- kapptemplate/kpartapp/main.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kapptemplate') diff --git a/kapptemplate/kapp/app_client.cpp b/kapptemplate/kapp/app_client.cpp index 53de48f5..9694e457 100644 --- a/kapptemplate/kapp/app_client.cpp +++ b/kapptemplate/kapp/app_client.cpp @@ -7,7 +7,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_client.cpp int main(int argc, char **argv) { - KApplication app(argc, argv, "${APP_NAME_LC}_client", false); + TDEApplication app(argc, argv, "${APP_NAME_LC}_client", false); // get our DCOP client and attach so that we may use it DCOPClient *client = app.dcopClient(); diff --git a/kapptemplate/kapp/main.cpp b/kapptemplate/kapp/main.cpp index 69668df8..abf4cf92 100644 --- a/kapptemplate/kapp/main.cpp +++ b/kapptemplate/kapp/main.cpp @@ -24,7 +24,7 @@ int main(int argc, char **argv) about.addAuthor( "${AUTHOR}", 0, "${EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; // register ourselves as a dcop client app.dcopClient()->registerAs(app.name(), false); diff --git a/kapptemplate/kpartapp/main.cpp b/kapptemplate/kpartapp/main.cpp index 5e5276bc..55cb53d7 100644 --- a/kapptemplate/kpartapp/main.cpp +++ b/kapptemplate/kpartapp/main.cpp @@ -23,7 +23,7 @@ int main(int argc, char **argv) about.addAuthor( "${AUTHOR}", 0, "${EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; // see if we are starting with session management if (app.isRestored()) -- cgit v1.2.1