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

---
 umbrello/umbrello/main.cpp   | 2 +-
 umbrello/umbrello/plugin.cpp | 2 +-
 umbrello/umbrello/uml.h      | 4 ++--
 umbrello/umbrello/umldoc.h   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'umbrello')

diff --git a/umbrello/umbrello/main.cpp b/umbrello/umbrello/main.cpp
index 8690f0fb..891fabee 100644
--- a/umbrello/umbrello/main.cpp
+++ b/umbrello/umbrello/main.cpp
@@ -99,7 +99,7 @@ int main(int argc, char *argv[]) {
     TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
-    KApplication app;
+    TDEApplication app;
     if( app.isRestored() ) {
         RESTORE( UMLApp );
     } else {
diff --git a/umbrello/umbrello/plugin.cpp b/umbrello/umbrello/plugin.cpp
index a682db06..fddbb6e9 100644
--- a/umbrello/umbrello/plugin.cpp
+++ b/umbrello/umbrello/plugin.cpp
@@ -150,7 +150,7 @@ Plugin::configure()
         loadPlugins(conf, "Load");
 
         // only load GUI plugins if this is not a terminal app
-        if(KApplication::kApplication()->type() != TQApplication::Tty) {
+        if(TDEApplication::kApplication()->type() != TQApplication::Tty) {
             loadPlugins(conf, "LoadGUI");
         }
     }
diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h
index 8a9a8c95..2c4f59c8 100644
--- a/umbrello/umbrello/uml.h
+++ b/umbrello/umbrello/uml.h
@@ -68,7 +68,7 @@ class TQCustomEvent;
  * UMLApp reimplements the methods that KMainWindow provides for main window handling and supports
  * full session management as well as using KActions.
  * @see KMainWindow
- * @see KApplication
+ * @see TDEApplication
  * @see KConfig
  *
  * @author Paul Hensgen <phensgen@techie.com>
@@ -399,7 +399,7 @@ protected:
      * Saves the window properties for each open window
      * during session end to the session config file,
      * including saving the currently opened file by a
-     * temporary filename provided by KApplication.
+     * temporary filename provided by TDEApplication.
      * @see KMainWindow#saveProperties
      */
     virtual void saveProperties(KConfig *_cfg);
diff --git a/umbrello/umbrello/umldoc.h b/umbrello/umbrello/umldoc.h
index 184fdf8c..cdfbd72a 100644
--- a/umbrello/umbrello/umldoc.h
+++ b/umbrello/umbrello/umldoc.h
@@ -64,7 +64,7 @@ class UMLFolder;
   * The UMLDoc class provides a document object that can be used
   * in conjunction with the classes UMLApp and UMLView to create
   * a document-view model for standard TDE applications based on
-  * KApplication and KMainWindow. Thereby, the document object
+  * TDEApplication and KMainWindow. Thereby, the document object
   * is created by the UMLApp instance and contains the document
   * structure with the according methods for manipulation of the
   * document data by UMLView objects. Also, UMLDoc contains the
-- 
cgit v1.2.3