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/notation/ClefInserter.cpp            | 2 +-
 src/gui/editors/notation/FontViewFrame.cpp           | 4 ++--
 src/gui/editors/notation/GuitarChordInserter.cpp     | 2 +-
 src/gui/editors/notation/NotationEraser.cpp          | 2 +-
 src/gui/editors/notation/NotationSelectionPaster.cpp | 2 +-
 src/gui/editors/notation/NotationSelector.cpp        | 2 +-
 src/gui/editors/notation/NotationStaff.cpp           | 4 ++--
 src/gui/editors/notation/NotationStrings.cpp         | 2 +-
 src/gui/editors/notation/NotationToolBox.cpp         | 2 +-
 src/gui/editors/notation/NotationVLayout.cpp         | 4 ++--
 src/gui/editors/notation/NotationView.cpp            | 8 ++++----
 src/gui/editors/notation/NotationView.h              | 2 +-
 src/gui/editors/notation/NoteFontFactory.cpp         | 6 +++---
 src/gui/editors/notation/NoteFontMap.cpp             | 4 ++--
 src/gui/editors/notation/NoteFontViewer.cpp          | 2 +-
 src/gui/editors/notation/NoteInserter.cpp            | 2 +-
 src/gui/editors/notation/NotePixmapFactory.cpp       | 6 +++---
 src/gui/editors/notation/NoteStyleFactory.cpp        | 2 +-
 src/gui/editors/notation/NoteStyleFileReader.cpp     | 4 ++--
 src/gui/editors/notation/RestInserter.cpp            | 2 +-
 src/gui/editors/notation/TextInserter.cpp            | 2 +-
 src/gui/editors/notation/TrackHeader.cpp             | 2 +-
 22 files changed, 34 insertions(+), 34 deletions(-)

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

diff --git a/src/gui/editors/notation/ClefInserter.cpp b/src/gui/editors/notation/ClefInserter.cpp
index 28198a2..d2d053f 100644
--- a/src/gui/editors/notation/ClefInserter.cpp
+++ b/src/gui/editors/notation/ClefInserter.cpp
@@ -25,7 +25,7 @@
 
 #include "ClefInserter.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/NotationTypes.h"
 #include "base/ViewElement.h"
diff --git a/src/gui/editors/notation/FontViewFrame.cpp b/src/gui/editors/notation/FontViewFrame.cpp
index a226ffb..40b686b 100644
--- a/src/gui/editors/notation/FontViewFrame.cpp
+++ b/src/gui/editors/notation/FontViewFrame.cpp
@@ -26,8 +26,8 @@
 #include "FontViewFrame.h"
 #include <tdeapplication.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqfontmetrics.h>
 #include <tqframe.h>
 #include <tqsize.h>
diff --git a/src/gui/editors/notation/GuitarChordInserter.cpp b/src/gui/editors/notation/GuitarChordInserter.cpp
index 0885b66..c35949e 100644
--- a/src/gui/editors/notation/GuitarChordInserter.cpp
+++ b/src/gui/editors/notation/GuitarChordInserter.cpp
@@ -25,7 +25,7 @@
 
 #include "GuitarChordInserter.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/Exception.h"
 #include "base/Staff.h"
diff --git a/src/gui/editors/notation/NotationEraser.cpp b/src/gui/editors/notation/NotationEraser.cpp
index 1908fcf..45aad1b 100644
--- a/src/gui/editors/notation/NotationEraser.cpp
+++ b/src/gui/editors/notation/NotationEraser.cpp
@@ -26,7 +26,7 @@
 #include "NotationEraser.h"
 #include <tdeapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "document/ConfigGroups.h"
 #include "base/ViewElement.h"
 #include "commands/notation/EraseEventCommand.h"
diff --git a/src/gui/editors/notation/NotationSelectionPaster.cpp b/src/gui/editors/notation/NotationSelectionPaster.cpp
index d3bba0e..e55bca6 100644
--- a/src/gui/editors/notation/NotationSelectionPaster.cpp
+++ b/src/gui/editors/notation/NotationSelectionPaster.cpp
@@ -25,7 +25,7 @@
 
 #include "NotationSelectionPaster.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/Selection.h"
 #include "base/ViewElement.h"
diff --git a/src/gui/editors/notation/NotationSelector.cpp b/src/gui/editors/notation/NotationSelector.cpp
index c6d1c68..0a4ab21 100644
--- a/src/gui/editors/notation/NotationSelector.cpp
+++ b/src/gui/editors/notation/NotationSelector.cpp
@@ -26,7 +26,7 @@
 #include "NotationSelector.h"
 #include "misc/Debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/NotationTypes.h"
 #include "base/PropertyName.h"
diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp
index 3e1bf28..d9c28e4 100644
--- a/src/gui/editors/notation/NotationStaff.cpp
+++ b/src/gui/editors/notation/NotationStaff.cpp
@@ -27,7 +27,7 @@
 #include "misc/Debug.h"
 #include <tdeapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "document/ConfigGroups.h"
 #include "base/Composition.h"
@@ -63,7 +63,7 @@
 #include "NotePixmapParameters.h"
 #include "NoteStyleFactory.h"
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqcanvas.h>
 #include <tqpainter.h>
 #include <tqpoint.h>
diff --git a/src/gui/editors/notation/NotationStrings.cpp b/src/gui/editors/notation/NotationStrings.cpp
index e46f95e..0554127 100644
--- a/src/gui/editors/notation/NotationStrings.cpp
+++ b/src/gui/editors/notation/NotationStrings.cpp
@@ -26,7 +26,7 @@
 #include "NotationStrings.h"
 #include <tdeapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "document/ConfigGroups.h"
 #include "base/Exception.h"
diff --git a/src/gui/editors/notation/NotationToolBox.cpp b/src/gui/editors/notation/NotationToolBox.cpp
index 7632413..f04162c 100644
--- a/src/gui/editors/notation/NotationToolBox.cpp
+++ b/src/gui/editors/notation/NotationToolBox.cpp
@@ -37,7 +37,7 @@
 #include "NotationSelector.h"
 
 #include <tqstring.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 namespace Rosegarden
 {
diff --git a/src/gui/editors/notation/NotationVLayout.cpp b/src/gui/editors/notation/NotationVLayout.cpp
index 5afaa4a..3366e20 100644
--- a/src/gui/editors/notation/NotationVLayout.cpp
+++ b/src/gui/editors/notation/NotationVLayout.cpp
@@ -26,7 +26,7 @@
 #include "NotationVLayout.h"
 #include "misc/Debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Composition.h"
 #include "base/Event.h"
 #include "base/LayoutEngine.h"
@@ -41,7 +41,7 @@
 #include "NotationProperties.h"
 #include "NotationStaff.h"
 #include "NotePixmapFactory.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqobject.h>
 #include <tqstring.h>
 #include <tqwidget.h>
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index 3059de3..35ddd87 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -32,7 +32,7 @@
 #include "gui/editors/segment/TrackEditor.h"
 #include "gui/editors/segment/TrackButtons.h"
 #include "base/BaseProperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "misc/Strings.h"
 #include "base/AnalysisTypes.h"
@@ -183,15 +183,15 @@
 #include <tdeaction.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineeditdlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprinter.h>
 #include <kprocess.h>
 #include <kprogress.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdetoolbar.h>
 #include <kxmlguiclient.h>
 #include <tqbrush.h>
diff --git a/src/gui/editors/notation/NotationView.h b/src/gui/editors/notation/NotationView.h
index 352e5e9..b8282d8 100644
--- a/src/gui/editors/notation/NotationView.h
+++ b/src/gui/editors/notation/NotationView.h
@@ -34,7 +34,7 @@
 #include "NotationCanvasView.h"
 #include <string>
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqmap.h>
 #include <tqsize.h>
 #include <tqstring.h>
diff --git a/src/gui/editors/notation/NoteFontFactory.cpp b/src/gui/editors/notation/NoteFontFactory.cpp
index b13f45b..d924ffc 100644
--- a/src/gui/editors/notation/NoteFontFactory.cpp
+++ b/src/gui/editors/notation/NoteFontFactory.cpp
@@ -27,7 +27,7 @@
 #include "misc/Debug.h"
 #include <tdeapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "misc/Strings.h"
 #include "document/ConfigGroups.h"
@@ -36,8 +36,8 @@
 #include "NoteFont.h"
 #include "NoteFontMap.h"
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <tqdir.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/src/gui/editors/notation/NoteFontMap.cpp b/src/gui/editors/notation/NoteFontMap.cpp
index 3060375..f557a08 100644
--- a/src/gui/editors/notation/NoteFontMap.cpp
+++ b/src/gui/editors/notation/NoteFontMap.cpp
@@ -26,12 +26,12 @@
 #include "NoteFontMap.h"
 #include "misc/Debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "misc/Strings.h"
 #include "base/Exception.h"
 #include "SystemFont.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqpixmap.h>
diff --git a/src/gui/editors/notation/NoteFontViewer.cpp b/src/gui/editors/notation/NoteFontViewer.cpp
index 2474ec1..9327b20 100644
--- a/src/gui/editors/notation/NoteFontViewer.cpp
+++ b/src/gui/editors/notation/NoteFontViewer.cpp
@@ -25,7 +25,7 @@
 
 #include "NoteFontViewer.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "FontViewFrame.h"
 #include <kcombobox.h>
 #include <kdialogbase.h>
diff --git a/src/gui/editors/notation/NoteInserter.cpp b/src/gui/editors/notation/NoteInserter.cpp
index 609b6cf..9763f7c 100644
--- a/src/gui/editors/notation/NoteInserter.cpp
+++ b/src/gui/editors/notation/NoteInserter.cpp
@@ -28,7 +28,7 @@
 #include <tdeapplication.h>
 
 #include "base/BaseProperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "document/ConfigGroups.h"
 #include "base/Event.h"
diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp
index e2f69cb..a190d5f 100644
--- a/src/gui/editors/notation/NotePixmapFactory.cpp
+++ b/src/gui/editors/notation/NotePixmapFactory.cpp
@@ -28,7 +28,7 @@
 #include "base/NotationRules.h"
 #include <tdeapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include <tdeconfig.h>
 #include "misc/Strings.h"
@@ -54,8 +54,8 @@
 #include "NotePixmapPainter.h"
 #include "NoteStyleFactory.h"
 #include "NoteStyle.h"
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <tqbitmap.h>
 #include <tqcolor.h>
 #include <tqfile.h>
diff --git a/src/gui/editors/notation/NoteStyleFactory.cpp b/src/gui/editors/notation/NoteStyleFactory.cpp
index 340a657..784218b 100644
--- a/src/gui/editors/notation/NoteStyleFactory.cpp
+++ b/src/gui/editors/notation/NoteStyleFactory.cpp
@@ -32,7 +32,7 @@
 #include "NotationProperties.h"
 #include "NoteStyle.h"
 #include "NoteStyleFileReader.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqdir.h>
 #include <tqfileinfo.h>
 #include <tqstring.h>
diff --git a/src/gui/editors/notation/NoteStyleFileReader.cpp b/src/gui/editors/notation/NoteStyleFileReader.cpp
index d8a552f..bcab138 100644
--- a/src/gui/editors/notation/NoteStyleFileReader.cpp
+++ b/src/gui/editors/notation/NoteStyleFileReader.cpp
@@ -29,9 +29,9 @@
 #include <tqfileinfo.h>
 #include <tqdir.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "misc/Strings.h"
 #include "NotationStrings.h"
diff --git a/src/gui/editors/notation/RestInserter.cpp b/src/gui/editors/notation/RestInserter.cpp
index 2dccf65..31b29d9 100644
--- a/src/gui/editors/notation/RestInserter.cpp
+++ b/src/gui/editors/notation/RestInserter.cpp
@@ -25,7 +25,7 @@
 
 #include "RestInserter.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/NotationTypes.h"
 #include "base/BaseProperties.h"
diff --git a/src/gui/editors/notation/TextInserter.cpp b/src/gui/editors/notation/TextInserter.cpp
index 84a832e..a812f07 100644
--- a/src/gui/editors/notation/TextInserter.cpp
+++ b/src/gui/editors/notation/TextInserter.cpp
@@ -25,7 +25,7 @@
 
 #include "TextInserter.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/Exception.h"
 #include "base/NotationTypes.h"
diff --git a/src/gui/editors/notation/TrackHeader.cpp b/src/gui/editors/notation/TrackHeader.cpp
index 1b73889..61215ea 100644
--- a/src/gui/editors/notation/TrackHeader.cpp
+++ b/src/gui/editors/notation/TrackHeader.cpp
@@ -49,7 +49,7 @@
 #include <utility>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqsize.h>
 #include <tqwidget.h>
 #include <tqhbox.h>
-- 
cgit v1.2.1