Initial TQt conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1172292 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

212 files changed, 402 insertions, 402 deletions

diff --git a/src/commands/edit/AddDotCommand.cpp b/src/commands/edit/AddDotCommand.cpp
index b69a25c..f4b802c 100644
--- a/src/commands/edit/AddDotCommand.cpp
+++ b/src/commands/edit/AddDotCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/NotationTypes.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/edit/AddDotCommand.h b/src/commands/edit/AddDotCommand.h
index a88da26..e173bb8 100644
--- a/src/commands/edit/AddDotCommand.h
+++ b/src/commands/edit/AddDotCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADDDOTCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -48,7 +48,7 @@ public:
         m_notationOnly(notationOnly)
     { }
 
-    static QString getGlobalName() {
+    static TQString getGlobalName() {
         return i18n("&Add Dot");
     }
 
diff --git a/src/commands/edit/AddMarkerCommand.cpp b/src/commands/edit/AddMarkerCommand.cpp
index b7c665a..528ee96 100644
--- a/src/commands/edit/AddMarkerCommand.cpp
+++ b/src/commands/edit/AddMarkerCommand.cpp
@@ -27,7 +27,7 @@
 
 #include "base/Composition.h"
 #include "base/Marker.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/edit/AddMarkerCommand.h b/src/commands/edit/AddMarkerCommand.h
index 80f15c1..3506817 100644
--- a/src/commands/edit/AddMarkerCommand.h
+++ b/src/commands/edit/AddMarkerCommand.h
@@ -28,7 +28,7 @@
 
 #include <string>
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 
@@ -51,7 +51,7 @@ public:
                      const std::string &description);
     ~AddMarkerCommand();
 
-    static QString getGlobalName() { return i18n("&Add Marker"); }
+    static TQString getGlobalName() { return i18n("&Add Marker"); }
 
     virtual void execute();
     virtual void unexecute();
diff --git a/src/commands/edit/ChangeVelocityCommand.cpp b/src/commands/edit/ChangeVelocityCommand.cpp
index fc1c1ea..9098cdf 100644
--- a/src/commands/edit/ChangeVelocityCommand.cpp
+++ b/src/commands/edit/ChangeVelocityCommand.cpp
@@ -28,7 +28,7 @@
 #include "base/NotationTypes.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/BaseProperties.h"
 
 
diff --git a/src/commands/edit/ChangeVelocityCommand.h b/src/commands/edit/ChangeVelocityCommand.h
index a0a51b1..f4a458d 100644
--- a/src/commands/edit/ChangeVelocityCommand.h
+++ b/src/commands/edit/ChangeVelocityCommand.h
@@ -27,7 +27,7 @@
 #define _RG_CHANGEVELOCITYCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -49,7 +49,7 @@ public:
         BasicSelectionCommand(getGlobalName(delta), selection, true),
         m_selection(&selection), m_delta(delta) { }
 
-    static QString getGlobalName(int delta = 0) {
+    static TQString getGlobalName(int delta = 0) {
         if (delta > 0) return i18n("&Increase Velocity");
         else return i18n("&Reduce Velocity");
     }
diff --git a/src/commands/edit/ClearTriggersCommand.cpp b/src/commands/edit/ClearTriggersCommand.cpp
index 3b58405..fbdb5a6 100644
--- a/src/commands/edit/ClearTriggersCommand.cpp
+++ b/src/commands/edit/ClearTriggersCommand.cpp
@@ -27,7 +27,7 @@
 
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/BaseProperties.h"
 
 
diff --git a/src/commands/edit/ClearTriggersCommand.h b/src/commands/edit/ClearTriggersCommand.h
index 077e270..5372f93 100644
--- a/src/commands/edit/ClearTriggersCommand.h
+++ b/src/commands/edit/ClearTriggersCommand.h
@@ -27,7 +27,7 @@
 #define _RG_CLEARTRIGGERSCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -43,12 +43,12 @@ class ClearTriggersCommand : public BasicSelectionCommand
 {
 public:
     ClearTriggersCommand(EventSelection &selection,
-                         QString name = 0) :
+                         TQString name = 0) :
         BasicSelectionCommand(name ? name : getGlobalName(), selection, true),
         m_selection(&selection)
     { }
 
-    static QString getGlobalName() {
+    static TQString getGlobalName() {
         return i18n("&Clear Triggers");
     }
 
diff --git a/src/commands/edit/CollapseNotesCommand.cpp b/src/commands/edit/CollapseNotesCommand.cpp
index 225d34c..937ab43 100644
--- a/src/commands/edit/CollapseNotesCommand.cpp
+++ b/src/commands/edit/CollapseNotesCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/SegmentNotationHelper.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/edit/CollapseNotesCommand.h b/src/commands/edit/CollapseNotesCommand.h
index 9d3a0fc..5655b4e 100644
--- a/src/commands/edit/CollapseNotesCommand.h
+++ b/src/commands/edit/CollapseNotesCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADJUSTMENUCOLLAPSENOTESCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -47,7 +47,7 @@ public:
         BasicSelectionCommand(getGlobalName(), selection, true),
         m_selection(&selection) { }
 
-    static QString getGlobalName() { return i18n("Collapse &Equal-Pitch Notes"); }
+    static TQString getGlobalName() { return i18n("Collapse &Equal-Pitch Notes"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/edit/CopyCommand.cpp b/src/commands/edit/CopyCommand.cpp
index 38aa628..cd86359 100644
--- a/src/commands/edit/CopyCommand.cpp
+++ b/src/commands/edit/CopyCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/Clipboard.h"
 #include "base/Composition.h"
 #include "base/Selection.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
@@ -56,7 +56,7 @@ CopyCommand::CopyCommand(SegmentSelection &selection,
 
     for (SegmentSelection::iterator i = selection.begin();
             i != selection.end(); ++i) {
-        QString newLabel = strtoqstr((*i)->getLabel());
+        TQString newLabel = strtoqstr((*i)->getLabel());
         if (newLabel.contains(i18n("(copied)"))) {
             m_sourceClipboard->newSegment(*i);
         } else {
diff --git a/src/commands/edit/CopyCommand.h b/src/commands/edit/CopyCommand.h
index 29d6dc7..9f1bc1a 100644
--- a/src/commands/edit/CopyCommand.h
+++ b/src/commands/edit/CopyCommand.h
@@ -27,7 +27,7 @@
 #define _RG_COPYCOMMAND_H_
 
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 
@@ -64,7 +64,7 @@ public:
 
     virtual ~CopyCommand();
 
-    static QString getGlobalName() { return i18n("&Copy"); }
+    static TQString getGlobalName() { return i18n("&Copy"); }
 
     virtual void execute();
     virtual void unexecute();
diff --git a/src/commands/edit/CutAndCloseCommand.cpp b/src/commands/edit/CutAndCloseCommand.cpp
index a99b4ef..959920b 100644
--- a/src/commands/edit/CutAndCloseCommand.cpp
+++ b/src/commands/edit/CutAndCloseCommand.cpp
@@ -30,7 +30,7 @@
 #include "base/Segment.h"
 #include "base/Selection.h"
 #include "CutCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "misc/Debug.h"
 
 
diff --git a/src/commands/edit/CutAndCloseCommand.h b/src/commands/edit/CutAndCloseCommand.h
index 4be5809..e98df09 100644
--- a/src/commands/edit/CutAndCloseCommand.h
+++ b/src/commands/edit/CutAndCloseCommand.h
@@ -27,7 +27,7 @@
 #define _RG_CUTANDCLOSECOMMAND_H_
 
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 
@@ -50,7 +50,7 @@ public:
     CutAndCloseCommand(EventSelection &selection,
                        Clipboard *clipboard);
 
-    static QString getGlobalName() { return i18n("C&ut and Close"); }
+    static TQString getGlobalName() { return i18n("C&ut and Close"); }
 
 protected:
     class CloseCommand : public KNamedCommand
diff --git a/src/commands/edit/CutCommand.cpp b/src/commands/edit/CutCommand.cpp
index 9d54089..78cbe85 100644
--- a/src/commands/edit/CutCommand.cpp
+++ b/src/commands/edit/CutCommand.cpp
@@ -30,7 +30,7 @@
 #include "commands/segment/SegmentEraseCommand.h"
 #include "CopyCommand.h"
 #include "EraseCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/edit/CutCommand.h b/src/commands/edit/CutCommand.h
index 186736c..87b929d 100644
--- a/src/commands/edit/CutCommand.h
+++ b/src/commands/edit/CutCommand.h
@@ -26,7 +26,7 @@
 #ifndef _RG_CUTCOMMAND_H_
 #define _RG_CUTCOMMAND_H_
 
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 #include <kcommand.h>
 
@@ -52,7 +52,7 @@ public:
     CutCommand(SegmentSelection &selection,
                Clipboard *clipboard);
 
-    static QString getGlobalName() { return i18n("Cu&t"); }
+    static TQString getGlobalName() { return i18n("Cu&t"); }
 };
 
 
diff --git a/src/commands/edit/EraseCommand.cpp b/src/commands/edit/EraseCommand.cpp
index 8649885..246eb5f 100644
--- a/src/commands/edit/EraseCommand.cpp
+++ b/src/commands/edit/EraseCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/NotationTypes.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/edit/EraseCommand.h b/src/commands/edit/EraseCommand.h
index 4e583ad..a662640 100644
--- a/src/commands/edit/EraseCommand.h
+++ b/src/commands/edit/EraseCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ERASECOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 
@@ -47,7 +47,7 @@ class EraseCommand : public BasicSelectionCommand
 public:
     EraseCommand(EventSelection &selection);
 
-    static QString getGlobalName() { return i18n("&Erase"); }
+    static TQString getGlobalName() { return i18n("&Erase"); }
 
     virtual timeT getRelayoutEndTime();
 
diff --git a/src/commands/edit/EventEditCommand.cpp b/src/commands/edit/EventEditCommand.cpp
index ef31be2..10bfe80 100644
--- a/src/commands/edit/EventEditCommand.cpp
+++ b/src/commands/edit/EventEditCommand.cpp
@@ -28,7 +28,7 @@
 #include "base/Event.h"
 #include "base/Segment.h"
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/edit/EventEditCommand.h b/src/commands/edit/EventEditCommand.h
index 5f22a1e..53abf73 100644
--- a/src/commands/edit/EventEditCommand.h
+++ b/src/commands/edit/EventEditCommand.h
@@ -28,7 +28,7 @@
 
 #include "base/Event.h"
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -52,7 +52,7 @@ public:
                      Event *eventToModify,
                      const Event &newEvent);
 
-    static QString getGlobalName() { return i18n("Edit E&vent"); }
+    static TQString getGlobalName() { return i18n("Edit E&vent"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/edit/EventQuantizeCommand.cpp b/src/commands/edit/EventQuantizeCommand.cpp
index 775a32f..95943ba 100644
--- a/src/commands/edit/EventQuantizeCommand.cpp
+++ b/src/commands/edit/EventQuantizeCommand.cpp
@@ -37,7 +37,7 @@
 #include "base/Selection.h"
 #include "document/BasicCommand.h"
 #include <kconfig.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/BaseProperties.h"
 #include "gui/application/RosegardenApplication.h"
 #include <kapplication.h>
@@ -76,7 +76,7 @@ EventQuantizeCommand::EventQuantizeCommand(EventSelection &selection,
 EventQuantizeCommand::EventQuantizeCommand(Segment &segment,
         timeT startTime,
         timeT endTime,
-        QString configGroup,
+        TQString configGroup,
         bool notation):
         BasicCommand(getGlobalName(makeQuantizer(configGroup, notation)),
                      segment, startTime, endTime,
@@ -88,7 +88,7 @@ EventQuantizeCommand::EventQuantizeCommand(Segment &segment,
 }
 
 EventQuantizeCommand::EventQuantizeCommand(EventSelection &selection,
-        QString configGroup,
+        TQString configGroup,
         bool notation):
         BasicCommand(getGlobalName(makeQuantizer(configGroup, notation)),
                      selection.getSegment(),
@@ -198,7 +198,7 @@ EventQuantizeCommand::modifySegment()
 }
 
 Quantizer *
-EventQuantizeCommand::makeQuantizer(QString configGroup,
+EventQuantizeCommand::makeQuantizer(TQString configGroup,
                                     bool notationDefault)
 {
     //!!! Excessive duplication with
diff --git a/src/commands/edit/EventQuantizeCommand.h b/src/commands/edit/EventQuantizeCommand.h
index 6ae1303..0d50678 100644
--- a/src/commands/edit/EventQuantizeCommand.h
+++ b/src/commands/edit/EventQuantizeCommand.h
@@ -23,12 +23,12 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RG_EVENTQUANTIZECOMMAND_H_
-#define _RG_EVENTQUANTIZECOMMAND_H_
+#ifndef _RG_EVENQUANTIZECOMMAND_H_
+#define _RG_EVENQUANTIZECOMMAND_H_
 
 #include "document/BasicCommand.h"
-#include <qobject.h>
-#include <qstring.h>
+#include <tqobject.h>
+#include <tqstring.h>
 #include "base/Event.h"
 
 
@@ -42,7 +42,7 @@ class Quantizer;
 class EventSelection;
 
 
-class EventQuantizeCommand : public QObject, public BasicCommand
+class EventQuantizeCommand : public TQObject, public BasicCommand
 {
     Q_OBJECT
 
@@ -61,17 +61,17 @@ public:
     EventQuantizeCommand(Segment &segment,
                          timeT startTime,
                          timeT endTime,
-                         QString configGroup,
+                         TQString configGroup,
                          bool notationDefault);
     
     /// Constructs own quantizer based on KConfig data in given group
     EventQuantizeCommand(EventSelection &selection,
-                         QString configGroup,
+                         TQString configGroup,
                          bool notationDefault);
 
     ~EventQuantizeCommand();
     
-    static QString getGlobalName(Quantizer *quantizer = 0);
+    static TQString getGlobalName(Quantizer *quantizer = 0);
     void setProgressTotal(int total) { m_progressTotal = total; }
 
 signals:
@@ -83,11 +83,11 @@ protected:
 private:
     Quantizer *m_quantizer; // I own this
     EventSelection *m_selection;
-    QString m_configGroup;
+    TQString m_configGroup;
     int m_progressTotal;
 
     /// Sets to m_quantizer as well as returning value
-    Quantizer *makeQuantizer(QString, bool);
+    Quantizer *makeQuantizer(TQString, bool);
 };
 
 // Collapse equal-pitch notes into one event
diff --git a/src/commands/edit/EventUnquantizeCommand.cpp b/src/commands/edit/EventUnquantizeCommand.cpp
index 5a8a07e..7e7ce58 100644
--- a/src/commands/edit/EventUnquantizeCommand.cpp
+++ b/src/commands/edit/EventUnquantizeCommand.cpp
@@ -30,7 +30,7 @@
 #include "base/Segment.h"
 #include "base/Selection.h"
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/edit/EventUnquantizeCommand.h b/src/commands/edit/EventUnquantizeCommand.h
index fca3a3c..4203726 100644
--- a/src/commands/edit/EventUnquantizeCommand.h
+++ b/src/commands/edit/EventUnquantizeCommand.h
@@ -27,7 +27,7 @@
 #define _RG_EVENTUNQUANTIZECOMMAND_H_
 
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 
 
@@ -56,7 +56,7 @@ public:
 
     ~EventUnquantizeCommand();
     
-    static QString getGlobalName(Quantizer *quantizer = 0);
+    static TQString getGlobalName(Quantizer *quantizer = 0);
     
 protected:
     virtual void modifySegment();
diff --git a/src/commands/edit/InvertCommand.cpp b/src/commands/edit/InvertCommand.cpp
index 053bcf9..44850e1 100644
--- a/src/commands/edit/InvertCommand.cpp
+++ b/src/commands/edit/InvertCommand.cpp
@@ -28,7 +28,7 @@
 #include "base/NotationTypes.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/BaseProperties.h"
 
 
diff --git a/src/commands/edit/InvertCommand.h b/src/commands/edit/InvertCommand.h
index 5bea38d..8a47cb9 100644
--- a/src/commands/edit/InvertCommand.h
+++ b/src/commands/edit/InvertCommand.h
@@ -27,7 +27,7 @@
 #define _RG_INVERTCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -46,7 +46,7 @@ public:
         BasicSelectionCommand(getGlobalName(semitones), selection, true),
         m_selection(&selection), m_semitones(semitones) { }
 
-    static QString getGlobalName(int semitones = 0) {
+    static TQString getGlobalName(int semitones = 0) {
         switch (semitones) {
         default:  return i18n("&Invert");
         }
diff --git a/src/commands/edit/ModifyMarkerCommand.cpp b/src/commands/edit/ModifyMarkerCommand.cpp
index 367f545..777b76a 100644
--- a/src/commands/edit/ModifyMarkerCommand.cpp
+++ b/src/commands/edit/ModifyMarkerCommand.cpp
@@ -26,7 +26,7 @@
 #include "ModifyMarkerCommand.h"
 
 #include "base/Composition.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/edit/ModifyMarkerCommand.h b/src/commands/edit/ModifyMarkerCommand.h
index 6a7e99f..392f0ff 100644
--- a/src/commands/edit/ModifyMarkerCommand.h
+++ b/src/commands/edit/ModifyMarkerCommand.h
@@ -28,7 +28,7 @@
 
 #include <string>
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 
@@ -52,7 +52,7 @@ public:
                         const std::string &des);
     ~ModifyMarkerCommand();
 
-    static QString getGlobalName() { return i18n("&Modify Marker"); }
+    static TQString getGlobalName() { return i18n("&Modify Marker"); }
 
     virtual void execute();
     virtual void unexecute();
diff --git a/src/commands/edit/MoveAcrossSegmentsCommand.cpp b/src/commands/edit/MoveAcrossSegmentsCommand.cpp
index 3363d65..f0b954a 100644
--- a/src/commands/edit/MoveAcrossSegmentsCommand.cpp
+++ b/src/commands/edit/MoveAcrossSegmentsCommand.cpp
@@ -31,7 +31,7 @@
 #include "base/Selection.h"
 #include "CutCommand.h"
 #include "PasteEventsCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/edit/MoveAcrossSegmentsCommand.h b/src/commands/edit/MoveAcrossSegmentsCommand.h
index ac3ee39..de4fca2 100644
--- a/src/commands/edit/MoveAcrossSegmentsCommand.h
+++ b/src/commands/edit/MoveAcrossSegmentsCommand.h
@@ -26,7 +26,7 @@
 #ifndef _RG_MOVEACROSSSEGMENTSCOMMAND_H_
 #define _RG_MOVEACROSSSEGMENTSCOMMAND_H_
 
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <kcommand.h>
 
@@ -50,7 +50,7 @@ public:
                               EventSelection &selection);
     virtual ~MoveAcrossSegmentsCommand();
 
-    static QString getGlobalName();
+    static TQString getGlobalName();
 
 private:
     Clipboard *m_clipboard;
diff --git a/src/commands/edit/MoveCommand.cpp b/src/commands/edit/MoveCommand.cpp
index 5df08a7..58667fc 100644
--- a/src/commands/edit/MoveCommand.cpp
+++ b/src/commands/edit/MoveCommand.cpp
@@ -32,7 +32,7 @@
 #include "base/SegmentNotationHelper.h"
 #include "base/Selection.h"
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/edit/MoveCommand.h b/src/commands/edit/MoveCommand.h
index 79c0081..5212a08 100644
--- a/src/commands/edit/MoveCommand.h
+++ b/src/commands/edit/MoveCommand.h
@@ -27,7 +27,7 @@
 #define _RG_MOVECOMMAND_H_
 
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 
 
@@ -49,7 +49,7 @@ public:
                 bool useNotationTimings,
                 EventSelection &selection);
     
-    static QString getGlobalName(timeT delta = 0);
+    static TQString getGlobalName(timeT delta = 0);
 
     Event *getLastInsertedEvent() { return m_lastInsertedEvent; }
 
diff --git a/src/commands/edit/PasteEventsCommand.cpp b/src/commands/edit/PasteEventsCommand.cpp
index f6fd323..2e2e458 100644
--- a/src/commands/edit/PasteEventsCommand.cpp
+++ b/src/commands/edit/PasteEventsCommand.cpp
@@ -32,7 +32,7 @@
 #include "base/Segment.h"
 #include "base/SegmentNotationHelper.h"
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/BaseProperties.h"
 
 
diff --git a/src/commands/edit/PasteEventsCommand.h b/src/commands/edit/PasteEventsCommand.h
index 3a26b25..66aea6d 100644
--- a/src/commands/edit/PasteEventsCommand.h
+++ b/src/commands/edit/PasteEventsCommand.h
@@ -29,7 +29,7 @@
 #include "document/BasicCommand.h"
 #include "base/Selection.h"
 #include <map>
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 
@@ -56,7 +56,7 @@ public:
         MatrixOverlay           // overlay raw matrix-style
     };
 
-    typedef std::map<PasteType, QString> PasteTypeMap;
+    typedef std::map<PasteType, TQString> PasteTypeMap;
     static PasteTypeMap getPasteTypes(); // type, descrip
 
     /**
@@ -87,7 +87,7 @@ public:
 
     EventSelection getPastedEvents();
 
-    static QString getGlobalName() { return i18n("&Paste"); }
+    static TQString getGlobalName() { return i18n("&Paste"); }
 
     /// Determine whether this paste will succeed (without executing it yet)
     bool isPossible();
diff --git a/src/commands/edit/PasteSegmentsCommand.cpp b/src/commands/edit/PasteSegmentsCommand.cpp
index ab3372a..12d243d 100644
--- a/src/commands/edit/PasteSegmentsCommand.cpp
+++ b/src/commands/edit/PasteSegmentsCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/Composition.h"
 #include "base/Segment.h"
 #include "base/Track.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/edit/PasteSegmentsCommand.h b/src/commands/edit/PasteSegmentsCommand.h
index 3f45914..4b0063c 100644
--- a/src/commands/edit/PasteSegmentsCommand.h
+++ b/src/commands/edit/PasteSegmentsCommand.h
@@ -28,7 +28,7 @@
 
 #include "base/Track.h"
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <vector>
 #include "base/Event.h"
 #include <klocale.h>
@@ -57,7 +57,7 @@ public:
 
     virtual ~PasteSegmentsCommand();
 
-    static QString getGlobalName() { return i18n("&Paste"); }
+    static TQString getGlobalName() { return i18n("&Paste"); }
 
     virtual void execute();
     virtual void unexecute();
diff --git a/src/commands/edit/RemoveMarkerCommand.cpp b/src/commands/edit/RemoveMarkerCommand.cpp
index af3c839..6c8172b 100644
--- a/src/commands/edit/RemoveMarkerCommand.cpp
+++ b/src/commands/edit/RemoveMarkerCommand.cpp
@@ -27,7 +27,7 @@
 
 #include "base/Composition.h"
 #include "base/Marker.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/edit/RemoveMarkerCommand.h b/src/commands/edit/RemoveMarkerCommand.h
index 2acaf53..da58872 100644
--- a/src/commands/edit/RemoveMarkerCommand.h
+++ b/src/commands/edit/RemoveMarkerCommand.h
@@ -28,7 +28,7 @@
 
 #include <string>
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 
@@ -52,7 +52,7 @@ public:
                         const std::string &description);
     ~RemoveMarkerCommand();
 
-    static QString getGlobalName() { return i18n("&Remove Marker"); }
+    static TQString getGlobalName() { return i18n("&Remove Marker"); }
 
     virtual void execute();
     virtual void unexecute();
diff --git a/src/commands/edit/RescaleCommand.cpp b/src/commands/edit/RescaleCommand.cpp
index 764969c..b29d725 100644
--- a/src/commands/edit/RescaleCommand.cpp
+++ b/src/commands/edit/RescaleCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/Segment.h"
 #include "base/Selection.h"
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/edit/RescaleCommand.h b/src/commands/edit/RescaleCommand.h
index 362de24..801c660 100644
--- a/src/commands/edit/RescaleCommand.h
+++ b/src/commands/edit/RescaleCommand.h
@@ -27,7 +27,7 @@
 #define _RG_RESCALECOMMAND_H_
 
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 
@@ -47,7 +47,7 @@ public:
                    timeT newDuration,
                    bool closeGap);
 
-    static QString getGlobalName() { return i18n("Stretch or S&quash..."); }
+    static TQString getGlobalName() { return i18n("Stretch or S&quash..."); }
     
 protected:
     virtual void modifySegment();
diff --git a/src/commands/edit/RetrogradeCommand.cpp b/src/commands/edit/RetrogradeCommand.cpp
index 955f066..670a45a 100644
--- a/src/commands/edit/RetrogradeCommand.cpp
+++ b/src/commands/edit/RetrogradeCommand.cpp
@@ -31,7 +31,7 @@
 #include "base/Segment.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/edit/RetrogradeCommand.h b/src/commands/edit/RetrogradeCommand.h
index 526a95d..4c7bde1 100644
--- a/src/commands/edit/RetrogradeCommand.h
+++ b/src/commands/edit/RetrogradeCommand.h
@@ -27,7 +27,7 @@
 #define _RG_RETROGRADECOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -46,7 +46,7 @@ public:
         BasicSelectionCommand(getGlobalName(semitones), selection, true),
         m_selection(&selection), m_semitones(semitones) { }
 
-    static QString getGlobalName(int semitones = 0) {
+    static TQString getGlobalName(int semitones = 0) {
         switch (semitones) {
         default:  return i18n("&Retrograde");
         }
diff --git a/src/commands/edit/RetrogradeInvertCommand.cpp b/src/commands/edit/RetrogradeInvertCommand.cpp
index 3387c9b..c5e3e1b 100644
--- a/src/commands/edit/RetrogradeInvertCommand.cpp
+++ b/src/commands/edit/RetrogradeInvertCommand.cpp
@@ -31,7 +31,7 @@
 #include "base/Segment.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/BaseProperties.h"
 
 
diff --git a/src/commands/edit/RetrogradeInvertCommand.h b/src/commands/edit/RetrogradeInvertCommand.h
index ea7d540..155f1ea 100644
--- a/src/commands/edit/RetrogradeInvertCommand.h
+++ b/src/commands/edit/RetrogradeInvertCommand.h
@@ -27,7 +27,7 @@
 #define _RG_RETROGRADEINVERTCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -46,7 +46,7 @@ public:
         BasicSelectionCommand(getGlobalName(semitones), selection, true),
         m_selection(&selection), m_semitones(semitones) { }
 
-    static QString getGlobalName(int semitones = 0) {
+    static TQString getGlobalName(int semitones = 0) {
         switch (semitones) {
         default:  return i18n("Re&trograde Invert");
         }
diff --git a/src/commands/edit/SelectionPropertyCommand.cpp b/src/commands/edit/SelectionPropertyCommand.cpp
index 3501e5b..a5beebe 100644
--- a/src/commands/edit/SelectionPropertyCommand.cpp
+++ b/src/commands/edit/SelectionPropertyCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/PropertyName.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/edit/SelectionPropertyCommand.h b/src/commands/edit/SelectionPropertyCommand.h
index 34c5352..a28b98c 100644
--- a/src/commands/edit/SelectionPropertyCommand.h
+++ b/src/commands/edit/SelectionPropertyCommand.h
@@ -28,7 +28,7 @@
 
 #include "base/PropertyName.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -63,7 +63,7 @@ public:
                              int value1,
                              int value2);
 
-    static QString getGlobalName() { return i18n("Set &Property"); }
+    static TQString getGlobalName() { return i18n("Set &Property"); }
 
     virtual void modifySegment();
 
diff --git a/src/commands/edit/SetLyricsCommand.cpp b/src/commands/edit/SetLyricsCommand.cpp
index 16f5be4..cfee2bf 100644
--- a/src/commands/edit/SetLyricsCommand.cpp
+++ b/src/commands/edit/SetLyricsCommand.cpp
@@ -32,9 +32,9 @@
 #include "base/NotationTypes.h"
 #include "base/Segment.h"
 #include "base/BaseProperties.h"
-#include <qregexp.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqregexp.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 
 
 namespace Rosegarden
@@ -42,7 +42,7 @@ namespace Rosegarden
 
 using namespace BaseProperties;
 
-SetLyricsCommand::SetLyricsCommand(Segment *segment, int verse, QString newLyricData) :
+SetLyricsCommand::SetLyricsCommand(Segment *segment, int verse, TQString newLyricData) :
         KNamedCommand(getGlobalName()),
         m_segment(segment),
         m_verse(verse),
@@ -93,26 +93,26 @@ SetLyricsCommand::execute()
 
     // now parse the new string
 
-    QStringList barStrings =
-        QStringList::split("/", m_newLyricData, true); // empties ok
+    TQStringList barStrings =
+        TQStringList::split("/", m_newLyricData, true); // empties ok
 
     Composition *comp = m_segment->getComposition();
     int barNo = comp->getBarNumber(m_segment->getStartTime());
 
-    for (QStringList::Iterator bsi = barStrings.begin();
+    for (TQStringList::Iterator bsi = barStrings.begin();
             bsi != barStrings.end(); ++bsi) {
 
         NOTATION_DEBUG << "Parsing lyrics for bar number " << barNo << ": \"" << *bsi << "\"" << endl;
 
         std::pair<timeT, timeT> barRange = comp->getBarRange(barNo++);
-        QString syllables = *bsi;
-        syllables.replace(QRegExp("\\[\\d+\\] "), " ");
-        QStringList syllableList = QStringList::split(" ", syllables); // no empties
+        TQString syllables = *bsi;
+        syllables.replace(TQRegExp("\\[\\d+\\] "), " ");
+        TQStringList syllableList = TQStringList::split(" ", syllables); // no empties
 
         i = m_segment->findTime(barRange.first);
         timeT laterThan = barRange.first - 1;
 
-        for (QStringList::Iterator ssi = syllableList.begin();
+        for (TQStringList::Iterator ssi = syllableList.begin();
                 ssi != syllableList.end(); ++ssi) {
 
             while (m_segment->isBeforeEndMarker(i) &&
@@ -130,8 +130,8 @@ SetLyricsCommand::execute()
                 notationTime = (*i)->getNotationAbsoluteTime();
             }
 
-            QString syllable = *ssi;
-            syllable.replace(QRegExp("~"), " ");
+            TQString syllable = *ssi;
+            syllable.replace(TQRegExp("~"), " ");
             syllable = syllable.simplifyWhiteSpace();
             if (syllable == "")
                 continue;
diff --git a/src/commands/edit/SetLyricsCommand.h b/src/commands/edit/SetLyricsCommand.h
index 499f12a..1d42150 100644
--- a/src/commands/edit/SetLyricsCommand.h
+++ b/src/commands/edit/SetLyricsCommand.h
@@ -27,7 +27,7 @@
 #define _RG_SETLYRICSCOMMAND_H_
 
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <vector>
 #include <klocale.h>
 
@@ -44,10 +44,10 @@ class Event;
 class SetLyricsCommand : public KNamedCommand
 {
 public:
-    SetLyricsCommand(Segment *segment, int verse, QString newLyricData);
+    SetLyricsCommand(Segment *segment, int verse, TQString newLyricData);
     ~SetLyricsCommand();
     
-    static QString getGlobalName() { return i18n("Edit L&yrics"); }
+    static TQString getGlobalName() { return i18n("Edit L&yrics"); }
 
     virtual void execute();
     virtual void unexecute();
@@ -56,7 +56,7 @@ private:
     Segment *m_segment;
     int m_verse;
     std::vector<Event *> m_oldLyricEvents;
-    QString m_newLyricData;
+    TQString m_newLyricData;
 };
 
 
diff --git a/src/commands/edit/SetNoteTypeCommand.cpp b/src/commands/edit/SetNoteTypeCommand.cpp
index 4dc97b1..7cf7d11 100644
--- a/src/commands/edit/SetNoteTypeCommand.cpp
+++ b/src/commands/edit/SetNoteTypeCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/NotationTypes.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/edit/SetNoteTypeCommand.h b/src/commands/edit/SetNoteTypeCommand.h
index eec4a4c..42d3327 100644
--- a/src/commands/edit/SetNoteTypeCommand.h
+++ b/src/commands/edit/SetNoteTypeCommand.h
@@ -28,7 +28,7 @@
 
 #include "base/NotationTypes.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -52,7 +52,7 @@ public:
         m_notationOnly(notationOnly)
     { }
 
-    static QString getGlobalName() {
+    static TQString getGlobalName() {
         return i18n("&Set Note Type");
     }
 
diff --git a/src/commands/edit/SetTriggerCommand.cpp b/src/commands/edit/SetTriggerCommand.cpp
index 861796e..c678be3 100644
--- a/src/commands/edit/SetTriggerCommand.cpp
+++ b/src/commands/edit/SetTriggerCommand.cpp
@@ -30,7 +30,7 @@
 #include "base/TriggerSegment.h"
 #include "document/BasicSelectionCommand.h"
 #include "base/BaseProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/edit/SetTriggerCommand.h b/src/commands/edit/SetTriggerCommand.h
index 579bb61..898bf0b 100644
--- a/src/commands/edit/SetTriggerCommand.h
+++ b/src/commands/edit/SetTriggerCommand.h
@@ -29,7 +29,7 @@
 #include "base/TriggerSegment.h"
 #include "document/BasicSelectionCommand.h"
 #include <string>
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -50,7 +50,7 @@ public:
                       bool retune,
                       std::string timeAdjust,
                       Mark mark,
-                      QString name = 0) :
+                      TQString name = 0) :
         BasicSelectionCommand(name ? name : getGlobalName(), selection, true),
         m_selection(&selection),
         m_triggerSegmentId(triggerSegmentId),
@@ -60,7 +60,7 @@ public:
         m_mark(mark)
     { }
 
-    static QString getGlobalName() {
+    static TQString getGlobalName() {
         return i18n("Tri&gger Segment");
     }
 
diff --git a/src/commands/edit/TransposeCommand.cpp b/src/commands/edit/TransposeCommand.cpp
index 4d08079..23742ab 100644
--- a/src/commands/edit/TransposeCommand.cpp
+++ b/src/commands/edit/TransposeCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/NotationTypes.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/BaseProperties.h"
 
 
diff --git a/src/commands/edit/TransposeCommand.h b/src/commands/edit/TransposeCommand.h
index 764f72b..6e3ddfd 100644
--- a/src/commands/edit/TransposeCommand.h
+++ b/src/commands/edit/TransposeCommand.h
@@ -27,7 +27,7 @@
 #define _RG_TRANSPOSECOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -50,13 +50,13 @@ public:
         BasicSelectionCommand(getDiatonicGlobalName(semitones, steps), selection, true),
         m_selection(&selection), m_semitones(semitones), m_steps(steps), m_diatonic(true) { }
 
-    static QString getDiatonicGlobalName(int semitones = 0, int step = 0) {
+    static TQString getDiatonicGlobalName(int semitones = 0, int step = 0) {
         switch (semitones) {
         default:  return i18n("Transpose by &Interval...");
         }
     }
 
-    static QString getGlobalName(int semitones = 0) {
+    static TQString getGlobalName(int semitones = 0) {
         switch (semitones) {
         case   1: return i18n("&Up a Semitone");
         case  -1: return i18n("&Down a Semitone");
diff --git a/src/commands/notation/AddFingeringMarkCommand.cpp b/src/commands/notation/AddFingeringMarkCommand.cpp
index 0c2e895..e8031ff 100644
--- a/src/commands/notation/AddFingeringMarkCommand.cpp
+++ b/src/commands/notation/AddFingeringMarkCommand.cpp
@@ -32,14 +32,14 @@
 #include "base/Selection.h"
 #include "base/Sets.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
 {
 
 QString
-AddFingeringMarkCommand::getGlobalName(QString fingering)
+AddFingeringMarkCommand::getGlobalName(TQString fingering)
 {
     if (fingering == "")
         return i18n("Add Other &Fingering...");
diff --git a/src/commands/notation/AddFingeringMarkCommand.h b/src/commands/notation/AddFingeringMarkCommand.h
index 1d95002..e044ef7 100644
--- a/src/commands/notation/AddFingeringMarkCommand.h
+++ b/src/commands/notation/AddFingeringMarkCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <string>
-#include <qstring.h>
+#include <tqstring.h>
 
 
 
@@ -47,7 +47,7 @@ public:
         BasicSelectionCommand(getGlobalName(), selection, true),
         m_selection(&selection), m_text(text) { }
 
-    static QString getGlobalName(QString fingering = "");
+    static TQString getGlobalName(TQString fingering = "");
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/AddIndicationCommand.cpp b/src/commands/notation/AddIndicationCommand.cpp
index 717463d..73aceb6 100644
--- a/src/commands/notation/AddIndicationCommand.cpp
+++ b/src/commands/notation/AddIndicationCommand.cpp
@@ -34,7 +34,7 @@
 #include "base/Selection.h"
 #include "document/BasicCommand.h"
 #include "gui/editors/notation/NotationProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
@@ -164,7 +164,7 @@ AddIndicationCommand::getGlobalName(std::string indicationType)
         return i18n("Add &Glissando");
     }
 
-    QString n = i18n("Add &%1%2").arg((char)toupper(indicationType[0])).arg(strtoqstr(indicationType.substr(1)));
+    TQString n = i18n("Add &%1%2").arg((char)toupper(indicationType[0])).arg(strtoqstr(indicationType.substr(1)));
     return n;
 }
 
diff --git a/src/commands/notation/AddIndicationCommand.h b/src/commands/notation/AddIndicationCommand.h
index c43dc3a..396a488 100644
--- a/src/commands/notation/AddIndicationCommand.h
+++ b/src/commands/notation/AddIndicationCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicCommand.h"
 #include <string>
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 
 
@@ -59,7 +59,7 @@ public:
         return getStartTime() + m_indicationDuration;
     }
 
-    static QString getGlobalName(std::string indicationType);
+    static TQString getGlobalName(std::string indicationType);
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/AddMarkCommand.cpp b/src/commands/notation/AddMarkCommand.cpp
index 5b30431..0fa8268 100644
--- a/src/commands/notation/AddMarkCommand.cpp
+++ b/src/commands/notation/AddMarkCommand.cpp
@@ -30,7 +30,7 @@
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
 #include "base/BaseProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
@@ -41,7 +41,7 @@ using namespace BaseProperties;
 QString
 AddMarkCommand::getGlobalName(Mark markType)
 {
-    QString m = strtoqstr(markType);
+    TQString m = strtoqstr(markType);
 
     // Gosh, lots of collisions
     if (markType == Marks::Sforzando)
diff --git a/src/commands/notation/AddMarkCommand.h b/src/commands/notation/AddMarkCommand.h
index 5bc36b4..5382417 100644
--- a/src/commands/notation/AddMarkCommand.h
+++ b/src/commands/notation/AddMarkCommand.h
@@ -27,7 +27,7 @@
 #define _RG_NOTESMENUADDMARKCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 
@@ -46,7 +46,7 @@ public:
         BasicSelectionCommand(getGlobalName(mark), selection, true),
         m_selection(&selection), m_mark(mark) { }
 
-    static QString getGlobalName(Mark mark);
+    static TQString getGlobalName(Mark mark);
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/AddTextMarkCommand.cpp b/src/commands/notation/AddTextMarkCommand.cpp
index d3de487..3983152 100644
--- a/src/commands/notation/AddTextMarkCommand.cpp
+++ b/src/commands/notation/AddTextMarkCommand.cpp
@@ -28,7 +28,7 @@
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
 #include "base/BaseProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/AddTextMarkCommand.h b/src/commands/notation/AddTextMarkCommand.h
index b4037cc..00cf66b 100644
--- a/src/commands/notation/AddTextMarkCommand.h
+++ b/src/commands/notation/AddTextMarkCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include <string>
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -48,7 +48,7 @@ public:
         BasicSelectionCommand(getGlobalName(), selection, true),
         m_selection(&selection), m_text(text) { }
 
-    static QString getGlobalName() { return i18n("Add Te&xt Mark..."); }
+    static TQString getGlobalName() { return i18n("Add Te&xt Mark..."); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/AutoBeamCommand.cpp b/src/commands/notation/AutoBeamCommand.cpp
index 04c243d..860e9cf 100644
--- a/src/commands/notation/AutoBeamCommand.cpp
+++ b/src/commands/notation/AutoBeamCommand.cpp
@@ -30,7 +30,7 @@
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
 #include "base/BaseProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/AutoBeamCommand.h b/src/commands/notation/AutoBeamCommand.h
index b26caf1..e437af7 100644
--- a/src/commands/notation/AutoBeamCommand.h
+++ b/src/commands/notation/AutoBeamCommand.h
@@ -27,7 +27,7 @@
 #define _RG_NOTESMENUAUTOBEAMCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -49,7 +49,7 @@ public:
     AutoBeamCommand(Segment &segment) :
         BasicSelectionCommand(getGlobalName(), segment) { }
 
-    static QString getGlobalName() { return i18n("&Auto-Beam"); }
+    static TQString getGlobalName() { return i18n("&Auto-Beam"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/BeamCommand.cpp b/src/commands/notation/BeamCommand.cpp
index fb75dcb..8e572e7 100644
--- a/src/commands/notation/BeamCommand.cpp
+++ b/src/commands/notation/BeamCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
 #include "base/BaseProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/BeamCommand.h b/src/commands/notation/BeamCommand.h
index 9fd112b..8456af2 100644
--- a/src/commands/notation/BeamCommand.h
+++ b/src/commands/notation/BeamCommand.h
@@ -27,7 +27,7 @@
 #define _RG_NOTESMENUBEAMCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -46,7 +46,7 @@ public:
         BasicSelectionCommand(getGlobalName(), selection, true),
         m_selection(&selection) { }
 
-    static QString getGlobalName() { return i18n("&Beam Group"); }
+    static TQString getGlobalName() { return i18n("&Beam Group"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/BreakCommand.cpp b/src/commands/notation/BreakCommand.cpp
index ae74e37..ccb64d1 100644
--- a/src/commands/notation/BreakCommand.cpp
+++ b/src/commands/notation/BreakCommand.cpp
@@ -29,7 +29,7 @@
 #include "document/BasicSelectionCommand.h"
 #include "gui/editors/notation/NotationProperties.h"
 #include "base/BaseProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/BreakCommand.h b/src/commands/notation/BreakCommand.h
index 5c95a33..c4b234e 100644
--- a/src/commands/notation/BreakCommand.h
+++ b/src/commands/notation/BreakCommand.h
@@ -27,7 +27,7 @@
 #define _RG_NOTESMENUBREAKCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -46,7 +46,7 @@ public:
         BasicSelectionCommand(getGlobalName(), selection, true),
         m_selection(&selection) { }
 
-    static QString getGlobalName() { return i18n("&Unbeam"); }
+    static TQString getGlobalName() { return i18n("&Unbeam"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/ChangeSlurPositionCommand.cpp b/src/commands/notation/ChangeSlurPositionCommand.cpp
index dc2ff0b..cc8613b 100644
--- a/src/commands/notation/ChangeSlurPositionCommand.cpp
+++ b/src/commands/notation/ChangeSlurPositionCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
 #include "gui/editors/notation/NotationProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/ChangeSlurPositionCommand.h b/src/commands/notation/ChangeSlurPositionCommand.h
index 11c4bce..e8a4911 100644
--- a/src/commands/notation/ChangeSlurPositionCommand.h
+++ b/src/commands/notation/ChangeSlurPositionCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADJUSTMENUCHANGESLURPOSITIONCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -47,7 +47,7 @@ public:
         BasicSelectionCommand(getGlobalName(above), selection, true),
         m_selection(&selection), m_above(above) { }
 
-    static QString getGlobalName(bool above) {
+    static TQString getGlobalName(bool above) {
         return above ? i18n("Slur &Above") : i18n("Slur &Below");
     }
 
diff --git a/src/commands/notation/ChangeStemsCommand.cpp b/src/commands/notation/ChangeStemsCommand.cpp
index 413f9d2..d133d46 100644
--- a/src/commands/notation/ChangeStemsCommand.cpp
+++ b/src/commands/notation/ChangeStemsCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
 #include "gui/editors/notation/NotationProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/ChangeStemsCommand.h b/src/commands/notation/ChangeStemsCommand.h
index 40b48bf..5874275 100644
--- a/src/commands/notation/ChangeStemsCommand.h
+++ b/src/commands/notation/ChangeStemsCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADJUSTMENUCHANGESTEMSCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -47,7 +47,7 @@ public:
         BasicSelectionCommand(getGlobalName(up), selection, true),
         m_selection(&selection), m_up(up) { }
 
-    static QString getGlobalName(bool up) {
+    static TQString getGlobalName(bool up) {
         return up ? i18n("Stems &Up") : i18n("Stems &Down");
     }
 
diff --git a/src/commands/notation/ChangeStyleCommand.cpp b/src/commands/notation/ChangeStyleCommand.cpp
index f8d5c04..f4b3456 100644
--- a/src/commands/notation/ChangeStyleCommand.cpp
+++ b/src/commands/notation/ChangeStyleCommand.cpp
@@ -31,7 +31,7 @@
 #include "document/BasicSelectionCommand.h"
 #include "gui/editors/notation/NotationProperties.h"
 #include "gui/editors/notation/NoteStyleFactory.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/ChangeStyleCommand.h b/src/commands/notation/ChangeStyleCommand.h
index d5edbab..cdc5af9 100644
--- a/src/commands/notation/ChangeStyleCommand.h
+++ b/src/commands/notation/ChangeStyleCommand.h
@@ -28,7 +28,7 @@
 
 #include "document/BasicSelectionCommand.h"
 #include "gui/editors/notation/NoteStyle.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -49,11 +49,11 @@ public:
         BasicSelectionCommand(getGlobalName(style), selection, true),
         m_selection(&selection), m_style(style) { }
 
-    static QString getGlobalName() {
+    static TQString getGlobalName() {
         return i18n("Change &Note Style");
     }
 
-    static QString getGlobalName(NoteStyleName style);
+    static TQString getGlobalName(NoteStyleName style);
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/ChangeTiePositionCommand.cpp b/src/commands/notation/ChangeTiePositionCommand.cpp
index 42f67e6..b374ef0 100644
--- a/src/commands/notation/ChangeTiePositionCommand.cpp
+++ b/src/commands/notation/ChangeTiePositionCommand.cpp
@@ -30,7 +30,7 @@
 #include "base/BaseProperties.h"
 #include "document/BasicSelectionCommand.h"
 #include "gui/editors/notation/NotationProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/ChangeTiePositionCommand.h b/src/commands/notation/ChangeTiePositionCommand.h
index c4c58a7..3b01618 100644
--- a/src/commands/notation/ChangeTiePositionCommand.h
+++ b/src/commands/notation/ChangeTiePositionCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADJUSTMENUCHANGETIEPOSITIONCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -43,7 +43,7 @@ public:
         BasicSelectionCommand(getGlobalName(above), selection, true),
         m_selection(&selection), m_above(above) { }
 
-    static QString getGlobalName(bool above) {
+    static TQString getGlobalName(bool above) {
         return above ? i18n("Tie &Above") : i18n("Tie &Below");
     }
 
diff --git a/src/commands/notation/ClefInsertionCommand.cpp b/src/commands/notation/ClefInsertionCommand.cpp
index f21c1b0..c2c5738 100644
--- a/src/commands/notation/ClefInsertionCommand.cpp
+++ b/src/commands/notation/ClefInsertionCommand.cpp
@@ -33,7 +33,7 @@
 #include "base/SegmentNotationHelper.h"
 #include "base/BaseProperties.h"
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
@@ -66,7 +66,7 @@ ClefInsertionCommand::getGlobalName(Clef *)
 {
     /* doesn't handle octave offset -- leave it for now
         if (clef) {
-    	QString name(strtoqstr(clef->getClefType()));
+    	TQString name(strtoqstr(clef->getClefType()));
     	name = name.left(1).upper() + name.right(name.length()-1);
     	return i18n("Change to %1 Cle&f...").arg(name);
         } else {
diff --git a/src/commands/notation/ClefInsertionCommand.h b/src/commands/notation/ClefInsertionCommand.h
index 3e9b940..9cacdfb 100644
--- a/src/commands/notation/ClefInsertionCommand.h
+++ b/src/commands/notation/ClefInsertionCommand.h
@@ -28,7 +28,7 @@
 
 #include "base/NotationTypes.h"
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 
 
@@ -51,7 +51,7 @@ public:
                          bool shouldTranspose = false);
     virtual ~ClefInsertionCommand();
 
-    static QString getGlobalName(Clef *clef = 0);
+    static TQString getGlobalName(Clef *clef = 0);
     virtual timeT getRelayoutEndTime();
 
     Event *getLastInsertedEvent() { return m_lastInsertedEvent; }
diff --git a/src/commands/notation/CollapseRestsCommand.cpp b/src/commands/notation/CollapseRestsCommand.cpp
index 655b3b6..9578a8a 100644
--- a/src/commands/notation/CollapseRestsCommand.cpp
+++ b/src/commands/notation/CollapseRestsCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/SegmentNotationHelper.h"
 #include "base/Selection.h"
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/CollapseRestsCommand.h b/src/commands/notation/CollapseRestsCommand.h
index 337fe04..1f4f663 100644
--- a/src/commands/notation/CollapseRestsCommand.h
+++ b/src/commands/notation/CollapseRestsCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADJUSTMENUCOLLAPSERESTSCOMMAND_H_
 
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 
@@ -51,7 +51,7 @@ public:
 
     CollapseRestsCommand(EventSelection &selection);
 
-    static QString getGlobalName() { return i18n("&Collapse Rests"); }
+    static TQString getGlobalName() { return i18n("&Collapse Rests"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/DeCounterpointCommand.cpp b/src/commands/notation/DeCounterpointCommand.cpp
index 1f97476..9a2699a 100644
--- a/src/commands/notation/DeCounterpointCommand.cpp
+++ b/src/commands/notation/DeCounterpointCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/SegmentNotationHelper.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/DeCounterpointCommand.h b/src/commands/notation/DeCounterpointCommand.h
index e0cda37..7e16d4b 100644
--- a/src/commands/notation/DeCounterpointCommand.h
+++ b/src/commands/notation/DeCounterpointCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADJUSTMENUDECOUNTERPOINTCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -52,7 +52,7 @@ public:
         BasicSelectionCommand(getGlobalName(), segment, true),
         m_selection(0) { }
 
-    static QString getGlobalName() { return i18n("Split-and-Tie Overlapping &Chords"); }
+    static TQString getGlobalName() { return i18n("Split-and-Tie Overlapping &Chords"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/FixNotationQuantizeCommand.cpp b/src/commands/notation/FixNotationQuantizeCommand.cpp
index 014d610..14f01c8 100644
--- a/src/commands/notation/FixNotationQuantizeCommand.cpp
+++ b/src/commands/notation/FixNotationQuantizeCommand.cpp
@@ -30,7 +30,7 @@
 #include "base/Segment.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/FixNotationQuantizeCommand.h b/src/commands/notation/FixNotationQuantizeCommand.h
index dfce3e9..3a5d334 100644
--- a/src/commands/notation/FixNotationQuantizeCommand.h
+++ b/src/commands/notation/FixNotationQuantizeCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADJUSTMENUFIXNOTATIONQUANTIZECOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -46,7 +46,7 @@ public:
         BasicSelectionCommand(getGlobalName(), selection, true),
         m_selection(&selection) { }
     
-    static QString getGlobalName() { return i18n("Fi&x Notation Quantization"); }
+    static TQString getGlobalName() { return i18n("Fi&x Notation Quantization"); }
     
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/GraceCommand.cpp b/src/commands/notation/GraceCommand.cpp
index 99b8e5a..1d1065d 100644
--- a/src/commands/notation/GraceCommand.cpp
+++ b/src/commands/notation/GraceCommand.cpp
@@ -30,7 +30,7 @@
 #include "base/Selection.h"
 #include "document/BasicCommand.h"
 #include "base/BaseProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/GraceCommand.h b/src/commands/notation/GraceCommand.h
index 08dcd87..e432a11 100644
--- a/src/commands/notation/GraceCommand.h
+++ b/src/commands/notation/GraceCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADJUSTMENUGRACECOMMAND_H_
 
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 
@@ -46,7 +46,7 @@ class GraceCommand : public BasicCommand
 public:
     GraceCommand(EventSelection &selection);
 
-    static QString getGlobalName() { return i18n("Make &Grace Notes"); }
+    static TQString getGlobalName() { return i18n("Make &Grace Notes"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/IncrementDisplacementsCommand.cpp b/src/commands/notation/IncrementDisplacementsCommand.cpp
index 2ac44df..299d58f 100644
--- a/src/commands/notation/IncrementDisplacementsCommand.cpp
+++ b/src/commands/notation/IncrementDisplacementsCommand.cpp
@@ -28,7 +28,7 @@
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
 #include "base/BaseProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/IncrementDisplacementsCommand.h b/src/commands/notation/IncrementDisplacementsCommand.h
index 4272b6a..bbedc7b 100644
--- a/src/commands/notation/IncrementDisplacementsCommand.h
+++ b/src/commands/notation/IncrementDisplacementsCommand.h
@@ -27,7 +27,7 @@
 #define _RG_INCREMENTDISPLACEMENTSCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -49,7 +49,7 @@ public:
         m_dx(dx),
         m_dy(dy) { }
 
-    static QString getGlobalName() { return i18n("Fine Reposition"); }
+    static TQString getGlobalName() { return i18n("Fine Reposition"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/InterpretCommand.cpp b/src/commands/notation/InterpretCommand.cpp
index d8a82cd..6d1b18b 100644
--- a/src/commands/notation/InterpretCommand.cpp
+++ b/src/commands/notation/InterpretCommand.cpp
@@ -35,7 +35,7 @@
 #include "base/BaseProperties.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/InterpretCommand.h b/src/commands/notation/InterpretCommand.h
index e1ace8f..a50a0f7 100644
--- a/src/commands/notation/InterpretCommand.h
+++ b/src/commands/notation/InterpretCommand.h
@@ -29,7 +29,7 @@
 #include "document/BasicSelectionCommand.h"
 #include <map>
 #include <string>
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 
@@ -67,7 +67,7 @@ public:
 
     virtual ~InterpretCommand();
 
-    static QString getGlobalName() { return i18n("&Interpret..."); }
+    static TQString getGlobalName() { return i18n("&Interpret..."); }
     
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/KeyInsertionCommand.cpp b/src/commands/notation/KeyInsertionCommand.cpp
index 39b87e2..fc2bb84 100644
--- a/src/commands/notation/KeyInsertionCommand.cpp
+++ b/src/commands/notation/KeyInsertionCommand.cpp
@@ -33,7 +33,7 @@
 #include "base/Studio.h"
 #include "document/BasicCommand.h"
 #include "base/BaseProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/KeyInsertionCommand.h b/src/commands/notation/KeyInsertionCommand.h
index a9caa6a..1a03383 100644
--- a/src/commands/notation/KeyInsertionCommand.h
+++ b/src/commands/notation/KeyInsertionCommand.h
@@ -28,7 +28,7 @@
 
 #include "base/NotationTypes.h"
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 #include "misc/Strings.h"
@@ -60,7 +60,7 @@ public:
 			bool shouldIgnorePercussion);
     virtual ~KeyInsertionCommand();
 
-    static QString getGlobalName(Key *key = 0) {
+    static TQString getGlobalName(Key *key = 0) {
         if (key) {
             return i18n("Change to &Key %1...").arg(strtoqstr(key->getName()));
         } else {
diff --git a/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp b/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp
index 5716a8b..73ebffb 100644
--- a/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp
+++ b/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp
@@ -30,7 +30,7 @@
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
 #include "gui/editors/notation/NotationProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/MakeAccidentalsCautionaryCommand.h b/src/commands/notation/MakeAccidentalsCautionaryCommand.h
index 2745dc7..13c1674 100644
--- a/src/commands/notation/MakeAccidentalsCautionaryCommand.h
+++ b/src/commands/notation/MakeAccidentalsCautionaryCommand.h
@@ -27,7 +27,7 @@
 #define _RG_MAKEACCIDENTALSCAUTIONARYCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 
@@ -47,7 +47,7 @@ public:
         m_selection(&selection),
         m_cautionary(cautionary) { }
     
-    static QString getGlobalName(bool cautionary);
+    static TQString getGlobalName(bool cautionary);
     
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/MakeChordCommand.cpp b/src/commands/notation/MakeChordCommand.cpp
index 668e627..307ac6d 100644
--- a/src/commands/notation/MakeChordCommand.cpp
+++ b/src/commands/notation/MakeChordCommand.cpp
@@ -30,7 +30,7 @@
 #include "base/Segment.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/MakeChordCommand.h b/src/commands/notation/MakeChordCommand.h
index 9c85ea2..e5028ba 100644
--- a/src/commands/notation/MakeChordCommand.h
+++ b/src/commands/notation/MakeChordCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADJUSTMENUMAKECHORDCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -47,7 +47,7 @@ public:
         BasicSelectionCommand(getGlobalName(), selection, true),
         m_selection(&selection) { }
 
-    static QString getGlobalName() { return i18n("Make &Chord"); }
+    static TQString getGlobalName() { return i18n("Make &Chord"); }
     
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/MakeNotesViableCommand.cpp b/src/commands/notation/MakeNotesViableCommand.cpp
index 26cff3c..6da7e82 100644
--- a/src/commands/notation/MakeNotesViableCommand.cpp
+++ b/src/commands/notation/MakeNotesViableCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/SegmentNotationHelper.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/MakeNotesViableCommand.h b/src/commands/notation/MakeNotesViableCommand.h
index f84f76d..4916750 100644
--- a/src/commands/notation/MakeNotesViableCommand.h
+++ b/src/commands/notation/MakeNotesViableCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADJUSTMENUMAKENOTESVIABLECOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -52,7 +52,7 @@ public:
         BasicSelectionCommand(getGlobalName(), segment, true),
         m_selection(0) { }
 
-    static QString getGlobalName() { return i18n("Tie Notes at &Barlines"); }
+    static TQString getGlobalName() { return i18n("Tie Notes at &Barlines"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/MakeRegionViableCommand.cpp b/src/commands/notation/MakeRegionViableCommand.cpp
index 597b232..62c576b 100644
--- a/src/commands/notation/MakeRegionViableCommand.cpp
+++ b/src/commands/notation/MakeRegionViableCommand.cpp
@@ -28,7 +28,7 @@
 #include "base/Segment.h"
 #include "base/SegmentNotationHelper.h"
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/MakeRegionViableCommand.h b/src/commands/notation/MakeRegionViableCommand.h
index 64762cb..9d9b0f0 100644
--- a/src/commands/notation/MakeRegionViableCommand.h
+++ b/src/commands/notation/MakeRegionViableCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADJUSTMENUMAKEREGIONVIABLECOMMAND_H_
 
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 
@@ -49,7 +49,7 @@ public:
                                           timeT endTime) :
         BasicCommand(getGlobalName(), segment, startTime, endTime) { }
 
-    static QString getGlobalName() { return i18n("Tie Notes at &Barlines"); }
+    static TQString getGlobalName() { return i18n("Tie Notes at &Barlines"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/MultiKeyInsertionCommand.cpp b/src/commands/notation/MultiKeyInsertionCommand.cpp
index 77bf625..f242b9c 100644
--- a/src/commands/notation/MultiKeyInsertionCommand.cpp
+++ b/src/commands/notation/MultiKeyInsertionCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/NotationTypes.h"
 #include "base/Segment.h"
 #include "KeyInsertionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "document/RosegardenGUIDoc.h"
 #include "base/Studio.h"
 #include "misc/Debug.h"
diff --git a/src/commands/notation/MultiKeyInsertionCommand.h b/src/commands/notation/MultiKeyInsertionCommand.h
index b8ae152..644e877 100644
--- a/src/commands/notation/MultiKeyInsertionCommand.h
+++ b/src/commands/notation/MultiKeyInsertionCommand.h
@@ -27,7 +27,7 @@
 #define _RG_MULTIKEYINSERTIONCOMMAND_H_
 
 #include "base/NotationTypes.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 #include "misc/Strings.h"
@@ -58,7 +58,7 @@ public:
 			     bool shouldIgnorePercussion); 
     virtual ~MultiKeyInsertionCommand();
 
-    static QString getGlobalName(Key *key = 0) {
+    static TQString getGlobalName(Key *key = 0) {
         if (key) {
             return i18n("Change all to &Key %1...").arg(strtoqstr(key->getName()));
         } else {
diff --git a/src/commands/notation/NormalizeRestsCommand.cpp b/src/commands/notation/NormalizeRestsCommand.cpp
index 9d96586..20a17b5 100644
--- a/src/commands/notation/NormalizeRestsCommand.cpp
+++ b/src/commands/notation/NormalizeRestsCommand.cpp
@@ -28,7 +28,7 @@
 #include "base/Segment.h"
 #include "base/Selection.h"
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/NormalizeRestsCommand.h b/src/commands/notation/NormalizeRestsCommand.h
index db57920..6d26c7b 100644
--- a/src/commands/notation/NormalizeRestsCommand.h
+++ b/src/commands/notation/NormalizeRestsCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADJUSTMENUNORMALIZERESTSCOMMAND_H_
 
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 
@@ -51,7 +51,7 @@ public:
 
     NormalizeRestsCommand(EventSelection &selection);
 
-    static QString getGlobalName() { return i18n("&Normalize Rests"); }
+    static TQString getGlobalName() { return i18n("&Normalize Rests"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/RemoveFingeringMarksCommand.cpp b/src/commands/notation/RemoveFingeringMarksCommand.cpp
index 2b66cba..5b69a0b 100644
--- a/src/commands/notation/RemoveFingeringMarksCommand.cpp
+++ b/src/commands/notation/RemoveFingeringMarksCommand.cpp
@@ -27,7 +27,7 @@
 
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/RemoveFingeringMarksCommand.h b/src/commands/notation/RemoveFingeringMarksCommand.h
index 6e02bfc..71fcca0 100644
--- a/src/commands/notation/RemoveFingeringMarksCommand.h
+++ b/src/commands/notation/RemoveFingeringMarksCommand.h
@@ -27,7 +27,7 @@
 #define _RG_NOTESMENUREMOVEFINGERINGMARKSCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -46,7 +46,7 @@ public:
         BasicSelectionCommand(getGlobalName(), selection, true),
         m_selection(&selection) { }
 
-    static QString getGlobalName() { return i18n("&Remove Fingerings"); }
+    static TQString getGlobalName() { return i18n("&Remove Fingerings"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/RemoveMarksCommand.cpp b/src/commands/notation/RemoveMarksCommand.cpp
index 29513c2..631ba1a 100644
--- a/src/commands/notation/RemoveMarksCommand.cpp
+++ b/src/commands/notation/RemoveMarksCommand.cpp
@@ -27,7 +27,7 @@
 
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/BaseProperties.h"
 
 
diff --git a/src/commands/notation/RemoveMarksCommand.h b/src/commands/notation/RemoveMarksCommand.h
index d04a1c9..1603c50 100644
--- a/src/commands/notation/RemoveMarksCommand.h
+++ b/src/commands/notation/RemoveMarksCommand.h
@@ -27,7 +27,7 @@
 #define _RG_NOTESMENUREMOVEMARKSCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -46,7 +46,7 @@ public:
         BasicSelectionCommand(getGlobalName(), selection, true),
         m_selection(&selection) { }
 
-    static QString getGlobalName() { return i18n("&Remove All Marks"); }
+    static TQString getGlobalName() { return i18n("&Remove All Marks"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/RemoveNotationQuantizeCommand.cpp b/src/commands/notation/RemoveNotationQuantizeCommand.cpp
index 9b500fc..2d824a0 100644
--- a/src/commands/notation/RemoveNotationQuantizeCommand.cpp
+++ b/src/commands/notation/RemoveNotationQuantizeCommand.cpp
@@ -28,7 +28,7 @@
 #include "base/Event.h"
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/RemoveNotationQuantizeCommand.h b/src/commands/notation/RemoveNotationQuantizeCommand.h
index bc61ff8..8fb3b53 100644
--- a/src/commands/notation/RemoveNotationQuantizeCommand.h
+++ b/src/commands/notation/RemoveNotationQuantizeCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADJUSTMENUREMOVENOTATIONQUANTIZECOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -46,7 +46,7 @@ public:
         BasicSelectionCommand(getGlobalName(), selection, true),
         m_selection(&selection) { }
     
-    static QString getGlobalName() { return i18n("Remo&ve Notation Quantization"); }
+    static TQString getGlobalName() { return i18n("Remo&ve Notation Quantization"); }
     
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/ResetDisplacementsCommand.cpp b/src/commands/notation/ResetDisplacementsCommand.cpp
index dff8549..cb38387 100644
--- a/src/commands/notation/ResetDisplacementsCommand.cpp
+++ b/src/commands/notation/ResetDisplacementsCommand.cpp
@@ -28,7 +28,7 @@
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
 #include "base/BaseProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/ResetDisplacementsCommand.h b/src/commands/notation/ResetDisplacementsCommand.h
index b1d165b..701ed91 100644
--- a/src/commands/notation/ResetDisplacementsCommand.h
+++ b/src/commands/notation/ResetDisplacementsCommand.h
@@ -27,7 +27,7 @@
 #define _RG_RESETDISPLACEMENTSCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -46,7 +46,7 @@ public:
         BasicSelectionCommand(getGlobalName(), selection, true),
         m_selection(&selection) { }
 
-    static QString getGlobalName() { return i18n("Restore Positions"); }
+    static TQString getGlobalName() { return i18n("Restore Positions"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/RespellCommand.cpp b/src/commands/notation/RespellCommand.cpp
index c410707..6264a0e 100644
--- a/src/commands/notation/RespellCommand.cpp
+++ b/src/commands/notation/RespellCommand.cpp
@@ -30,7 +30,7 @@
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
 #include "base/BaseProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
@@ -44,7 +44,7 @@ RespellCommand::getGlobalName(Type type, Accidental accidental)
     switch (type) {
 
     case Set: {
-            QString s(i18n("Respell with %1"));
+            TQString s(i18n("Respell with %1"));
             //!!! should be in notationstrings:
             if (accidental == DoubleSharp) {
                 s = s.arg(i18n("Do&uble Sharp"));
diff --git a/src/commands/notation/RespellCommand.h b/src/commands/notation/RespellCommand.h
index e2c414f..4f98dff 100644
--- a/src/commands/notation/RespellCommand.h
+++ b/src/commands/notation/RespellCommand.h
@@ -27,7 +27,7 @@
 #define _RG_RESPELLCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 
@@ -55,7 +55,7 @@ public:
         m_type(type),
         m_accidental(acc) { }
 
-    static QString getGlobalName(Type type, Accidental acc);
+    static TQString getGlobalName(Type type, Accidental acc);
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/RestoreSlursCommand.cpp b/src/commands/notation/RestoreSlursCommand.cpp
index 4cb2ec8..f6dd19d 100644
--- a/src/commands/notation/RestoreSlursCommand.cpp
+++ b/src/commands/notation/RestoreSlursCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
 #include "gui/editors/notation/NotationProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/RestoreSlursCommand.h b/src/commands/notation/RestoreSlursCommand.h
index 687d016..ed6bc4c 100644
--- a/src/commands/notation/RestoreSlursCommand.h
+++ b/src/commands/notation/RestoreSlursCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADJUSTMENURESTORESLURSCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -46,7 +46,7 @@ public:
         BasicSelectionCommand(getGlobalName(), selection, true),
         m_selection(&selection) { }
 
-    static QString getGlobalName() { return i18n("&Restore Slur Positions"); }
+    static TQString getGlobalName() { return i18n("&Restore Slur Positions"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/RestoreStemsCommand.cpp b/src/commands/notation/RestoreStemsCommand.cpp
index 99709f3..fadd82e 100644
--- a/src/commands/notation/RestoreStemsCommand.cpp
+++ b/src/commands/notation/RestoreStemsCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
 #include "gui/editors/notation/NotationProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/RestoreStemsCommand.h b/src/commands/notation/RestoreStemsCommand.h
index 94dd0cf..add54ce 100644
--- a/src/commands/notation/RestoreStemsCommand.h
+++ b/src/commands/notation/RestoreStemsCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADJUSTMENURESTORESTEMSCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -46,7 +46,7 @@ public:
         BasicSelectionCommand(getGlobalName(), selection, true),
         m_selection(&selection) { }
 
-    static QString getGlobalName() { return i18n("&Restore Stems"); }
+    static TQString getGlobalName() { return i18n("&Restore Stems"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/RestoreTiesCommand.cpp b/src/commands/notation/RestoreTiesCommand.cpp
index 6402361..2430524 100644
--- a/src/commands/notation/RestoreTiesCommand.cpp
+++ b/src/commands/notation/RestoreTiesCommand.cpp
@@ -30,7 +30,7 @@
 #include "document/BasicSelectionCommand.h"
 #include "base/BaseProperties.h"
 #include "gui/editors/notation/NotationProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/RestoreTiesCommand.h b/src/commands/notation/RestoreTiesCommand.h
index d3ffef9..5bd35e5 100644
--- a/src/commands/notation/RestoreTiesCommand.h
+++ b/src/commands/notation/RestoreTiesCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADJUSTMENURESTORETIESCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -46,7 +46,7 @@ public:
         BasicSelectionCommand(getGlobalName(), selection, true),
         m_selection(&selection) { }
 
-    static QString getGlobalName() { return i18n("&Restore Tie Positions"); }
+    static TQString getGlobalName() { return i18n("&Restore Tie Positions"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/SetVisibilityCommand.cpp b/src/commands/notation/SetVisibilityCommand.cpp
index c7f49f3..d66e476 100644
--- a/src/commands/notation/SetVisibilityCommand.cpp
+++ b/src/commands/notation/SetVisibilityCommand.cpp
@@ -28,7 +28,7 @@
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
 #include "base/BaseProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/SetVisibilityCommand.h b/src/commands/notation/SetVisibilityCommand.h
index 6aef5ef..6aece6a 100644
--- a/src/commands/notation/SetVisibilityCommand.h
+++ b/src/commands/notation/SetVisibilityCommand.h
@@ -27,7 +27,7 @@
 #define _RG_SETVISIBILITYCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -47,7 +47,7 @@ public:
         m_selection(&selection),
         m_visible(visible) { }
 
-    static QString getGlobalName() { return i18n("Set Visibility"); }
+    static TQString getGlobalName() { return i18n("Set Visibility"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/SustainInsertionCommand.cpp b/src/commands/notation/SustainInsertionCommand.cpp
index f3c3917..4f12aa1 100644
--- a/src/commands/notation/SustainInsertionCommand.cpp
+++ b/src/commands/notation/SustainInsertionCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/MidiTypes.h"
 #include "base/Segment.h"
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/SustainInsertionCommand.h b/src/commands/notation/SustainInsertionCommand.h
index ddb93b4..235e2e5 100644
--- a/src/commands/notation/SustainInsertionCommand.h
+++ b/src/commands/notation/SustainInsertionCommand.h
@@ -27,7 +27,7 @@
 #define _RG_SUSTAININSERTIONCOMMAND_H_
 
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 
@@ -51,7 +51,7 @@ public:
                             int controllerNumber);
     virtual ~SustainInsertionCommand();
 
-    static QString getGlobalName(bool down) {
+    static TQString getGlobalName(bool down) {
         if (down) {
             return i18n("Add Pedal &Press");
         } else {
diff --git a/src/commands/notation/TieNotesCommand.cpp b/src/commands/notation/TieNotesCommand.cpp
index 18b8188..ff7f3ab 100644
--- a/src/commands/notation/TieNotesCommand.cpp
+++ b/src/commands/notation/TieNotesCommand.cpp
@@ -30,7 +30,7 @@
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
 #include "base/BaseProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/TieNotesCommand.h b/src/commands/notation/TieNotesCommand.h
index 2f1874f..b46470b 100644
--- a/src/commands/notation/TieNotesCommand.h
+++ b/src/commands/notation/TieNotesCommand.h
@@ -27,7 +27,7 @@
 #define _RG_NOTESMENUTIENOTESCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -46,7 +46,7 @@ public:
         BasicSelectionCommand(getGlobalName(), selection, true),
         m_selection(&selection) { }
 
-    static QString getGlobalName() { return i18n("&Tie"); }
+    static TQString getGlobalName() { return i18n("&Tie"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/TupletCommand.cpp b/src/commands/notation/TupletCommand.cpp
index b46fff5..2597424 100644
--- a/src/commands/notation/TupletCommand.cpp
+++ b/src/commands/notation/TupletCommand.cpp
@@ -30,7 +30,7 @@
 #include "base/SegmentNotationHelper.h"
 #include "document/BasicCommand.h"
 #include "base/BaseProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/TupletCommand.h b/src/commands/notation/TupletCommand.h
index b08a204..fcf5840 100644
--- a/src/commands/notation/TupletCommand.h
+++ b/src/commands/notation/TupletCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADJUSTMENUTUPLETCOMMAND_H_
 
 #include "document/BasicCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 
@@ -49,7 +49,7 @@ public:
                            int untupled = 3, int tupled = 2,
                            bool groupHasTimingAlready = false);
 
-    static QString getGlobalName(bool simple = true) {
+    static TQString getGlobalName(bool simple = true) {
         if (simple) return i18n("&Triplet");
         else return i18n("Tu&plet...");
     }
diff --git a/src/commands/notation/UnGraceCommand.cpp b/src/commands/notation/UnGraceCommand.cpp
index 7eb0343..d88365e 100644
--- a/src/commands/notation/UnGraceCommand.cpp
+++ b/src/commands/notation/UnGraceCommand.cpp
@@ -27,7 +27,7 @@
 
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/UnGraceCommand.h b/src/commands/notation/UnGraceCommand.h
index cdaf244..535843e 100644
--- a/src/commands/notation/UnGraceCommand.h
+++ b/src/commands/notation/UnGraceCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADJUSTMENUUNGRACECOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -45,7 +45,7 @@ public:
     UnGraceCommand(EventSelection &selection) :
         BasicSelectionCommand(getGlobalName(), selection) { }
 
-    static QString getGlobalName() { return i18n("Ung&race"); }
+    static TQString getGlobalName() { return i18n("Ung&race"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/notation/UnTupletCommand.cpp b/src/commands/notation/UnTupletCommand.cpp
index 0a4b85e..d502529 100644
--- a/src/commands/notation/UnTupletCommand.cpp
+++ b/src/commands/notation/UnTupletCommand.cpp
@@ -28,7 +28,7 @@
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
 #include "base/BaseProperties.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/notation/UnTupletCommand.h b/src/commands/notation/UnTupletCommand.h
index 76aabe4..866069c 100644
--- a/src/commands/notation/UnTupletCommand.h
+++ b/src/commands/notation/UnTupletCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADJUSTMENUUNTUPLETCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -46,7 +46,7 @@ public:
         BasicSelectionCommand(getGlobalName(), selection, true),
         m_selection(&selection) { }
 
-    static QString getGlobalName() {
+    static TQString getGlobalName() {
         return i18n("&Untuplet");
     }
 
diff --git a/src/commands/notation/UntieNotesCommand.cpp b/src/commands/notation/UntieNotesCommand.cpp
index e32d605..9bd85c7 100644
--- a/src/commands/notation/UntieNotesCommand.cpp
+++ b/src/commands/notation/UntieNotesCommand.cpp
@@ -27,7 +27,7 @@
 
 #include "base/Selection.h"
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/BaseProperties.h"
 
 
diff --git a/src/commands/notation/UntieNotesCommand.h b/src/commands/notation/UntieNotesCommand.h
index 3f57413..8d0ca67 100644
--- a/src/commands/notation/UntieNotesCommand.h
+++ b/src/commands/notation/UntieNotesCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADJUSTMENUUNTIENOTESCOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -46,7 +46,7 @@ public:
         BasicSelectionCommand(getGlobalName(), selection, true),
         m_selection(&selection) { }
 
-    static QString getGlobalName() { return i18n("&Untie"); }
+    static TQString getGlobalName() { return i18n("&Untie"); }
 
 protected:
     virtual void modifySegment();
diff --git a/src/commands/segment/AddTempoChangeCommand.cpp b/src/commands/segment/AddTempoChangeCommand.cpp
index 6665215..6e67b00 100644
--- a/src/commands/segment/AddTempoChangeCommand.cpp
+++ b/src/commands/segment/AddTempoChangeCommand.cpp
@@ -26,7 +26,7 @@
 #include "AddTempoChangeCommand.h"
 
 #include "base/Composition.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/segment/AddTempoChangeCommand.h b/src/commands/segment/AddTempoChangeCommand.h
index 07036dd..c791550 100644
--- a/src/commands/segment/AddTempoChangeCommand.h
+++ b/src/commands/segment/AddTempoChangeCommand.h
@@ -27,7 +27,7 @@
 #define _RG_ADDTEMPOCHANGECOMMAND_H_
 
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include "base/Composition.h" // for tempoT
 #include <klocale.h>
@@ -55,7 +55,7 @@ public:
 
     virtual ~AddTempoChangeCommand();
 
-    static QString getGlobalName() { return i18n("Add Te&mpo Change..."); }
+    static TQString getGlobalName() { return i18n("Add Te&mpo Change..."); }
 
     virtual void execute();
     virtual void unexecute();
diff --git a/src/commands/segment/AddTimeSignatureCommand.cpp b/src/commands/segment/AddTimeSignatureCommand.cpp
index 88f2d07..0687962 100644
--- a/src/commands/segment/AddTimeSignatureCommand.cpp
+++ b/src/commands/segment/AddTimeSignatureCommand.cpp
@@ -27,7 +27,7 @@
 
 #include "base/Composition.h"
 #include "base/NotationTypes.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/segment/AddTimeSignatureCommand.h b/src/commands/segment/AddTimeSignatureCommand.h
index fbc875d..21a0cd8 100644
--- a/src/commands/segment/AddTimeSignatureCommand.h
+++ b/src/commands/segment/AddTimeSignatureCommand.h
@@ -28,7 +28,7 @@
 
 #include "base/NotationTypes.h"
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 
@@ -49,7 +49,7 @@ public:
                             TimeSignature timeSig);
     virtual ~AddTimeSignatureCommand();
 
-    static QString getGlobalName() { return i18n("Add Time Si&gnature Change..."); }
+    static TQString getGlobalName() { return i18n("Add Time Si&gnature Change..."); }
 
     virtual void execute();
     virtual void unexecute();
diff --git a/src/commands/segment/AddTracksCommand.cpp b/src/commands/segment/AddTracksCommand.cpp
index 1f09227..094b5cc 100644
--- a/src/commands/segment/AddTracksCommand.cpp
+++ b/src/commands/segment/AddTracksCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/Composition.h"
 #include "base/MidiProgram.h"
 #include "base/Track.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/segment/AddTracksCommand.h b/src/commands/segment/AddTracksCommand.h
index d3e09ca..dba0e68 100644
--- a/src/commands/segment/AddTracksCommand.h
+++ b/src/commands/segment/AddTracksCommand.h
@@ -29,7 +29,7 @@
 #include "base/MidiProgram.h"
 #include "base/Composition.h"
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <vector>
 #include <map>
 #include <klocale.h>
@@ -52,7 +52,7 @@ public:
                      int position); // -1 -> at end
     virtual ~AddTracksCommand();
 
-    static QString getGlobalName() { return i18n("Add Tracks..."); }
+    static TQString getGlobalName() { return i18n("Add Tracks..."); }
 
     virtual void execute();
     virtual void unexecute();
diff --git a/src/commands/segment/AudioSegmentAutoSplitCommand.cpp b/src/commands/segment/AudioSegmentAutoSplitCommand.cpp
index d474b64..b450c89 100644
--- a/src/commands/segment/AudioSegmentAutoSplitCommand.cpp
+++ b/src/commands/segment/AudioSegmentAutoSplitCommand.cpp
@@ -34,7 +34,7 @@
 #include "document/RosegardenGUIDoc.h"
 #include "sound/AudioFileManager.h"
 #include "sound/PeakFileManager.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/segment/AudioSegmentAutoSplitCommand.h b/src/commands/segment/AudioSegmentAutoSplitCommand.h
index a1c4b48..0b11f77 100644
--- a/src/commands/segment/AudioSegmentAutoSplitCommand.h
+++ b/src/commands/segment/AudioSegmentAutoSplitCommand.h
@@ -27,7 +27,7 @@
 #define _RG_AUDIOSEGMENTAUTOSPLITCOMMAND_H_
 
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <vector>
 #include <klocale.h>
 
@@ -54,7 +54,7 @@ public:
     virtual void execute();
     virtual void unexecute();
     
-    static QString getGlobalName() { return i18n("&Split on Silence"); }
+    static TQString getGlobalName() { return i18n("&Split on Silence"); }
 
 private:
     Segment                *m_segment;
diff --git a/src/commands/segment/AudioSegmentDistributeCommand.cpp b/src/commands/segment/AudioSegmentDistributeCommand.cpp
index 9bdfb97..bde65f6 100644
--- a/src/commands/segment/AudioSegmentDistributeCommand.cpp
+++ b/src/commands/segment/AudioSegmentDistributeCommand.cpp
@@ -32,7 +32,7 @@
 #include "base/Segment.h"
 #include "base/Selection.h"
 #include "sound/AudioFile.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/segment/AudioSegmentDistributeCommand.h b/src/commands/segment/AudioSegmentDistributeCommand.h
index d325daf..940fc66 100644
--- a/src/commands/segment/AudioSegmentDistributeCommand.h
+++ b/src/commands/segment/AudioSegmentDistributeCommand.h
@@ -28,7 +28,7 @@
 
 #include "base/Selection.h"
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <vector>
 #include <klocale.h>
 
@@ -62,7 +62,7 @@ public:
 
     virtual ~AudioSegmentDistributeCommand();
 
-    static QString getGlobalName() 
+    static TQString getGlobalName() 
         { return i18n("Distribute Audio Segments over MIDI"); }
 
 
diff --git a/src/commands/segment/AudioSegmentRescaleCommand.cpp b/src/commands/segment/AudioSegmentRescaleCommand.cpp
index 1386783..2786aa9 100644
--- a/src/commands/segment/AudioSegmentRescaleCommand.cpp
+++ b/src/commands/segment/AudioSegmentRescaleCommand.cpp
@@ -34,7 +34,7 @@
 #include "sound/AudioFileTimeStretcher.h"
 #include "sound/AudioFileManager.h"
 #include "gui/widgets/ProgressDialog.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
@@ -92,19 +92,19 @@ AudioSegmentRescaleCommand::~AudioSegmentRescaleCommand()
 void
 AudioSegmentRescaleCommand::connectProgressDialog(ProgressDialog *dlg)
 {
-    QObject::connect(m_stretcher, SIGNAL(setProgress(int)),
-                     dlg->progressBar(), SLOT(setValue(int)));
-    QObject::connect(dlg, SIGNAL(cancelClicked()),
-                     m_stretcher, SLOT(slotStopTimestretch()));
+    TQObject::connect(m_stretcher, TQT_SIGNAL(setProgress(int)),
+                     dlg->progressBar(), TQT_SLOT(setValue(int)));
+    TQObject::connect(dlg, TQT_SIGNAL(cancelClicked()),
+                     m_stretcher, TQT_SLOT(slotStopTimestretch()));
 }
  
 void
 AudioSegmentRescaleCommand::disconnectProgressDialog(ProgressDialog *dlg)
 {
-    QObject::disconnect(m_stretcher, SIGNAL(setProgress(int)),
-                        dlg->progressBar(), SLOT(setValue(int)));
-    QObject::disconnect(dlg, SIGNAL(cancelClicked()),
-                        m_stretcher, SLOT(slotStopTimestretch()));
+    TQObject::disconnect(m_stretcher, TQT_SIGNAL(setProgress(int)),
+                        dlg->progressBar(), TQT_SLOT(setValue(int)));
+    TQObject::disconnect(dlg, TQT_SIGNAL(cancelClicked()),
+                        m_stretcher, TQT_SLOT(slotStopTimestretch()));
 }
 
 void
@@ -122,7 +122,7 @@ AudioSegmentRescaleCommand::execute()
 
         m_newSegment = new Segment(*m_segment);
 
-        QString oldLabel = strtoqstr(m_segment->getLabel());
+        TQString oldLabel = strtoqstr(m_segment->getLabel());
         if (!oldLabel.endsWith(i18n("(rescaled)"))) {
             m_newSegment->setLabel(qstrtostr(i18n("%1 (rescaled)").arg
                                              (oldLabel)));
diff --git a/src/commands/segment/AudioSegmentRescaleCommand.h b/src/commands/segment/AudioSegmentRescaleCommand.h
index a4edb13..3243a21 100644
--- a/src/commands/segment/AudioSegmentRescaleCommand.h
+++ b/src/commands/segment/AudioSegmentRescaleCommand.h
@@ -26,7 +26,7 @@
 #define _RG_AUDIOSEGMENTRESCALECOMMAND_H_
 
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 
@@ -59,7 +59,7 @@ public:
     void connectProgressDialog(ProgressDialog *dlg);
     void disconnectProgressDialog(ProgressDialog *dlg);
     
-    static QString getGlobalName() { return i18n("Stretch or S&quash..."); }
+    static TQString getGlobalName() { return i18n("Stretch or S&quash..."); }
 
 private:
     AudioFileManager *m_afm;
diff --git a/src/commands/segment/AudioSegmentSplitCommand.cpp b/src/commands/segment/AudioSegmentSplitCommand.cpp
index f0c462e..6657b7b 100644
--- a/src/commands/segment/AudioSegmentSplitCommand.cpp
+++ b/src/commands/segment/AudioSegmentSplitCommand.cpp
@@ -31,7 +31,7 @@
 #include "base/RealTime.h"
 #include "base/Composition.h"
 #include "base/Segment.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
@@ -99,7 +99,7 @@ AudioSegmentSplitCommand::execute()
         // Set labels
         //
         m_segmentLabel = m_segment->getLabel();
-        QString newLabel = strtoqstr(m_segmentLabel);
+        TQString newLabel = strtoqstr(m_segmentLabel);
         if (!newLabel.endsWith(i18n(" (split)"))) {
             newLabel = i18n("%1 (split)").arg(newLabel);
         }
diff --git a/src/commands/segment/ChangeCompositionLengthCommand.cpp b/src/commands/segment/ChangeCompositionLengthCommand.cpp
index bdeb7a5..6dd50f9 100644
--- a/src/commands/segment/ChangeCompositionLengthCommand.cpp
+++ b/src/commands/segment/ChangeCompositionLengthCommand.cpp
@@ -26,7 +26,7 @@
 #include "ChangeCompositionLengthCommand.h"
 
 #include "base/Composition.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/segment/ChangeCompositionLengthCommand.h b/src/commands/segment/ChangeCompositionLengthCommand.h
index 9e0db9b..4828c3a 100644
--- a/src/commands/segment/ChangeCompositionLengthCommand.h
+++ b/src/commands/segment/ChangeCompositionLengthCommand.h
@@ -27,7 +27,7 @@
 #define _RG_CHANGECOMPOSITIONLENGTHCOMMAND_H_
 
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 
@@ -49,7 +49,7 @@ public:
                                    timeT endTime);
     virtual ~ChangeCompositionLengthCommand();
 
-    static QString getGlobalName()
+    static TQString getGlobalName()
         { return i18n("Change &Composition Start and End..."); }
 
     virtual void execute();
diff --git a/src/commands/segment/DeleteTracksCommand.cpp b/src/commands/segment/DeleteTracksCommand.cpp
index bad2be0..4d3d72a 100644
--- a/src/commands/segment/DeleteTracksCommand.cpp
+++ b/src/commands/segment/DeleteTracksCommand.cpp
@@ -28,7 +28,7 @@
 #include "misc/Debug.h"
 #include "base/Composition.h"
 #include "base/Segment.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/segment/DeleteTracksCommand.h b/src/commands/segment/DeleteTracksCommand.h
index d1d2332..d02f5ac 100644
--- a/src/commands/segment/DeleteTracksCommand.h
+++ b/src/commands/segment/DeleteTracksCommand.h
@@ -27,7 +27,7 @@
 #define _RG_DELETETRACKSCOMMAND_H_
 
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <vector>
 #include <klocale.h>
 #include "base/Track.h"
@@ -48,7 +48,7 @@ public:
                         std::vector<TrackId> tracks);
     virtual ~DeleteTracksCommand();
 
-    static QString getGlobalName() { return i18n("Delete Tracks..."); }
+    static TQString getGlobalName() { return i18n("Delete Tracks..."); }
 
     virtual void execute();
     virtual void unexecute();
diff --git a/src/commands/segment/ModifyDefaultTempoCommand.cpp b/src/commands/segment/ModifyDefaultTempoCommand.cpp
index 88360a4..2b01d4d 100644
--- a/src/commands/segment/ModifyDefaultTempoCommand.cpp
+++ b/src/commands/segment/ModifyDefaultTempoCommand.cpp
@@ -26,7 +26,7 @@
 #include "ModifyDefaultTempoCommand.h"
 
 #include "base/Composition.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/segment/ModifyDefaultTempoCommand.h b/src/commands/segment/ModifyDefaultTempoCommand.h
index 50f736d..5ca4252 100644
--- a/src/commands/segment/ModifyDefaultTempoCommand.h
+++ b/src/commands/segment/ModifyDefaultTempoCommand.h
@@ -27,7 +27,7 @@
 #define _RG_MODIFYDEFAULTTEMPOCOMMAND_H_
 
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 #include "base/Composition.h" // for tempoT
 
@@ -48,7 +48,7 @@ public:
 
     virtual ~ModifyDefaultTempoCommand() {}
 
-    static QString getGlobalName() { return i18n("Modify &Default Tempo..."); }
+    static TQString getGlobalName() { return i18n("Modify &Default Tempo..."); }
 
     virtual void execute();
     virtual void unexecute();
diff --git a/src/commands/segment/MoveTracksCommand.cpp b/src/commands/segment/MoveTracksCommand.cpp
index 49c089b..bc967d5 100644
--- a/src/commands/segment/MoveTracksCommand.cpp
+++ b/src/commands/segment/MoveTracksCommand.cpp
@@ -27,7 +27,7 @@
 
 #include "base/Composition.h"
 #include "base/Track.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/segment/MoveTracksCommand.h b/src/commands/segment/MoveTracksCommand.h
index e35af5e..b1a72aa 100644
--- a/src/commands/segment/MoveTracksCommand.h
+++ b/src/commands/segment/MoveTracksCommand.h
@@ -28,7 +28,7 @@
 
 #include "base/Track.h"
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -48,7 +48,7 @@ public:
                       TrackId destTrack);
     virtual ~MoveTracksCommand();
 
-    static QString getGlobalName() { return i18n("Move Tracks..."); }
+    static TQString getGlobalName() { return i18n("Move Tracks..."); }
 
     virtual void execute();
     virtual void unexecute();
diff --git a/src/commands/segment/PasteToTriggerSegmentCommand.cpp b/src/commands/segment/PasteToTriggerSegmentCommand.cpp
index 0447c40..1b3838a 100644
--- a/src/commands/segment/PasteToTriggerSegmentCommand.cpp
+++ b/src/commands/segment/PasteToTriggerSegmentCommand.cpp
@@ -33,7 +33,7 @@
 #include "base/NotationTypes.h"
 #include "base/Segment.h"
 #include "base/TriggerSegment.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
@@ -41,7 +41,7 @@ namespace Rosegarden
 
 PasteToTriggerSegmentCommand::PasteToTriggerSegmentCommand(Composition *composition,
         Clipboard *clipboard,
-        QString label,
+        TQString label,
         int basePitch,
         int baseVelocity) :
         KNamedCommand(i18n("Paste as New Triggered Segment")),
diff --git a/src/commands/segment/PasteToTriggerSegmentCommand.h b/src/commands/segment/PasteToTriggerSegmentCommand.h
index 32f95e7..adb5fe0 100644
--- a/src/commands/segment/PasteToTriggerSegmentCommand.h
+++ b/src/commands/segment/PasteToTriggerSegmentCommand.h
@@ -28,7 +28,7 @@
 
 #include "base/TriggerSegment.h"
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 
 
 
@@ -47,7 +47,7 @@ public:
     /// If basePitch is -1, the first pitch in the selection will be used
     PasteToTriggerSegmentCommand(Composition *composition,
                                  Clipboard *clipboard,
-                                 QString label,
+                                 TQString label,
                                  int basePitch = -1,
                                  int baseVelocity = -1);
     virtual ~PasteToTriggerSegmentCommand();
@@ -58,7 +58,7 @@ public:
 protected:
     Composition *m_composition;
     Clipboard *m_clipboard;
-    QString m_label;
+    TQString m_label;
     int m_basePitch;
     int m_baseVelocity;
     Segment *m_segment;
diff --git a/src/commands/segment/RemoveTempoChangeCommand.cpp b/src/commands/segment/RemoveTempoChangeCommand.cpp
index 11a89ad..72e2ed5 100644
--- a/src/commands/segment/RemoveTempoChangeCommand.cpp
+++ b/src/commands/segment/RemoveTempoChangeCommand.cpp
@@ -26,7 +26,7 @@
 #include "RemoveTempoChangeCommand.h"
 
 #include "base/Composition.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/segment/RemoveTempoChangeCommand.h b/src/commands/segment/RemoveTempoChangeCommand.h
index 1900a8b..b77f8be 100644
--- a/src/commands/segment/RemoveTempoChangeCommand.h
+++ b/src/commands/segment/RemoveTempoChangeCommand.h
@@ -27,7 +27,7 @@
 #define _RG_REMOVETEMPOCHANGECOMMAND_H_
 
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include "base/Composition.h" // for tempoT
 #include <klocale.h>
@@ -55,7 +55,7 @@ public:
 
     virtual ~RemoveTempoChangeCommand() {}
 
-    static QString getGlobalName() { return i18n("Remove &Tempo Change..."); }
+    static TQString getGlobalName() { return i18n("Remove &Tempo Change..."); }
 
     virtual void execute();
     virtual void unexecute();
diff --git a/src/commands/segment/RemoveTimeSignatureCommand.cpp b/src/commands/segment/RemoveTimeSignatureCommand.cpp
index c6b59b1..5e8230b 100644
--- a/src/commands/segment/RemoveTimeSignatureCommand.cpp
+++ b/src/commands/segment/RemoveTimeSignatureCommand.cpp
@@ -27,7 +27,7 @@
 
 #include "base/Composition.h"
 #include "base/NotationTypes.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/segment/RemoveTimeSignatureCommand.h b/src/commands/segment/RemoveTimeSignatureCommand.h
index d29d666..cc1ee59 100644
--- a/src/commands/segment/RemoveTimeSignatureCommand.h
+++ b/src/commands/segment/RemoveTimeSignatureCommand.h
@@ -28,7 +28,7 @@
 
 #include "base/NotationTypes.h"
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 
@@ -55,7 +55,7 @@ public:
 
     virtual ~RemoveTimeSignatureCommand() {}
 
-    static QString getGlobalName() { return i18n("Remove &Time Signature Change..."); }
+    static TQString getGlobalName() { return i18n("Remove &Time Signature Change..."); }
 
     virtual void execute();
     virtual void unexecute();
diff --git a/src/commands/segment/RenameTrackCommand.cpp b/src/commands/segment/RenameTrackCommand.cpp
index 62d1d7e..f942e42 100644
--- a/src/commands/segment/RenameTrackCommand.cpp
+++ b/src/commands/segment/RenameTrackCommand.cpp
@@ -28,7 +28,7 @@
 #include "misc/Debug.h"
 #include "base/Composition.h"
 #include "base/Track.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/segment/RenameTrackCommand.h b/src/commands/segment/RenameTrackCommand.h
index 8e63a88..385cd38 100644
--- a/src/commands/segment/RenameTrackCommand.h
+++ b/src/commands/segment/RenameTrackCommand.h
@@ -29,7 +29,7 @@
 #include "base/Track.h"
 #include <string>
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -49,7 +49,7 @@ public:
                        std::string name);
     virtual ~RenameTrackCommand();
 
-    static QString getGlobalName() { return i18n("Rename Track"); }
+    static TQString getGlobalName() { return i18n("Rename Track"); }
 
     virtual void execute();
     virtual void unexecute();
diff --git a/src/commands/segment/SegmentAutoSplitCommand.cpp b/src/commands/segment/SegmentAutoSplitCommand.cpp
index fbd6daa..5f3630f 100644
--- a/src/commands/segment/SegmentAutoSplitCommand.cpp
+++ b/src/commands/segment/SegmentAutoSplitCommand.cpp
@@ -31,7 +31,7 @@
 #include "base/Composition.h"
 #include "base/NotationTypes.h"
 #include "base/Segment.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/segment/SegmentAutoSplitCommand.h b/src/commands/segment/SegmentAutoSplitCommand.h
index a7e54c7..a9e03f2 100644
--- a/src/commands/segment/SegmentAutoSplitCommand.h
+++ b/src/commands/segment/SegmentAutoSplitCommand.h
@@ -27,7 +27,7 @@
 #define _RG_SEGMENTAUTOSPLITCOMMAND_H_
 
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <vector>
 #include <klocale.h>
 
@@ -50,7 +50,7 @@ public:
     virtual void execute();
     virtual void unexecute();
     
-    static QString getGlobalName() { return i18n("&Split on Silence"); }
+    static TQString getGlobalName() { return i18n("&Split on Silence"); }
 
 private:
     Segment *m_segment;
diff --git a/src/commands/segment/SegmentChangePlayableRangeCommand.cpp b/src/commands/segment/SegmentChangePlayableRangeCommand.cpp
index b4d5d3a..026e9e1 100644
--- a/src/commands/segment/SegmentChangePlayableRangeCommand.cpp
+++ b/src/commands/segment/SegmentChangePlayableRangeCommand.cpp
@@ -27,7 +27,7 @@
 
 #include "base/Segment.h"
 #include "gui/editors/notation/NotationStrings.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
@@ -70,7 +70,7 @@ SegmentChangePlayableRangeCommand::getGlobalName(int low, int high)
     if (!unit) {
         return "Undo change playable range";
     } else {
-        return QString("Change playable range to %1-%2").arg(low, high);
+        return TQString("Change playable range to %1-%2").arg(low, high);
     }
 }
 
diff --git a/src/commands/segment/SegmentChangePlayableRangeCommand.h b/src/commands/segment/SegmentChangePlayableRangeCommand.h
index d78aa5c..0370def 100644
--- a/src/commands/segment/SegmentChangePlayableRangeCommand.h
+++ b/src/commands/segment/SegmentChangePlayableRangeCommand.h
@@ -27,7 +27,7 @@
 #define _RG_SEGMENTCHANGEPLAYABLERANGECOMMAND_H_
 
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <vector>
 #include "base/Event.h"
 
@@ -50,7 +50,7 @@ public:
     virtual void execute();
     virtual void unexecute();
 
-    static QString getGlobalName(int, int);
+    static TQString getGlobalName(int, int);
 
 private:
     Segment *m_segment;
diff --git a/src/commands/segment/SegmentChangeQuantizationCommand.cpp b/src/commands/segment/SegmentChangeQuantizationCommand.cpp
index 22d09f4..e26c235 100644
--- a/src/commands/segment/SegmentChangeQuantizationCommand.cpp
+++ b/src/commands/segment/SegmentChangeQuantizationCommand.cpp
@@ -28,7 +28,7 @@
 #include "base/Segment.h"
 #include "base/BasicQuantizer.h"
 #include "gui/editors/notation/NotationStrings.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
@@ -107,8 +107,8 @@ SegmentChangeQuantizationCommand::getGlobalName(timeT unit)
         return "Unquantize";
     } else {
         timeT error = 0;
-        QString label = NotationStrings::makeNoteMenuLabel(unit, true, error);
-        return QString("Quantize to %1").arg(label);
+        TQString label = NotationStrings::makeNoteMenuLabel(unit, true, error);
+        return TQString("Quantize to %1").arg(label);
     }
 }
 
diff --git a/src/commands/segment/SegmentChangeQuantizationCommand.h b/src/commands/segment/SegmentChangeQuantizationCommand.h
index e5d7a36..6c69728 100644
--- a/src/commands/segment/SegmentChangeQuantizationCommand.h
+++ b/src/commands/segment/SegmentChangeQuantizationCommand.h
@@ -27,7 +27,7 @@
 #define _RG_SEGMENTCHANGEQUANTIZATIONCOMMAND_H_
 
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <vector>
 #include "base/Event.h"
 
@@ -52,7 +52,7 @@ public:
     virtual void execute();
     virtual void unexecute();
 
-    static QString getGlobalName(timeT);
+    static TQString getGlobalName(timeT);
 
 private:
     struct SegmentRec {
diff --git a/src/commands/segment/SegmentChangeTransposeCommand.cpp b/src/commands/segment/SegmentChangeTransposeCommand.cpp
index 452c2d7..e7a8697 100644
--- a/src/commands/segment/SegmentChangeTransposeCommand.cpp
+++ b/src/commands/segment/SegmentChangeTransposeCommand.cpp
@@ -27,7 +27,7 @@
 
 #include "base/Segment.h"
 #include "gui/editors/notation/NotationStrings.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
@@ -65,7 +65,7 @@ SegmentChangeTransposeCommand::getGlobalName(int unit)
     if (!unit) {
         return "Undo change transposition";
     } else {
-        return QString("Change transposition to %1").arg(unit);
+        return TQString("Change transposition to %1").arg(unit);
     }
 }
 
diff --git a/src/commands/segment/SegmentChangeTransposeCommand.h b/src/commands/segment/SegmentChangeTransposeCommand.h
index 64bd75a..a3c77b7 100644
--- a/src/commands/segment/SegmentChangeTransposeCommand.h
+++ b/src/commands/segment/SegmentChangeTransposeCommand.h
@@ -27,7 +27,7 @@
 #define _RG_SEGMENTCHANGETRANSPOSECOMMAND_H_
 
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <vector>
 #include "base/Event.h"
 
@@ -50,7 +50,7 @@ public:
     virtual void execute();
     virtual void unexecute();
 
-    static QString getGlobalName(int);
+    static TQString getGlobalName(int);
 
 private:
     Segment *m_segment;
diff --git a/src/commands/segment/SegmentColourCommand.cpp b/src/commands/segment/SegmentColourCommand.cpp
index 7dffc8f..c572556 100644
--- a/src/commands/segment/SegmentColourCommand.cpp
+++ b/src/commands/segment/SegmentColourCommand.cpp
@@ -27,7 +27,7 @@
 
 #include "base/Segment.h"
 #include "base/Selection.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/segment/SegmentColourCommand.h b/src/commands/segment/SegmentColourCommand.h
index 79b7d3d..6a19d63 100644
--- a/src/commands/segment/SegmentColourCommand.h
+++ b/src/commands/segment/SegmentColourCommand.h
@@ -28,7 +28,7 @@
 
 #include "base/Segment.h"
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <vector>
 #include <klocale.h>
 
@@ -48,7 +48,7 @@ public:
                          const unsigned int index);
     virtual ~SegmentColourCommand();
 
-    static QString getGlobalName()
+    static TQString getGlobalName()
         { return i18n("Change Segment Color..."); }
 
     virtual void execute();
diff --git a/src/commands/segment/SegmentColourMapCommand.cpp b/src/commands/segment/SegmentColourMapCommand.cpp
index 0e09d4b..9284e14 100644
--- a/src/commands/segment/SegmentColourMapCommand.cpp
+++ b/src/commands/segment/SegmentColourMapCommand.cpp
@@ -28,7 +28,7 @@
 #include "base/ColourMap.h"
 #include "base/Segment.h"
 #include "document/RosegardenGUIDoc.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/segment/SegmentColourMapCommand.h b/src/commands/segment/SegmentColourMapCommand.h
index 257cdce..5adb533 100644
--- a/src/commands/segment/SegmentColourMapCommand.h
+++ b/src/commands/segment/SegmentColourMapCommand.h
@@ -29,7 +29,7 @@
 #include "base/ColourMap.h"
 #include "base/Segment.h"
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -48,7 +48,7 @@ public:
                             const ColourMap& map);
     virtual ~SegmentColourMapCommand();
 
-    static QString getGlobalName()
+    static TQString getGlobalName()
         { return i18n("Change Segment Color Map..."); }
 
     virtual void execute();
diff --git a/src/commands/segment/SegmentCommand.cpp b/src/commands/segment/SegmentCommand.cpp
index 68ff846..7e9c3ab 100644
--- a/src/commands/segment/SegmentCommand.cpp
+++ b/src/commands/segment/SegmentCommand.cpp
@@ -26,13 +26,13 @@
 #include "SegmentCommand.h"
 
 #include "base/Segment.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
 {
 
-SegmentCommand::SegmentCommand(QString name, const std::vector<Segment*>& segments)
+SegmentCommand::SegmentCommand(TQString name, const std::vector<Segment*>& segments)
         : KNamedCommand(name)
 {
     m_segments.resize(segments.size());
diff --git a/src/commands/segment/SegmentCommand.h b/src/commands/segment/SegmentCommand.h
index da28a04..45865a1 100644
--- a/src/commands/segment/SegmentCommand.h
+++ b/src/commands/segment/SegmentCommand.h
@@ -27,7 +27,7 @@
 #define _RG_SEGMENTCOMMAND_H_
 
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <vector>
 
 
@@ -45,7 +45,7 @@ class Segment;
 class SegmentCommand : public KNamedCommand
 {
 public:
-    SegmentCommand(QString name, const std::vector<Segment*>&);
+    SegmentCommand(TQString name, const std::vector<Segment*>&);
 
     typedef std::vector<Segment*> segmentlist;
     
diff --git a/src/commands/segment/SegmentCommandRepeat.cpp b/src/commands/segment/SegmentCommandRepeat.cpp
index 4b707cb..355c004 100644
--- a/src/commands/segment/SegmentCommandRepeat.cpp
+++ b/src/commands/segment/SegmentCommandRepeat.cpp
@@ -28,7 +28,7 @@
 #include <klocale.h>
 #include "base/Segment.h"
 #include "SegmentCommand.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/segment/SegmentJoinCommand.cpp b/src/commands/segment/SegmentJoinCommand.cpp
index 27b1bb8..989384d 100644
--- a/src/commands/segment/SegmentJoinCommand.cpp
+++ b/src/commands/segment/SegmentJoinCommand.cpp
@@ -30,7 +30,7 @@
 #include "base/NotationTypes.h"
 #include "base/Segment.h"
 #include "base/Selection.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/segment/SegmentJoinCommand.h b/src/commands/segment/SegmentJoinCommand.h
index 97c7924..f7e6907 100644
--- a/src/commands/segment/SegmentJoinCommand.h
+++ b/src/commands/segment/SegmentJoinCommand.h
@@ -27,7 +27,7 @@
 #define _RG_SEGMENTJOINCOMMAND_H_
 
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <vector>
 #include <klocale.h>
 
@@ -50,7 +50,7 @@ public:
     virtual void execute();
     virtual void unexecute();
 
-    static QString getGlobalName() { return i18n("&Join"); }
+    static TQString getGlobalName() { return i18n("&Join"); }
     
 private:
     std::vector<Segment *> m_oldSegments;
diff --git a/src/commands/segment/SegmentLabelCommand.cpp b/src/commands/segment/SegmentLabelCommand.cpp
index 8bc0ff4..afffaba 100644
--- a/src/commands/segment/SegmentLabelCommand.cpp
+++ b/src/commands/segment/SegmentLabelCommand.cpp
@@ -28,7 +28,7 @@
 #include "misc/Strings.h"
 #include "base/Segment.h"
 #include "base/Selection.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
@@ -36,7 +36,7 @@ namespace Rosegarden
 
 SegmentLabelCommand::SegmentLabelCommand(
     SegmentSelection &segments,
-    const QString &label):
+    const TQString &label):
         KNamedCommand(i18n("Label Segments")),
         m_newLabel(label)
 {
diff --git a/src/commands/segment/SegmentLabelCommand.h b/src/commands/segment/SegmentLabelCommand.h
index 1c55f3b..215b827 100644
--- a/src/commands/segment/SegmentLabelCommand.h
+++ b/src/commands/segment/SegmentLabelCommand.h
@@ -27,7 +27,7 @@
 #define _RG_SEGMENTLABELCOMMAND_H_
 
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <vector>
 #include <klocale.h>
 
@@ -45,10 +45,10 @@ class SegmentLabelCommand : public KNamedCommand
 {
 public:
     SegmentLabelCommand(SegmentSelection &segments,
-                        const QString &label);
+                        const TQString &label);
     virtual ~SegmentLabelCommand();
 
-    static QString getGlobalName()
+    static TQString getGlobalName()
         { return i18n("Re&label..."); }
 
     virtual void execute();
@@ -56,8 +56,8 @@ public:
 protected:
 
     std::vector<Segment*>  m_segments;
-    std::vector<QString>               m_labels;
-    QString                            m_newLabel;
+    std::vector<TQString>               m_labels;
+    TQString                            m_newLabel;
 };
 
 
diff --git a/src/commands/segment/SegmentQuickCopyCommand.cpp b/src/commands/segment/SegmentQuickCopyCommand.cpp
index 1ce432c..6e118c8 100644
--- a/src/commands/segment/SegmentQuickCopyCommand.cpp
+++ b/src/commands/segment/SegmentQuickCopyCommand.cpp
@@ -28,7 +28,7 @@
 #include "misc/Strings.h"
 #include "base/Composition.h"
 #include "base/Segment.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/segment/SegmentQuickCopyCommand.h b/src/commands/segment/SegmentQuickCopyCommand.h
index 638b16a..7e97781 100644
--- a/src/commands/segment/SegmentQuickCopyCommand.h
+++ b/src/commands/segment/SegmentQuickCopyCommand.h
@@ -23,11 +23,11 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RG_SEGMENTQUICKCOPYCOMMAND_H_
-#define _RG_SEGMENTQUICKCOPYCOMMAND_H_
+#ifndef _RG_SEGMENQUICKCOPYCOMMAND_H_
+#define _RG_SEGMENQUICKCOPYCOMMAND_H_
 
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -52,7 +52,7 @@ public:
     // return pointer to new copy
     Segment* getCopy() { return m_segment; }
 
-    static QString getGlobalName() { return i18n("Quick-Copy Segment"); }
+    static TQString getGlobalName() { return i18n("Quick-Copy Segment"); }
 
 private:
     Composition *m_composition;
diff --git a/src/commands/segment/SegmentReconfigureCommand.cpp b/src/commands/segment/SegmentReconfigureCommand.cpp
index ec9d1bd..183b4ac 100644
--- a/src/commands/segment/SegmentReconfigureCommand.cpp
+++ b/src/commands/segment/SegmentReconfigureCommand.cpp
@@ -27,13 +27,13 @@
 
 #include "base/Segment.h"
 #include "base/Track.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
 {
 
-SegmentReconfigureCommand::SegmentReconfigureCommand(QString name) :
+SegmentReconfigureCommand::SegmentReconfigureCommand(TQString name) :
         KNamedCommand(name)
 {}
 
diff --git a/src/commands/segment/SegmentReconfigureCommand.h b/src/commands/segment/SegmentReconfigureCommand.h
index be82e47..ec35725 100644
--- a/src/commands/segment/SegmentReconfigureCommand.h
+++ b/src/commands/segment/SegmentReconfigureCommand.h
@@ -28,7 +28,7 @@
 
 #include "base/Track.h"
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <vector>
 #include "base/Event.h"
 
@@ -48,7 +48,7 @@ class Segment;
 class SegmentReconfigureCommand : public KNamedCommand
 {
 public:
-    SegmentReconfigureCommand(QString name);
+    SegmentReconfigureCommand(TQString name);
     virtual ~SegmentReconfigureCommand();
 
     struct SegmentRec {
diff --git a/src/commands/segment/SegmentRescaleCommand.cpp b/src/commands/segment/SegmentRescaleCommand.cpp
index d7a7c80..ce8a6d1 100644
--- a/src/commands/segment/SegmentRescaleCommand.cpp
+++ b/src/commands/segment/SegmentRescaleCommand.cpp
@@ -30,7 +30,7 @@
 #include "base/Composition.h"
 #include "base/NotationTypes.h"
 #include "base/Segment.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
@@ -98,7 +98,7 @@ SegmentRescaleCommand::execute()
 
         m_newSegment = new Segment();
         m_newSegment->setTrack(m_segment->getTrack());
-        QString oldLabel = strtoqstr(m_segment->getLabel());
+        TQString oldLabel = strtoqstr(m_segment->getLabel());
         if (oldLabel.endsWith(i18n("(rescaled)"))) {
             m_newSegment->setLabel(m_segment->getLabel());
         } else {
diff --git a/src/commands/segment/SegmentRescaleCommand.h b/src/commands/segment/SegmentRescaleCommand.h
index 7a34727..bc724be 100644
--- a/src/commands/segment/SegmentRescaleCommand.h
+++ b/src/commands/segment/SegmentRescaleCommand.h
@@ -27,7 +27,7 @@
 #define _RG_SEGMENTRESCALECOMMAND_H_
 
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include "base/Event.h"
 #include <klocale.h>
 
@@ -55,7 +55,7 @@ public:
     virtual void execute();
     virtual void unexecute();
     
-    static QString getGlobalName() { return i18n("Stretch or S&quash..."); }
+    static TQString getGlobalName() { return i18n("Stretch or S&quash..."); }
 
 private:
     Segment *m_segment;
diff --git a/src/commands/segment/SegmentSplitByPitchCommand.cpp b/src/commands/segment/SegmentSplitByPitchCommand.cpp
index 2000a35..9510848 100644
--- a/src/commands/segment/SegmentSplitByPitchCommand.cpp
+++ b/src/commands/segment/SegmentSplitByPitchCommand.cpp
@@ -34,7 +34,7 @@
 #include "base/NotationQuantizer.h"
 #include "base/Segment.h"
 #include "base/SegmentNotationHelper.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/segment/SegmentSplitByPitchCommand.h b/src/commands/segment/SegmentSplitByPitchCommand.h
index e536be6..b935867 100644
--- a/src/commands/segment/SegmentSplitByPitchCommand.h
+++ b/src/commands/segment/SegmentSplitByPitchCommand.h
@@ -28,7 +28,7 @@
 
 #include "base/Segment.h"
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 #include "gui/general/ClefIndex.h"
 
@@ -57,7 +57,7 @@ public:
                                ClefHandling clefHandling);
     virtual ~SegmentSplitByPitchCommand();
 
-    static QString getGlobalName()
+    static TQString getGlobalName()
         { return i18n("Split by &Pitch..."); }
 
     virtual void execute();
diff --git a/src/commands/segment/SegmentSplitByRecordingSrcCommand.cpp b/src/commands/segment/SegmentSplitByRecordingSrcCommand.cpp
index fbb3c1b..801fc1d 100644
--- a/src/commands/segment/SegmentSplitByRecordingSrcCommand.cpp
+++ b/src/commands/segment/SegmentSplitByRecordingSrcCommand.cpp
@@ -31,7 +31,7 @@
 #include "base/Event.h"
 #include "base/NotationTypes.h"
 #include "base/Segment.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/segment/SegmentSplitByRecordingSrcCommand.h b/src/commands/segment/SegmentSplitByRecordingSrcCommand.h
index 3b087ab..03ca3b6 100644
--- a/src/commands/segment/SegmentSplitByRecordingSrcCommand.h
+++ b/src/commands/segment/SegmentSplitByRecordingSrcCommand.h
@@ -27,7 +27,7 @@
 #define _RG_SEGMENTSPLITBYRECORDINGSRCCOMMAND_H_
 
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 #include "gui/application/RosegardenDCOP.h"
 
@@ -48,7 +48,7 @@ public:
                                       int channel, int device);
     virtual ~SegmentSplitByRecordingSrcCommand();
     
-    static QString getGlobalName()
+    static TQString getGlobalName()
         { return i18n("Split by &Recording Source..."); }
 
     virtual void execute();
diff --git a/src/commands/segment/SegmentSplitCommand.cpp b/src/commands/segment/SegmentSplitCommand.cpp
index 450ad3e..9fbcdf6 100644
--- a/src/commands/segment/SegmentSplitCommand.cpp
+++ b/src/commands/segment/SegmentSplitCommand.cpp
@@ -31,7 +31,7 @@
 #include "base/Composition.h"
 #include "base/NotationTypes.h"
 #include "base/Segment.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
@@ -131,7 +131,7 @@ SegmentSplitCommand::execute()
     // Set labels
     //
     m_segmentLabel = m_segment->getLabel();
-    QString newLabel = strtoqstr(m_segmentLabel);
+    TQString newLabel = strtoqstr(m_segmentLabel);
     if (!newLabel.endsWith(i18n(" (split)"))) {
         newLabel = i18n("%1 (split)").arg(newLabel);
     }
diff --git a/src/commands/segment/SegmentTransposeCommand.h b/src/commands/segment/SegmentTransposeCommand.h
index 74af8d4..075ca79 100644
--- a/src/commands/segment/SegmentTransposeCommand.h
+++ b/src/commands/segment/SegmentTransposeCommand.h
@@ -49,7 +49,7 @@ public:
 
     virtual ~SegmentTransposeCommand();
 
-    static QString getGlobalName(int semitones = 0, int step = 0) {
+    static TQString getGlobalName(int semitones = 0, int step = 0) {
         switch (semitones) {
         default:  return i18n("Transpose by &Interval...");
         }
diff --git a/src/commands/studio/AddControlParameterCommand.cpp b/src/commands/studio/AddControlParameterCommand.cpp
index 35ac62a..e5b4516 100644
--- a/src/commands/studio/AddControlParameterCommand.cpp
+++ b/src/commands/studio/AddControlParameterCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/Device.h"
 #include "base/MidiDevice.h"
 #include "base/Studio.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <iostream>
 
 
diff --git a/src/commands/studio/AddControlParameterCommand.h b/src/commands/studio/AddControlParameterCommand.h
index fa614ac..3cbf903 100644
--- a/src/commands/studio/AddControlParameterCommand.h
+++ b/src/commands/studio/AddControlParameterCommand.h
@@ -29,7 +29,7 @@
 #include "base/ControlParameter.h"
 #include "base/Device.h"
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -58,7 +58,7 @@ public:
     virtual void execute();
     virtual void unexecute();
 
-    static QString getGlobalName() { return i18n("&Add Control Parameter"); }
+    static TQString getGlobalName() { return i18n("&Add Control Parameter"); }
 
 protected:
     Studio              *m_studio;
diff --git a/src/commands/studio/CreateOrDeleteDeviceCommand.cpp b/src/commands/studio/CreateOrDeleteDeviceCommand.cpp
index 48dc6c1..3933483 100644
--- a/src/commands/studio/CreateOrDeleteDeviceCommand.cpp
+++ b/src/commands/studio/CreateOrDeleteDeviceCommand.cpp
@@ -30,9 +30,9 @@
 #include "base/Device.h"
 #include "base/MidiDevice.h"
 #include "base/Studio.h"
-#include <qcstring.h>
-#include <qdatastream.h>
-#include <qstring.h>
+#include <tqcstring.h>
+#include <tqdatastream.h>
+#include <tqstring.h>
 #include "gui/application/RosegardenApplication.h"
 
 
@@ -74,10 +74,10 @@ CreateOrDeleteDeviceCommand::execute()
         m_deviceCreated = true;
 
 
-        QByteArray data;
-        QByteArray replyData;
-        QCString replyType;
-        QDataStream arg(data, IO_WriteOnly);
+        TQByteArray data;
+        TQByteArray replyData;
+        TQCString replyType;
+        TQDataStream arg(data, IO_WriteOnly);
 
         arg << (int)m_type;
         arg << (unsigned int)m_direction;
@@ -89,7 +89,7 @@ CreateOrDeleteDeviceCommand::execute()
             return ;
         }
 
-        QDataStream reply(replyData, IO_ReadOnly);
+        TQDataStream reply(replyData, IO_ReadOnly);
         reply >> m_deviceId;
 
         if (m_deviceId == Device::NO_DEVICE) {
@@ -105,7 +105,7 @@ CreateOrDeleteDeviceCommand::execute()
         arg << (unsigned int)m_deviceId;
         arg << strtoqstr(m_connection);
 
-        if (!rgapp->sequencerCall("setConnection(unsigned int, QString)",
+        if (!rgapp->sequencerCall("setConnection(unsigned int, TQString)",
                                   replyType, replyData, data)) {
             SEQMAN_DEBUG << "CreateDeviceCommand::execute - "
             << "failure in sequencer setConnection" << endl;
@@ -131,10 +131,10 @@ CreateOrDeleteDeviceCommand::execute()
 
         // Delete
 
-        QByteArray data;
-        QByteArray replyData;
-        QCString replyType;
-        QDataStream arg(data, IO_WriteOnly);
+        TQByteArray data;
+        TQByteArray replyData;
+        TQCString replyType;
+        TQDataStream arg(data, IO_WriteOnly);
 
         if (m_deviceId == Device::NO_DEVICE)
             return ;
diff --git a/src/commands/studio/CreateOrDeleteDeviceCommand.h b/src/commands/studio/CreateOrDeleteDeviceCommand.h
index 2fe69a3..3db7b25 100644
--- a/src/commands/studio/CreateOrDeleteDeviceCommand.h
+++ b/src/commands/studio/CreateOrDeleteDeviceCommand.h
@@ -30,7 +30,7 @@
 #include "base/MidiDevice.h"
 #include <string>
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -64,7 +64,7 @@ public:
     CreateOrDeleteDeviceCommand(Studio *studio,
                                 DeviceId deviceId);
     
-    static QString getGlobalName(bool deletion) {
+    static TQString getGlobalName(bool deletion) {
         return (deletion ? i18n("Delete Device") : i18n("Create Device")); 
     }
     
diff --git a/src/commands/studio/ModifyControlParameterCommand.cpp b/src/commands/studio/ModifyControlParameterCommand.cpp
index 5c8c1a2..f1913a8 100644
--- a/src/commands/studio/ModifyControlParameterCommand.cpp
+++ b/src/commands/studio/ModifyControlParameterCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/Device.h"
 #include "base/MidiDevice.h"
 #include "base/Studio.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <iostream>
 
 
diff --git a/src/commands/studio/ModifyControlParameterCommand.h b/src/commands/studio/ModifyControlParameterCommand.h
index cd705d6..1a32994 100644
--- a/src/commands/studio/ModifyControlParameterCommand.h
+++ b/src/commands/studio/ModifyControlParameterCommand.h
@@ -29,7 +29,7 @@
 #include "base/ControlParameter.h"
 #include "base/Device.h"
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -58,7 +58,7 @@ public:
     virtual void execute();
     virtual void unexecute();
 
-    static QString getGlobalName() { return i18n("&Modify Control Parameter"); }
+    static TQString getGlobalName() { return i18n("&Modify Control Parameter"); }
 
 protected:
     Studio            *m_studio;
diff --git a/src/commands/studio/ModifyDeviceCommand.cpp b/src/commands/studio/ModifyDeviceCommand.cpp
index d3323ac..2cf02e0 100644
--- a/src/commands/studio/ModifyDeviceCommand.cpp
+++ b/src/commands/studio/ModifyDeviceCommand.cpp
@@ -28,7 +28,7 @@
 #include "base/Device.h"
 #include "base/MidiDevice.h"
 #include "base/Studio.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <iostream>
 
 
diff --git a/src/commands/studio/ModifyDeviceCommand.h b/src/commands/studio/ModifyDeviceCommand.h
index f8f820e..f6c5289 100644
--- a/src/commands/studio/ModifyDeviceCommand.h
+++ b/src/commands/studio/ModifyDeviceCommand.h
@@ -30,7 +30,7 @@
 #include "base/MidiDevice.h"
 #include <string>
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -65,7 +65,7 @@ public:
     /// supersedes setBankList() and setProgramList()
     void clearBankAndProgramList() { m_clearBankAndProgramList = true; }
 
-    static QString getGlobalName() { return i18n("Modify &MIDI Bank"); }
+    static TQString getGlobalName() { return i18n("Modify &MIDI Bank"); }
 
     virtual void execute();
     virtual void unexecute();
diff --git a/src/commands/studio/ModifyDeviceMappingCommand.cpp b/src/commands/studio/ModifyDeviceMappingCommand.cpp
index 6f02d8d..f37fd3a 100644
--- a/src/commands/studio/ModifyDeviceMappingCommand.cpp
+++ b/src/commands/studio/ModifyDeviceMappingCommand.cpp
@@ -33,7 +33,7 @@
 #include "base/Studio.h"
 #include "base/Track.h"
 #include "document/RosegardenGUIDoc.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/studio/ModifyDeviceMappingCommand.h b/src/commands/studio/ModifyDeviceMappingCommand.h
index 150275d..824b07e 100644
--- a/src/commands/studio/ModifyDeviceMappingCommand.h
+++ b/src/commands/studio/ModifyDeviceMappingCommand.h
@@ -29,7 +29,7 @@
 #include "base/Device.h"
 #include "base/Track.h"
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <vector>
 #include <klocale.h>
 
@@ -52,7 +52,7 @@ public:
                                DeviceId fromDevice,
                                DeviceId toDevice);
 
-    static QString getGlobalName() { return i18n("Modify &Device Mapping"); }
+    static TQString getGlobalName() { return i18n("Modify &Device Mapping"); }
 
     virtual void execute();
     virtual void unexecute();
diff --git a/src/commands/studio/ModifyInstrumentMappingCommand.cpp b/src/commands/studio/ModifyInstrumentMappingCommand.cpp
index e6369b6..87c5785 100644
--- a/src/commands/studio/ModifyInstrumentMappingCommand.cpp
+++ b/src/commands/studio/ModifyInstrumentMappingCommand.cpp
@@ -30,7 +30,7 @@
 #include "base/Studio.h"
 #include "base/Track.h"
 #include "document/RosegardenGUIDoc.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/studio/ModifyInstrumentMappingCommand.h b/src/commands/studio/ModifyInstrumentMappingCommand.h
index 224459b..f482008 100644
--- a/src/commands/studio/ModifyInstrumentMappingCommand.h
+++ b/src/commands/studio/ModifyInstrumentMappingCommand.h
@@ -29,7 +29,7 @@
 #include "base/MidiProgram.h"
 #include "base/Track.h"
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <vector>
 #include <klocale.h>
 
@@ -52,7 +52,7 @@ public:
                                    InstrumentId fromInstrument,
                                    InstrumentId toInstrument);
 
-    static QString getGlobalName() { return i18n("Modify &Instrument Mapping"); }
+    static TQString getGlobalName() { return i18n("Modify &Instrument Mapping"); }
 
     virtual void execute();
     virtual void unexecute();
diff --git a/src/commands/studio/ReconnectDeviceCommand.cpp b/src/commands/studio/ReconnectDeviceCommand.cpp
index 6d40ede..3d28185 100644
--- a/src/commands/studio/ReconnectDeviceCommand.cpp
+++ b/src/commands/studio/ReconnectDeviceCommand.cpp
@@ -29,9 +29,9 @@
 #include "misc/Debug.h"
 #include "base/Device.h"
 #include "base/Studio.h"
-#include <qcstring.h>
-#include <qdatastream.h>
-#include <qstring.h>
+#include <tqcstring.h>
+#include <tqdatastream.h>
+#include <tqstring.h>
 #include "gui/application/RosegardenApplication.h"
 
 
@@ -46,15 +46,15 @@ ReconnectDeviceCommand::execute()
     if (device) {
         m_oldConnection = device->getConnection();
 
-        QByteArray data;
-        QByteArray replyData;
-        QCString replyType;
-        QDataStream arg(data, IO_WriteOnly);
+        TQByteArray data;
+        TQByteArray replyData;
+        TQCString replyType;
+        TQDataStream arg(data, IO_WriteOnly);
 
         arg << (unsigned int)m_deviceId;
         arg << strtoqstr(m_newConnection);
 
-        if (!rgapp->sequencerCall("setConnection(unsigned int, QString)",
+        if (!rgapp->sequencerCall("setConnection(unsigned int, TQString)",
                                   replyType, replyData, data)) {
             SEQMAN_DEBUG << "ReconnectDeviceCommand::execute - "
             << "failure in sequencer setConnection" << endl;
@@ -74,15 +74,15 @@ ReconnectDeviceCommand::unexecute()
 
     if (device) {
 
-        QByteArray data;
-        QByteArray replyData;
-        QCString replyType;
-        QDataStream arg(data, IO_WriteOnly);
+        TQByteArray data;
+        TQByteArray replyData;
+        TQCString replyType;
+        TQDataStream arg(data, IO_WriteOnly);
 
         arg << (unsigned int)m_deviceId;
         arg << strtoqstr(m_oldConnection);
 
-        if (!rgapp->sequencerCall("setConnection(unsigned int, QString)",
+        if (!rgapp->sequencerCall("setConnection(unsigned int, TQString)",
                                   replyType, replyData, data)) {
             SEQMAN_DEBUG << "ReconnectDeviceCommand::unexecute - "
             << "failure in sequencer setConnection" << endl;
diff --git a/src/commands/studio/ReconnectDeviceCommand.h b/src/commands/studio/ReconnectDeviceCommand.h
index 910bdbf..ba445a6 100644
--- a/src/commands/studio/ReconnectDeviceCommand.h
+++ b/src/commands/studio/ReconnectDeviceCommand.h
@@ -29,7 +29,7 @@
 #include "base/Device.h"
 #include <string>
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -52,7 +52,7 @@ public:
         m_deviceId(deviceId),
         m_newConnection(newConnection) { }
 
-    static QString getGlobalName() { return i18n("Reconnect Device"); }
+    static TQString getGlobalName() { return i18n("Reconnect Device"); }
 
     virtual void execute();
     virtual void unexecute();
diff --git a/src/commands/studio/RemoveControlParameterCommand.cpp b/src/commands/studio/RemoveControlParameterCommand.cpp
index 5f596b5..a18a28d 100644
--- a/src/commands/studio/RemoveControlParameterCommand.cpp
+++ b/src/commands/studio/RemoveControlParameterCommand.cpp
@@ -29,7 +29,7 @@
 #include "base/Device.h"
 #include "base/MidiDevice.h"
 #include "base/Studio.h"
-#include <qstring.h>
+#include <tqstring.h>
 #include <iostream>
 
 
diff --git a/src/commands/studio/RemoveControlParameterCommand.h b/src/commands/studio/RemoveControlParameterCommand.h
index 3143739..9b8f82f 100644
--- a/src/commands/studio/RemoveControlParameterCommand.h
+++ b/src/commands/studio/RemoveControlParameterCommand.h
@@ -29,7 +29,7 @@
 #include "base/ControlParameter.h"
 #include "base/Device.h"
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -57,7 +57,7 @@ public:
     virtual void execute();
     virtual void unexecute();
 
-    static QString getGlobalName() { return i18n("&Remove Control Parameter"); }
+    static TQString getGlobalName() { return i18n("&Remove Control Parameter"); }
 
 protected:
     Studio              *m_studio;
diff --git a/src/commands/studio/RenameDeviceCommand.cpp b/src/commands/studio/RenameDeviceCommand.cpp
index 1d6c382..e3b1f61 100644
--- a/src/commands/studio/RenameDeviceCommand.cpp
+++ b/src/commands/studio/RenameDeviceCommand.cpp
@@ -27,7 +27,7 @@
 
 #include "base/Device.h"
 #include "base/Studio.h"
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace Rosegarden
diff --git a/src/commands/studio/RenameDeviceCommand.h b/src/commands/studio/RenameDeviceCommand.h
index d767bca..8e4f1f4 100644
--- a/src/commands/studio/RenameDeviceCommand.h
+++ b/src/commands/studio/RenameDeviceCommand.h
@@ -29,7 +29,7 @@
 #include "base/Device.h"
 #include <string>
 #include <kcommand.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <klocale.h>
 
 
@@ -52,7 +52,7 @@ public:
         m_deviceId(deviceId),
         m_name(name) { }
 
-    static QString getGlobalName() { return i18n("Rename Device"); }
+    static TQString getGlobalName() { return i18n("Rename Device"); }
 
     virtual void execute();
     virtual void unexecute();