From 5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:51:32 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 src/document/MultiViewCommandHistory.cpp | 2 +-
 src/document/RoseXmlHandler.cpp          | 4 ++--
 src/document/RosegardenGUIDoc.cpp        | 8 ++++----
 src/document/io/HydrogenXMLHandler.cpp   | 2 +-
 src/document/io/LilyPondExporter.cpp     | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/document')

diff --git a/src/document/MultiViewCommandHistory.cpp b/src/document/MultiViewCommandHistory.cpp
index 68efb3a..db7bfcd 100644
--- a/src/document/MultiViewCommandHistory.cpp
+++ b/src/document/MultiViewCommandHistory.cpp
@@ -25,7 +25,7 @@
 
 #include "MultiViewCommandHistory.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include <tdeactioncollection.h>
 #include <tdeaction.h>
diff --git a/src/document/RoseXmlHandler.cpp b/src/document/RoseXmlHandler.cpp
index 1dc572b..4b6d932 100644
--- a/src/document/RoseXmlHandler.cpp
+++ b/src/document/RoseXmlHandler.cpp
@@ -26,7 +26,7 @@
 #include "RoseXmlHandler.h"
 
 #include "sound/Midi.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "base/AudioLevel.h"
@@ -60,7 +60,7 @@
 #include "RosegardenGUIDoc.h"
 #include "sound/AudioFileManager.h"
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqcstring.h>
 #include <tqdatastream.h>
 #include <tqdialog.h>
diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp
index e764273..5184076 100644
--- a/src/document/RosegardenGUIDoc.cpp
+++ b/src/document/RosegardenGUIDoc.cpp
@@ -30,7 +30,7 @@
 #include "sound/Midi.h"
 #include "gui/editors/segment/TrackEditor.h"
 #include "gui/editors/segment/TrackButtons.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
@@ -93,11 +93,11 @@
 #include <kcommand.h>
 #include <tdeconfig.h>
 #include <kfilterdev.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kprogress.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqcstring.h>
 #include <tqdatastream.h>
 #include <tqdialog.h>
diff --git a/src/document/io/HydrogenXMLHandler.cpp b/src/document/io/HydrogenXMLHandler.cpp
index 9854648..d09a648 100644
--- a/src/document/io/HydrogenXMLHandler.cpp
+++ b/src/document/io/HydrogenXMLHandler.cpp
@@ -27,7 +27,7 @@
 
 #include "base/Event.h"
 #include "base/BaseProperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "base/Composition.h"
diff --git a/src/document/io/LilyPondExporter.cpp b/src/document/io/LilyPondExporter.cpp
index 284fea2..b44b6f3 100644
--- a/src/document/io/LilyPondExporter.cpp
+++ b/src/document/io/LilyPondExporter.cpp
@@ -37,7 +37,7 @@
 
 #include "LilyPondExporter.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "document/ConfigGroups.h"
@@ -67,7 +67,7 @@
 #include "gui/general/ProgressReporter.h"
 #include "gui/widgets/CurrentProgressDialog.h"
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqfileinfo.h>
 #include <tqobject.h>
 #include <tqregexp.h>
-- 
cgit v1.2.1