From 94c9dc38220d50d037075127ad46add8a264ef26 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:23:32 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- cervisia/cvsservice/DESIGN | 2 +- cervisia/cvsservice/cvsaskpass.cpp | 4 ++-- cervisia/cvsservice/main.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'cervisia/cvsservice') diff --git a/cervisia/cvsservice/DESIGN b/cervisia/cvsservice/DESIGN index c258e911..02f0ed62 100644 --- a/cervisia/cvsservice/DESIGN +++ b/cervisia/cvsservice/DESIGN @@ -30,7 +30,7 @@ How-to use this service in C++ applications: QString error; QCString appId; - KApplication::startServiceByDesktopName("cvsservice", QStringList(), &error, + TDEApplication::startServiceByDesktopName("cvsservice", QStringList(), &error, &appId); // create stub for repository diff --git a/cervisia/cvsservice/cvsaskpass.cpp b/cervisia/cvsservice/cvsaskpass.cpp index eb581f34..ac6a6796 100644 --- a/cervisia/cvsservice/cvsaskpass.cpp +++ b/cervisia/cvsservice/cvsaskpass.cpp @@ -46,8 +46,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char** argv) TDECmdLineArgs::addCmdLineOptions(options); // no need to register with the dcop server - KApplication::disableAutoDcopRegistration(); - KApplication app; + TDEApplication::disableAutoDcopRegistration(); + TDEApplication app; // no need for session management app.disableSessionManagement(); diff --git a/cervisia/cvsservice/main.cpp b/cervisia/cvsservice/main.cpp index 3264487c..bcb666a2 100644 --- a/cervisia/cvsservice/main.cpp +++ b/cervisia/cvsservice/main.cpp @@ -35,7 +35,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char** argv) TDECmdLineArgs::init(argc, argv, &about); - KApplication app; + TDEApplication app; // This app is started automatically, no need for session management app.disableSessionManagement(); -- cgit v1.2.1