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/gui/editors/segment/ControlEditorDialog.cpp           | 2 +-
 src/gui/editors/segment/ControlParameterEditDialog.cpp    | 2 +-
 src/gui/editors/segment/MarkerEditor.cpp                  | 4 ++--
 src/gui/editors/segment/PlayList.cpp                      | 4 ++--
 src/gui/editors/segment/PlayListView.cpp                  | 2 +-
 src/gui/editors/segment/TrackButtons.cpp                  | 6 +++---
 src/gui/editors/segment/TrackEditor.cpp                   | 6 +++---
 src/gui/editors/segment/TrackLabel.cpp                    | 2 +-
 src/gui/editors/segment/TriggerSegmentManager.cpp         | 6 +++---
 src/gui/editors/segment/segmentcanvas/CompositionView.cpp | 2 +-
 src/gui/editors/segment/segmentcanvas/SegmentEraser.cpp   | 2 +-
 src/gui/editors/segment/segmentcanvas/SegmentJoiner.cpp   | 2 +-
 src/gui/editors/segment/segmentcanvas/SegmentMover.cpp    | 4 ++--
 src/gui/editors/segment/segmentcanvas/SegmentOrderer.cpp  | 2 +-
 src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp   | 2 +-
 src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp  | 4 ++--
 src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp | 2 +-
 src/gui/editors/segment/segmentcanvas/SegmentSplitter.cpp | 2 +-
 src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp  | 2 +-
 19 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'src/gui/editors/segment')

diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp
index e91f9f1..d064d0c 100644
--- a/src/gui/editors/segment/ControlEditorDialog.cpp
+++ b/src/gui/editors/segment/ControlEditorDialog.cpp
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tdeapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "base/Colour.h"
diff --git a/src/gui/editors/segment/ControlParameterEditDialog.cpp b/src/gui/editors/segment/ControlParameterEditDialog.cpp
index a7d794b..253e7c6 100644
--- a/src/gui/editors/segment/ControlParameterEditDialog.cpp
+++ b/src/gui/editors/segment/ControlParameterEditDialog.cpp
@@ -26,7 +26,7 @@
 #include "ControlParameterEditDialog.h"
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "base/Colour.h"
diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index 922b385..66d44a7 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -28,7 +28,7 @@
 #include <tqlayout.h>
 #include <tdeapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include <tdestdaccel.h>
 #include <tdeconfig.h>
@@ -46,7 +46,7 @@
 #include "gui/dialogs/MarkerModifyDialog.h"
 #include <tdeaction.h>
 #include <kcommand.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdelistview.h>
 #include <tdemainwindow.h>
 #include <tdestdaccel.h>
diff --git a/src/gui/editors/segment/PlayList.cpp b/src/gui/editors/segment/PlayList.cpp
index 58d59cc..ccb54d6 100644
--- a/src/gui/editors/segment/PlayList.cpp
+++ b/src/gui/editors/segment/PlayList.cpp
@@ -29,10 +29,10 @@
 #include "document/ConfigGroups.h"
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kurl.h>
 #include <tqframe.h>
 #include <tqpushbutton.h>
diff --git a/src/gui/editors/segment/PlayListView.cpp b/src/gui/editors/segment/PlayListView.cpp
index bbaa4b3..dbf7a0a 100644
--- a/src/gui/editors/segment/PlayListView.cpp
+++ b/src/gui/editors/segment/PlayListView.cpp
@@ -24,7 +24,7 @@
 
 #include "PlayListView.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdragobject.h>
 
 namespace Rosegarden {
diff --git a/src/gui/editors/segment/TrackButtons.cpp b/src/gui/editors/segment/TrackButtons.cpp
index e4eb458..6d2b9eb 100644
--- a/src/gui/editors/segment/TrackButtons.cpp
+++ b/src/gui/editors/segment/TrackButtons.cpp
@@ -26,7 +26,7 @@
 #include "TrackButtons.h"
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
@@ -47,9 +47,9 @@
 #include "sound/PluginIdentifier.h"
 #include "TrackLabel.h"
 #include "TrackVUMeter.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kled.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqcursor.h>
 #include <tqframe.h>
 #include <tqiconset.h>
diff --git a/src/gui/editors/segment/TrackEditor.cpp b/src/gui/editors/segment/TrackEditor.cpp
index 0638aba..c4e13a2 100644
--- a/src/gui/editors/segment/TrackEditor.cpp
+++ b/src/gui/editors/segment/TrackEditor.cpp
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tdeapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstddirs.h>
 #include "misc/Debug.h"
@@ -62,8 +62,8 @@
 #include "TrackEditorIface.h"
 #include <dcopobject.h>
 #include <kcommand.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <tqapplication.h>
 #include <tqcursor.h>
 #include <tqfont.h>
diff --git a/src/gui/editors/segment/TrackLabel.cpp b/src/gui/editors/segment/TrackLabel.cpp
index 49b3afc..5adc1af 100644
--- a/src/gui/editors/segment/TrackLabel.cpp
+++ b/src/gui/editors/segment/TrackLabel.cpp
@@ -25,7 +25,7 @@
 
 #include "TrackLabel.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Track.h"
 #include <klineeditdlg.h>
 #include <tqfont.h>
diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp
index c26cc15..3435abd 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.cpp
+++ b/src/gui/editors/segment/TriggerSegmentManager.cpp
@@ -29,7 +29,7 @@
 #include <tdeapplication.h>
 
 #include "base/BaseProperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
@@ -49,10 +49,10 @@
 #include "gui/general/MidiPitchLabel.h"
 #include <tdeaction.h>
 #include <kcommand.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdelistview.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <tdeconfig.h>
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
index 0380d9e..b7cce97 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
@@ -46,7 +46,7 @@
 #include "SegmentSelector.h"
 #include "SegmentToolBox.h"
 #include "SegmentTool.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqbrush.h>
 #include <tqcolor.h>
 #include <tqevent.h>
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentEraser.cpp b/src/gui/editors/segment/segmentcanvas/SegmentEraser.cpp
index 3c4a7ae..b34fe20 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentEraser.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentEraser.cpp
@@ -36,7 +36,7 @@
 #include <kcommand.h>
 #include <tqpoint.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Rosegarden
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentJoiner.cpp b/src/gui/editors/segment/segmentcanvas/SegmentJoiner.cpp
index 71a3ca3..6361a55 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentJoiner.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentJoiner.cpp
@@ -34,7 +34,7 @@
 #include <kcommand.h>
 #include <tqpoint.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Rosegarden
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp b/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
index 04da855..eaf5735 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
@@ -26,7 +26,7 @@
 #include "SegmentMover.h"
 
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "base/Composition.h"
 #include "base/RealTime.h"
@@ -48,7 +48,7 @@
 #include <tqpoint.h>
 #include <tqrect.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Rosegarden
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentOrderer.cpp b/src/gui/editors/segment/segmentcanvas/SegmentOrderer.cpp
index 4262eb9..0b5629e 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentOrderer.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentOrderer.cpp
@@ -28,7 +28,7 @@
 #include "misc/Debug.h"
 #include "base/Composition.h"
 #include "base/Segment.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Rosegarden
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp b/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp
index 8f4399c..c29bc73 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp
@@ -41,7 +41,7 @@
 #include "gui/general/RosegardenCanvasView.h"
 #include "SegmentTool.h"
 #include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcursor.h>
 #include <tqevent.h>
 #include <tqpoint.h>
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp b/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp
index 4c4c884..befedad 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp
@@ -26,7 +26,7 @@
 #include "SegmentResizer.h"
 
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "base/Composition.h"
 #include "base/NotationTypes.h"
@@ -48,7 +48,7 @@
 #include "gui/widgets/ProgressDialog.h"
 #include "SegmentTool.h"
 #include <kcommand.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqcursor.h>
 #include <tqevent.h>
 #include <tqpoint.h>
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
index fe61e78..e8fbae8 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
@@ -26,7 +26,7 @@
 #include "SegmentSelector.h"
 
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "base/Composition.h"
 #include "base/RealTime.h"
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSplitter.cpp b/src/gui/editors/segment/segmentcanvas/SegmentSplitter.cpp
index d5fe45a..42ba2a3 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentSplitter.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentSplitter.cpp
@@ -40,7 +40,7 @@
 #include <tqpoint.h>
 #include <tqrect.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Rosegarden
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
index 5ce8a58..ca359c9 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
@@ -37,7 +37,7 @@
 #include "SegmentResizer.h"
 #include "SegmentSplitter.h"
 #include <tqstring.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 namespace Rosegarden
 {
-- 
cgit v1.2.1