Initial TQt conversion

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

54 files changed, 111 insertions, 111 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");