Rename additional header files to avoid conflicts with KDE4

author: Timothy Pearson <[email protected]> 2013-02-15 21:51:32 -0600
committer: Timothy Pearson <[email protected]> 2013-02-15 21:51:32 -0600
commit: 5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb (patch)
tree: 7fdeb64e5bef896a23bdf46847e3ffd3ec460cda /src
parent: 3f02581883759395fcd3935ec1d88ddca4895f32 (diff)
download: rosegarden-5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb.tar.gz
rosegarden-5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb.zip
319 files changed, 394 insertions, 394 deletions
diff --git a/src/commands/edit/AddDotCommand.h b/src/commands/edit/AddDotCommand.h
index e173bb8..ca0b674 100644
--- 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>
 
 
 
diff --git a/src/commands/edit/AddMarkerCommand.h b/src/commands/edit/AddMarkerCommand.h
index 3506817..551750a 100644
--- 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>
 
 
 
diff --git a/src/commands/edit/ChangeVelocityCommand.h b/src/commands/edit/ChangeVelocityCommand.h
index f4a458d..38d64e2 100644
--- 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>
 
 
 
diff --git a/src/commands/edit/ClearTriggersCommand.h b/src/commands/edit/ClearTriggersCommand.h
index 0abbdb7..65b7a16 100644
--- 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>
 
 
 
diff --git a/src/commands/edit/CollapseNotesCommand.h b/src/commands/edit/CollapseNotesCommand.h
index 5655b4e..022cb38 100644
--- 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;
diff --git a/src/commands/edit/CopyCommand.h b/src/commands/edit/CopyCommand.h
index 9f1bc1a..a084a6d 100644
--- 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>
 
 
 
diff --git a/src/commands/edit/CutAndCloseCommand.h b/src/commands/edit/CutAndCloseCommand.h
index e98df09..934219a 100644
--- 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>
 
 
 
diff --git a/src/commands/edit/CutCommand.h b/src/commands/edit/CutCommand.h
index 87b929d..29f54be 100644
--- 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>
 
 
diff --git a/src/commands/edit/EraseCommand.h b/src/commands/edit/EraseCommand.h
index a662640..fee4038 100644
--- 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>
 
 
 
diff --git a/src/commands/edit/EventEditCommand.h b/src/commands/edit/EventEditCommand.h
index 53abf73..6ea6440 100644
--- 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>
 
 
 
diff --git a/src/commands/edit/EventInsertionCommand.cpp b/src/commands/edit/EventInsertionCommand.cpp
index a684883..348a545 100644
--- 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"
diff --git a/src/commands/edit/EventQuantizeCommand.cpp b/src/commands/edit/EventQuantizeCommand.cpp
index d115c89..170aeca 100644
--- 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"
diff --git a/src/commands/edit/EventUnquantizeCommand.cpp b/src/commands/edit/EventUnquantizeCommand.cpp
index 3fe2eb2..b5b2470 100644
--- 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"
diff --git a/src/commands/edit/InsertTriggerNoteCommand.cpp b/src/commands/edit/InsertTriggerNoteCommand.cpp
index 65696f3..7022277 100644
--- 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"
diff --git a/src/commands/edit/InvertCommand.h b/src/commands/edit/InvertCommand.h
index 8a47cb9..b94803c 100644
--- 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>
 
 
 
diff --git a/src/commands/edit/ModifyMarkerCommand.h b/src/commands/edit/ModifyMarkerCommand.h
index 392f0ff..e5721aa 100644
--- 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>
 
 
 
diff --git a/src/commands/edit/MoveAcrossSegmentsCommand.cpp b/src/commands/edit/MoveAcrossSegmentsCommand.cpp
index ed73360..a01df03 100644
--- 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"
diff --git a/src/commands/edit/PasteEventsCommand.h b/src/commands/edit/PasteEventsCommand.h
index 66aea6d..04c8e74 100644
--- 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>
 
 
 
diff --git a/src/commands/edit/PasteSegmentsCommand.h b/src/commands/edit/PasteSegmentsCommand.h
index 4b0063c..35253f8 100644
--- 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>
 
 
 
diff --git a/src/commands/edit/RemoveMarkerCommand.h b/src/commands/edit/RemoveMarkerCommand.h
index da58872..570365f 100644
--- 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>
 
 
 
diff --git a/src/commands/edit/RescaleCommand.h b/src/commands/edit/RescaleCommand.h
index 801c660..99ced62 100644
--- 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>
 
 
 
diff --git a/src/commands/edit/RetrogradeCommand.h b/src/commands/edit/RetrogradeCommand.h
index 4c7bde1..4c1d24e 100644
--- 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>
 
 
 
diff --git a/src/commands/edit/RetrogradeInvertCommand.h b/src/commands/edit/RetrogradeInvertCommand.h
index 155f1ea..70f22d7 100644
--- 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>
 
 
 
diff --git a/src/commands/edit/SelectionPropertyCommand.h b/src/commands/edit/SelectionPropertyCommand.h
index a28b98c..586717a 100644
--- 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;
diff --git a/src/commands/edit/SetLyricsCommand.h b/src/commands/edit/SetLyricsCommand.h
index 1d42150..e3a8589 100644
--- 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>
 
 
 
diff --git a/src/commands/edit/SetNoteTypeCommand.h b/src/commands/edit/SetNoteTypeCommand.h
index 42d3327..9709842 100644
--- 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>
 
 
 
diff --git a/src/commands/edit/SetTriggerCommand.h b/src/commands/edit/SetTriggerCommand.h
index a87eab8..3d68dd8 100644
--- 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>
 
 
 
diff --git a/src/commands/edit/TransposeCommand.h b/src/commands/edit/TransposeCommand.h
index 6e3ddfd..6de15a0 100644
--- 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>
 
 
 
diff --git a/src/commands/matrix/MatrixEraseCommand.cpp b/src/commands/matrix/MatrixEraseCommand.cpp
index c35259e..6779678 100644
--- 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"
diff --git a/src/commands/matrix/MatrixInsertionCommand.cpp b/src/commands/matrix/MatrixInsertionCommand.cpp
index 5b03d1a..970b9d0 100644
--- 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"
diff --git a/src/commands/matrix/MatrixModifyCommand.cpp b/src/commands/matrix/MatrixModifyCommand.cpp
index b78d6f3..04cd903 100644
--- 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"
diff --git a/src/commands/matrix/MatrixPercussionInsertionCommand.cpp b/src/commands/matrix/MatrixPercussionInsertionCommand.cpp
index 513663d..0e5aa0e 100644
--- 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"
diff --git a/src/commands/notation/AddFingeringMarkCommand.cpp b/src/commands/notation/AddFingeringMarkCommand.cpp
index 2a6a310..a8a8b14 100644
--- a/src/commands/notation/AddFingeringMarkCommand.cpp
+++ b/src/commands/notation/AddFingeringMarkCommand.cpp
@@ -25,7 +25,7 @@
 
 #include "AddFingeringMarkCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/NotationTypes.h"
 #include "base/NotationQuantizer.h"
 #include "base/Segment.h"
diff --git a/src/commands/notation/AddIndicationCommand.cpp b/src/commands/notation/AddIndicationCommand.cpp
index e6b4493..7b8988c 100644
--- a/src/commands/notation/AddIndicationCommand.cpp
+++ b/src/commands/notation/AddIndicationCommand.cpp
@@ -25,7 +25,7 @@
 
 #include "AddIndicationCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "base/Event.h"
 #include "base/NotationTypes.h"
diff --git a/src/commands/notation/AddMarkCommand.cpp b/src/commands/notation/AddMarkCommand.cpp
index 49c69ec..0421793 100644
--- a/src/commands/notation/AddMarkCommand.cpp
+++ b/src/commands/notation/AddMarkCommand.cpp
@@ -25,7 +25,7 @@
 
 #include "AddMarkCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
diff --git a/src/commands/notation/AddSlashesCommand.h b/src/commands/notation/AddSlashesCommand.h
index 4c85cd4..cf9cc89 100644
--- a/src/commands/notation/AddSlashesCommand.h
+++ b/src/commands/notation/AddSlashesCommand.h
@@ -27,7 +27,7 @@
 #define _RG_NOTESMENUADDSLASHESCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/AddTextMarkCommand.h b/src/commands/notation/AddTextMarkCommand.h
index 00cf66b..e6a8f30 100644
--- a/src/commands/notation/AddTextMarkCommand.h
+++ b/src/commands/notation/AddTextMarkCommand.h
@@ -29,7 +29,7 @@
 #include "document/BasicSelectionCommand.h"
 #include <string>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/AutoBeamCommand.h b/src/commands/notation/AutoBeamCommand.h
index e437af7..a9ef26a 100644
--- a/src/commands/notation/AutoBeamCommand.h
+++ b/src/commands/notation/AutoBeamCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/BeamCommand.h b/src/commands/notation/BeamCommand.h
index 8456af2..64efbb1 100644
--- a/src/commands/notation/BeamCommand.h
+++ b/src/commands/notation/BeamCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/BreakCommand.h b/src/commands/notation/BreakCommand.h
index c4b234e..61dc031 100644
--- a/src/commands/notation/BreakCommand.h
+++ b/src/commands/notation/BreakCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/ChangeSlurPositionCommand.h b/src/commands/notation/ChangeSlurPositionCommand.h
index e8a4911..3cceb3a 100644
--- a/src/commands/notation/ChangeSlurPositionCommand.h
+++ b/src/commands/notation/ChangeSlurPositionCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class Slur;
diff --git a/src/commands/notation/ChangeStemsCommand.h b/src/commands/notation/ChangeStemsCommand.h
index 5874275..6cb18de 100644
--- a/src/commands/notation/ChangeStemsCommand.h
+++ b/src/commands/notation/ChangeStemsCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class Stems;
diff --git a/src/commands/notation/ChangeStyleCommand.h b/src/commands/notation/ChangeStyleCommand.h
index cdc5af9..5e9b391 100644
--- a/src/commands/notation/ChangeStyleCommand.h
+++ b/src/commands/notation/ChangeStyleCommand.h
@@ -29,7 +29,7 @@
 #include "document/BasicSelectionCommand.h"
 #include "gui/editors/notation/NoteStyle.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class Change;
diff --git a/src/commands/notation/ChangeTiePositionCommand.h b/src/commands/notation/ChangeTiePositionCommand.h
index 3b01618..2a61f4e 100644
--- a/src/commands/notation/ChangeTiePositionCommand.h
+++ b/src/commands/notation/ChangeTiePositionCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/ClefInsertionCommand.cpp b/src/commands/notation/ClefInsertionCommand.cpp
index 2268325..5573975 100644
--- a/src/commands/notation/ClefInsertionCommand.cpp
+++ b/src/commands/notation/ClefInsertionCommand.cpp
@@ -25,7 +25,7 @@
 
 #include "ClefInsertionCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "base/Event.h"
 #include "base/NotationTypes.h"
diff --git a/src/commands/notation/CollapseRestsCommand.h b/src/commands/notation/CollapseRestsCommand.h
index 1f4f663..799d470 100644
--- a/src/commands/notation/CollapseRestsCommand.h
+++ b/src/commands/notation/CollapseRestsCommand.h
@@ -29,7 +29,7 @@
 #include "document/BasicCommand.h"
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/DeCounterpointCommand.h b/src/commands/notation/DeCounterpointCommand.h
index 7e16d4b..de4cb8d 100644
--- a/src/commands/notation/DeCounterpointCommand.h
+++ b/src/commands/notation/DeCounterpointCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class Overlapping;
diff --git a/src/commands/notation/FixNotationQuantizeCommand.h b/src/commands/notation/FixNotationQuantizeCommand.h
index 3a5d334..5290d5a 100644
--- a/src/commands/notation/FixNotationQuantizeCommand.h
+++ b/src/commands/notation/FixNotationQuantizeCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/GraceCommand.h b/src/commands/notation/GraceCommand.h
index e432a11..50d1290 100644
--- a/src/commands/notation/GraceCommand.h
+++ b/src/commands/notation/GraceCommand.h
@@ -29,7 +29,7 @@
 #include "document/BasicCommand.h"
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class Make;
diff --git a/src/commands/notation/GuitarChordInsertionCommand.cpp b/src/commands/notation/GuitarChordInsertionCommand.cpp
index 79e2b44..6b8fcf6 100644
--- a/src/commands/notation/GuitarChordInsertionCommand.cpp
+++ b/src/commands/notation/GuitarChordInsertionCommand.cpp
@@ -25,7 +25,7 @@
 
 #include "GuitarChordInsertionCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/Segment.h"
 #include "document/BasicCommand.h"
diff --git a/src/commands/notation/IncrementDisplacementsCommand.h b/src/commands/notation/IncrementDisplacementsCommand.h
index bbedc7b..740d37f 100644
--- a/src/commands/notation/IncrementDisplacementsCommand.h
+++ b/src/commands/notation/IncrementDisplacementsCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/InterpretCommand.h b/src/commands/notation/InterpretCommand.h
index a50a0f7..c4e2254 100644
--- a/src/commands/notation/InterpretCommand.h
+++ b/src/commands/notation/InterpretCommand.h
@@ -31,7 +31,7 @@
 #include <string>
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/KeyInsertionCommand.h b/src/commands/notation/KeyInsertionCommand.h
index 1a03383..e044619 100644
--- a/src/commands/notation/KeyInsertionCommand.h
+++ b/src/commands/notation/KeyInsertionCommand.h
@@ -30,7 +30,7 @@
 #include "document/BasicCommand.h"
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 
 
diff --git a/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp b/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp
index 611419f..7e9ea30 100644
--- a/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp
+++ b/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp
@@ -25,7 +25,7 @@
 
 #include "MakeAccidentalsCautionaryCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/NotationTypes.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
diff --git a/src/commands/notation/MakeChordCommand.h b/src/commands/notation/MakeChordCommand.h
index e5028ba..8738013 100644
--- a/src/commands/notation/MakeChordCommand.h
+++ b/src/commands/notation/MakeChordCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class Make;
diff --git a/src/commands/notation/MakeNotesViableCommand.h b/src/commands/notation/MakeNotesViableCommand.h
index 4916750..65cdd92 100644
--- a/src/commands/notation/MakeNotesViableCommand.h
+++ b/src/commands/notation/MakeNotesViableCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/MakeRegionViableCommand.h b/src/commands/notation/MakeRegionViableCommand.h
index 9d9b0f0..ebe9406 100644
--- a/src/commands/notation/MakeRegionViableCommand.h
+++ b/src/commands/notation/MakeRegionViableCommand.h
@@ -29,7 +29,7 @@
 #include "document/BasicCommand.h"
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/MultiKeyInsertionCommand.h b/src/commands/notation/MultiKeyInsertionCommand.h
index 644e877..916918d 100644
--- a/src/commands/notation/MultiKeyInsertionCommand.h
+++ b/src/commands/notation/MultiKeyInsertionCommand.h
@@ -29,7 +29,7 @@
 #include "base/NotationTypes.h"
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include <kcommand.h>
 #include "document/RosegardenGUIDoc.h"
diff --git a/src/commands/notation/NormalizeRestsCommand.h b/src/commands/notation/NormalizeRestsCommand.h
index 6d26c7b..7fd42ea 100644
--- a/src/commands/notation/NormalizeRestsCommand.h
+++ b/src/commands/notation/NormalizeRestsCommand.h
@@ -29,7 +29,7 @@
 #include "document/BasicCommand.h"
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/NoteInsertionCommand.cpp b/src/commands/notation/NoteInsertionCommand.cpp
index cadae55..fdbbc77 100644
--- a/src/commands/notation/NoteInsertionCommand.cpp
+++ b/src/commands/notation/NoteInsertionCommand.cpp
@@ -26,7 +26,7 @@
 #include "NoteInsertionCommand.h"
 
 #include <cmath>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/NotationTypes.h"
 #include "base/Segment.h"
diff --git a/src/commands/notation/RemoveFingeringMarksCommand.h b/src/commands/notation/RemoveFingeringMarksCommand.h
index 71fcca0..b82fa68 100644
--- a/src/commands/notation/RemoveFingeringMarksCommand.h
+++ b/src/commands/notation/RemoveFingeringMarksCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/RemoveMarksCommand.h b/src/commands/notation/RemoveMarksCommand.h
index 1603c50..690e592 100644
--- a/src/commands/notation/RemoveMarksCommand.h
+++ b/src/commands/notation/RemoveMarksCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/RemoveNotationQuantizeCommand.h b/src/commands/notation/RemoveNotationQuantizeCommand.h
index 8fb3b53..f065345 100644
--- a/src/commands/notation/RemoveNotationQuantizeCommand.h
+++ b/src/commands/notation/RemoveNotationQuantizeCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/ResetDisplacementsCommand.h b/src/commands/notation/ResetDisplacementsCommand.h
index 701ed91..4c819a5 100644
--- a/src/commands/notation/ResetDisplacementsCommand.h
+++ b/src/commands/notation/ResetDisplacementsCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/RespellCommand.cpp b/src/commands/notation/RespellCommand.cpp
index 983622a..2d64ff7 100644
--- a/src/commands/notation/RespellCommand.cpp
+++ b/src/commands/notation/RespellCommand.cpp
@@ -25,7 +25,7 @@
 
 #include "RespellCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/NotationTypes.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
diff --git a/src/commands/notation/RestoreSlursCommand.h b/src/commands/notation/RestoreSlursCommand.h
index ed6bc4c..33b1b1c 100644
--- a/src/commands/notation/RestoreSlursCommand.h
+++ b/src/commands/notation/RestoreSlursCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/RestoreStemsCommand.h b/src/commands/notation/RestoreStemsCommand.h
index add54ce..0b5159d 100644
--- a/src/commands/notation/RestoreStemsCommand.h
+++ b/src/commands/notation/RestoreStemsCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/RestoreTiesCommand.h b/src/commands/notation/RestoreTiesCommand.h
index 5bd35e5..9955c48 100644
--- a/src/commands/notation/RestoreTiesCommand.h
+++ b/src/commands/notation/RestoreTiesCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/SetVisibilityCommand.h b/src/commands/notation/SetVisibilityCommand.h
index 6aece6a..1cddc0b 100644
--- a/src/commands/notation/SetVisibilityCommand.h
+++ b/src/commands/notation/SetVisibilityCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/SustainInsertionCommand.h b/src/commands/notation/SustainInsertionCommand.h
index 235e2e5..ee80b93 100644
--- a/src/commands/notation/SustainInsertionCommand.h
+++ b/src/commands/notation/SustainInsertionCommand.h
@@ -29,7 +29,7 @@
 #include "document/BasicCommand.h"
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class Pedal;
diff --git a/src/commands/notation/TextChangeCommand.cpp b/src/commands/notation/TextChangeCommand.cpp
index e909839..1cc0a5b 100644
--- a/src/commands/notation/TextChangeCommand.cpp
+++ b/src/commands/notation/TextChangeCommand.cpp
@@ -25,7 +25,7 @@
 
 #include "TextChangeCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/NotationTypes.h"
 #include "base/Segment.h"
diff --git a/src/commands/notation/TextInsertionCommand.cpp b/src/commands/notation/TextInsertionCommand.cpp
index 8ba94c9..f189f94 100644
--- a/src/commands/notation/TextInsertionCommand.cpp
+++ b/src/commands/notation/TextInsertionCommand.cpp
@@ -25,7 +25,7 @@
 
 #include "TextInsertionCommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/NotationTypes.h"
 #include "base/Segment.h"
diff --git a/src/commands/notation/TieNotesCommand.h b/src/commands/notation/TieNotesCommand.h
index b46470b..cd80c84 100644
--- a/src/commands/notation/TieNotesCommand.h
+++ b/src/commands/notation/TieNotesCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/TupletCommand.h b/src/commands/notation/TupletCommand.h
index fcf5840..2748411 100644
--- a/src/commands/notation/TupletCommand.h
+++ b/src/commands/notation/TupletCommand.h
@@ -29,7 +29,7 @@
 #include "document/BasicCommand.h"
 #include <tqstring.h>
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/UnGraceCommand.h b/src/commands/notation/UnGraceCommand.h
index 535843e..f96a7f8 100644
--- a/src/commands/notation/UnGraceCommand.h
+++ b/src/commands/notation/UnGraceCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/UnTupletCommand.h b/src/commands/notation/UnTupletCommand.h
index 866069c..3d5c2fe 100644
--- a/src/commands/notation/UnTupletCommand.h
+++ b/src/commands/notation/UnTupletCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/notation/UntieNotesCommand.h b/src/commands/notation/UntieNotesCommand.h
index 8d0ca67..be209c7 100644
--- a/src/commands/notation/UntieNotesCommand.h
+++ b/src/commands/notation/UntieNotesCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/src/commands/segment/AddTempoChangeCommand.h b/src/commands/segment/AddTempoChangeCommand.h
index c791550..8beb391 100644
--- 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>
 
 
 
diff --git a/src/commands/segment/AddTimeSignatureCommand.h b/src/commands/segment/AddTimeSignatureCommand.h
index 21a0cd8..50e7c4b 100644
--- 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>
 
 
 
diff --git a/src/commands/segment/AddTracksCommand.h b/src/commands/segment/AddTracksCommand.h
index dba0e68..60c8e98 100644
--- 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>
 
 
 
diff --git a/src/commands/segment/AddTriggerSegmentCommand.cpp b/src/commands/segment/AddTriggerSegmentCommand.cpp
index 12d406e..9819428 100644
--- 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"
diff --git a/src/commands/segment/AudioSegmentAutoSplitCommand.h b/src/commands/segment/AudioSegmentAutoSplitCommand.h
index 0b11f77..145b344 100644
--- 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>
 
 
 
diff --git a/src/commands/segment/AudioSegmentDistributeCommand.h b/src/commands/segment/AudioSegmentDistributeCommand.h
index 940fc66..f9fc98e 100644
--- 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>
 
 
 
diff --git a/src/commands/segment/AudioSegmentInsertCommand.cpp b/src/commands/segment/AudioSegmentInsertCommand.cpp
index b5167f7..4ae9148 100644
--- 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"
diff --git a/src/commands/segment/AudioSegmentRescaleCommand.h b/src/commands/segment/AudioSegmentRescaleCommand.h
index 3243a21..f8b7208 100644
--- 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
 {
diff --git a/src/commands/segment/AudioSegmentResizeFromStartCommand.cpp b/src/commands/segment/AudioSegmentResizeFromStartCommand.cpp
index 5045500..f0d9d47 100644
--- 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"
diff --git a/src/commands/segment/AudioSegmentSplitCommand.cpp b/src/commands/segment/AudioSegmentSplitCommand.cpp
index 6657b7b..73711e2 100644
--- 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"
diff --git a/src/commands/segment/ChangeCompositionLengthCommand.h b/src/commands/segment/ChangeCompositionLengthCommand.h
index 4828c3a..44f1815 100644
--- 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;
diff --git a/src/commands/segment/CreateTempoMapFromSegmentCommand.cpp b/src/commands/segment/CreateTempoMapFromSegmentCommand.cpp
index e548875..69ac078 100644
--- 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"
diff --git a/src/commands/segment/CutRangeCommand.cpp b/src/commands/segment/CutRangeCommand.cpp
index df91398..874d0aa 100644
--- 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"
diff --git a/src/commands/segment/DeleteRangeCommand.h b/src/commands/segment/DeleteRangeCommand.h
index 6b198ea..3a21218 100644
--- 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"
 
diff --git a/src/commands/segment/DeleteTracksCommand.h b/src/commands/segment/DeleteTracksCommand.h
index d02f5ac..7cc7c06 100644
--- 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"
 
 
diff --git a/src/commands/segment/DeleteTriggerSegmentCommand.cpp b/src/commands/segment/DeleteTriggerSegmentCommand.cpp
index 3ddb4af..3b85c4b 100644
--- 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"
diff --git a/src/commands/segment/EraseSegmentsStartingInRangeCommand.cpp b/src/commands/segment/EraseSegmentsStartingInRangeCommand.cpp
index 35f7f10..b25c3cb 100644
--- 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"
 
diff --git a/src/commands/segment/InsertRangeCommand.cpp b/src/commands/segment/InsertRangeCommand.cpp
index 73dc5fd..ac6ad7a 100644
--- 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"
diff --git a/src/commands/segment/ModifyDefaultTempoCommand.h b/src/commands/segment/ModifyDefaultTempoCommand.h
index 5ca4252..634a426 100644
--- 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
 
 
diff --git a/src/commands/segment/MoveTracksCommand.h b/src/commands/segment/MoveTracksCommand.h
index b1a72aa..df8a8a7 100644
--- 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>
 
 
 
diff --git a/src/commands/segment/OpenOrCloseRangeCommand.cpp b/src/commands/segment/OpenOrCloseRangeCommand.cpp
index ad1db2c..0ab3edd 100644
--- 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"
diff --git a/src/commands/segment/PasteConductorDataCommand.cpp b/src/commands/segment/PasteConductorDataCommand.cpp
index 6db082f..4b50444 100644
--- 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"
diff --git a/src/commands/segment/PasteRangeCommand.cpp b/src/commands/segment/PasteRangeCommand.cpp
index c2f9a0e..80bfeb4 100644
--- 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"
diff --git a/src/commands/segment/PasteToTriggerSegmentCommand.cpp b/src/commands/segment/PasteToTriggerSegmentCommand.cpp
index 1b3838a..933fe17 100644
--- 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"
diff --git a/src/commands/segment/RemoveTempoChangeCommand.h b/src/commands/segment/RemoveTempoChangeCommand.h
index b77f8be..e9ec834 100644
--- 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;
diff --git a/src/commands/segment/RemoveTimeSignatureCommand.h b/src/commands/segment/RemoveTimeSignatureCommand.h
index cc1ee59..ddaa38c 100644
--- 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;
diff --git a/src/commands/segment/RenameTrackCommand.h b/src/commands/segment/RenameTrackCommand.h
index 385cd38..f23c4e1 100644
--- 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>
 
 
 
diff --git a/src/commands/segment/SegmentAutoSplitCommand.h b/src/commands/segment/SegmentAutoSplitCommand.h
index a9e03f2..4a8ca2b 100644
--- 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>
 
 
 
diff --git a/src/commands/segment/SegmentColourCommand.h b/src/commands/segment/SegmentColourCommand.h
index 6a19d63..459c292 100644
--- 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>
 
 
 
diff --git a/src/commands/segment/SegmentColourMapCommand.h b/src/commands/segment/SegmentColourMapCommand.h
index 5adb533..7f0d884 100644
--- 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>
 
 
 
diff --git a/src/commands/segment/SegmentCommandRepeat.cpp b/src/commands/segment/SegmentCommandRepeat.cpp
index 355c004..c3472a2 100644
--- 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>
diff --git a/src/commands/segment/SegmentEraseCommand.cpp b/src/commands/segment/SegmentEraseCommand.cpp
index b15788f..88c3748 100644
--- 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"
diff --git a/src/commands/segment/SegmentInsertCommand.cpp b/src/commands/segment/SegmentInsertCommand.cpp
index f10ef45..bd095f4 100644
--- 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"
diff --git a/src/commands/segment/SegmentJoinCommand.h b/src/commands/segment/SegmentJoinCommand.h
index f7e6907..8053fe3 100644
--- 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>
 
 
 
diff --git a/src/commands/segment/SegmentLabelCommand.h b/src/commands/segment/SegmentLabelCommand.h
index 215b827..0668c7f 100644
--- 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>
 
 
 
diff --git a/src/commands/segment/SegmentQuickCopyCommand.h b/src/commands/segment/SegmentQuickCopyCommand.h
index 7e97781..0030369 100644
--- 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>
 
 
 
diff --git a/src/commands/segment/SegmentRecordCommand.cpp b/src/commands/segment/SegmentRecordCommand.cpp
index f457f32..b51d746 100644
--- 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"
 
diff --git a/src/commands/segment/SegmentRepeatToCopyCommand.cpp b/src/commands/segment/SegmentRepeatToCopyCommand.cpp
index a0e0e43..13ed565 100644
--- 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"
 
diff --git a/src/commands/segment/SegmentRescaleCommand.h b/src/commands/segment/SegmentRescaleCommand.h
index bc724be..1e723b6 100644
--- 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>
 
 
 
diff --git a/src/commands/segment/SegmentResizeFromStartCommand.cpp b/src/commands/segment/SegmentResizeFromStartCommand.cpp
index a4157bb..bae1304 100644
--- 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"
diff --git a/src/commands/segment/SegmentSingleRepeatToCopyCommand.cpp b/src/commands/segment/SegmentSingleRepeatToCopyCommand.cpp
index c9b92fb..c5418c7 100644
--- 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"
 
diff --git a/src/commands/segment/SegmentSplitByPitchCommand.h b/src/commands/segment/SegmentSplitByPitchCommand.h
index b935867..350a477 100644
--- 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"
 
 
diff --git a/src/commands/segment/SegmentSplitByRecordingSrcCommand.h b/src/commands/segment/SegmentSplitByRecordingSrcCommand.h
index 03ca3b6..1265416 100644
--- 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"
 
 
diff --git a/src/commands/segment/SegmentSplitCommand.cpp b/src/commands/segment/SegmentSplitCommand.cpp
index 5de234c..6a0af81 100644
--- 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"
diff --git a/src/commands/segment/SegmentSyncClefCommand.h b/src/commands/segment/SegmentSyncClefCommand.h
index 01b97fd..e5fe740 100644
--- 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
 {
diff --git a/src/commands/segment/SegmentSyncCommand.h b/src/commands/segment/SegmentSyncCommand.h
index 0d8e189..3f50db2 100644
--- 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
 {
diff --git a/src/commands/segment/SegmentTransposeCommand.h b/src/commands/segment/SegmentTransposeCommand.h
index 075ca79..dc5f9a0 100644
--- 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
 {
diff --git a/src/commands/segment/SetTriggerSegmentBasePitchCommand.cpp b/src/commands/segment/SetTriggerSegmentBasePitchCommand.cpp
index 9bb1bc3..7f1ce1d 100644
--- 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"
 
diff --git a/src/commands/segment/SetTriggerSegmentBaseVelocityCommand.cpp b/src/commands/segment/SetTriggerSegmentBaseVelocityCommand.cpp
index f1bba10..b14905b 100644
--- 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"
 
diff --git a/src/commands/segment/SetTriggerSegmentDefaultRetuneCommand.cpp b/src/commands/segment/SetTriggerSegmentDefaultRetuneCommand.cpp
index 35ae878..4b3c20c 100644
--- 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"
 
diff --git a/src/commands/segment/SetTriggerSegmentDefaultTimeAdjustCommand.cpp b/src/commands/segment/SetTriggerSegmentDefaultTimeAdjustCommand.cpp
index deb49a1..3522910 100644
--- 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"
 
diff --git a/src/commands/studio/AddControlParameterCommand.h b/src/commands/studio/AddControlParameterCommand.h
index 3cbf903..841ceef 100644
--- 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>
 
 
 
diff --git a/src/commands/studio/CreateOrDeleteDeviceCommand.h b/src/commands/studio/CreateOrDeleteDeviceCommand.h
index 3db7b25..4df85b3 100644
--- 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>
 
 
 
diff --git a/src/commands/studio/ModifyControlParameterCommand.h b/src/commands/studio/ModifyControlParameterCommand.h
index 1a32994..1821b9f 100644
--- 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>
 
 
 
diff --git a/src/commands/studio/ModifyDeviceCommand.h b/src/commands/studio/ModifyDeviceCommand.h
index f6c5289..c6f2fa2 100644
--- 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;
diff --git a/src/commands/studio/ModifyDeviceMappingCommand.h b/src/commands/studio/ModifyDeviceMappingCommand.h
index 824b07e..3f220b7 100644
--- 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;
diff --git a/src/commands/studio/ModifyInstrumentMappingCommand.h b/src/commands/studio/ModifyInstrumentMappingCommand.h
index f482008..32aa04f 100644
--- 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;
diff --git a/src/commands/studio/ReconnectDeviceCommand.h b/src/commands/studio/ReconnectDeviceCommand.h
index ba445a6..b094014 100644
--- 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>
 
 
 
diff --git a/src/commands/studio/RemoveControlParameterCommand.h b/src/commands/studio/RemoveControlParameterCommand.h
index 9b8f82f..2fc8eed 100644
--- 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>
 
 
 
diff --git a/src/commands/studio/RenameDeviceCommand.h b/src/commands/studio/RenameDeviceCommand.h
index 8e4f1f4..941817f 100644
--- 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>
 
 
 
diff --git a/src/document/MultiViewCommandHistory.cpp b/src/document/MultiViewCommandHistory.cpp
index 68efb3a..db7bfcd 100644
--- 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>
diff --git a/src/document/RoseXmlHandler.cpp b/src/document/RoseXmlHandler.cpp
index 1dc572b..4b6d932 100644
--- 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>
diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp
index e764273..5184076 100644
--- 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>
diff --git a/src/document/io/HydrogenXMLHandler.cpp b/src/document/io/HydrogenXMLHandler.cpp
index 9854648..d09a648 100644
--- 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"
diff --git a/src/document/io/LilyPondExporter.cpp b/src/document/io/LilyPondExporter.cpp
index 284fea2..b44b6f3 100644
--- 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>
diff --git a/src/gui/application/RosegardenApplication.cpp b/src/gui/application/RosegardenApplication.cpp
index 0a427a5..447df3d 100644
--- 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>
diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp
index c2f3068..fbc5fe4 100644
--- 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>
diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig
index b47bd1d..498cedb 100644
--- 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>
diff --git a/src/gui/application/RosegardenGUIView.cpp b/src/gui/application/RosegardenGUIView.cpp
index 40adbc6..a335dba 100644
--- 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>
diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp
index e14f657..3506d68 100644
--- 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>
diff --git a/src/gui/configuration/AudioConfigurationPage.cpp b/src/gui/configuration/AudioConfigurationPage.cpp
index 43c143a..49b854c 100644
--- 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
diff --git a/src/gui/configuration/AudioConfigurationPage.h b/src/gui/configuration/AudioConfigurationPage.h
index 2ff2776..4f31b0e 100644
--- 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;
diff --git a/src/gui/configuration/AudioPropertiesPage.h b/src/gui/configuration/AudioPropertiesPage.h
index 3e68f37..f226dcc 100644
--- 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;
diff --git a/src/gui/configuration/ColourConfigurationPage.h b/src/gui/configuration/ColourConfigurationPage.h
index e43fa4e..092ab1c 100644
--- 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;
diff --git a/src/gui/configuration/DocumentMetaConfigurationPage.h b/src/gui/configuration/DocumentMetaConfigurationPage.h
index e9a4f04..f41db1e 100644
--- 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;
diff --git a/src/gui/configuration/GeneralConfigurationPage.cpp b/src/gui/configuration/GeneralConfigurationPage.cpp
index 0dff640..2e4930e 100644
--- 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>
diff --git a/src/gui/configuration/GeneralConfigurationPage.h b/src/gui/configuration/GeneralConfigurationPage.h
index 2309ce4..2508099 100644
--- 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;
diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp
index b4f5339..c424c9e 100644
--- 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>
diff --git a/src/gui/configuration/LatencyConfigurationPage.h b/src/gui/configuration/LatencyConfigurationPage.h
index 21cd926..4aec527 100644
--- 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>
 
 
diff --git a/src/gui/configuration/MIDIConfigurationPage.h b/src/gui/configuration/MIDIConfigurationPage.h
index cf1c63b..78aff2f 100644
--- 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>
 
diff --git a/src/gui/configuration/MatrixConfigurationPage.h b/src/gui/configuration/MatrixConfigurationPage.h
index 3b9740e..e306f11 100644
--- 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;
diff --git a/src/gui/configuration/NotationConfigurationPage.cpp b/src/gui/configuration/NotationConfigurationPage.cpp
index 9bb61d7..e6a73ec 100644
--- 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>
diff --git a/src/gui/configuration/NotationConfigurationPage.h b/src/gui/configuration/NotationConfigurationPage.h
index 8ab2b0c..e72a1fd 100644
--- 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;
diff --git a/src/gui/dialogs/AddTracksDialog.cpp b/src/gui/dialogs/AddTracksDialog.cpp
index a41d10b..5754266 100644
--- 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>
diff --git a/src/gui/dialogs/AudioManagerDialog.cpp b/src/gui/dialogs/AudioManagerDialog.cpp
index 06e7d1b..6d53e22 100644
--- 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>
diff --git a/src/gui/dialogs/AudioPlayingDialog.cpp b/src/gui/dialogs/AudioPlayingDialog.cpp
index 524278e..7aa08c3 100644
--- 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>
diff --git a/src/gui/dialogs/AudioPluginDialog.cpp b/src/gui/dialogs/AudioPluginDialog.cpp
index 9258cd7..d522b8f 100644
--- 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"
diff --git a/src/gui/dialogs/AudioSplitDialog.cpp b/src/gui/dialogs/AudioSplitDialog.cpp
index ceec4b5..f7e3d07 100644
--- 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"
diff --git a/src/gui/dialogs/BeatsBarsDialog.cpp b/src/gui/dialogs/BeatsBarsDialog.cpp
index 3d02b64..c8fde70 100644
--- 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>
diff --git a/src/gui/dialogs/ClefDialog.cpp b/src/gui/dialogs/ClefDialog.cpp
index c566948..850571e 100644
--- 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>
diff --git a/src/gui/dialogs/CompositionLengthDialog.cpp b/src/gui/dialogs/CompositionLengthDialog.cpp
index 85d2530..0f32551 100644
--- 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>
diff --git a/src/gui/dialogs/ConfigureDialog.cpp b/src/gui/dialogs/ConfigureDialog.cpp
index 42276b6..6845eca 100644
--- 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"
diff --git a/src/gui/dialogs/ConfigureDialogBase.cpp b/src/gui/dialogs/ConfigureDialogBase.cpp
index 3102922..14ddd0c 100644
--- 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>
diff --git a/src/gui/dialogs/CountdownDialog.cpp b/src/gui/dialogs/CountdownDialog.cpp
index 537bc2b..aaccaf6 100644
--- 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>
diff --git a/src/gui/dialogs/DocumentConfigureDialog.cpp b/src/gui/dialogs/DocumentConfigureDialog.cpp
index bff4531..ef8a32d 100644
--- 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"
diff --git a/src/gui/dialogs/EventEditDialog.cpp b/src/gui/dialogs/EventEditDialog.cpp
index 6bd4752..941e631 100644
--- 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>
diff --git a/src/gui/dialogs/EventFilterDialog.cpp b/src/gui/dialogs/EventFilterDialog.cpp
index b765532..53760eb 100644
--- 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>
diff --git a/src/gui/dialogs/EventParameterDialog.cpp b/src/gui/dialogs/EventParameterDialog.cpp
index 98abb44..3669b40 100644
--- 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"
diff --git a/src/gui/dialogs/ExportDeviceDialog.cpp b/src/gui/dialogs/ExportDeviceDialog.cpp
index 348a5b8..0ca4024 100644
--- 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>
diff --git a/src/gui/dialogs/FileLocateDialog.cpp b/src/gui/dialogs/FileLocateDialog.cpp
index 04c3c20..83d84dc 100644
--- 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>
diff --git a/src/gui/dialogs/FileMergeDialog.cpp b/src/gui/dialogs/FileMergeDialog.cpp
index d7d48cf..6e4e59d 100644
--- 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>
diff --git a/src/gui/dialogs/IdentifyTextCodecDialog.cpp b/src/gui/dialogs/IdentifyTextCodecDialog.cpp
index 2c4f179..f1fabe0 100644
--- 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>
diff --git a/src/gui/dialogs/ImportDeviceDialog.cpp b/src/gui/dialogs/ImportDeviceDialog.cpp
index badf983..b232b06 100644
--- 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>
diff --git a/src/gui/dialogs/InterpretDialog.cpp b/src/gui/dialogs/InterpretDialog.cpp
index 2ed7922..caa8767 100644
--- 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>
diff --git a/src/gui/dialogs/IntervalDialog.cpp b/src/gui/dialogs/IntervalDialog.cpp
index 2a9b3ec..fb90371 100644
--- 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"
diff --git a/src/gui/dialogs/KeySignatureDialog.cpp b/src/gui/dialogs/KeySignatureDialog.cpp
index c79ff35..953f97f 100644
--- 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"
diff --git a/src/gui/dialogs/LilyPondOptionsDialog.cpp b/src/gui/dialogs/LilyPondOptionsDialog.cpp
index 9d0a5ec..4481e74 100644
--- 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>
diff --git a/src/gui/dialogs/LyricEditDialog.cpp b/src/gui/dialogs/LyricEditDialog.cpp
index f713d11..c73467d 100644
--- 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"
diff --git a/src/gui/dialogs/MakeOrnamentDialog.cpp b/src/gui/dialogs/MakeOrnamentDialog.cpp
index 8bd283f..d06168b 100644
--- 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>
diff --git a/src/gui/dialogs/ManageMetronomeDialog.cpp b/src/gui/dialogs/ManageMetronomeDialog.cpp
index 8335a83..6ecbc8d 100644
--- 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"
diff --git a/src/gui/dialogs/MarkerModifyDialog.cpp b/src/gui/dialogs/MarkerModifyDialog.cpp
index 9308303..ce4725f 100644
--- 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"
diff --git a/src/gui/dialogs/PasteNotationDialog.cpp b/src/gui/dialogs/PasteNotationDialog.cpp
index cb0aa43..c9af4aa 100644
--- 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>
diff --git a/src/gui/dialogs/PitchDialog.cpp b/src/gui/dialogs/PitchDialog.cpp
index c484142..3d0ea97 100644
--- 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>
diff --git a/src/gui/dialogs/PitchPickerDialog.cpp b/src/gui/dialogs/PitchPickerDialog.cpp
index 3853818..8620d83 100644
--- 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>
diff --git a/src/gui/dialogs/QuantizeDialog.cpp b/src/gui/dialogs/QuantizeDialog.cpp
index 87d7f79..ceb957e 100644
--- 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>
diff --git a/src/gui/dialogs/RescaleDialog.cpp b/src/gui/dialogs/RescaleDialog.cpp
index d30d247..537e45d 100644
--- 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"
diff --git a/src/gui/dialogs/ShowSequencerStatusDialog.cpp b/src/gui/dialogs/ShowSequencerStatusDialog.cpp
index 373712a..539a7bd 100644
--- 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>
diff --git a/src/gui/dialogs/SimpleEventEditDialog.cpp b/src/gui/dialogs/SimpleEventEditDialog.cpp
index 7597e69..80b25af 100644
--- 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>
diff --git a/src/gui/dialogs/SplitByPitchDialog.cpp b/src/gui/dialogs/SplitByPitchDialog.cpp
index aacad2c..dfd5367 100644
--- 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"
diff --git a/src/gui/dialogs/SplitByRecordingSrcDialog.cpp b/src/gui/dialogs/SplitByRecordingSrcDialog.cpp
index df23437..7348825 100644
--- 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"
diff --git a/src/gui/dialogs/TempoDialog.cpp b/src/gui/dialogs/TempoDialog.cpp
index 7d7bbd9..b8bf9e3 100644
--- 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"
diff --git a/src/gui/dialogs/TextEventDialog.cpp b/src/gui/dialogs/TextEventDialog.cpp
index a3cf30e..469548e 100644
--- 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"
diff --git a/src/gui/dialogs/TimeDialog.cpp b/src/gui/dialogs/TimeDialog.cpp
index d4eb4b6..ca7abbd 100644
--- 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>
diff --git a/src/gui/dialogs/TimeSignatureDialog.cpp b/src/gui/dialogs/TimeSignatureDialog.cpp
index c502380..f29bde2 100644
--- 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"
diff --git a/src/gui/dialogs/TransportDialog.cpp b/src/gui/dialogs/TransportDialog.cpp
index f1297e3..ebd386c 100644
--- 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>
diff --git a/src/gui/dialogs/TriggerSegmentDialog.cpp b/src/gui/dialogs/TriggerSegmentDialog.cpp
index e6d04bf..e1c245a 100644
--- 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"
diff --git a/src/gui/dialogs/TupletDialog.cpp b/src/gui/dialogs/TupletDialog.cpp
index 6dff628..a9ee1dc 100644
--- 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"
diff --git a/src/gui/dialogs/UnusedAudioSelectionDialog.cpp b/src/gui/dialogs/UnusedAudioSelectionDialog.cpp
index 8e4f40b..da05eab 100644
--- 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>
diff --git a/src/gui/dialogs/UseOrnamentDialog.cpp b/src/gui/dialogs/UseOrnamentDialog.cpp
index 9747418..1d6a4d9 100644
--- 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"
diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp
index 8ecbb27..2f7caa0 100644
--- 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>
diff --git a/src/gui/editors/guitar/Fingering.cpp b/src/gui/editors/guitar/Fingering.cpp
index 59459e9..caa98fe 100644
--- 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
 {
diff --git a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
index 8a4fb3e..79bec1e 100644
--- 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>
diff --git a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
index accbcc5..c1a6165 100644
--- 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
diff --git a/src/gui/editors/matrix/MatrixEraser.cpp b/src/gui/editors/matrix/MatrixEraser.cpp
index ffd1a59..db69d51 100644
--- a/src/gui/editors/matrix/MatrixEraser.cpp
+++ b/src/gui/editors/matrix/MatrixEraser.cpp
@@ -26,7 +26,7 @@
 #include "MatrixEraser.h"
 #include "misc/Debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "base/ViewElement.h"
 #include "commands/matrix/MatrixEraseCommand.h"
@@ -35,7 +35,7 @@
 #include "MatrixTool.h"
 #include "MatrixView.h"
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqiconset.h>
 #include <tqstring.h>
 
diff --git a/src/gui/editors/matrix/MatrixMover.cpp b/src/gui/editors/matrix/MatrixMover.cpp
index 50344ab..310786a 100644
--- a/src/gui/editors/matrix/MatrixMover.cpp
+++ b/src/gui/editors/matrix/MatrixMover.cpp
@@ -26,7 +26,7 @@
 #include "MatrixMover.h"
 
 #include "base/BaseProperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "base/Event.h"
 #include "base/Segment.h"
@@ -44,7 +44,7 @@
 #include "MatrixView.h"
 #include "MatrixVLayout.h"
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqiconset.h>
 #include <tqpoint.h>
 #include <tqstring.h>
diff --git a/src/gui/editors/matrix/MatrixPainter.cpp b/src/gui/editors/matrix/MatrixPainter.cpp
index e48e4ed..5a95f7d 100644
--- a/src/gui/editors/matrix/MatrixPainter.cpp
+++ b/src/gui/editors/matrix/MatrixPainter.cpp
@@ -26,7 +26,7 @@
 #include "MatrixPainter.h"
 
 #include "base/BaseProperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "base/Event.h"
 #include "base/NotationTypes.h"
@@ -43,7 +43,7 @@
 #include "MatrixTool.h"
 #include "MatrixView.h"
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqiconset.h>
 #include <tqpoint.h>
 #include <tqstring.h>
diff --git a/src/gui/editors/matrix/MatrixResizer.cpp b/src/gui/editors/matrix/MatrixResizer.cpp
index 167d464..6e2bd95 100644
--- a/src/gui/editors/matrix/MatrixResizer.cpp
+++ b/src/gui/editors/matrix/MatrixResizer.cpp
@@ -25,7 +25,7 @@
 
 #include "MatrixResizer.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "base/Event.h"
 #include "base/Segment.h"
@@ -41,7 +41,7 @@
 #include "MatrixTool.h"
 #include "MatrixView.h"
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqiconset.h>
 #include <tqpoint.h>
 #include <tqstring.h>
diff --git a/src/gui/editors/matrix/MatrixSelector.cpp b/src/gui/editors/matrix/MatrixSelector.cpp
index c75400b..3f9904d 100644
--- a/src/gui/editors/matrix/MatrixSelector.cpp
+++ b/src/gui/editors/matrix/MatrixSelector.cpp
@@ -26,7 +26,7 @@
 #include "MatrixSelector.h"
 
 #include "base/BaseProperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "base/Event.h"
 #include "base/NotationTypes.h"
@@ -47,7 +47,7 @@
 #include "MatrixTool.h"
 #include "MatrixView.h"
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tqdialog.h>
diff --git a/src/gui/editors/matrix/MatrixToolBox.cpp b/src/gui/editors/matrix/MatrixToolBox.cpp
index dab9632..1d2af4b 100644
--- a/src/gui/editors/matrix/MatrixToolBox.cpp
+++ b/src/gui/editors/matrix/MatrixToolBox.cpp
@@ -35,7 +35,7 @@
 #include "MatrixResizer.h"
 
 #include <tqstring.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 namespace Rosegarden
 {
diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp
index 8353ce2..5b3e411 100644
--- a/src/gui/editors/matrix/MatrixView.cpp
+++ b/src/gui/editors/matrix/MatrixView.cpp
@@ -102,14 +102,14 @@
 #include "PianoKeyboard.h"
 #include "sound/MappedEvent.h"
 #include "sound/SequencerDataBlock.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include <tdeaction.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdockwidget.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 #include <tdetoolbar.h>
 #include <kxmlguiclient.h>
diff --git a/src/gui/editors/notation/ClefInserter.cpp b/src/gui/editors/notation/ClefInserter.cpp
index 28198a2..d2d053f 100644
--- a/src/gui/editors/notation/ClefInserter.cpp
+++ b/src/gui/editors/notation/ClefInserter.cpp
@@ -25,7 +25,7 @@
 
 #include "ClefInserter.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/NotationTypes.h"
 #include "base/ViewElement.h"
diff --git a/src/gui/editors/notation/FontViewFrame.cpp b/src/gui/editors/notation/FontViewFrame.cpp
index a226ffb..40b686b 100644
--- a/src/gui/editors/notation/FontViewFrame.cpp
+++ b/src/gui/editors/notation/FontViewFrame.cpp
@@ -26,8 +26,8 @@
 #include "FontViewFrame.h"
 #include <tdeapplication.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqfontmetrics.h>
 #include <tqframe.h>
 #include <tqsize.h>
diff --git a/src/gui/editors/notation/GuitarChordInserter.cpp b/src/gui/editors/notation/GuitarChordInserter.cpp
index 0885b66..c35949e 100644
--- a/src/gui/editors/notation/GuitarChordInserter.cpp
+++ b/src/gui/editors/notation/GuitarChordInserter.cpp
@@ -25,7 +25,7 @@
 
 #include "GuitarChordInserter.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/Exception.h"
 #include "base/Staff.h"
diff --git a/src/gui/editors/notation/NotationEraser.cpp b/src/gui/editors/notation/NotationEraser.cpp
index 1908fcf..45aad1b 100644
--- a/src/gui/editors/notation/NotationEraser.cpp
+++ b/src/gui/editors/notation/NotationEraser.cpp
@@ -26,7 +26,7 @@
 #include "NotationEraser.h"
 #include <tdeapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "document/ConfigGroups.h"
 #include "base/ViewElement.h"
 #include "commands/notation/EraseEventCommand.h"
diff --git a/src/gui/editors/notation/NotationSelectionPaster.cpp b/src/gui/editors/notation/NotationSelectionPaster.cpp
index d3bba0e..e55bca6 100644
--- a/src/gui/editors/notation/NotationSelectionPaster.cpp
+++ b/src/gui/editors/notation/NotationSelectionPaster.cpp
@@ -25,7 +25,7 @@
 
 #include "NotationSelectionPaster.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/Selection.h"
 #include "base/ViewElement.h"
diff --git a/src/gui/editors/notation/NotationSelector.cpp b/src/gui/editors/notation/NotationSelector.cpp
index c6d1c68..0a4ab21 100644
--- a/src/gui/editors/notation/NotationSelector.cpp
+++ b/src/gui/editors/notation/NotationSelector.cpp
@@ -26,7 +26,7 @@
 #include "NotationSelector.h"
 #include "misc/Debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/NotationTypes.h"
 #include "base/PropertyName.h"
diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp
index 3e1bf28..d9c28e4 100644
--- a/src/gui/editors/notation/NotationStaff.cpp
+++ b/src/gui/editors/notation/NotationStaff.cpp
@@ -27,7 +27,7 @@
 #include "misc/Debug.h"
 #include <tdeapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "document/ConfigGroups.h"
 #include "base/Composition.h"
@@ -63,7 +63,7 @@
 #include "NotePixmapParameters.h"
 #include "NoteStyleFactory.h"
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqcanvas.h>
 #include <tqpainter.h>
 #include <tqpoint.h>
diff --git a/src/gui/editors/notation/NotationStrings.cpp b/src/gui/editors/notation/NotationStrings.cpp
index e46f95e..0554127 100644
--- a/src/gui/editors/notation/NotationStrings.cpp
+++ b/src/gui/editors/notation/NotationStrings.cpp
@@ -26,7 +26,7 @@
 #include "NotationStrings.h"
 #include <tdeapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "document/ConfigGroups.h"
 #include "base/Exception.h"
diff --git a/src/gui/editors/notation/NotationToolBox.cpp b/src/gui/editors/notation/NotationToolBox.cpp
index 7632413..f04162c 100644
--- a/src/gui/editors/notation/NotationToolBox.cpp
+++ b/src/gui/editors/notation/NotationToolBox.cpp
@@ -37,7 +37,7 @@
 #include "NotationSelector.h"
 
 #include <tqstring.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 namespace Rosegarden
 {
diff --git a/src/gui/editors/notation/NotationVLayout.cpp b/src/gui/editors/notation/NotationVLayout.cpp
index 5afaa4a..3366e20 100644
--- a/src/gui/editors/notation/NotationVLayout.cpp
+++ b/src/gui/editors/notation/NotationVLayout.cpp
@@ -26,7 +26,7 @@
 #include "NotationVLayout.h"
 #include "misc/Debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Composition.h"
 #include "base/Event.h"
 #include "base/LayoutEngine.h"
@@ -41,7 +41,7 @@
 #include "NotationProperties.h"
 #include "NotationStaff.h"
 #include "NotePixmapFactory.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqobject.h>
 #include <tqstring.h>
 #include <tqwidget.h>
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index 3059de3..35ddd87 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -32,7 +32,7 @@
 #include "gui/editors/segment/TrackEditor.h"
 #include "gui/editors/segment/TrackButtons.h"
 #include "base/BaseProperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "misc/Strings.h"
 #include "base/AnalysisTypes.h"
@@ -183,15 +183,15 @@
 #include <tdeaction.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineeditdlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprinter.h>
 #include <kprocess.h>
 #include <kprogress.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdetoolbar.h>
 #include <kxmlguiclient.h>
 #include <tqbrush.h>
diff --git a/src/gui/editors/notation/NotationView.h b/src/gui/editors/notation/NotationView.h
index 352e5e9..b8282d8 100644
--- a/src/gui/editors/notation/NotationView.h
+++ b/src/gui/editors/notation/NotationView.h
@@ -34,7 +34,7 @@
 #include "NotationCanvasView.h"
 #include <string>
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqmap.h>
 #include <tqsize.h>
 #include <tqstring.h>
diff --git a/src/gui/editors/notation/NoteFontFactory.cpp b/src/gui/editors/notation/NoteFontFactory.cpp
index b13f45b..d924ffc 100644
--- a/src/gui/editors/notation/NoteFontFactory.cpp
+++ b/src/gui/editors/notation/NoteFontFactory.cpp
@@ -27,7 +27,7 @@
 #include "misc/Debug.h"
 #include <tdeapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "misc/Strings.h"
 #include "document/ConfigGroups.h"
@@ -36,8 +36,8 @@
 #include "NoteFont.h"
 #include "NoteFontMap.h"
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <tqdir.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/src/gui/editors/notation/NoteFontMap.cpp b/src/gui/editors/notation/NoteFontMap.cpp
index 3060375..f557a08 100644
--- a/src/gui/editors/notation/NoteFontMap.cpp
+++ b/src/gui/editors/notation/NoteFontMap.cpp
@@ -26,12 +26,12 @@
 #include "NoteFontMap.h"
 #include "misc/Debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "misc/Strings.h"
 #include "base/Exception.h"
 #include "SystemFont.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqpixmap.h>
diff --git a/src/gui/editors/notation/NoteFontViewer.cpp b/src/gui/editors/notation/NoteFontViewer.cpp
index 2474ec1..9327b20 100644
--- a/src/gui/editors/notation/NoteFontViewer.cpp
+++ b/src/gui/editors/notation/NoteFontViewer.cpp
@@ -25,7 +25,7 @@
 
 #include "NoteFontViewer.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "FontViewFrame.h"
 #include <kcombobox.h>
 #include <kdialogbase.h>
diff --git a/src/gui/editors/notation/NoteInserter.cpp b/src/gui/editors/notation/NoteInserter.cpp
index 609b6cf..9763f7c 100644
--- a/src/gui/editors/notation/NoteInserter.cpp
+++ b/src/gui/editors/notation/NoteInserter.cpp
@@ -28,7 +28,7 @@
 #include <tdeapplication.h>
 
 #include "base/BaseProperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Strings.h"
 #include "document/ConfigGroups.h"
 #include "base/Event.h"
diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp
index e2f69cb..a190d5f 100644
--- a/src/gui/editors/notation/NotePixmapFactory.cpp
+++ b/src/gui/editors/notation/NotePixmapFactory.cpp
@@ -28,7 +28,7 @@
 #include "base/NotationRules.h"
 #include <tdeapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include <tdeconfig.h>
 #include "misc/Strings.h"
@@ -54,8 +54,8 @@
 #include "NotePixmapPainter.h"
 #include "NoteStyleFactory.h"
 #include "NoteStyle.h"
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <tqbitmap.h>
 #include <tqcolor.h>
 #include <tqfile.h>
diff --git a/src/gui/editors/notation/NoteStyleFactory.cpp b/src/gui/editors/notation/NoteStyleFactory.cpp
index 340a657..784218b 100644
--- a/src/gui/editors/notation/NoteStyleFactory.cpp
+++ b/src/gui/editors/notation/NoteStyleFactory.cpp
@@ -32,7 +32,7 @@
 #include "NotationProperties.h"
 #include "NoteStyle.h"
 #include "NoteStyleFileReader.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqdir.h>
 #include <tqfileinfo.h>
 #include <tqstring.h>
diff --git a/src/gui/editors/notation/NoteStyleFileReader.cpp b/src/gui/editors/notation/NoteStyleFileReader.cpp
index d8a552f..bcab138 100644
--- a/src/gui/editors/notation/NoteStyleFileReader.cpp
+++ b/src/gui/editors/notation/NoteStyleFileReader.cpp
@@ -29,9 +29,9 @@
 #include <tqfileinfo.h>
 #include <tqdir.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "misc/Strings.h"
 #include "NotationStrings.h"
diff --git a/src/gui/editors/notation/RestInserter.cpp b/src/gui/editors/notation/RestInserter.cpp
index 2dccf65..31b29d9 100644
--- a/src/gui/editors/notation/RestInserter.cpp
+++ b/src/gui/editors/notation/RestInserter.cpp
@@ -25,7 +25,7 @@
 
 #include "RestInserter.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/NotationTypes.h"
 #include "base/BaseProperties.h"
diff --git a/src/gui/editors/notation/TextInserter.cpp b/src/gui/editors/notation/TextInserter.cpp
index 84a832e..a812f07 100644
--- a/src/gui/editors/notation/TextInserter.cpp
+++ b/src/gui/editors/notation/TextInserter.cpp
@@ -25,7 +25,7 @@
 
 #include "TextInserter.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Event.h"
 #include "base/Exception.h"
 #include "base/NotationTypes.h"
diff --git a/src/gui/editors/notation/TrackHeader.cpp b/src/gui/editors/notation/TrackHeader.cpp
index 1b73889..61215ea 100644
--- a/src/gui/editors/notation/TrackHeader.cpp
+++ b/src/gui/editors/notation/TrackHeader.cpp
@@ -49,7 +49,7 @@
 #include <utility>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqsize.h>
 #include <tqwidget.h>
 #include <tqhbox.h>
diff --git a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
index ddd9d6a..cdabe74 100644
--- 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"
diff --git a/src/gui/editors/parameters/InstrumentParameterBox.cpp b/src/gui/editors/parameters/InstrumentParameterBox.cpp
index a47edef..60323f6 100644
--- 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"
diff --git a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
index f3c137f..cd42eb8 100644
--- 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"
diff --git a/src/gui/editors/parameters/RosegardenParameterBox.h b/src/gui/editors/parameters/RosegardenParameterBox.h
index e7fbfef..716c3bc 100644
--- 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;
diff --git a/src/gui/editors/parameters/SegmentParameterBox.cpp b/src/gui/editors/parameters/SegmentParameterBox.cpp
index e6c3beb..7f2ee49 100644
--- 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"
diff --git a/src/gui/editors/parameters/TrackParameterBox.cpp b/src/gui/editors/parameters/TrackParameterBox.cpp
index 347ee8a..566a952 100644
--- 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>
diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp
index e91f9f1..d064d0c 100644
--- a/src/gui/editors/segment/ControlEditorDialog.cpp
+++ b/src/gui/editors/segment/ControlEditorDialog.cpp
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tdeapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "base/Colour.h"
diff --git a/src/gui/editors/segment/ControlParameterEditDialog.cpp b/src/gui/editors/segment/ControlParameterEditDialog.cpp
index a7d794b..253e7c6 100644
--- a/src/gui/editors/segment/ControlParameterEditDialog.cpp
+++ b/src/gui/editors/segment/ControlParameterEditDialog.cpp
@@ -26,7 +26,7 @@
 #include "ControlParameterEditDialog.h"
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "base/Colour.h"
diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index 922b385..66d44a7 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -28,7 +28,7 @@
 #include <tqlayout.h>
 #include <tdeapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include <tdestdaccel.h>
 #include <tdeconfig.h>
@@ -46,7 +46,7 @@
 #include "gui/dialogs/MarkerModifyDialog.h"
 #include <tdeaction.h>
 #include <kcommand.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdelistview.h>
 #include <tdemainwindow.h>
 #include <tdestdaccel.h>
diff --git a/src/gui/editors/segment/PlayList.cpp b/src/gui/editors/segment/PlayList.cpp
index 58d59cc..ccb54d6 100644
--- a/src/gui/editors/segment/PlayList.cpp
+++ b/src/gui/editors/segment/PlayList.cpp
@@ -29,10 +29,10 @@
 #include "document/ConfigGroups.h"
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kurl.h>
 #include <tqframe.h>
 #include <tqpushbutton.h>
diff --git a/src/gui/editors/segment/PlayListView.cpp b/src/gui/editors/segment/PlayListView.cpp
index bbaa4b3..dbf7a0a 100644
--- a/src/gui/editors/segment/PlayListView.cpp
+++ b/src/gui/editors/segment/PlayListView.cpp
@@ -24,7 +24,7 @@
 
 #include "PlayListView.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdragobject.h>
 
 namespace Rosegarden {
diff --git a/src/gui/editors/segment/TrackButtons.cpp b/src/gui/editors/segment/TrackButtons.cpp
index e4eb458..6d2b9eb 100644
--- a/src/gui/editors/segment/TrackButtons.cpp
+++ b/src/gui/editors/segment/TrackButtons.cpp
@@ -26,7 +26,7 @@
 #include "TrackButtons.h"
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
@@ -47,9 +47,9 @@
 #include "sound/PluginIdentifier.h"
 #include "TrackLabel.h"
 #include "TrackVUMeter.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kled.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqcursor.h>
 #include <tqframe.h>
 #include <tqiconset.h>
diff --git a/src/gui/editors/segment/TrackEditor.cpp b/src/gui/editors/segment/TrackEditor.cpp
index 0638aba..c4e13a2 100644
--- a/src/gui/editors/segment/TrackEditor.cpp
+++ b/src/gui/editors/segment/TrackEditor.cpp
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tdeapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstddirs.h>
 #include "misc/Debug.h"
@@ -62,8 +62,8 @@
 #include "TrackEditorIface.h"
 #include <dcopobject.h>
 #include <kcommand.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <tqapplication.h>
 #include <tqcursor.h>
 #include <tqfont.h>
diff --git a/src/gui/editors/segment/TrackLabel.cpp b/src/gui/editors/segment/TrackLabel.cpp
index 49b3afc..5adc1af 100644
--- a/src/gui/editors/segment/TrackLabel.cpp
+++ b/src/gui/editors/segment/TrackLabel.cpp
@@ -25,7 +25,7 @@
 
 #include "TrackLabel.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "base/Track.h"
 #include <klineeditdlg.h>
 #include <tqfont.h>
diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp
index c26cc15..3435abd 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.cpp
+++ b/src/gui/editors/segment/TriggerSegmentManager.cpp
@@ -29,7 +29,7 @@
 #include <tdeapplication.h>
 
 #include "base/BaseProperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
@@ -49,10 +49,10 @@
 #include "gui/general/MidiPitchLabel.h"
 #include <tdeaction.h>
 #include <kcommand.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdelistview.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <tdeconfig.h>
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
index 0380d9e..b7cce97 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
@@ -46,7 +46,7 @@
 #include "SegmentSelector.h"
 #include "SegmentToolBox.h"
 #include "SegmentTool.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqbrush.h>
 #include <tqcolor.h>
 #include <tqevent.h>
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentEraser.cpp b/src/gui/editors/segment/segmentcanvas/SegmentEraser.cpp
index 3c4a7ae..b34fe20 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentEraser.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentEraser.cpp
@@ -36,7 +36,7 @@
 #include <kcommand.h>
 #include <tqpoint.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Rosegarden
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentJoiner.cpp b/src/gui/editors/segment/segmentcanvas/SegmentJoiner.cpp
index 71a3ca3..6361a55 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentJoiner.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentJoiner.cpp
@@ -34,7 +34,7 @@
 #include <kcommand.h>
 #include <tqpoint.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Rosegarden
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp b/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
index 04da855..eaf5735 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
@@ -26,7 +26,7 @@
 #include "SegmentMover.h"
 
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "base/Composition.h"
 #include "base/RealTime.h"
@@ -48,7 +48,7 @@
 #include <tqpoint.h>
 #include <tqrect.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Rosegarden
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentOrderer.cpp b/src/gui/editors/segment/segmentcanvas/SegmentOrderer.cpp
index 4262eb9..0b5629e 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentOrderer.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentOrderer.cpp
@@ -28,7 +28,7 @@
 #include "misc/Debug.h"
 #include "base/Composition.h"
 #include "base/Segment.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Rosegarden
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp b/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp
index 8f4399c..c29bc73 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp
@@ -41,7 +41,7 @@
 #include "gui/general/RosegardenCanvasView.h"
 #include "SegmentTool.h"
 #include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcursor.h>
 #include <tqevent.h>
 #include <tqpoint.h>
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp b/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp
index 4c4c884..befedad 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp
@@ -26,7 +26,7 @@
 #include "SegmentResizer.h"
 
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "base/Composition.h"
 #include "base/NotationTypes.h"
@@ -48,7 +48,7 @@
 #include "gui/widgets/ProgressDialog.h"
 #include "SegmentTool.h"
 #include <kcommand.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqcursor.h>
 #include <tqevent.h>
 #include <tqpoint.h>
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
index fe61e78..e8fbae8 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
@@ -26,7 +26,7 @@
 #include "SegmentSelector.h"
 
 #include "base/Event.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "misc/Debug.h"
 #include "base/Composition.h"
 #include "base/RealTime.h"
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSplitter.cpp b/src/gui/editors/segment/segmentcanvas/SegmentSplitter.cpp
index d5fe45a..42ba2a3 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentSplitter.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentSplitter.cpp
@@ -40,7 +40,7 @@
 #include <tqpoint.h>
 #include <tqrect.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Rosegarden
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
index 5ce8a58..ca359c9 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
@@ -37,7 +37,7 @@
 #include "SegmentResizer.h"
 #include "SegmentSplitter.h"
 #include <tqstring.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 namespace Rosegarden
 {
diff --git a/src/gui/editors/tempo/TempoView.cpp b/src/gui/editors/tempo/TempoView.cpp
index 2041515..bad04b3 100644
--- 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>
diff --git a/src/gui/general/EditToolBox.cpp b/src/gui/general/EditToolBox.cpp
index 48fa7e4..19b0714 100644
--- 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
 {
diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp
index 551e48a..0ad2e69 100644
--- 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>
diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp
index 5194349..0591a8c 100644
--- 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>
diff --git a/src/gui/general/MidiPitchLabel.cpp b/src/gui/general/MidiPitchLabel.cpp
index 82667b6..ba42587 100644
--- 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>
 
 
diff --git a/src/gui/general/PresetGroup.cpp b/src/gui/general/PresetGroup.cpp
index 9eb17ba..353b7d4 100644
--- 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>
diff --git a/src/gui/general/PresetHandlerDialog.cpp b/src/gui/general/PresetHandlerDialog.cpp
index a1ce9d5..1dc7db1 100644
--- 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"
diff --git a/src/gui/kdeext/KTmpStatusMsg.cpp b/src/gui/kdeext/KTmpStatusMsg.cpp
index 6051009..57214f3 100644
--- 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"
diff --git a/src/gui/rulers/ChordNameRuler.cpp b/src/gui/rulers/ChordNameRuler.cpp
index 26a5145..0854af6 100644
--- 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"
diff --git a/src/gui/rulers/ControlChangeCommand.cpp b/src/gui/rulers/ControlChangeCommand.cpp
index 6d90d0d..ccbce4e 100644
--- 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 {
 
diff --git a/src/gui/rulers/ControlRulerEventEraseCommand.cpp b/src/gui/rulers/ControlRulerEventEraseCommand.cpp
index 743ee16..807877d 100644
--- 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
 {
diff --git a/src/gui/rulers/ControlRulerEventInsertCommand.cpp b/src/gui/rulers/ControlRulerEventInsertCommand.cpp
index ab6a73c..b7302f8 100644
--- 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
 {
diff --git a/src/gui/rulers/ControllerEventsRuler.cpp b/src/gui/rulers/ControllerEventsRuler.cpp
index fef6e15..d220929 100644
--- 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"
diff --git a/src/gui/rulers/LoopRuler.cpp b/src/gui/rulers/LoopRuler.cpp
index cd6932e..eb012c5 100644
--- 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>
diff --git a/src/gui/rulers/MarkerRuler.cpp b/src/gui/rulers/MarkerRuler.cpp
index 7bb97eb..16ad5ba 100644
--- 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>
diff --git a/src/gui/rulers/PropertyViewRuler.cpp b/src/gui/rulers/PropertyViewRuler.cpp
index 2a39713..3e74c36 100644
--- 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"
diff --git a/src/gui/rulers/RawNoteRuler.cpp b/src/gui/rulers/RawNoteRuler.cpp
index 30029bc..a9c8187 100644
--- 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>
diff --git a/src/gui/rulers/StandardRuler.cpp b/src/gui/rulers/StandardRuler.cpp
index 4869d84..e943ec7 100644
--- 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"
diff --git a/src/gui/rulers/TempoRuler.cpp b/src/gui/rulers/TempoRuler.cpp
index fe81cf2..18b1ab3 100644
--- 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>
diff --git a/src/gui/seqmanager/CompositionMmapper.cpp b/src/gui/seqmanager/CompositionMmapper.cpp
index 543959d..c86fbab 100644
--- 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>
diff --git a/src/gui/seqmanager/ControlBlockMmapper.cpp b/src/gui/seqmanager/ControlBlockMmapper.cpp
index 2d64c57..ec4810b 100644
--- 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>
diff --git a/src/gui/seqmanager/MetronomeMmapper.cpp b/src/gui/seqmanager/MetronomeMmapper.cpp
index ab46191..196c481 100644
--- 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>
 
diff --git a/src/gui/seqmanager/MidiFilterDialog.cpp b/src/gui/seqmanager/MidiFilterDialog.cpp
index 0227eff..1988f2a 100644
--- 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"
diff --git a/src/gui/seqmanager/SequenceManager.cpp b/src/gui/seqmanager/SequenceManager.cpp
index e0b0b2d..cc6d52b 100644
--- 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>
diff --git a/src/gui/seqmanager/SpecialSegmentMmapper.cpp b/src/gui/seqmanager/SpecialSegmentMmapper.cpp
index e556820..45a87fd 100644
--- 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>
 
 
diff --git a/src/gui/studio/AudioMixerWindow.cpp b/src/gui/studio/AudioMixerWindow.cpp
index f983cb9..abdb387 100644
--- 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>
diff --git a/src/gui/studio/AudioPluginOSCGUIManager.cpp b/src/gui/studio/AudioPluginOSCGUIManager.cpp
index 7b8bbd3..0a0ab7e 100644
--- 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"
diff --git a/src/gui/studio/BankEditorDialog.cpp b/src/gui/studio/BankEditorDialog.cpp
index 14a0636..40937c2 100644
--- 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>
diff --git a/src/gui/studio/ChangeRecordDeviceCommand.h b/src/gui/studio/ChangeRecordDeviceCommand.h
index 70819db..cb47c22 100644
--- 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
diff --git a/src/gui/studio/DeviceEditorDialog.cpp b/src/gui/studio/DeviceEditorDialog.cpp
index dc80ff6..9d19cc0 100644
--- 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>
diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp
index 8c8f160..0bc9b8d 100644
--- 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>
diff --git a/src/gui/studio/MidiBankListViewItem.cpp b/src/gui/studio/MidiBankListViewItem.cpp
index 599eb9e..b568772 100644
--- 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"
diff --git a/src/gui/studio/MidiDeviceListViewItem.cpp b/src/gui/studio/MidiDeviceListViewItem.cpp
index bfece9e..e155568 100644
--- 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>
diff --git a/src/gui/studio/MidiKeyMapListViewItem.cpp b/src/gui/studio/MidiKeyMapListViewItem.cpp
index dd77055..9136d80 100644
--- 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>
 
 
diff --git a/src/gui/studio/MidiKeyMappingEditor.cpp b/src/gui/studio/MidiKeyMappingEditor.cpp
index 0a607ad..11c8c6b 100644
--- 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"
diff --git a/src/gui/studio/MidiMixerWindow.cpp b/src/gui/studio/MidiMixerWindow.cpp
index 088369b..0c62685 100644
--- 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"
diff --git a/src/gui/studio/MidiProgramsEditor.cpp b/src/gui/studio/MidiProgramsEditor.cpp
index 25cad16..21ea94a 100644
--- 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>
diff --git a/src/gui/studio/NameSetEditor.cpp b/src/gui/studio/NameSetEditor.cpp
index d349543..5f8438d 100644
--- 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>
diff --git a/src/gui/studio/RemapInstrumentDialog.cpp b/src/gui/studio/RemapInstrumentDialog.cpp
index a957650..b06d334 100644
--- 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>
diff --git a/src/gui/studio/SynthPluginManagerDialog.cpp b/src/gui/studio/SynthPluginManagerDialog.cpp
index ba57efc..6d0d14a 100644
--- 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"
diff --git a/src/gui/widgets/AudioFaderBox.cpp b/src/gui/widgets/AudioFaderBox.cpp
index 3313a79..070e334 100644
--- 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>
diff --git a/src/gui/widgets/AudioRouteMenu.cpp b/src/gui/widgets/AudioRouteMenu.cpp
index 89cd416..8c3adce 100644
--- 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>
diff --git a/src/gui/widgets/CollapsingFrame.cpp b/src/gui/widgets/CollapsingFrame.cpp
index 93fc146..804fa31 100644
--- 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>
diff --git a/src/gui/widgets/ColourTable.cpp b/src/gui/widgets/ColourTable.cpp
index 2cceca4..8855166 100644
--- 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"
diff --git a/src/gui/widgets/DiatonicPitchChooser.cpp b/src/gui/widgets/DiatonicPitchChooser.cpp
index 539a8fb..091ef8b 100644
--- 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"
diff --git a/src/gui/widgets/PitchChooser.cpp b/src/gui/widgets/PitchChooser.cpp
index 869d11c..3ecc632 100644
--- 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>
diff --git a/src/gui/widgets/ProgressDialog.cpp b/src/gui/widgets/ProgressDialog.cpp
index 7cef518..e01368b 100644
--- 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>
diff --git a/src/gui/widgets/QuantizeParameters.cpp b/src/gui/widgets/QuantizeParameters.cpp
index 5a6076f..adc52a9 100644
--- 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"
diff --git a/src/gui/widgets/Rotary.cpp b/src/gui/widgets/Rotary.cpp
index f1475c4..0090500 100644
--- 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>
diff --git a/src/gui/widgets/TimeWidget.cpp b/src/gui/widgets/TimeWidget.cpp
index 0edc963..4ea48dd 100644
--- 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"
diff --git a/src/misc/stableheaders.h b/src/misc/stableheaders.h
index 777f75f..9068e14 100644
--- 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>
diff --git a/src/sequencer/MmappedSegment.h b/src/sequencer/MmappedSegment.h
index 0becead..6ab4420 100644
--- 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>
diff --git a/src/sequencer/RosegardenSequencerApp.cpp b/src/sequencer/RosegardenSequencerApp.cpp
index 637a5e8..6a96e20 100644
--- 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>
diff --git a/src/sequencer/main.cpp b/src/sequencer/main.cpp
index 89c96a2..80de453 100644
--- 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"
diff --git a/src/sound/AudioFileManager.cpp b/src/sound/AudioFileManager.cpp
index ec762d9..a5aa89c 100644
--- 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>
author	Timothy Pearson <[email protected]>	2013-02-15 21:51:32 -0600
committer	Timothy Pearson <[email protected]>	2013-02-15 21:51:32 -0600
commit	5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb (patch)
tree	7fdeb64e5bef896a23bdf46847e3ffd3ec460cda /src
parent	3f02581883759395fcd3935ec1d88ddca4895f32 (diff)
download	rosegarden-5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb.tar.gz rosegarden-5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb.zip