Rename KApplication to TDEApplication to avoid conflicts with KDE4

5 files changed, 9 insertions, 9 deletions

diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index 35024df0..da2d1556 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -111,7 +111,7 @@ CervisiaPart::CervisiaPart( TQWidget *parentWidget, const char *widgetName,
     // start the cvs DCOP service
     TQString error;
     TQCString appId;
-    if( KApplication::startServiceByDesktopName("cvsservice", TQStringList(), &error, &appId) )
+    if( TDEApplication::startServiceByDesktopName("cvsservice", TQStringList(), &error, &appId) )
     {
         KMessageBox::sorry(0, i18n("Starting cvsservice failed with message: ") +
             error, "Cervisia");
@@ -1642,14 +1642,14 @@ void CervisiaPart::slotConfigure()
 void CervisiaPart::slotHelp()
 {
     emit setStatusBarText( i18n("Invoking help on Cervisia") );
-    KApplication::startServiceByDesktopName("khelpcenter", TQString("help:/cervisia/index.html"));
+    TDEApplication::startServiceByDesktopName("khelpcenter", TQString("help:/cervisia/index.html"));
 }
 
 
 void CervisiaPart::slotCVSInfo()
 {
     emit setStatusBarText( i18n("Invoking help on CVS") );
-    KApplication::startServiceByDesktopName("khelpcenter", TQString("info:/cvs/Top"));
+    TDEApplication::startServiceByDesktopName("khelpcenter", TQString("info:/cvs/Top"));
 }
 
 
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();
diff --git a/cervisia/main.cpp b/cervisia/main.cpp
index 4a5bb5ad..1290995b 100644
--- a/cervisia/main.cpp
+++ b/cervisia/main.cpp
@@ -43,7 +43,7 @@ static CvsService_stub* StartDCOPService(const TQString& directory)
     // start the cvs DCOP service
     TQString error;
     TQCString appId;
-    if( KApplication::startServiceByDesktopName("cvsservice", TQStringList(),
+    if( TDEApplication::startServiceByDesktopName("cvsservice", TQStringList(),
                                                 &error, &appId) )
     {
         std::cerr << "Starting cvsservice failed with message: "
@@ -167,7 +167,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions(options);
 
-    KApplication app;
+    TDEApplication app;
 
     TQString resolvefile = TDECmdLineArgs::parsedArgs()->getOption("resolve");
     if (!resolvefile.isEmpty())