Rename additional header files to avoid conflicts with KDE4

45 files changed, 45 insertions, 45 deletions

diff --git a/src/commands/notation/AddFingeringMarkCommand.cpp b/src/commands/notation/AddFingeringMarkCommand.cpp
index 2a6a310..a8a8b14 100644
--- a/src/commands/notation/AddFingeringMarkCommand.cpp
+++ b/src/commands/notation/AddFingeringMarkCommand.cpp
@@ -25,7 +25,7 @@
 
 #include "AddFingeringMarkCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/NotationTypes.h"
 #include "base/NotationQuantizer.h"
 #include "base/Segment.h"
diff --git a/src/commands/notation/AddIndicationCommand.cpp b/src/commands/notation/AddIndicationCommand.cpp
index e6b4493..7b8988c 100644
--- a/src/commands/notation/AddIndicationCommand.cpp
+++ b/src/commands/notation/AddIndicationCommand.cpp
@@ -25,7 +25,7 @@
 
 #include "AddIndicationCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "base/Event.h"
 #include "base/NotationTypes.h"
diff --git a/src/commands/notation/AddMarkCommand.cpp b/src/commands/notation/AddMarkCommand.cpp
index 49c69ec..0421793 100644
--- a/src/commands/notation/AddMarkCommand.cpp
+++ b/src/commands/notation/AddMarkCommand.cpp
@@ -25,7 +25,7 @@
 
 #include "AddMarkCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
diff --git a/src/commands/notation/AddSlashesCommand.h b/src/commands/notation/AddSlashesCommand.h
index 4c85cd4..cf9cc89 100644
--- a/src/commands/notation/AddSlashesCommand.h
+++ b/src/commands/notation/AddSlashesCommand.h
@@ -27,7 +27,7 @@
 #define _RG_NOTESMENUADDSLASHESCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/AddTextMarkCommand.h b/src/commands/notation/AddTextMarkCommand.h
index 00cf66b..e6a8f30 100644
--- a/src/commands/notation/AddTextMarkCommand.h
+++ b/src/commands/notation/AddTextMarkCommand.h
@@ -29,7 +29,7 @@
 #include "document/BasicSelectionCommand.h"
 #include <string>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/AutoBeamCommand.h b/src/commands/notation/AutoBeamCommand.h
index e437af7..a9ef26a 100644
--- a/src/commands/notation/AutoBeamCommand.h
+++ b/src/commands/notation/AutoBeamCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/BeamCommand.h b/src/commands/notation/BeamCommand.h
index 8456af2..64efbb1 100644
--- a/src/commands/notation/BeamCommand.h
+++ b/src/commands/notation/BeamCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/BreakCommand.h b/src/commands/notation/BreakCommand.h
index c4b234e..61dc031 100644
--- a/src/commands/notation/BreakCommand.h
+++ b/src/commands/notation/BreakCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/ChangeSlurPositionCommand.h b/src/commands/notation/ChangeSlurPositionCommand.h
index e8a4911..3cceb3a 100644
--- a/src/commands/notation/ChangeSlurPositionCommand.h
+++ b/src/commands/notation/ChangeSlurPositionCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class Slur;
diff --git a/src/commands/notation/ChangeStemsCommand.h b/src/commands/notation/ChangeStemsCommand.h
index 5874275..6cb18de 100644
--- a/src/commands/notation/ChangeStemsCommand.h
+++ b/src/commands/notation/ChangeStemsCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class Stems;
diff --git a/src/commands/notation/ChangeStyleCommand.h b/src/commands/notation/ChangeStyleCommand.h
index cdc5af9..5e9b391 100644
--- a/src/commands/notation/ChangeStyleCommand.h
+++ b/src/commands/notation/ChangeStyleCommand.h
@@ -29,7 +29,7 @@
 #include "document/BasicSelectionCommand.h"
 #include "gui/editors/notation/NoteStyle.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class Change;
diff --git a/src/commands/notation/ChangeTiePositionCommand.h b/src/commands/notation/ChangeTiePositionCommand.h
index 3b01618..2a61f4e 100644
--- a/src/commands/notation/ChangeTiePositionCommand.h
+++ b/src/commands/notation/ChangeTiePositionCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/ClefInsertionCommand.cpp b/src/commands/notation/ClefInsertionCommand.cpp
index 2268325..5573975 100644
--- a/src/commands/notation/ClefInsertionCommand.cpp
+++ b/src/commands/notation/ClefInsertionCommand.cpp
@@ -25,7 +25,7 @@
 
 #include "ClefInsertionCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "base/Event.h"
 #include "base/NotationTypes.h"
diff --git a/src/commands/notation/CollapseRestsCommand.h b/src/commands/notation/CollapseRestsCommand.h
index 1f4f663..799d470 100644
--- a/src/commands/notation/CollapseRestsCommand.h
+++ b/src/commands/notation/CollapseRestsCommand.h
@@ -29,7 +29,7 @@
 #include "document/BasicCommand.h"
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/DeCounterpointCommand.h b/src/commands/notation/DeCounterpointCommand.h
index 7e16d4b..de4cb8d 100644
--- a/src/commands/notation/DeCounterpointCommand.h
+++ b/src/commands/notation/DeCounterpointCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class Overlapping;
diff --git a/src/commands/notation/FixNotationQuantizeCommand.h b/src/commands/notation/FixNotationQuantizeCommand.h
index 3a5d334..5290d5a 100644
--- a/src/commands/notation/FixNotationQuantizeCommand.h
+++ b/src/commands/notation/FixNotationQuantizeCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/GraceCommand.h b/src/commands/notation/GraceCommand.h
index e432a11..50d1290 100644
--- a/src/commands/notation/GraceCommand.h
+++ b/src/commands/notation/GraceCommand.h
@@ -29,7 +29,7 @@
 #include "document/BasicCommand.h"
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class Make;
diff --git a/src/commands/notation/GuitarChordInsertionCommand.cpp b/src/commands/notation/GuitarChordInsertionCommand.cpp
index 79e2b44..6b8fcf6 100644
--- a/src/commands/notation/GuitarChordInsertionCommand.cpp
+++ b/src/commands/notation/GuitarChordInsertionCommand.cpp
@@ -25,7 +25,7 @@
 
 #include "GuitarChordInsertionCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/Segment.h"
 #include "document/BasicCommand.h"
diff --git a/src/commands/notation/IncrementDisplacementsCommand.h b/src/commands/notation/IncrementDisplacementsCommand.h
index bbedc7b..740d37f 100644
--- a/src/commands/notation/IncrementDisplacementsCommand.h
+++ b/src/commands/notation/IncrementDisplacementsCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/InterpretCommand.h b/src/commands/notation/InterpretCommand.h
index a50a0f7..c4e2254 100644
--- a/src/commands/notation/InterpretCommand.h
+++ b/src/commands/notation/InterpretCommand.h
@@ -31,7 +31,7 @@
 #include <string>
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/KeyInsertionCommand.h b/src/commands/notation/KeyInsertionCommand.h
index 1a03383..e044619 100644
--- a/src/commands/notation/KeyInsertionCommand.h
+++ b/src/commands/notation/KeyInsertionCommand.h
@@ -30,7 +30,7 @@
 #include "document/BasicCommand.h"
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 
 
diff --git a/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp b/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp
index 611419f..7e9ea30 100644
--- a/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp
+++ b/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp
@@ -25,7 +25,7 @@
 
 #include "MakeAccidentalsCautionaryCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/NotationTypes.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
diff --git a/src/commands/notation/MakeChordCommand.h b/src/commands/notation/MakeChordCommand.h
index e5028ba..8738013 100644
--- a/src/commands/notation/MakeChordCommand.h
+++ b/src/commands/notation/MakeChordCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class Make;
diff --git a/src/commands/notation/MakeNotesViableCommand.h b/src/commands/notation/MakeNotesViableCommand.h
index 4916750..65cdd92 100644
--- a/src/commands/notation/MakeNotesViableCommand.h
+++ b/src/commands/notation/MakeNotesViableCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/MakeRegionViableCommand.h b/src/commands/notation/MakeRegionViableCommand.h
index 9d9b0f0..ebe9406 100644
--- a/src/commands/notation/MakeRegionViableCommand.h
+++ b/src/commands/notation/MakeRegionViableCommand.h
@@ -29,7 +29,7 @@
 #include "document/BasicCommand.h"
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/MultiKeyInsertionCommand.h b/src/commands/notation/MultiKeyInsertionCommand.h
index 644e877..916918d 100644
--- a/src/commands/notation/MultiKeyInsertionCommand.h
+++ b/src/commands/notation/MultiKeyInsertionCommand.h
@@ -29,7 +29,7 @@
 #include "base/NotationTypes.h"
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include <kcommand.h>
 #include "document/RosegardenGUIDoc.h"
diff --git a/src/commands/notation/NormalizeRestsCommand.h b/src/commands/notation/NormalizeRestsCommand.h
index 6d26c7b..7fd42ea 100644
--- a/src/commands/notation/NormalizeRestsCommand.h
+++ b/src/commands/notation/NormalizeRestsCommand.h
@@ -29,7 +29,7 @@
 #include "document/BasicCommand.h"
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/NoteInsertionCommand.cpp b/src/commands/notation/NoteInsertionCommand.cpp
index cadae55..fdbbc77 100644
--- a/src/commands/notation/NoteInsertionCommand.cpp
+++ b/src/commands/notation/NoteInsertionCommand.cpp
@@ -26,7 +26,7 @@
 #include "NoteInsertionCommand.h"
 
 #include <cmath>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/NotationTypes.h"
 #include "base/Segment.h"
diff --git a/src/commands/notation/RemoveFingeringMarksCommand.h b/src/commands/notation/RemoveFingeringMarksCommand.h
index 71fcca0..b82fa68 100644
--- a/src/commands/notation/RemoveFingeringMarksCommand.h
+++ b/src/commands/notation/RemoveFingeringMarksCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/RemoveMarksCommand.h b/src/commands/notation/RemoveMarksCommand.h
index 1603c50..690e592 100644
--- a/src/commands/notation/RemoveMarksCommand.h
+++ b/src/commands/notation/RemoveMarksCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/RemoveNotationQuantizeCommand.h b/src/commands/notation/RemoveNotationQuantizeCommand.h
index 8fb3b53..f065345 100644
--- a/src/commands/notation/RemoveNotationQuantizeCommand.h
+++ b/src/commands/notation/RemoveNotationQuantizeCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/ResetDisplacementsCommand.h b/src/commands/notation/ResetDisplacementsCommand.h
index 701ed91..4c819a5 100644
--- a/src/commands/notation/ResetDisplacementsCommand.h
+++ b/src/commands/notation/ResetDisplacementsCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/RespellCommand.cpp b/src/commands/notation/RespellCommand.cpp
index 983622a..2d64ff7 100644
--- a/src/commands/notation/RespellCommand.cpp
+++ b/src/commands/notation/RespellCommand.cpp
@@ -25,7 +25,7 @@
 
 #include "RespellCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/NotationTypes.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
diff --git a/src/commands/notation/RestoreSlursCommand.h b/src/commands/notation/RestoreSlursCommand.h
index ed6bc4c..33b1b1c 100644
--- a/src/commands/notation/RestoreSlursCommand.h
+++ b/src/commands/notation/RestoreSlursCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/RestoreStemsCommand.h b/src/commands/notation/RestoreStemsCommand.h
index add54ce..0b5159d 100644
--- a/src/commands/notation/RestoreStemsCommand.h
+++ b/src/commands/notation/RestoreStemsCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/RestoreTiesCommand.h b/src/commands/notation/RestoreTiesCommand.h
index 5bd35e5..9955c48 100644
--- a/src/commands/notation/RestoreTiesCommand.h
+++ b/src/commands/notation/RestoreTiesCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/SetVisibilityCommand.h b/src/commands/notation/SetVisibilityCommand.h
index 6aece6a..1cddc0b 100644
--- a/src/commands/notation/SetVisibilityCommand.h
+++ b/src/commands/notation/SetVisibilityCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/SustainInsertionCommand.h b/src/commands/notation/SustainInsertionCommand.h
index 235e2e5..ee80b93 100644
--- a/src/commands/notation/SustainInsertionCommand.h
+++ b/src/commands/notation/SustainInsertionCommand.h
@@ -29,7 +29,7 @@
 #include "document/BasicCommand.h"
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class Pedal;
diff --git a/src/commands/notation/TextChangeCommand.cpp b/src/commands/notation/TextChangeCommand.cpp
index e909839..1cc0a5b 100644
--- a/src/commands/notation/TextChangeCommand.cpp
+++ b/src/commands/notation/TextChangeCommand.cpp
@@ -25,7 +25,7 @@
 
 #include "TextChangeCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/NotationTypes.h"
 #include "base/Segment.h"
diff --git a/src/commands/notation/TextInsertionCommand.cpp b/src/commands/notation/TextInsertionCommand.cpp
index 8ba94c9..f189f94 100644
--- a/src/commands/notation/TextInsertionCommand.cpp
+++ b/src/commands/notation/TextInsertionCommand.cpp
@@ -25,7 +25,7 @@
 
 #include "TextInsertionCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/NotationTypes.h"
 #include "base/Segment.h"
diff --git a/src/commands/notation/TieNotesCommand.h b/src/commands/notation/TieNotesCommand.h
index b46470b..cd80c84 100644
--- a/src/commands/notation/TieNotesCommand.h
+++ b/src/commands/notation/TieNotesCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/TupletCommand.h b/src/commands/notation/TupletCommand.h
index fcf5840..2748411 100644
--- a/src/commands/notation/TupletCommand.h
+++ b/src/commands/notation/TupletCommand.h
@@ -29,7 +29,7 @@
 #include "document/BasicCommand.h"
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/UnGraceCommand.h b/src/commands/notation/UnGraceCommand.h
index 535843e..f96a7f8 100644
--- a/src/commands/notation/UnGraceCommand.h
+++ b/src/commands/notation/UnGraceCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/UnTupletCommand.h b/src/commands/notation/UnTupletCommand.h
index 866069c..3d5c2fe 100644
--- a/src/commands/notation/UnTupletCommand.h
+++ b/src/commands/notation/UnTupletCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/UntieNotesCommand.h b/src/commands/notation/UntieNotesCommand.h
index 8d0ca67..be209c7 100644
--- a/src/commands/notation/UntieNotesCommand.h
+++ b/src/commands/notation/UntieNotesCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>