summaryrefslogtreecommitdiffstats
path: root/kicker/proxy/appletproxy.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-20 00:17:06 -0600
committerTimothy Pearson <[email protected]>2013-01-20 00:17:06 -0600
commite4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch)
tree8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /kicker/proxy/appletproxy.cpp
parentd41050ea3f6904e5156d35f664346b816b9e4d12 (diff)
downloadtdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz
tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kicker/proxy/appletproxy.cpp')
-rw-r--r--kicker/proxy/appletproxy.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp
index 04e81612e..328cec09c 100644
--- a/kicker/proxy/appletproxy.cpp
+++ b/kicker/proxy/appletproxy.cpp
@@ -78,10 +78,10 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
TDECmdLineArgs::init(argc, argv, &aboutData );
aboutData.addAuthor("Matthias Elter",0, "[email protected]");
aboutData.addAuthor("Matthias Ettrich",0, "[email protected]");
- KApplication::addCmdLineOptions();
+ TDEApplication::addCmdLineOptions();
TDECmdLineArgs::addCmdLineOptions(options); // Add our own options.
- KApplication a;
+ TDEApplication a;
a.disableSessionManagement();
KGlobal::dirs()->addResourceType("applets", KStandardDirs::kde_default("data") +