summaryrefslogtreecommitdiffstats
path: root/kandy/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:08 -0600
commitd6d75dc9ff326e0bd6fc673adae71d53277fb8e4 (patch)
tree56a87e6a48bdf5e310958f1943a834e59eddbba1 /kandy/src
parent32b66c9ae78f439199a6d281cc33218e57c5106d (diff)
downloadtdepim-d6d75dc9ff326e0bd6fc673adae71d53277fb8e4.tar.gz
tdepim-d6d75dc9ff326e0bd6fc673adae71d53277fb8e4.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kandy/src')
-rw-r--r--kandy/src/kandy_client.cpp2
-rw-r--r--kandy/src/main.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/kandy/src/kandy_client.cpp b/kandy/src/kandy_client.cpp
index 2aba3b355..b27e5de69 100644
--- a/kandy/src/kandy_client.cpp
+++ b/kandy/src/kandy_client.cpp
@@ -29,7 +29,7 @@
int main(int argc, char **argv)
{
- KApplication app(argc, argv, "kandy_client", false);
+ TDEApplication app(argc, argv, "kandy_client", false);
// get our DCOP client and attach so that we may use it
DCOPClient *client = app.dcopClient();
diff --git a/kandy/src/main.cpp b/kandy/src/main.cpp
index b3f6aa82e..0ba62eb69 100644
--- a/kandy/src/main.cpp
+++ b/kandy/src/main.cpp
@@ -95,7 +95,7 @@ int main(int argc, char **argv)
TDECmdLineArgs::init(argc,argv,&about);
TDECmdLineArgs::addCmdLineOptions(options);
- KApplication app;
+ TDEApplication app;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
// register ourselves as a dcop client