Rename additional header files to avoid conflicts with KDE4

11 years ago · 5459fb4c7f
parent 3f02581883
commit 5459fb4c7f
319 changed files with 394 additions and 394 deletions
--- a/src/commands/edit/AddDotCommand.h
+++ b/src/commands/edit/AddDotCommand.h
@ -28,7 +28,7 @@

 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/edit/AddMarkerCommand.h
+++ b/src/commands/edit/AddMarkerCommand.h
@ -30,7 +30,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/edit/ChangeVelocityCommand.h
+++ b/src/commands/edit/ChangeVelocityCommand.h
@ -28,7 +28,7 @@

 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/edit/ClearTriggersCommand.h
+++ b/src/commands/edit/ClearTriggersCommand.h
@ -28,7 +28,7 @@

 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/edit/CollapseNotesCommand.h
+++ b/src/commands/edit/CollapseNotesCommand.h
@ -28,7 +28,7 @@

 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>


 class Collapse;
--- a/src/commands/edit/CopyCommand.h
+++ b/src/commands/edit/CopyCommand.h
@ -29,7 +29,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/edit/CutAndCloseCommand.h
+++ b/src/commands/edit/CutAndCloseCommand.h
@ -29,7 +29,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/edit/CutCommand.h
+++ b/src/commands/edit/CutCommand.h
@ -27,7 +27,7 @@
 #define _RG_CUTCOMMAND_H_

 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcommand.h>


--- a/src/commands/edit/EraseCommand.h
+++ b/src/commands/edit/EraseCommand.h
@ -29,7 +29,7 @@
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/edit/EventEditCommand.h
+++ b/src/commands/edit/EventEditCommand.h
@ -29,7 +29,7 @@
 #include "base/Event.h"
 #include "document/BasicCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/edit/EventInsertionCommand.cpp
+++ b/src/commands/edit/EventInsertionCommand.cpp
@ -25,7 +25,7 @@

 #include "EventInsertionCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/Segment.h"
 #include "document/BasicCommand.h"
--- a/src/commands/edit/EventQuantizeCommand.cpp
+++ b/src/commands/edit/EventQuantizeCommand.cpp
@ -25,7 +25,7 @@

 #include "EventQuantizeCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/NotationTypes.h"
 #include "base/Profiler.h"
 #include "base/Quantizer.h"
--- a/src/commands/edit/EventUnquantizeCommand.cpp
+++ b/src/commands/edit/EventUnquantizeCommand.cpp
@ -25,7 +25,7 @@

 #include "EventUnquantizeCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Quantizer.h"
 #include "base/Segment.h"
 #include "base/Selection.h"
--- a/src/commands/edit/InsertTriggerNoteCommand.cpp
+++ b/src/commands/edit/InsertTriggerNoteCommand.cpp
@ -25,7 +25,7 @@

 #include "InsertTriggerNoteCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/NotationTypes.h"
 #include "base/Segment.h"
--- a/src/commands/edit/InvertCommand.h
+++ b/src/commands/edit/InvertCommand.h
@ -28,7 +28,7 @@

 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/edit/ModifyMarkerCommand.h
+++ b/src/commands/edit/ModifyMarkerCommand.h
@ -30,7 +30,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/edit/MoveAcrossSegmentsCommand.cpp
+++ b/src/commands/edit/MoveAcrossSegmentsCommand.cpp
@ -25,7 +25,7 @@

 #include "MoveAcrossSegmentsCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Clipboard.h"
 #include "base/Segment.h"
 #include "base/Selection.h"
--- a/src/commands/edit/PasteEventsCommand.h
+++ b/src/commands/edit/PasteEventsCommand.h
@ -31,7 +31,7 @@
 #include <map>
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/edit/PasteSegmentsCommand.h
+++ b/src/commands/edit/PasteSegmentsCommand.h
@ -31,7 +31,7 @@
 #include <tqstring.h>
 #include <vector>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/edit/RemoveMarkerCommand.h
+++ b/src/commands/edit/RemoveMarkerCommand.h
@ -30,7 +30,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/edit/RescaleCommand.h
+++ b/src/commands/edit/RescaleCommand.h
@ -29,7 +29,7 @@
 #include "document/BasicCommand.h"
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/edit/RetrogradeCommand.h
+++ b/src/commands/edit/RetrogradeCommand.h
@ -28,7 +28,7 @@

 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/edit/RetrogradeInvertCommand.h
+++ b/src/commands/edit/RetrogradeInvertCommand.h
@ -28,7 +28,7 @@

 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/edit/SelectionPropertyCommand.h
+++ b/src/commands/edit/SelectionPropertyCommand.h
@ -29,7 +29,7 @@
 #include "base/PropertyName.h"
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>


 class Set;
--- a/src/commands/edit/SetLyricsCommand.h
+++ b/src/commands/edit/SetLyricsCommand.h
@ -29,7 +29,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include <vector>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/edit/SetNoteTypeCommand.h
+++ b/src/commands/edit/SetNoteTypeCommand.h
@ -29,7 +29,7 @@
 #include "base/NotationTypes.h"
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/edit/SetTriggerCommand.h
+++ b/src/commands/edit/SetTriggerCommand.h
@ -30,7 +30,7 @@
 #include "document/BasicSelectionCommand.h"
 #include <string>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/edit/TransposeCommand.h
+++ b/src/commands/edit/TransposeCommand.h
@ -28,7 +28,7 @@

 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/matrix/MatrixEraseCommand.cpp
+++ b/src/commands/matrix/MatrixEraseCommand.cpp
@ -25,7 +25,7 @@

 #include "MatrixEraseCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/NotationTypes.h"
 #include "base/Segment.h"
--- a/src/commands/matrix/MatrixInsertionCommand.cpp
+++ b/src/commands/matrix/MatrixInsertionCommand.cpp
@ -25,7 +25,7 @@

 #include "MatrixInsertionCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/Segment.h"
 #include "base/SegmentMatrixHelper.h"
--- a/src/commands/matrix/MatrixModifyCommand.cpp
+++ b/src/commands/matrix/MatrixModifyCommand.cpp
@ -26,7 +26,7 @@
 #include "MatrixModifyCommand.h"

 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/NotationTypes.h"
 #include "base/Segment.h"
 #include "document/BasicCommand.h"
--- a/src/commands/matrix/MatrixPercussionInsertionCommand.cpp
+++ b/src/commands/matrix/MatrixPercussionInsertionCommand.cpp
@ -25,7 +25,7 @@

 #include "MatrixPercussionInsertionCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Composition.h"
 #include "base/Event.h"
 #include "base/NotationTypes.h"
--- 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"
--- 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"
--- 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"
--- 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>



--- 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>



--- 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>



--- 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>



--- 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>



--- 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;
--- 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;
--- 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;
--- 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
--- 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"
--- 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>



--- 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;
--- 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>



--- 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;
--- 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"
--- 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>



--- 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>



--- 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"


--- 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"
--- 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;
--- 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>



--- 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>



--- 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"
--- 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>



--- 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"
--- 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>



--- 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>



--- 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>



--- 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>



--- 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"
--- 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>



--- 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>



--- 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>



--- 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>



--- 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;
--- 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"
--- 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"
--- 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>



--- 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>



--- 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>



--- 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>



--- 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>



--- a/src/commands/segment/AddTempoChangeCommand.h
+++ b/src/commands/segment/AddTempoChangeCommand.h
@ -30,7 +30,7 @@
 #include <tqstring.h>
 #include "base/Event.h"
 #include "base/Composition.h" // for tempoT
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/segment/AddTimeSignatureCommand.h
+++ b/src/commands/segment/AddTimeSignatureCommand.h
@ -30,7 +30,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/segment/AddTracksCommand.h
+++ b/src/commands/segment/AddTracksCommand.h
@ -32,7 +32,7 @@
 #include <tqstring.h>
 #include <vector>
 #include <map>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/segment/AddTriggerSegmentCommand.cpp
+++ b/src/commands/segment/AddTriggerSegmentCommand.cpp
@ -25,7 +25,7 @@

 #include "AddTriggerSegmentCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Composition.h"
 #include "base/Segment.h"
 #include "base/TriggerSegment.h"
--- a/src/commands/segment/AudioSegmentAutoSplitCommand.h
+++ b/src/commands/segment/AudioSegmentAutoSplitCommand.h
@ -29,7 +29,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include <vector>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/segment/AudioSegmentDistributeCommand.h
+++ b/src/commands/segment/AudioSegmentDistributeCommand.h
@ -30,7 +30,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include <vector>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/segment/AudioSegmentInsertCommand.cpp
+++ b/src/commands/segment/AudioSegmentInsertCommand.cpp
@ -25,7 +25,7 @@

 #include "AudioSegmentInsertCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "base/Composition.h"
--- a/src/commands/segment/AudioSegmentRescaleCommand.h
+++ b/src/commands/segment/AudioSegmentRescaleCommand.h
@ -28,7 +28,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>

 namespace Rosegarden
 {
--- a/src/commands/segment/AudioSegmentResizeFromStartCommand.cpp
+++ b/src/commands/segment/AudioSegmentResizeFromStartCommand.cpp
@ -25,7 +25,7 @@

 #include "AudioSegmentResizeFromStartCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Composition.h"
 #include "base/RealTime.h"
 #include "base/Segment.h"
--- a/src/commands/segment/AudioSegmentSplitCommand.cpp
+++ b/src/commands/segment/AudioSegmentSplitCommand.cpp
@ -25,7 +25,7 @@

 #include "AudioSegmentSplitCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "base/RealTime.h"
--- a/src/commands/segment/ChangeCompositionLengthCommand.h
+++ b/src/commands/segment/ChangeCompositionLengthCommand.h
@ -29,7 +29,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>


 class Change;
--- a/src/commands/segment/CreateTempoMapFromSegmentCommand.cpp
+++ b/src/commands/segment/CreateTempoMapFromSegmentCommand.cpp
@ -25,7 +25,7 @@

 #include "CreateTempoMapFromSegmentCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "base/Composition.h"
 #include "base/NotationTypes.h"
--- a/src/commands/segment/CutRangeCommand.cpp
+++ b/src/commands/segment/CutRangeCommand.cpp
@ -25,7 +25,7 @@

 #include "CutRangeCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Clipboard.h"
 #include "base/Composition.h"
 #include "commands/edit/CopyCommand.h"
--- a/src/commands/segment/DeleteRangeCommand.h
+++ b/src/commands/segment/DeleteRangeCommand.h
@ -28,7 +28,7 @@

 #include <kcommand.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>

 #include "SegmentJoinCommand.h"

--- a/src/commands/segment/DeleteTracksCommand.h
+++ b/src/commands/segment/DeleteTracksCommand.h
@ -29,7 +29,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include <vector>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Track.h"


--- a/src/commands/segment/DeleteTriggerSegmentCommand.cpp
+++ b/src/commands/segment/DeleteTriggerSegmentCommand.cpp
@ -25,7 +25,7 @@

 #include "DeleteTriggerSegmentCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Composition.h"
 #include "base/Segment.h"
 #include "base/TriggerSegment.h"
--- a/src/commands/segment/EraseSegmentsStartingInRangeCommand.cpp
+++ b/src/commands/segment/EraseSegmentsStartingInRangeCommand.cpp
@ -25,7 +25,7 @@

 #include "EraseSegmentsStartingInRangeCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Composition.h"
 #include "base/Segment.h"

--- a/src/commands/segment/InsertRangeCommand.cpp
+++ b/src/commands/segment/InsertRangeCommand.cpp
@ -25,7 +25,7 @@

 #include "InsertRangeCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "AudioSegmentSplitCommand.h"
 #include "base/Clipboard.h"
 #include "base/Composition.h"
--- a/src/commands/segment/ModifyDefaultTempoCommand.h
+++ b/src/commands/segment/ModifyDefaultTempoCommand.h
@ -28,7 +28,7 @@

 #include <kcommand.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Composition.h" // for tempoT


--- a/src/commands/segment/MoveTracksCommand.h
+++ b/src/commands/segment/MoveTracksCommand.h
@ -29,7 +29,7 @@
 #include "base/Track.h"
 #include <kcommand.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/segment/OpenOrCloseRangeCommand.cpp
+++ b/src/commands/segment/OpenOrCloseRangeCommand.cpp
@ -25,7 +25,7 @@

 #include "OpenOrCloseRangeCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "base/Composition.h"
 #include "base/NotationTypes.h"
--- a/src/commands/segment/PasteConductorDataCommand.cpp
+++ b/src/commands/segment/PasteConductorDataCommand.cpp
@ -25,7 +25,7 @@

 #include "PasteConductorDataCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Clipboard.h"
 #include "base/Composition.h"
 #include "base/NotationTypes.h"
--- a/src/commands/segment/PasteRangeCommand.cpp
+++ b/src/commands/segment/PasteRangeCommand.cpp
@ -25,7 +25,7 @@

 #include "PasteRangeCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "AudioSegmentSplitCommand.h"
 #include "base/Clipboard.h"
 #include "base/Composition.h"
--- a/src/commands/segment/PasteToTriggerSegmentCommand.cpp
+++ b/src/commands/segment/PasteToTriggerSegmentCommand.cpp
@ -26,7 +26,7 @@
 #include "PasteToTriggerSegmentCommand.h"

 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "base/Clipboard.h"
 #include "base/Composition.h"
--- a/src/commands/segment/RemoveTempoChangeCommand.h
+++ b/src/commands/segment/RemoveTempoChangeCommand.h
@ -30,7 +30,7 @@
 #include <tqstring.h>
 #include "base/Event.h"
 #include "base/Composition.h" // for tempoT
-#include <klocale.h>
+#include <tdelocale.h>


 class Remove;
--- a/src/commands/segment/RemoveTimeSignatureCommand.h
+++ b/src/commands/segment/RemoveTimeSignatureCommand.h
@ -30,7 +30,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>


 class Remove;
--- a/src/commands/segment/RenameTrackCommand.h
+++ b/src/commands/segment/RenameTrackCommand.h
@ -30,7 +30,7 @@
 #include <string>
 #include <kcommand.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/segment/SegmentAutoSplitCommand.h
+++ b/src/commands/segment/SegmentAutoSplitCommand.h
@ -29,7 +29,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include <vector>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/segment/SegmentColourCommand.h
+++ b/src/commands/segment/SegmentColourCommand.h
@ -30,7 +30,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include <vector>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/segment/SegmentColourMapCommand.h
+++ b/src/commands/segment/SegmentColourMapCommand.h
@ -30,7 +30,7 @@
 #include "base/Segment.h"
 #include <kcommand.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/segment/SegmentCommandRepeat.cpp
+++ b/src/commands/segment/SegmentCommandRepeat.cpp
@ -25,7 +25,7 @@

 #include "SegmentCommandRepeat.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Segment.h"
 #include "SegmentCommand.h"
 #include <tqstring.h>
--- a/src/commands/segment/SegmentEraseCommand.cpp
+++ b/src/commands/segment/SegmentEraseCommand.cpp
@ -25,7 +25,7 @@

 #include "SegmentEraseCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "base/Composition.h"
 #include "base/Segment.h"
--- a/src/commands/segment/SegmentInsertCommand.cpp
+++ b/src/commands/segment/SegmentInsertCommand.cpp
@ -25,7 +25,7 @@

 #include "SegmentInsertCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Composition.h"
 #include "base/Segment.h"
 #include "base/Studio.h"
--- a/src/commands/segment/SegmentJoinCommand.h
+++ b/src/commands/segment/SegmentJoinCommand.h
@ -29,7 +29,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include <vector>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/segment/SegmentLabelCommand.h
+++ b/src/commands/segment/SegmentLabelCommand.h
@ -29,7 +29,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include <vector>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/segment/SegmentQuickCopyCommand.h
+++ b/src/commands/segment/SegmentQuickCopyCommand.h
@ -28,7 +28,7 @@

 #include <kcommand.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/segment/SegmentRecordCommand.cpp
+++ b/src/commands/segment/SegmentRecordCommand.cpp
@ -25,7 +25,7 @@

 #include "SegmentRecordCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Composition.h"
 #include "base/Segment.h"

--- a/src/commands/segment/SegmentRepeatToCopyCommand.cpp
+++ b/src/commands/segment/SegmentRepeatToCopyCommand.cpp
@ -26,7 +26,7 @@
 #include "SegmentRepeatToCopyCommand.h"

 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Composition.h"
 #include "base/Segment.h"

--- a/src/commands/segment/SegmentRescaleCommand.h
+++ b/src/commands/segment/SegmentRescaleCommand.h
@ -29,7 +29,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/segment/SegmentResizeFromStartCommand.cpp
+++ b/src/commands/segment/SegmentResizeFromStartCommand.cpp
@ -25,7 +25,7 @@

 #include "SegmentResizeFromStartCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/Segment.h"
 #include "document/BasicCommand.h"
--- a/src/commands/segment/SegmentSingleRepeatToCopyCommand.cpp
+++ b/src/commands/segment/SegmentSingleRepeatToCopyCommand.cpp
@ -25,7 +25,7 @@

 #include "SegmentSingleRepeatToCopyCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Composition.h"
 #include "base/Segment.h"

--- a/src/commands/segment/SegmentSplitByPitchCommand.h
+++ b/src/commands/segment/SegmentSplitByPitchCommand.h
@ -29,7 +29,7 @@
 #include "base/Segment.h"
 #include <kcommand.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "gui/general/ClefIndex.h"


--- a/src/commands/segment/SegmentSplitByRecordingSrcCommand.h
+++ b/src/commands/segment/SegmentSplitByRecordingSrcCommand.h
@ -28,7 +28,7 @@

 #include <kcommand.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "gui/application/RosegardenDCOP.h"


--- a/src/commands/segment/SegmentSplitCommand.cpp
+++ b/src/commands/segment/SegmentSplitCommand.cpp
@ -25,7 +25,7 @@

 #include "SegmentSplitCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "base/Event.h"
 #include "base/Composition.h"
--- a/src/commands/segment/SegmentSyncClefCommand.h
+++ b/src/commands/segment/SegmentSyncClefCommand.h
@ -30,7 +30,7 @@
 #include "base/Event.h"
 #include "base/NotationTypes.h"
 #include "document/MultiViewCommandHistory.h"
-#include <klocale.h>
+#include <tdelocale.h>

 namespace Rosegarden
 {
--- a/src/commands/segment/SegmentSyncCommand.h
+++ b/src/commands/segment/SegmentSyncCommand.h
@ -31,7 +31,7 @@
 #include "base/Event.h"
 #include "base/NotationTypes.h"
 #include "document/MultiViewCommandHistory.h"
-#include <klocale.h>
+#include <tdelocale.h>

 namespace Rosegarden
 {
--- a/src/commands/segment/SegmentTransposeCommand.h
+++ b/src/commands/segment/SegmentTransposeCommand.h
@ -29,7 +29,7 @@
 #include <kcommand.h>
 #include "base/Event.h"
 #include "document/MultiViewCommandHistory.h"
-#include <klocale.h>
+#include <tdelocale.h>

 namespace Rosegarden
 {
--- a/src/commands/segment/SetTriggerSegmentBasePitchCommand.cpp
+++ b/src/commands/segment/SetTriggerSegmentBasePitchCommand.cpp
@ -25,7 +25,7 @@

 #include "SetTriggerSegmentBasePitchCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Composition.h"
 #include "base/TriggerSegment.h"

--- a/src/commands/segment/SetTriggerSegmentBaseVelocityCommand.cpp
+++ b/src/commands/segment/SetTriggerSegmentBaseVelocityCommand.cpp
@ -25,7 +25,7 @@

 #include "SetTriggerSegmentBaseVelocityCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Composition.h"
 #include "base/TriggerSegment.h"

--- a/src/commands/segment/SetTriggerSegmentDefaultRetuneCommand.cpp
+++ b/src/commands/segment/SetTriggerSegmentDefaultRetuneCommand.cpp
@ -25,7 +25,7 @@

 #include "SetTriggerSegmentDefaultRetuneCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Composition.h"
 #include "base/TriggerSegment.h"

--- a/src/commands/segment/SetTriggerSegmentDefaultTimeAdjustCommand.cpp
+++ b/src/commands/segment/SetTriggerSegmentDefaultTimeAdjustCommand.cpp
@ -25,7 +25,7 @@

 #include "SetTriggerSegmentDefaultTimeAdjustCommand.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Composition.h"
 #include "base/TriggerSegment.h"

--- a/src/commands/studio/AddControlParameterCommand.h
+++ b/src/commands/studio/AddControlParameterCommand.h
@ -30,7 +30,7 @@
 #include "base/Device.h"
 #include <kcommand.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/studio/CreateOrDeleteDeviceCommand.h
+++ b/src/commands/studio/CreateOrDeleteDeviceCommand.h
@ -31,7 +31,7 @@
 #include <string>
 #include <kcommand.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/studio/ModifyControlParameterCommand.h
+++ b/src/commands/studio/ModifyControlParameterCommand.h
@ -30,7 +30,7 @@
 #include "base/Device.h"
 #include <kcommand.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/studio/ModifyDeviceCommand.h
+++ b/src/commands/studio/ModifyDeviceCommand.h
@ -31,7 +31,7 @@
 #include <string>
 #include <kcommand.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>


 class Modify;
--- a/src/commands/studio/ModifyDeviceMappingCommand.h
+++ b/src/commands/studio/ModifyDeviceMappingCommand.h
@ -31,7 +31,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include <vector>
-#include <klocale.h>
+#include <tdelocale.h>


 class Modify;
--- a/src/commands/studio/ModifyInstrumentMappingCommand.h
+++ b/src/commands/studio/ModifyInstrumentMappingCommand.h
@ -31,7 +31,7 @@
 #include <kcommand.h>
 #include <tqstring.h>
 #include <vector>
-#include <klocale.h>
+#include <tdelocale.h>


 class Modify;
--- a/src/commands/studio/ReconnectDeviceCommand.h
+++ b/src/commands/studio/ReconnectDeviceCommand.h
@ -30,7 +30,7 @@
 #include <string>
 #include <kcommand.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/studio/RemoveControlParameterCommand.h
+++ b/src/commands/studio/RemoveControlParameterCommand.h
@ -30,7 +30,7 @@
 #include "base/Device.h"
 #include <kcommand.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>



--- a/src/commands/studio/RenameDeviceCommand.h
+++ b/src/commands/studio/RenameDeviceCommand.h
@ -30,7 +30,7 @@
 #include <string>
 #include <kcommand.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>



--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- a/src/gui/application/RosegardenApplication.cpp
+++ b/src/gui/application/RosegardenApplication.cpp
@ -32,9 +32,9 @@
 #include "gui/kdeext/KTmpStatusMsg.h"
 #include "RosegardenGUIApp.h"
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kuniqueapplication.h>
 #include <tqcstring.h>
--- a/src/gui/application/RosegardenGUIApp.cpp
+++ b/src/gui/application/RosegardenGUIApp.cpp
@ -181,20 +181,20 @@
 #include <kdockwidget.h>
 #include <kedittoolbar.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
 #include <kkeydialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <kprocess.h>
 #include <kstatusbar.h>
 #include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ktip.h>
 #include <tdetoolbar.h>
 #include <kurl.h>
--- a/src/gui/application/RosegardenGUIApp.cpp.orig
+++ b/src/gui/application/RosegardenGUIApp.cpp.orig
@ -181,20 +181,20 @@
 #include <kdockwidget.h>
 #include <kedittoolbar.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
 #include <kkeydialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <kprocess.h>
 #include <kstatusbar.h>
 #include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ktip.h>
 #include <tdetoolbar.h>
 #include <kurl.h>
--- a/src/gui/application/RosegardenGUIView.cpp
+++ b/src/gui/application/RosegardenGUIView.cpp
@ -28,7 +28,7 @@

 #include "sound/Midi.h"
 #include "gui/editors/segment/TrackButtons.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "document/ConfigGroups.h"
@ -81,7 +81,7 @@
 #include "sound/MappedEvent.h"
 #include <kcommand.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <tqapplication.h>
 #include <tqcursor.h>
--- a/src/gui/application/main.cpp
+++ b/src/gui/application/main.cpp
@ -27,14 +27,14 @@

 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstddirs.h>
 #include <ktip.h>
 #include <kprocess.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>

 #include <tqstringlist.h>
 #include <tqregexp.h>
--- a/src/gui/configuration/AudioConfigurationPage.cpp
+++ b/src/gui/configuration/AudioConfigurationPage.cpp
@ -58,7 +58,7 @@
 #include <tqtabwidget.h>
 #include <tqtooltip.h>
 #include <tqwidget.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>


 namespace Rosegarden
--- a/src/gui/configuration/AudioConfigurationPage.h
+++ b/src/gui/configuration/AudioConfigurationPage.h
@ -27,7 +27,7 @@

 #include "TabbedConfigurationPage.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlineedit.h>

 class TQWidget;
--- a/src/gui/configuration/AudioPropertiesPage.h
+++ b/src/gui/configuration/AudioPropertiesPage.h
@ -28,7 +28,7 @@

 #include "TabbedConfigurationPage.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>


 class TQWidget;
--- a/src/gui/configuration/ColourConfigurationPage.h
+++ b/src/gui/configuration/ColourConfigurationPage.h
@ -30,7 +30,7 @@
 #include "gui/widgets/ColourTable.h"
 #include "TabbedConfigurationPage.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>


 class TQWidget;
--- a/src/gui/configuration/DocumentMetaConfigurationPage.h
+++ b/src/gui/configuration/DocumentMetaConfigurationPage.h
@ -28,7 +28,7 @@

 #include "TabbedConfigurationPage.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>


 class TQWidget;
--- a/src/gui/configuration/GeneralConfigurationPage.cpp
+++ b/src/gui/configuration/GeneralConfigurationPage.cpp
@ -38,7 +38,7 @@
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqfileinfo.h>
--- a/src/gui/configuration/GeneralConfigurationPage.h
+++ b/src/gui/configuration/GeneralConfigurationPage.h
@ -33,7 +33,7 @@
 #include <tqspinbox.h>
 #include <tqcombobox.h>
 #include <tqlineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>

 class TQWidget;
--- a/src/gui/configuration/HeadersConfigurationPage.cpp
+++ b/src/gui/configuration/HeadersConfigurationPage.cpp
@ -34,7 +34,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
--- a/src/gui/configuration/LatencyConfigurationPage.h
+++ b/src/gui/configuration/LatencyConfigurationPage.h
@ -28,7 +28,7 @@

 #include "TabbedConfigurationPage.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqslider.h>


--- a/src/gui/configuration/MIDIConfigurationPage.h
+++ b/src/gui/configuration/MIDIConfigurationPage.h
@ -27,7 +27,7 @@

 #include "TabbedConfigurationPage.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>

--- a/src/gui/configuration/MatrixConfigurationPage.h
+++ b/src/gui/configuration/MatrixConfigurationPage.h
@ -28,7 +28,7 @@

 #include "TabbedConfigurationPage.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>


 class TQWidget;
--- a/src/gui/configuration/NotationConfigurationPage.cpp
+++ b/src/gui/configuration/NotationConfigurationPage.cpp
@ -46,7 +46,7 @@
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <tdefontrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqfont.h>
--- a/src/gui/configuration/NotationConfigurationPage.h
+++ b/src/gui/configuration/NotationConfigurationPage.h
@ -30,7 +30,7 @@
 #include "TabbedConfigurationPage.h"
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>


 class TQWidget;
--- a/src/gui/dialogs/AddTracksDialog.cpp
+++ b/src/gui/dialogs/AddTracksDialog.cpp
@ -25,7 +25,7 @@

 #include "AddTracksDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
--- a/src/gui/dialogs/AudioManagerDialog.cpp
+++ b/src/gui/dialogs/AudioManagerDialog.cpp
@ -53,16 +53,16 @@
 #include "sound/AudioFileManager.h"
 #include "sound/WAVAudioFile.h"
 #include "UnusedAudioSelectionDialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include <tdeaction.h>
 #include <kcommand.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineeditdlg.h>
 #include <tdelistview.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdaction.h>
 #include <kurl.h>
 #include <kxmlguiclient.h>
--- a/src/gui/dialogs/AudioPlayingDialog.cpp
+++ b/src/gui/dialogs/AudioPlayingDialog.cpp
@ -25,7 +25,7 @@

 #include "AudioPlayingDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
--- a/src/gui/dialogs/AudioPluginDialog.cpp
+++ b/src/gui/dialogs/AudioPluginDialog.cpp
@ -26,7 +26,7 @@
 #include "AudioPluginDialog.h"
 #include <tqlayout.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "base/AudioPluginInstance.h"
--- a/src/gui/dialogs/AudioSplitDialog.cpp
+++ b/src/gui/dialogs/AudioSplitDialog.cpp
@ -26,7 +26,7 @@
 #include "AudioSplitDialog.h"
 #include <tdeapplication.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "base/Exception.h"
--- a/src/gui/dialogs/BeatsBarsDialog.cpp
+++ b/src/gui/dialogs/BeatsBarsDialog.cpp
@ -26,7 +26,7 @@
 #include "BeatsBarsDialog.h"
 #include <tqlayout.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Segment.h"
 #include <kcombobox.h>
 #include <kdialogbase.h>
--- a/src/gui/dialogs/ClefDialog.cpp
+++ b/src/gui/dialogs/ClefDialog.cpp
@ -28,7 +28,7 @@
 #include "base/NotationTypes.h"
 #include "gui/editors/notation/NotePixmapFactory.h"
 #include "gui/widgets/BigArrowButton.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <tqbuttongroup.h>
 #include <tqgroupbox.h>
--- a/src/gui/dialogs/CompositionLengthDialog.cpp
+++ b/src/gui/dialogs/CompositionLengthDialog.cpp
@ -25,7 +25,7 @@

 #include "CompositionLengthDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Composition.h"
 #include <kdialogbase.h>
 #include <tqhbox.h>
--- a/src/gui/dialogs/ConfigureDialog.cpp
+++ b/src/gui/dialogs/ConfigureDialog.cpp
@ -26,7 +26,7 @@
 #include "ConfigureDialog.h"
 #include <tqlayout.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "ConfigureDialogBase.h"
 #include "document/RosegardenGUIDoc.h"
 #include "gui/configuration/GeneralConfigurationPage.h"
--- a/src/gui/dialogs/ConfigureDialogBase.cpp
+++ b/src/gui/dialogs/ConfigureDialogBase.cpp
@ -25,7 +25,7 @@

 #include "ConfigureDialogBase.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "gui/configuration/ConfigurationPage.h"
 #include <kdialogbase.h>
 #include <tqstring.h>
--- a/src/gui/dialogs/CountdownDialog.cpp
+++ b/src/gui/dialogs/CountdownDialog.cpp
@ -26,7 +26,7 @@
 #include "CountdownDialog.h"
 #include <tqlayout.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "CountdownBar.h"
 #include <tqaccel.h>
 #include <tqdialog.h>
--- a/src/gui/dialogs/DocumentConfigureDialog.cpp
+++ b/src/gui/dialogs/DocumentConfigureDialog.cpp
@ -26,7 +26,7 @@
 #include "DocumentConfigureDialog.h"
 #include <tqlayout.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "ConfigureDialogBase.h"
 #include "document/RosegardenGUIDoc.h"
 #include "gui/configuration/AudioPropertiesPage.h"
--- a/src/gui/dialogs/EventEditDialog.cpp
+++ b/src/gui/dialogs/EventEditDialog.cpp
@ -25,7 +25,7 @@

 #include "EventEditDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "base/Event.h"
 #include "base/MidiTypes.h"
@ -34,7 +34,7 @@
 #include "base/RealTime.h"
 #include "gui/editors/notation/NotePixmapFactory.h"
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqcheckbox.h>
 #include <tqfont.h>
 #include <tqgrid.h>
--- a/src/gui/dialogs/EventFilterDialog.cpp
+++ b/src/gui/dialogs/EventFilterDialog.cpp
@ -40,7 +40,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqdialog.h>
--- a/src/gui/dialogs/EventParameterDialog.cpp
+++ b/src/gui/dialogs/EventParameterDialog.cpp
@ -25,7 +25,7 @@

 #include "EventParameterDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "base/PropertyName.h"
--- a/src/gui/dialogs/ExportDeviceDialog.cpp
+++ b/src/gui/dialogs/ExportDeviceDialog.cpp
@ -25,7 +25,7 @@

 #include "ExportDeviceDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <tqbuttongroup.h>
 #include <tqlabel.h>
--- a/src/gui/dialogs/FileLocateDialog.cpp
+++ b/src/gui/dialogs/FileLocateDialog.cpp
@ -25,7 +25,7 @@

 #include "FileLocateDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include <kdialogbase.h>
 #include <tdefiledialog.h>
--- a/src/gui/dialogs/FileMergeDialog.cpp
+++ b/src/gui/dialogs/FileMergeDialog.cpp
@ -25,7 +25,7 @@

 #include "FileMergeDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <kdialogbase.h>
 #include <tqcheckbox.h>
--- a/src/gui/dialogs/IdentifyTextCodecDialog.cpp
+++ b/src/gui/dialogs/IdentifyTextCodecDialog.cpp
@ -25,7 +25,7 @@

 #include "IdentifyTextCodecDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "base/NotationTypes.h"
 #include <kcombobox.h>
--- a/src/gui/dialogs/ImportDeviceDialog.cpp
+++ b/src/gui/dialogs/ImportDeviceDialog.cpp
@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tdeapplication.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "document/ConfigGroups.h"
 #include "base/MidiDevice.h"
@ -37,7 +37,7 @@
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
 #include <tqbuttongroup.h>
--- a/src/gui/dialogs/InterpretDialog.cpp
+++ b/src/gui/dialogs/InterpretDialog.cpp
@ -26,7 +26,7 @@
 #include "InterpretDialog.h"
 #include <tdeapplication.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "document/ConfigGroups.h"
 #include "commands/notation/InterpretCommand.h"
 #include <tdeconfig.h>
--- a/src/gui/dialogs/IntervalDialog.cpp
+++ b/src/gui/dialogs/IntervalDialog.cpp
@ -27,7 +27,7 @@
 #include <tqlayout.h>

 #include <iostream>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "base/MidiDevice.h"
 #include "base/NotationRules.h"
--- a/src/gui/dialogs/KeySignatureDialog.cpp
+++ b/src/gui/dialogs/KeySignatureDialog.cpp
@ -25,7 +25,7 @@

 #include "KeySignatureDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "base/NotationTypes.h"
 #include "gui/editors/notation/NotePixmapFactory.h"
--- a/src/gui/dialogs/LilyPondOptionsDialog.cpp
+++ b/src/gui/dialogs/LilyPondOptionsDialog.cpp
@ -37,8 +37,8 @@
 #include <klineedit.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqframe.h>
--- a/src/gui/dialogs/LyricEditDialog.cpp
+++ b/src/gui/dialogs/LyricEditDialog.cpp
@ -27,7 +27,7 @@

 #include "base/Event.h"
 #include "base/BaseProperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "misc/Debug.h"
 #include "base/Composition.h"
--- a/src/gui/dialogs/MakeOrnamentDialog.cpp
+++ b/src/gui/dialogs/MakeOrnamentDialog.cpp
@ -25,7 +25,7 @@

 #include "MakeOrnamentDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "gui/widgets/PitchChooser.h"
 #include <kdialogbase.h>
 #include <tqgroupbox.h>
--- a/src/gui/dialogs/ManageMetronomeDialog.cpp
+++ b/src/gui/dialogs/ManageMetronomeDialog.cpp
@ -26,7 +26,7 @@
 #include "ManageMetronomeDialog.h"
 #include <tqlayout.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "base/Composition.h"
--- a/src/gui/dialogs/MarkerModifyDialog.cpp
+++ b/src/gui/dialogs/MarkerModifyDialog.cpp
@ -26,7 +26,7 @@
 #include "MarkerModifyDialog.h"
 #include <tqlayout.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Composition.h"
 #include "document/RosegardenGUIDoc.h"
 #include "gui/widgets/TimeWidget.h"
--- a/src/gui/dialogs/PasteNotationDialog.cpp
+++ b/src/gui/dialogs/PasteNotationDialog.cpp
@ -25,7 +25,7 @@

 #include "PasteNotationDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "commands/edit/PasteEventsCommand.h"
 #include <kdialogbase.h>
 #include <tqbuttongroup.h>
--- a/src/gui/dialogs/PitchDialog.cpp
+++ b/src/gui/dialogs/PitchDialog.cpp
@ -25,7 +25,7 @@

 #include "PitchDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "gui/widgets/PitchChooser.h"
 #include <kdialogbase.h>
 #include <tqstring.h>
--- a/src/gui/dialogs/PitchPickerDialog.cpp
+++ b/src/gui/dialogs/PitchPickerDialog.cpp
@ -24,7 +24,7 @@


 #include "PitchPickerDialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <tqlayout.h>
 #include <tqframe.h>
--- a/src/gui/dialogs/QuantizeDialog.cpp
+++ b/src/gui/dialogs/QuantizeDialog.cpp
@ -25,7 +25,7 @@

 #include "QuantizeDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Quantizer.h"
 #include "gui/widgets/QuantizeParameters.h"
 #include <kdialogbase.h>
--- a/src/gui/dialogs/RescaleDialog.cpp
+++ b/src/gui/dialogs/RescaleDialog.cpp
@ -25,7 +25,7 @@

 #include "RescaleDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "document/ConfigGroups.h"
 #include "base/Composition.h"
 #include "gui/widgets/TimeWidget.h"
--- a/src/gui/dialogs/ShowSequencerStatusDialog.cpp
+++ b/src/gui/dialogs/ShowSequencerStatusDialog.cpp
@ -25,7 +25,7 @@

 #include "ShowSequencerStatusDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <tqcstring.h>
 #include <tqdatastream.h>
--- a/src/gui/dialogs/SimpleEventEditDialog.cpp
+++ b/src/gui/dialogs/SimpleEventEditDialog.cpp
@ -38,7 +38,7 @@
 #include <kcombobox.h>
 #include <kdialogbase.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcheckbox.h>
 #include <tqdialog.h>
 #include <tqfile.h>
--- a/src/gui/dialogs/SplitByPitchDialog.cpp
+++ b/src/gui/dialogs/SplitByPitchDialog.cpp
@ -25,7 +25,7 @@

 #include "SplitByPitchDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "commands/segment/SegmentSplitByPitchCommand.h"
 #include "gui/general/ClefIndex.h"
 #include "gui/widgets/PitchChooser.h"
--- a/src/gui/dialogs/SplitByRecordingSrcDialog.cpp
+++ b/src/gui/dialogs/SplitByRecordingSrcDialog.cpp
@ -26,7 +26,7 @@
 #include "SplitByRecordingSrcDialog.h"
 #include <tqlayout.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "base/MidiDevice.h"
 #include "document/RosegardenGUIDoc.h"
--- a/src/gui/dialogs/TempoDialog.cpp
+++ b/src/gui/dialogs/TempoDialog.cpp
@ -26,7 +26,7 @@
 #include "TempoDialog.h"
 #include <tqlayout.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "base/Composition.h"
 #include "base/NotationTypes.h"
--- a/src/gui/dialogs/TextEventDialog.cpp
+++ b/src/gui/dialogs/TextEventDialog.cpp
@ -26,7 +26,7 @@
 #include "TextEventDialog.h"
 #include <tdeapplication.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "document/ConfigGroups.h"
 #include "base/NotationTypes.h"
--- a/src/gui/dialogs/TimeDialog.cpp
+++ b/src/gui/dialogs/TimeDialog.cpp
@ -25,7 +25,7 @@

 #include "TimeDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Composition.h"
 #include "gui/widgets/TimeWidget.h"
 #include <kdialogbase.h>
--- a/src/gui/dialogs/TimeSignatureDialog.cpp
+++ b/src/gui/dialogs/TimeSignatureDialog.cpp
@ -26,7 +26,7 @@
 #include "TimeSignatureDialog.h"
 #include <tdeapplication.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "document/ConfigGroups.h"
 #include "base/Composition.h"
 #include "base/NotationTypes.h"
--- a/src/gui/dialogs/TransportDialog.cpp
+++ b/src/gui/dialogs/TransportDialog.cpp
@ -25,7 +25,7 @@

 #include "TransportDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "base/Composition.h"
 #include "base/NotationTypes.h"
@ -38,7 +38,7 @@
 #include "sound/MappedEvent.h"
 #include "document/ConfigGroups.h"
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqaccel.h>
 #include <tqcolor.h>
 #include <tqcstring.h>
--- a/src/gui/dialogs/TriggerSegmentDialog.cpp
+++ b/src/gui/dialogs/TriggerSegmentDialog.cpp
@ -27,7 +27,7 @@
 #include <tdeapplication.h>

 #include "base/BaseProperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "document/ConfigGroups.h"
 #include "base/Composition.h"
--- a/src/gui/dialogs/TupletDialog.cpp
+++ b/src/gui/dialogs/TupletDialog.cpp
@ -26,7 +26,7 @@
 #include "TupletDialog.h"
 #include <tqlayout.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/NotationTypes.h"
 #include "gui/editors/notation/NotationStrings.h"
 #include "gui/editors/notation/NotePixmapFactory.h"
--- a/src/gui/dialogs/UnusedAudioSelectionDialog.cpp
+++ b/src/gui/dialogs/UnusedAudioSelectionDialog.cpp
@ -25,7 +25,7 @@

 #include "UnusedAudioSelectionDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <tdelistview.h>
 #include <tqfileinfo.h>
--- a/src/gui/dialogs/UseOrnamentDialog.cpp
+++ b/src/gui/dialogs/UseOrnamentDialog.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/Composition.h"
--- a/src/gui/editors/eventlist/EventView.cpp
+++ b/src/gui/editors/eventlist/EventView.cpp
@ -61,10 +61,10 @@
 #include "gui/dialogs/EventFilterDialog.h"
 #include <tdeaction.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <kstddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineeditdlg.h>
 #include <tdelistview.h>
 #include <kxmlguiclient.h>
--- a/src/gui/editors/guitar/Fingering.cpp
+++ b/src/gui/editors/guitar/Fingering.cpp
@ -29,7 +29,7 @@
 #include <tqstringlist.h>
 #include <sstream>
 #include <algorithm>
-#include <klocale.h>
+#include <tdelocale.h>

 namespace Rosegarden
 {
--- a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
+++ b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
@ -30,8 +30,8 @@
 #include <klineedit.h>
 #include <tqcombobox.h>
 #include <tqspinbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstddirs.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
--- a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
+++ b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
@ -34,8 +34,8 @@
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstddirs.h>

 namespace Rosegarden
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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
 {
--- 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>
--- 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"
--- 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>
--- 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"
--- 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"
--- 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"
--- 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"
--- 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>
--- 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"
--- 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
 {
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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"
--- 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"
--- 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"
--- 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>
--- a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/AudioInstrumentParameterPanel.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/AudioPluginInstance.h"
--- a/src/gui/editors/parameters/InstrumentParameterBox.cpp
+++ b/src/gui/editors/parameters/InstrumentParameterBox.cpp
@ -26,7 +26,7 @@
 #include "InstrumentParameterBox.h"
 #include <tqlayout.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "AudioInstrumentParameterPanel.h"
 #include "base/Instrument.h"
--- a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
@ -27,7 +27,7 @@
 #include <tqlayout.h>

 #include "sound/Midi.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "base/Colour.h"
--- a/src/gui/editors/parameters/RosegardenParameterBox.h
+++ b/src/gui/editors/parameters/RosegardenParameterBox.h
@ -30,7 +30,7 @@
 #include <tqfont.h>
 #include <tqframe.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>


 class TQWidget;
--- a/src/gui/editors/parameters/SegmentParameterBox.cpp
+++ b/src/gui/editors/parameters/SegmentParameterBox.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 "document/ConfigGroups.h"
--- a/src/gui/editors/parameters/TrackParameterBox.cpp
+++ b/src/gui/editors/parameters/TrackParameterBox.cpp
@ -31,7 +31,7 @@
 #include <tqlayout.h>
 #include <tdeapplication.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "gui/general/ClefIndex.h"
@ -63,7 +63,7 @@
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <klineeditdlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksqueezedtextlabel.h>
 #include <ktabwidget.h>
 #include <tqcolor.h>
--- 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"
--- 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"
--- 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>
--- 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>
--- 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 {
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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
--- 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
--- 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
--- 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>
--- 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>
--- 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"
--- 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
--- 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
 {
--- a/src/gui/editors/tempo/TempoView.cpp
+++ b/src/gui/editors/tempo/TempoView.cpp
@ -25,7 +25,7 @@

 #include "TempoView.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "misc/Debug.h"
 #include "base/Composition.h"
@ -45,7 +45,7 @@
 #include "gui/kdeext/KTmpStatusMsg.h"
 #include "TempoListItem.h"
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tdelistview.h>
 #include <kxmlguiclient.h>
--- a/src/gui/general/EditToolBox.cpp
+++ b/src/gui/general/EditToolBox.cpp
@ -30,7 +30,7 @@
 #include "EditView.h"
 #include <tqobject.h>
 #include <tqstring.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 namespace Rosegarden
 {
--- a/src/gui/general/EditView.cpp
+++ b/src/gui/general/EditView.cpp
@ -27,7 +27,7 @@
 #include <tqlayout.h>

 #include "base/BaseProperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
@ -82,7 +82,7 @@
 #include <tdeaction.h>
 #include <kcommand.h>
 #include <kdockwidget.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kstddirs.h>
 #include <ktabwidget.h>
--- a/src/gui/general/EditViewBase.cpp
+++ b/src/gui/general/EditViewBase.cpp
@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tdeapplication.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "misc/Debug.h"
 #include "base/Clipboard.h"
@ -49,7 +49,7 @@
 #include <tdeconfig.h>
 #include <kdockwidget.h>
 #include <kedittoolbar.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kkeydialog.h>
 #include <tdemainwindow.h>
 #include <kstatusbar.h>
--- a/src/gui/general/MidiPitchLabel.cpp
+++ b/src/gui/general/MidiPitchLabel.cpp
@ -28,7 +28,7 @@

 #include "document/ConfigGroups.h"
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>


--- a/src/gui/general/PresetGroup.cpp
+++ b/src/gui/general/PresetGroup.cpp
@ -33,9 +33,9 @@
 #include "gui/general/ClefIndex.h"
 #include "base/Exception.h"
 #include "CategoryElement.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqregexp.h>
--- a/src/gui/general/PresetHandlerDialog.cpp
+++ b/src/gui/general/PresetHandlerDialog.cpp
@ -30,7 +30,7 @@
 #include <tqlayout.h>
 #include <tdeapplication.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "document/ConfigGroups.h"
 #include "CategoryElement.h"
--- a/src/gui/kdeext/KTmpStatusMsg.cpp
+++ b/src/gui/kdeext/KTmpStatusMsg.cpp
@ -24,7 +24,7 @@

 #include <tdemainwindow.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>

 #include "KTmpStatusMsg.h"
 #include "gui/application/RosegardenApplication.h"
--- a/src/gui/rulers/ChordNameRuler.cpp
+++ b/src/gui/rulers/ChordNameRuler.cpp
@ -26,7 +26,7 @@
 #include "ChordNameRuler.h"
 #include "misc/Debug.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "base/AnalysisTypes.h"
 #include "base/Composition.h"
--- a/src/gui/rulers/ControlChangeCommand.cpp
+++ b/src/gui/rulers/ControlChangeCommand.cpp
@ -25,7 +25,7 @@
 #include "ControlChangeCommand.h"
 #include "ControlItem.h"
 #include "misc/Debug.h"
-#include <klocale.h>
+#include <tdelocale.h>

 namespace Rosegarden {

--- a/src/gui/rulers/ControlRulerEventEraseCommand.cpp
+++ b/src/gui/rulers/ControlRulerEventEraseCommand.cpp
@ -26,7 +26,7 @@
 #include "ControlItem.h"
 #include "ElementAdapter.h"
 #include "misc/Debug.h"
-#include <klocale.h>
+#include <tdelocale.h>

 namespace Rosegarden
 {
--- a/src/gui/rulers/ControlRulerEventInsertCommand.cpp
+++ b/src/gui/rulers/ControlRulerEventInsertCommand.cpp
@ -24,7 +24,7 @@

 #include "ControlRulerEventInsertCommand.h"
 #include "base/MidiTypes.h"
-#include <klocale.h>
+#include <tdelocale.h>

 namespace Rosegarden
 {
--- a/src/gui/rulers/ControllerEventsRuler.cpp
+++ b/src/gui/rulers/ControllerEventsRuler.cpp
@ -25,7 +25,7 @@

 #include "ControllerEventsRuler.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "base/ControlParameter.h"
--- a/src/gui/rulers/LoopRuler.cpp
+++ b/src/gui/rulers/LoopRuler.cpp
@ -36,7 +36,7 @@
 #include <tqsize.h>
 #include <tqwidget.h>
 #include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tqpainter.h>
 #include <tqpointarray.h>
--- a/src/gui/rulers/MarkerRuler.cpp
+++ b/src/gui/rulers/MarkerRuler.cpp
@ -48,7 +48,7 @@
 #include <tqsize.h>
 #include <tqstring.h>
 #include <tqwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kstddirs.h>
 #include <tqtooltip.h>
--- a/src/gui/rulers/PropertyViewRuler.cpp
+++ b/src/gui/rulers/PropertyViewRuler.cpp
@ -26,7 +26,7 @@
 #include "PropertyViewRuler.h"

 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "base/PropertyName.h"
 #include "base/RulerScale.h"
--- a/src/gui/rulers/RawNoteRuler.cpp
+++ b/src/gui/rulers/RawNoteRuler.cpp
@ -34,7 +34,7 @@
 #include "base/Segment.h"
 #include "DefaultVelocityColour.h"
 #include "gui/general/GUIPalette.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcolor.h>
 #include <tqpainter.h>
 #include <tqrect.h>
--- a/src/gui/rulers/StandardRuler.cpp
+++ b/src/gui/rulers/StandardRuler.cpp
@ -25,7 +25,7 @@

 #include "StandardRuler.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "MarkerRuler.h"
 #include "base/RulerScale.h"
--- a/src/gui/rulers/TempoRuler.cpp
+++ b/src/gui/rulers/TempoRuler.cpp
@ -25,7 +25,7 @@

 #include "TempoRuler.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "misc/Debug.h"
 #include "base/Composition.h"
@ -41,7 +41,7 @@
 #include "gui/widgets/TextFloat.h"
 #include "TempoColour.h"
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kxmlguiclient.h>
 #include <kxmlguifactory.h>
 #include <tqcolor.h>
--- a/src/gui/seqmanager/CompositionMmapper.cpp
+++ b/src/gui/seqmanager/CompositionMmapper.cpp
@ -33,7 +33,7 @@
 #include "gui/application/RosegardenApplication.h"
 #include "SegmentMmapperFactory.h"
 #include "SegmentMmapper.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqstring.h>
--- a/src/gui/seqmanager/ControlBlockMmapper.cpp
+++ b/src/gui/seqmanager/ControlBlockMmapper.cpp
@ -34,7 +34,7 @@
 #include "base/Track.h"
 #include "document/RosegardenGUIDoc.h"
 #include "sound/ControlBlock.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqfile.h>
 #include <tqstring.h>
 #include <sys/types.h>
--- a/src/gui/seqmanager/MetronomeMmapper.cpp
+++ b/src/gui/seqmanager/MetronomeMmapper.cpp
@ -41,7 +41,7 @@
 #include "SegmentMmapper.h"
 #include "sound/MappedEvent.h"
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqstring.h>
 #include <algorithm>

--- a/src/gui/seqmanager/MidiFilterDialog.cpp
+++ b/src/gui/seqmanager/MidiFilterDialog.cpp
@ -25,7 +25,7 @@

 #include "MidiFilterDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/MidiProgram.h"
 #include "base/NotationTypes.h"
 #include "document/RosegardenGUIDoc.h"
--- a/src/gui/seqmanager/SequenceManager.cpp
+++ b/src/gui/seqmanager/SequenceManager.cpp
@ -61,11 +61,11 @@
 #include "sound/SoundDriver.h"
 #include "TempoSegmentMmapper.h"
 #include "TimeSigSegmentMmapper.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <tqapplication.h>
 #include <tqcstring.h>
 #include <tqcursor.h>
--- a/src/gui/seqmanager/SpecialSegmentMmapper.cpp
+++ b/src/gui/seqmanager/SpecialSegmentMmapper.cpp
@ -31,7 +31,7 @@
 #include "base/TriggerSegment.h"
 #include "document/RosegardenGUIDoc.h"
 #include "SegmentMmapper.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqstring.h>


--- a/src/gui/studio/AudioMixerWindow.cpp
+++ b/src/gui/studio/AudioMixerWindow.cpp
@ -54,10 +54,10 @@
 #include "sound/MappedCommon.h"
 #include "sound/MappedEvent.h"
 #include "sound/MappedStudio.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdemainwindow.h>
 #include <kstdaction.h>
 #include <tqaccel.h>
--- a/src/gui/studio/AudioPluginOSCGUIManager.cpp
+++ b/src/gui/studio/AudioPluginOSCGUIManager.cpp
@ -30,7 +30,7 @@
 #include "AudioPluginOSCGUIManager.h"

 #include "sound/Midi.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "AudioPluginOSCGUI.h"
--- a/src/gui/studio/BankEditorDialog.cpp
+++ b/src/gui/studio/BankEditorDialog.cpp
@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tdeapplication.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
@ -51,10 +51,10 @@
 #include <kcombobox.h>
 #include <kcommand.h>
 #include <tdefiledialog.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 <kxmlguiclient.h>
--- a/src/gui/studio/ChangeRecordDeviceCommand.h
+++ b/src/gui/studio/ChangeRecordDeviceCommand.h
@ -26,7 +26,7 @@
 #define _RG_CHANGERECORDDEVICECOMMAND_H_

 #include "base/Studio.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcommand.h>

 namespace Rosegarden
--- a/src/gui/studio/DeviceEditorDialog.cpp
+++ b/src/gui/studio/DeviceEditorDialog.cpp
@ -25,7 +25,7 @@

 #include "DeviceEditorDialog.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "base/Device.h"
@ -38,7 +38,7 @@
 #include "document/MultiViewCommandHistory.h"
 #include "gui/application/RosegardenApplication.h"
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqcstring.h>
 #include <tqdatastream.h>
 #include <tqhbox.h>
--- a/src/gui/studio/DeviceManagerDialog.cpp
+++ b/src/gui/studio/DeviceManagerDialog.cpp
@ -45,13 +45,13 @@
 #include "gui/dialogs/ExportDeviceDialog.h"
 #include "gui/dialogs/ImportDeviceDialog.h"
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include <tdeaction.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <tqcstring.h>
--- a/src/gui/studio/MidiBankListViewItem.cpp
+++ b/src/gui/studio/MidiBankListViewItem.cpp
@ -25,7 +25,7 @@

 #include "MidiBankListViewItem.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Device.h"
 #include "MidiDeviceListViewItem.h"
 #include "MidiKeyMapListViewItem.h"
--- a/src/gui/studio/MidiDeviceListViewItem.cpp
+++ b/src/gui/studio/MidiDeviceListViewItem.cpp
@ -25,7 +25,7 @@

 #include "MidiDeviceListViewItem.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Device.h"
 #include <tqlistview.h>
 #include <tqstring.h>
--- a/src/gui/studio/MidiKeyMapListViewItem.cpp
+++ b/src/gui/studio/MidiKeyMapListViewItem.cpp
@ -28,7 +28,7 @@
 #include "MidiDeviceListViewItem.h"
 #include "MidiBankListViewItem.h"
 #include "base/Device.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>


--- a/src/gui/studio/MidiKeyMappingEditor.cpp
+++ b/src/gui/studio/MidiKeyMappingEditor.cpp
@ -25,7 +25,7 @@

 #include "MidiKeyMappingEditor.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "BankEditorDialog.h"
--- a/src/gui/studio/MidiMixerWindow.cpp
+++ b/src/gui/studio/MidiMixerWindow.cpp
@ -27,7 +27,7 @@
 #include <tqlayout.h>

 #include "sound/Midi.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "base/Colour.h"
--- a/src/gui/studio/MidiProgramsEditor.cpp
+++ b/src/gui/studio/MidiProgramsEditor.cpp
@ -34,9 +34,9 @@
 #include "base/MidiProgram.h"
 #include "gui/widgets/RosegardenPopupMenu.h"
 #include <kcompletion.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include <tqcheckbox.h>
 #include <tqcursor.h>
--- a/src/gui/studio/NameSetEditor.cpp
+++ b/src/gui/studio/NameSetEditor.cpp
@ -26,9 +26,9 @@
 #include "NameSetEditor.h"
 #include "BankEditorDialog.h"
 #include <kcompletion.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqframe.h>
 #include <tqgroupbox.h>
 #include <tqhbox.h>
--- a/src/gui/studio/RemapInstrumentDialog.cpp
+++ b/src/gui/studio/RemapInstrumentDialog.cpp
@ -38,7 +38,7 @@
 #include <kcombobox.h>
 #include <kcommand.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqbuttongroup.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
--- a/src/gui/studio/SynthPluginManagerDialog.cpp
+++ b/src/gui/studio/SynthPluginManagerDialog.cpp
@ -26,7 +26,7 @@
 #include "SynthPluginManagerDialog.h"
 #include <tqlayout.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "AudioPlugin.h"
 #include "AudioPluginManager.h"
--- a/src/gui/widgets/AudioFaderBox.cpp
+++ b/src/gui/widgets/AudioFaderBox.cpp
@ -26,7 +26,7 @@
 #include "AudioFaderBox.h"
 #include <tqlayout.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "misc/Debug.h"
 #include "AudioRouteMenu.h"
@ -39,7 +39,7 @@
 #include "gui/application/RosegardenGUIApp.h"
 #include "gui/studio/AudioPluginOSCGUIManager.h"
 #include "Rotary.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqframe.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
--- a/src/gui/widgets/AudioRouteMenu.cpp
+++ b/src/gui/widgets/AudioRouteMenu.cpp
@ -33,7 +33,7 @@
 #include "sound/MappedCommon.h"
 #include "sound/MappedStudio.h"
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcursor.h>
 #include <tqobject.h>
 #include <tqpoint.h>
--- a/src/gui/widgets/CollapsingFrame.cpp
+++ b/src/gui/widgets/CollapsingFrame.cpp
@ -27,7 +27,7 @@
 #include <tdeapplication.h>
 #include <kstddirs.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqfont.h>
 #include <tqframe.h>
 #include <tqlayout.h>
--- a/src/gui/widgets/ColourTable.cpp
+++ b/src/gui/widgets/ColourTable.cpp
@ -25,7 +25,7 @@

 #include "ColourTable.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "base/ColourMap.h"
 #include "ColourTableItem.h"
--- a/src/gui/widgets/DiatonicPitchChooser.cpp
+++ b/src/gui/widgets/DiatonicPitchChooser.cpp
@ -26,7 +26,7 @@
 #include "DiatonicPitchChooser.h"

 #include <iostream>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/NotationRules.h"
 #include "base/NotationTypes.h"
 #include "gui/general/MidiPitchLabel.h"
--- a/src/gui/widgets/PitchChooser.cpp
+++ b/src/gui/widgets/PitchChooser.cpp
@ -25,7 +25,7 @@

 #include "PitchChooser.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include "gui/general/MidiPitchLabel.h"
 #include "PitchDragLabel.h"
 #include <tqgroupbox.h>
--- a/src/gui/widgets/ProgressDialog.cpp
+++ b/src/gui/widgets/ProgressDialog.cpp
@ -27,7 +27,7 @@
 #include "CurrentProgressDialog.h"
 #include "misc/Debug.h"
 #include "gui/application/RosegardenApplication.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcursor.h>
 #include <tqprogressdialog.h>
 #include <tqstring.h>
--- a/src/gui/widgets/QuantizeParameters.cpp
+++ b/src/gui/widgets/QuantizeParameters.cpp
@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tdeapplication.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/NotationTypes.h"
 #include "base/Quantizer.h"
 #include "base/BasicQuantizer.h"
--- a/src/gui/widgets/Rotary.cpp
+++ b/src/gui/widgets/Rotary.cpp
@ -30,7 +30,7 @@
 #include "gui/general/GUIPalette.h"
 #include "TextFloat.h"
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqbrush.h>
 #include <tqcolor.h>
 #include <tqdialog.h>
--- a/src/gui/widgets/TimeWidget.cpp
+++ b/src/gui/widgets/TimeWidget.cpp
@ -26,7 +26,7 @@
 #include "TimeWidget.h"
 #include <tqlayout.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "base/Composition.h"
 #include "base/NotationTypes.h"
--- a/src/misc/stableheaders.h
+++ b/src/misc/stableheaders.h
@ -167,8 +167,8 @@
 #include <tdefile.h>
 #include <kfilterdev.h>
 #include <tdefontrequester.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
@ -177,9 +177,9 @@
 #include <klineeditdlg.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <kpixmapeffect.h>
 #include <tdepopupmenu.h>
@ -193,7 +193,7 @@
 #include <kstdaction.h>
 #include <kstddirs.h>
 #include <ktabwidget.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ktip.h>
 #include <tdetoolbar.h>
 #include <kuniqueapplication.h>
--- a/src/sequencer/MmappedSegment.h
+++ b/src/sequencer/MmappedSegment.h
@ -35,7 +35,7 @@

 #include <iostream>

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>

 #include <dcopclient.h>
--- a/src/sequencer/RosegardenSequencerApp.cpp
+++ b/src/sequencer/RosegardenSequencerApp.cpp
@ -34,7 +34,7 @@

 #include <iostream>

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>

 #include <dcopclient.h>
--- a/src/sequencer/main.cpp
+++ b/src/sequencer/main.cpp
@ -28,7 +28,7 @@

 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>

 #include "base/Profiler.h"
--- a/src/sound/AudioFileManager.cpp
+++ b/src/sound/AudioFileManager.cpp
@ -36,10 +36,10 @@
 #endif

 #include <kapp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 #include <tqpixmap.h>
 #include <tqpainter.h>