From 990bf92fa5cefbe5ebb34a172d18bb3df745bd7a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:16:04 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 src/gui/application/RosegardenApplication.cpp | 2 +-
 src/gui/application/RosegardenGUIApp.cpp      | 8 ++++----
 src/gui/application/RosegardenGUIApp.cpp.orig | 8 ++++----
 src/gui/application/RosegardenIface.cpp       | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/gui/application')

diff --git a/src/gui/application/RosegardenApplication.cpp b/src/gui/application/RosegardenApplication.cpp
index b160f45..e77fea1 100644
--- a/src/gui/application/RosegardenApplication.cpp
+++ b/src/gui/application/RosegardenApplication.cpp
@@ -33,7 +33,7 @@
 #include "RosegardenGUIApp.h"
 #include <kcmdlineargs.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <kuniqueapplication.h>
diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp
index 6bb154a..202c530 100644
--- a/src/gui/application/RosegardenGUIApp.cpp
+++ b/src/gui/application/RosegardenGUIApp.cpp
@@ -175,7 +175,7 @@
 #include <dcopclient.h>
 #include <dcopobject.h>
 #include <dcopref.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kdcopactionproxy.h>
 #include <kdockwidget.h>
@@ -186,17 +186,17 @@
 #include <tdeio/netaccess.h>
 #include <kkeydialog.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
 #include <kprocess.h>
 #include <kstatusbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstddirs.h>
 #include <ktempfile.h>
 #include <ktip.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kurl.h>
 #include <kxmlguiclient.h>
 #include <tqaccel.h>
diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig
index 23215a9..970c6be 100644
--- a/src/gui/application/RosegardenGUIApp.cpp.orig
+++ b/src/gui/application/RosegardenGUIApp.cpp.orig
@@ -175,7 +175,7 @@
 #include <dcopclient.h>
 #include <dcopobject.h>
 #include <dcopref.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kdcopactionproxy.h>
 #include <kdockwidget.h>
@@ -186,17 +186,17 @@
 #include <tdeio/netaccess.h>
 #include <kkeydialog.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
 #include <kprocess.h>
 #include <kstatusbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstddirs.h>
 #include <ktempfile.h>
 #include <ktip.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kurl.h>
 #include <kxmlguiclient.h>
 #include <tqaccel.h>
diff --git a/src/gui/application/RosegardenIface.cpp b/src/gui/application/RosegardenIface.cpp
index 4679e1c..b413612 100644
--- a/src/gui/application/RosegardenIface.cpp
+++ b/src/gui/application/RosegardenIface.cpp
@@ -32,9 +32,9 @@
 #include "sound/MappedComposition.h"
 #include <dcopobject.h>
 #include <dcopref.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdcopactionproxy.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqcstring.h>
 #include <tqstring.h>
 #include <tqvaluelist.h>
-- 
cgit v1.2.1