Rename additional header files to avoid conflicts with KDE4

7 files changed, 14 insertions, 14 deletions

diff --git a/src/gui/editors/matrix/MatrixEraser.cpp b/src/gui/editors/matrix/MatrixEraser.cpp
index ffd1a59..db69d51 100644
--- a/src/gui/editors/matrix/MatrixEraser.cpp
+++ b/src/gui/editors/matrix/MatrixEraser.cpp
@@ -26,7 +26,7 @@
 #include "MatrixEraser.h"
 #include "misc/Debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "base/ViewElement.h"
 #include "commands/matrix/MatrixEraseCommand.h"
@@ -35,7 +35,7 @@
 #include "MatrixTool.h"
 #include "MatrixView.h"
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqiconset.h>
 #include <tqstring.h>
 
diff --git a/src/gui/editors/matrix/MatrixMover.cpp b/src/gui/editors/matrix/MatrixMover.cpp
index 50344ab..310786a 100644
--- a/src/gui/editors/matrix/MatrixMover.cpp
+++ b/src/gui/editors/matrix/MatrixMover.cpp
@@ -26,7 +26,7 @@
 #include "MatrixMover.h"
 
 #include "base/BaseProperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "base/Event.h"
 #include "base/Segment.h"
@@ -44,7 +44,7 @@
 #include "MatrixView.h"
 #include "MatrixVLayout.h"
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqiconset.h>
 #include <tqpoint.h>
 #include <tqstring.h>
diff --git a/src/gui/editors/matrix/MatrixPainter.cpp b/src/gui/editors/matrix/MatrixPainter.cpp
index e48e4ed..5a95f7d 100644
--- a/src/gui/editors/matrix/MatrixPainter.cpp
+++ b/src/gui/editors/matrix/MatrixPainter.cpp
@@ -26,7 +26,7 @@
 #include "MatrixPainter.h"
 
 #include "base/BaseProperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "base/Event.h"
 #include "base/NotationTypes.h"
@@ -43,7 +43,7 @@
 #include "MatrixTool.h"
 #include "MatrixView.h"
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqiconset.h>
 #include <tqpoint.h>
 #include <tqstring.h>
diff --git a/src/gui/editors/matrix/MatrixResizer.cpp b/src/gui/editors/matrix/MatrixResizer.cpp
index 167d464..6e2bd95 100644
--- a/src/gui/editors/matrix/MatrixResizer.cpp
+++ b/src/gui/editors/matrix/MatrixResizer.cpp
@@ -25,7 +25,7 @@
 
 #include "MatrixResizer.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "base/Event.h"
 #include "base/Segment.h"
@@ -41,7 +41,7 @@
 #include "MatrixTool.h"
 #include "MatrixView.h"
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqiconset.h>
 #include <tqpoint.h>
 #include <tqstring.h>
diff --git a/src/gui/editors/matrix/MatrixSelector.cpp b/src/gui/editors/matrix/MatrixSelector.cpp
index c75400b..3f9904d 100644
--- a/src/gui/editors/matrix/MatrixSelector.cpp
+++ b/src/gui/editors/matrix/MatrixSelector.cpp
@@ -26,7 +26,7 @@
 #include "MatrixSelector.h"
 
 #include "base/BaseProperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "base/Event.h"
 #include "base/NotationTypes.h"
@@ -47,7 +47,7 @@
 #include "MatrixTool.h"
 #include "MatrixView.h"
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tqdialog.h>
diff --git a/src/gui/editors/matrix/MatrixToolBox.cpp b/src/gui/editors/matrix/MatrixToolBox.cpp
index dab9632..1d2af4b 100644
--- a/src/gui/editors/matrix/MatrixToolBox.cpp
+++ b/src/gui/editors/matrix/MatrixToolBox.cpp
@@ -35,7 +35,7 @@
 #include "MatrixResizer.h"
 
 #include <tqstring.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 namespace Rosegarden
 {
diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp
index 8353ce2..5b3e411 100644
--- a/src/gui/editors/matrix/MatrixView.cpp
+++ b/src/gui/editors/matrix/MatrixView.cpp
@@ -102,14 +102,14 @@
 #include "PianoKeyboard.h"
 #include "sound/MappedEvent.h"
 #include "sound/SequencerDataBlock.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include <tdeaction.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdockwidget.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 #include <tdetoolbar.h>
 #include <kxmlguiclient.h>