diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:21:02 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:21:02 -0600 |
commit | 8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a (patch) | |
tree | 19ff5ecf5e6b5168e5503677f18b85f3dfa91f95 /kded/kde-menu.cpp | |
parent | 5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 (diff) | |
download | tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.tar.gz tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.zip |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kded/kde-menu.cpp')
-rw-r--r-- | kded/kde-menu.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kded/kde-menu.cpp b/kded/kde-menu.cpp index 81887a695..7148a1e6b 100644 --- a/kded/kde-menu.cpp +++ b/kded/kde-menu.cpp @@ -121,8 +121,8 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc, argv, &d); TDECmdLineArgs::addCmdLineOptions(options); -// KApplication k(false, false); - KApplication k(false); +// TDEApplication k(false, false); + TDEApplication k(false); k.disableSessionManagement(); // this program is in tdelibs so it uses tdelibs as catalog @@ -147,7 +147,7 @@ int main(int argc, char **argv) args.append("--incremental"); args.append("--checkstamps"); TQString command = "kbuildsycoca"; - TQCString _launcher = KApplication::launcher(); + TQCString _launcher = TDEApplication::launcher(); if (!DCOPRef(_launcher, _launcher).call("tdeinit_exec_wait", command, args).isValid()) { tqWarning("Can't talk to klauncher!"); |