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

---
 src/document/RosegardenGUIDoc.h        | 2 +-
 src/gui/application/RosegardenGUIApp.h | 4 ++--
 src/gui/application/main.cpp           | 2 +-
 src/sequencer/main.cpp                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/document/RosegardenGUIDoc.h b/src/document/RosegardenGUIDoc.h
index 32ce73d..c6e13cd 100644
--- a/src/document/RosegardenGUIDoc.h
+++ b/src/document/RosegardenGUIDoc.h
@@ -77,7 +77,7 @@ static const int MERGE_KEEP_NEW_TIMINGS = (1 << 3);
   * The RosegardenGUIDoc class provides a document object that can be
   * used in conjunction with the classes RosegardenGUIApp and
   * RosegardenGUIView to create a document-view model for standard KDE
-  * applications based on KApplication and KTMainWindow. Thereby, the
+  * applications based on TDEApplication and KTMainWindow. Thereby, the
   * document object is created by the RosegardenGUIApp instance and
   * contains the document structure with the according methods for
   * manipulation of the document data by RosegardenGUIView
diff --git a/src/gui/application/RosegardenGUIApp.h b/src/gui/application/RosegardenGUIApp.h
index 2c2d57c..23933ea 100644
--- a/src/gui/application/RosegardenGUIApp.h
+++ b/src/gui/application/RosegardenGUIApp.h
@@ -100,7 +100,7 @@ class AudioManagerDialog;
   * RosegardenGUIApp reimplements the methods that KTMainWindow provides for main window handling and supports
   * full session management as well as keyboard accelerator configuration by using KAccel.
   * @see KTMainWindow
-  * @see KApplication
+  * @see TDEApplication
   * @see KConfig
   * @see KAccel
   *
@@ -440,7 +440,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.
+     * opened file by a temporary filename provided by TDEApplication.
      *
      * @see KTMainWindow#saveProperties
      */
diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp
index 2d58cd7..bb1c4c2 100644
--- a/src/gui/application/main.cpp
+++ b/src/gui/application/main.cpp
@@ -520,7 +520,7 @@ int main(int argc, char *argv[])
     config->setGroup("MainView");
     int windowWidth = 0, windowHeight = 0;
 
-    TQDesktopWidget *desktop = KApplication::desktop();
+    TQDesktopWidget *desktop = TDEApplication::desktop();
     if (desktop) {
 	TQRect totalRect(desktop->screenGeometry());
 	TQRect desktopRect = KGlobalSettings::desktopGeometry(TQPoint(0, 0));
diff --git a/src/sequencer/main.cpp b/src/sequencer/main.cpp
index c931bae..a69c744 100644
--- a/src/sequencer/main.cpp
+++ b/src/sequencer/main.cpp
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
     //
     /*TDECmdLineArgs *args =*/
     TDECmdLineArgs::parsedArgs();
-    KApplication app;
+    TDEApplication app;
 
     if (app.isRestored()) {
         SEQUENCER_DEBUG << "RosegardenSequencer - we're being session-restored - that's not supposed to happen\n";
-- 
cgit v1.2.1