summaryrefslogtreecommitdiffstats
path: root/kapptemplate/kapp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:32 -0600
commit94c9dc38220d50d037075127ad46add8a264ef26 (patch)
treeaf6ba5d26197827dac1b1901895dee7a7b62a9d6 /kapptemplate/kapp
parent479647c43c62fc50302342c8ac50a2fe024b4426 (diff)
downloadtdesdk-94c9dc38220d50d037075127ad46add8a264ef26.tar.gz
tdesdk-94c9dc38220d50d037075127ad46add8a264ef26.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kapptemplate/kapp')
-rw-r--r--kapptemplate/kapp/app_client.cpp2
-rw-r--r--kapptemplate/kapp/main.cpp2
2 files changed, 2 insertions, 2 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);