From 94c9dc38220d50d037075127ad46add8a264ef26 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 20 Jan 2013 00:23:32 -0600
Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4

---
 kbabel/catalogmanager/catalogmanagerapp.h   | 2 +-
 kbabel/catalogmanager/libcvs/cvshandler.cpp | 2 +-
 kbabel/catalogmanager/libsvn/svnhandler.cpp | 2 +-
 kbabel/catalogmanager/main.cpp              | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kbabel/catalogmanager')

diff --git a/kbabel/catalogmanager/catalogmanagerapp.h b/kbabel/catalogmanager/catalogmanagerapp.h
index 3f7c0fa8..99e3e97e 100644
--- a/kbabel/catalogmanager/catalogmanagerapp.h
+++ b/kbabel/catalogmanager/catalogmanagerapp.h
@@ -53,7 +53,7 @@ public:
     virtual void updatedFile( TQCString url );
 };
 
-class CatalogManagerApp : public KApplication
+class CatalogManagerApp : public TDEApplication
 {
 public:
     CatalogManagerApp();
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp
index b0be0345..1cd78410 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.cpp
+++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp
@@ -379,7 +379,7 @@ void CVSHandler::processDiff( TQString output )
   tmpFile.close();
 
   TQString error;
-  if ( KApplication::startServiceByName( "Kompare", tmpFile.name(), &error ) )
+  if ( TDEApplication::startServiceByName( "Kompare", tmpFile.name(), &error ) )
     KMessageBox::error( 0, error );
 }
 
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp
index d00c0858..bff097fd 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.cpp
+++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp
@@ -487,7 +487,7 @@ void SVNHandler::processDiff( TQString output )
   tmpFile.close();
 
   TQString error;
-  if ( KApplication::startServiceByName( "Kompare", tmpFile.name(), &error ) )
+  if ( TDEApplication::startServiceByName( "Kompare", tmpFile.name(), &error ) )
     KMessageBox::error( 0, error );
 }
 
diff --git a/kbabel/catalogmanager/main.cpp b/kbabel/catalogmanager/main.cpp
index d071ecb6..ef17c176 100644
--- a/kbabel/catalogmanager/main.cpp
+++ b/kbabel/catalogmanager/main.cpp
@@ -61,7 +61,7 @@
 CatalogManager *CatalogManagerApp::_view = 0;
 
 CatalogManagerApp::CatalogManagerApp()
-    : KApplication()
+    : TDEApplication()
 {
     kbInterface = new CatalogManagerInterface;
     _view = 0;
@@ -222,7 +222,7 @@ int main(int argc, char **argv)
     TDECmdLineArgs::addCmdLineOptions( options );
 
     // Add options from other components
-    KApplication::addCmdLineOptions();
+    TDEApplication::addCmdLineOptions();
 
     CatalogManagerApp app;
 
-- 
cgit v1.2.1