diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:23:32 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:23:32 -0600 |
commit | 94c9dc38220d50d037075127ad46add8a264ef26 (patch) | |
tree | af6ba5d26197827dac1b1901895dee7a7b62a9d6 /kapptemplate | |
parent | 479647c43c62fc50302342c8ac50a2fe024b4426 (diff) | |
download | tdesdk-94c9dc38220d50d037075127ad46add8a264ef26.tar.gz tdesdk-94c9dc38220d50d037075127ad46add8a264ef26.zip |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kapptemplate')
-rw-r--r-- | kapptemplate/kapp/app_client.cpp | 2 | ||||
-rw-r--r-- | kapptemplate/kapp/main.cpp | 2 | ||||
-rw-r--r-- | kapptemplate/kpartapp/main.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
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()) |