Initial TQt4 port of Rosegarden

This enables compilation under both Qt3 and Qt4


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

41 files changed, 96 insertions, 95 deletions

diff --git a/src/commands/edit/CopyCommand.cpp b/src/commands/edit/CopyCommand.cpp
index cd86359..34534db 100644
--- a/src/commands/edit/CopyCommand.cpp
+++ b/src/commands/edit/CopyCommand.cpp
@@ -57,11 +57,11 @@ CopyCommand::CopyCommand(SegmentSelection &selection,
     for (SegmentSelection::iterator i = selection.begin();
             i != selection.end(); ++i) {
         TQString newLabel = strtoqstr((*i)->getLabel());
-        if (newLabel.contains(i18n("(copied)"))) {
+        if (newLabel.tqcontains(i18n("(copied)"))) {
             m_sourceClipboard->newSegment(*i);
         } else {
             m_sourceClipboard->newSegment(*i)->
-            setLabel(qstrtostr(i18n("%1 (copied)").arg(newLabel)));
+            setLabel(qstrtostr(i18n("%1 (copied)").tqarg(newLabel)));
         }
     }
 }
diff --git a/src/commands/edit/EraseCommand.cpp b/src/commands/edit/EraseCommand.cpp
index 246eb5f..3a3df26 100644
--- a/src/commands/edit/EraseCommand.cpp
+++ b/src/commands/edit/EraseCommand.cpp
@@ -38,7 +38,7 @@ namespace Rosegarden
 EraseCommand::EraseCommand(EventSelection &selection) :
         BasicSelectionCommand(getGlobalName(), selection, true),
         m_selection(&selection),
-        m_relayoutEndTime(getEndTime())
+        m_retqlayoutEndTime(getEndTime())
 {
     // nothing else
 }
@@ -56,7 +56,7 @@ EraseCommand::modifySegment()
 
         if ((*i)->isa(Clef::EventType) ||
                 (*i)->isa(Key ::EventType)) {
-            m_relayoutEndTime = getSegment().getEndTime();
+            m_retqlayoutEndTime = getSegment().getEndTime();
         }
 
         // We used to do this by calling SegmentNotationHelper::deleteEvent
@@ -78,9 +78,9 @@ EraseCommand::modifySegment()
 }
 
 timeT
-EraseCommand::getRelayoutEndTime()
+EraseCommand::getRetqlayoutEndTime()
 {
-    return m_relayoutEndTime;
+    return m_retqlayoutEndTime;
 }
 
 }
diff --git a/src/commands/edit/EraseCommand.h b/src/commands/edit/EraseCommand.h
index a662640..e54139b 100644
--- a/src/commands/edit/EraseCommand.h
+++ b/src/commands/edit/EraseCommand.h
@@ -49,14 +49,14 @@ public:
 
     static TQString getGlobalName() { return i18n("&Erase"); }
 
-    virtual timeT getRelayoutEndTime();
+    virtual timeT getRetqlayoutEndTime();
 
 protected:
     virtual void modifySegment();
 
 private:
     EventSelection *m_selection;// only used on 1st execute (cf bruteForceRedo)
-    timeT m_relayoutEndTime;
+    timeT m_retqlayoutEndTime;
 };
 
 
diff --git a/src/commands/edit/EventQuantizeCommand.cpp b/src/commands/edit/EventQuantizeCommand.cpp
index 95943ba..de033ef 100644
--- a/src/commands/edit/EventQuantizeCommand.cpp
+++ b/src/commands/edit/EventQuantizeCommand.cpp
@@ -106,7 +106,7 @@ EventQuantizeCommand::~EventQuantizeCommand()
     delete m_quantizer;
 }
 
-QString
+TQString
 EventQuantizeCommand::getGlobalName(Quantizer *quantizer)
 {
     if (quantizer) {
diff --git a/src/commands/edit/EventQuantizeCommand.h b/src/commands/edit/EventQuantizeCommand.h
index 0d50678..aa9dd58 100644
--- a/src/commands/edit/EventQuantizeCommand.h
+++ b/src/commands/edit/EventQuantizeCommand.h
@@ -23,8 +23,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RG_EVENQUANTIZECOMMAND_H_
-#define _RG_EVENQUANTIZECOMMAND_H_
+#ifndef _RG_EVENTQUANTIZECOMMAND_H_
+#define _RG_EVENTQUANTIZECOMMAND_H_
 
 #include "document/BasicCommand.h"
 #include <tqobject.h>
@@ -45,6 +45,7 @@ class EventSelection;
 class EventQuantizeCommand : public TQObject, public BasicCommand
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     /// Quantizer must be on heap (EventQuantizeCommand dtor will delete)
diff --git a/src/commands/edit/EventUnquantizeCommand.cpp b/src/commands/edit/EventUnquantizeCommand.cpp
index 7e7ce58..3fe2eb2 100644
--- a/src/commands/edit/EventUnquantizeCommand.cpp
+++ b/src/commands/edit/EventUnquantizeCommand.cpp
@@ -67,7 +67,7 @@ EventUnquantizeCommand::~EventUnquantizeCommand()
     delete m_quantizer;
 }
 
-QString
+TQString
 EventUnquantizeCommand::getGlobalName(Quantizer *)
 {
     /*!!!
diff --git a/src/commands/edit/EventUnquantizeCommand.h b/src/commands/edit/EventUnquantizeCommand.h
index 4203726..9bb2718 100644
--- a/src/commands/edit/EventUnquantizeCommand.h
+++ b/src/commands/edit/EventUnquantizeCommand.h
@@ -23,8 +23,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RG_EVENTUNQUANTIZECOMMAND_H_
-#define _RG_EVENTUNQUANTIZECOMMAND_H_
+#ifndef _RG_EVENTUNTQUANTIZECOMMAND_H_
+#define _RG_EVENTUNTQUANTIZECOMMAND_H_
 
 #include "document/BasicCommand.h"
 #include <tqstring.h>
diff --git a/src/commands/edit/MoveAcrossSegmentsCommand.cpp b/src/commands/edit/MoveAcrossSegmentsCommand.cpp
index f0b954a..ed73360 100644
--- a/src/commands/edit/MoveAcrossSegmentsCommand.cpp
+++ b/src/commands/edit/MoveAcrossSegmentsCommand.cpp
@@ -67,7 +67,7 @@ MoveAcrossSegmentsCommand::~MoveAcrossSegmentsCommand()
     delete m_clipboard;
 }
 
-QString
+TQString
 MoveAcrossSegmentsCommand::getGlobalName()
 {
     return i18n("&Move Events to Other Segment");
diff --git a/src/commands/edit/MoveCommand.cpp b/src/commands/edit/MoveCommand.cpp
index 58667fc..aa6b891 100644
--- a/src/commands/edit/MoveCommand.cpp
+++ b/src/commands/edit/MoveCommand.cpp
@@ -52,7 +52,7 @@ MoveCommand::MoveCommand(Segment &s, timeT delta, bool useNotationTimings,
     // nothing else
 }
 
-QString
+TQString
 MoveCommand::getGlobalName(timeT delta)
 {
     if (delta == 0) {
diff --git a/src/commands/edit/PasteEventsCommand.cpp b/src/commands/edit/PasteEventsCommand.cpp
index 2e2e458..9b84ee7 100644
--- a/src/commands/edit/PasteEventsCommand.cpp
+++ b/src/commands/edit/PasteEventsCommand.cpp
@@ -47,14 +47,14 @@ PasteEventsCommand::PasteEventsCommand(Segment &segment,
                                        PasteType pasteType) :
     BasicCommand(getGlobalName(), segment, pasteTime,
                  getEffectiveEndTime(segment, clipboard, pasteTime)),
-    m_relayoutEndTime(getEndTime()),
+    m_retqlayoutEndTime(getEndTime()),
     m_clipboard(new Clipboard(*clipboard)),
     m_pasteType(pasteType),
     m_pastedEvents(segment)
 {
     if (pasteType != OpenAndPaste) {
 
-        // paste clef or key -> relayout to end
+        // paste clef or key -> retqlayout to end
 
         if (clipboard->isSingleSegment()) {
 
@@ -62,7 +62,7 @@ PasteEventsCommand::PasteEventsCommand(Segment &segment,
             for (Segment::iterator i = s->begin(); i != s->end(); ++i) {
                 if ((*i)->isa(Clef::EventType) ||
                     (*i)->isa(Key::EventType)) {
-                    m_relayoutEndTime = s->getEndTime();
+                    m_retqlayoutEndTime = s->getEndTime();
                     break;
                 }
             }
@@ -76,7 +76,7 @@ PasteEventsCommand::PasteEventsCommand(Segment &segment,
                                        timeT pasteEndTime,
                                        PasteType pasteType) :
     BasicCommand(getGlobalName(), segment, pasteTime, pasteEndTime),
-    m_relayoutEndTime(getEndTime()),
+    m_retqlayoutEndTime(getEndTime()),
     m_clipboard(new Clipboard(*clipboard)),
     m_pasteType(pasteType),
     m_pastedEvents(segment)
@@ -138,9 +138,9 @@ PasteEventsCommand::getEffectiveEndTime(Segment &segment,
 }
 
 timeT
-PasteEventsCommand::getRelayoutEndTime()
+PasteEventsCommand::getRetqlayoutEndTime()
 {
-    return m_relayoutEndTime;
+    return m_retqlayoutEndTime;
 }
 
 bool
diff --git a/src/commands/edit/PasteEventsCommand.h b/src/commands/edit/PasteEventsCommand.h
index 66aea6d..2817d84 100644
--- a/src/commands/edit/PasteEventsCommand.h
+++ b/src/commands/edit/PasteEventsCommand.h
@@ -60,7 +60,7 @@ public:
     static PasteTypeMap getPasteTypes(); // type, descrip
 
     /**
-     * Construct a Paste command from a clipboard that already contains
+     * Construct a Paste command from a clipboard that already tqcontains
      * the events to be pasted.
      */
     PasteEventsCommand(Segment &segment,
@@ -92,14 +92,14 @@ public:
     /// Determine whether this paste will succeed (without executing it yet)
     bool isPossible();
 
-    virtual timeT getRelayoutEndTime();
+    virtual timeT getRetqlayoutEndTime();
 
 protected:
     virtual void modifySegment();
     timeT getEffectiveEndTime(Segment &,
                                           Clipboard *,
                                           timeT);
-    timeT m_relayoutEndTime;
+    timeT m_retqlayoutEndTime;
     Clipboard *m_clipboard;
     PasteType m_pasteType;
     EventSelection m_pastedEvents;
diff --git a/src/commands/edit/SetLyricsCommand.cpp b/src/commands/edit/SetLyricsCommand.cpp
index cfee2bf..f10d746 100644
--- a/src/commands/edit/SetLyricsCommand.cpp
+++ b/src/commands/edit/SetLyricsCommand.cpp
@@ -106,7 +106,7 @@ SetLyricsCommand::execute()
 
         std::pair<timeT, timeT> barRange = comp->getBarRange(barNo++);
         TQString syllables = *bsi;
-        syllables.replace(TQRegExp("\\[\\d+\\] "), " ");
+        syllables.tqreplace(TQRegExp("\\[\\d+\\] "), " ");
         TQStringList syllableList = TQStringList::split(" ", syllables); // no empties
 
         i = m_segment->findTime(barRange.first);
@@ -131,7 +131,7 @@ SetLyricsCommand::execute()
             }
 
             TQString syllable = *ssi;
-            syllable.replace(TQRegExp("~"), " ");
+            syllable.tqreplace(TQRegExp("~"), " ");
             syllable = syllable.simplifyWhiteSpace();
             if (syllable == "")
                 continue;
diff --git a/src/commands/matrix/MatrixEraseCommand.cpp b/src/commands/matrix/MatrixEraseCommand.cpp
index c35259e..3285e84 100644
--- a/src/commands/matrix/MatrixEraseCommand.cpp
+++ b/src/commands/matrix/MatrixEraseCommand.cpp
@@ -44,14 +44,14 @@ MatrixEraseCommand::MatrixEraseCommand(Segment &segment,
                      event->getAbsoluteTime() + event->getDuration(),
                      true),
         m_event(event),
-        m_relayoutEndTime(getEndTime())
+        m_retqlayoutEndTime(getEndTime())
 {
     // nothing
 }
 
-timeT MatrixEraseCommand::getRelayoutEndTime()
+timeT MatrixEraseCommand::getRetqlayoutEndTime()
 {
-    return m_relayoutEndTime;
+    return m_retqlayoutEndTime;
 }
 
 void MatrixEraseCommand::modifySegment()
diff --git a/src/commands/matrix/MatrixEraseCommand.h b/src/commands/matrix/MatrixEraseCommand.h
index 244c0f9..9e126a4 100644
--- a/src/commands/matrix/MatrixEraseCommand.h
+++ b/src/commands/matrix/MatrixEraseCommand.h
@@ -45,13 +45,13 @@ public:
     MatrixEraseCommand(Segment &segment,
                        Event *event);
 
-    virtual timeT getRelayoutEndTime();
+    virtual timeT getRetqlayoutEndTime();
 
 protected:
     virtual void modifySegment();
 
     Event *m_event; // only used on 1st execute (cf bruteForceRedo)
-    timeT m_relayoutEndTime;
+    timeT m_retqlayoutEndTime;
 };
 
 //------------------------------
diff --git a/src/commands/notation/AddFingeringMarkCommand.cpp b/src/commands/notation/AddFingeringMarkCommand.cpp
index e8031ff..49ec03c 100644
--- a/src/commands/notation/AddFingeringMarkCommand.cpp
+++ b/src/commands/notation/AddFingeringMarkCommand.cpp
@@ -38,7 +38,7 @@
 namespace Rosegarden
 {
 
-QString
+TQString
 AddFingeringMarkCommand::getGlobalName(TQString fingering)
 {
     if (fingering == "")
@@ -46,7 +46,7 @@ AddFingeringMarkCommand::getGlobalName(TQString fingering)
     else if (fingering == "0")
         return i18n("Add Fingering &0 (Thumb)");
     else
-        return i18n("Add Fingering &%1").arg(fingering);
+        return i18n("Add Fingering &%1").tqarg(fingering);
 }
 
 void
@@ -84,7 +84,7 @@ AddFingeringMarkCommand::modifySegment()
             for (Chord::iterator ci = chord.begin();
                     ci != chord.end(); ++ci) {
 
-                if (!m_selection->contains(**ci))
+                if (!m_selection->tqcontains(**ci))
                     continue;
 
                 if (attempt < 2 &&
@@ -104,7 +104,7 @@ AddFingeringMarkCommand::modifySegment()
                     break;
                 for (Chord::iterator ci = chord.begin();
                         ci != chord.end(); ++ci) {
-                    if (m_selection->contains(**ci)) {
+                    if (m_selection->tqcontains(**ci)) {
                         Marks::removeMark
                         (***ci,
                          Marks::getFingeringMark(***ci));
diff --git a/src/commands/notation/AddIndicationCommand.cpp b/src/commands/notation/AddIndicationCommand.cpp
index 73aceb6..fd24930 100644
--- a/src/commands/notation/AddIndicationCommand.cpp
+++ b/src/commands/notation/AddIndicationCommand.cpp
@@ -138,7 +138,7 @@ AddIndicationCommand::modifySegment()
     }
 }
 
-QString
+TQString
 AddIndicationCommand::getGlobalName(std::string indicationType)
 {
     if (indicationType == Indication::Slur) {
@@ -164,7 +164,7 @@ AddIndicationCommand::getGlobalName(std::string indicationType)
         return i18n("Add &Glissando");
     }
 
-    TQString n = i18n("Add &%1%2").arg((char)toupper(indicationType[0])).arg(strtoqstr(indicationType.substr(1)));
+    TQString n = i18n("Add &%1%2").tqarg((char)toupper(indicationType[0])).tqarg(strtoqstr(indicationType.substr(1)));
     return n;
 }
 
diff --git a/src/commands/notation/AddIndicationCommand.h b/src/commands/notation/AddIndicationCommand.h
index 396a488..1b31760 100644
--- a/src/commands/notation/AddIndicationCommand.h
+++ b/src/commands/notation/AddIndicationCommand.h
@@ -55,7 +55,7 @@ public:
     Event *getLastInsertedEvent() {
         return m_lastInsertedEvent;
     }
-    virtual timeT getRelayoutEndTime() {
+    virtual timeT getRetqlayoutEndTime() {
         return getStartTime() + m_indicationDuration;
     }
 
diff --git a/src/commands/notation/AddMarkCommand.cpp b/src/commands/notation/AddMarkCommand.cpp
index 0fa8268..5386eac 100644
--- a/src/commands/notation/AddMarkCommand.cpp
+++ b/src/commands/notation/AddMarkCommand.cpp
@@ -38,7 +38,7 @@ namespace Rosegarden
 
 using namespace BaseProperties;
 
-QString
+TQString
 AddMarkCommand::getGlobalName(Mark markType)
 {
     TQString m = strtoqstr(markType);
@@ -81,12 +81,12 @@ AddMarkCommand::getGlobalName(Mark markType)
     else if (markType == Marks::MordentLongInverted)
         m = i18n("Lon&g Inverted Mordent");
     else
-        m = i18n("&%1%2").arg(m[0].upper()).arg(m.right(m.length() - 1));
+        m = i18n("&%1%2").tqarg(m[0].upper()).tqarg(m.right(m.length() - 1));
     // FIXME: That last i18n has very little chance of working, unless
     // by some miracle the exact same string was translated elsewhere already
     // but we'll leave it as a warning
 
-    m = i18n("Add %1").arg(m);
+    m = i18n("Add %1").tqarg(m);
     return m;
 }
 
diff --git a/src/commands/notation/ChangeStyleCommand.cpp b/src/commands/notation/ChangeStyleCommand.cpp
index f4b3456..f6a3464 100644
--- a/src/commands/notation/ChangeStyleCommand.cpp
+++ b/src/commands/notation/ChangeStyleCommand.cpp
@@ -37,7 +37,7 @@
 namespace Rosegarden
 {
 
-QString
+TQString
 ChangeStyleCommand::getGlobalName(NoteStyleName style)
 {
     return strtoqstr(style);
diff --git a/src/commands/notation/ClefInsertionCommand.cpp b/src/commands/notation/ClefInsertionCommand.cpp
index c2c5738..8752e8b 100644
--- a/src/commands/notation/ClefInsertionCommand.cpp
+++ b/src/commands/notation/ClefInsertionCommand.cpp
@@ -61,14 +61,14 @@ ClefInsertionCommand::~ClefInsertionCommand()
     // nothing
 }
 
-QString
+TQString
 ClefInsertionCommand::getGlobalName(Clef *)
 {
     /* doesn't handle octave offset -- leave it for now
         if (clef) {
     	TQString name(strtoqstr(clef->getClefType()));
     	name = name.left(1).upper() + name.right(name.length()-1);
-    	return i18n("Change to %1 Cle&f...").arg(name);
+    	return i18n("Change to %1 Cle&f...").tqarg(name);
         } else {
     */ 
     return i18n("Add Cle&f Change...");
@@ -78,7 +78,7 @@ ClefInsertionCommand::getGlobalName(Clef *)
 }
 
 timeT
-ClefInsertionCommand::getRelayoutEndTime()
+ClefInsertionCommand::getRetqlayoutEndTime()
 {
     // Inserting a clef can change the y-coord of every subsequent note
     return getSegment().getEndTime();
diff --git a/src/commands/notation/ClefInsertionCommand.h b/src/commands/notation/ClefInsertionCommand.h
index 9cacdfb..e3c91a5 100644
--- a/src/commands/notation/ClefInsertionCommand.h
+++ b/src/commands/notation/ClefInsertionCommand.h
@@ -52,7 +52,7 @@ public:
     virtual ~ClefInsertionCommand();
 
     static TQString getGlobalName(Clef *clef = 0);
-    virtual timeT getRelayoutEndTime();
+    virtual timeT getRetqlayoutEndTime();
 
     Event *getLastInsertedEvent() { return m_lastInsertedEvent; }
 
diff --git a/src/commands/notation/EraseEventCommand.cpp b/src/commands/notation/EraseEventCommand.cpp
index e599079..a3479dd 100644
--- a/src/commands/notation/EraseEventCommand.cpp
+++ b/src/commands/notation/EraseEventCommand.cpp
@@ -47,7 +47,7 @@ EraseEventCommand::EraseEventCommand(Segment &segment,
                      true),
         m_collapseRest(collapseRest),
         m_event(event),
-        m_relayoutEndTime(getEndTime())
+        m_retqlayoutEndTime(getEndTime())
 {
     // nothing
 }
@@ -67,9 +67,9 @@ EraseEventCommand::makeName(std::string e)
 }
 
 timeT
-EraseEventCommand::getRelayoutEndTime()
+EraseEventCommand::getRetqlayoutEndTime()
 {
-    return m_relayoutEndTime;
+    return m_retqlayoutEndTime;
 }
 
 void
@@ -80,7 +80,7 @@ EraseEventCommand::modifySegment()
     if (m_event->isa(Clef::EventType) ||
             m_event->isa(Key ::EventType)) {
 
-        m_relayoutEndTime = helper.segment().getEndTime();
+        m_retqlayoutEndTime = helper.segment().getEndTime();
 
     } else if (m_event->isa(Indication::EventType)) {
 
diff --git a/src/commands/notation/EraseEventCommand.h b/src/commands/notation/EraseEventCommand.h
index 07043fa..4584e5f 100644
--- a/src/commands/notation/EraseEventCommand.h
+++ b/src/commands/notation/EraseEventCommand.h
@@ -48,7 +48,7 @@ public:
                       bool collapseRest);
     virtual ~EraseEventCommand();
 
-    virtual timeT getRelayoutEndTime();
+    virtual timeT getRetqlayoutEndTime();
 
 protected:
     virtual void modifySegment();
@@ -56,7 +56,7 @@ protected:
     bool m_collapseRest;
 
     Event *m_event; // only used on 1st execute (cf bruteForceRedo)
-    timeT m_relayoutEndTime;
+    timeT m_retqlayoutEndTime;
     std::string makeName(std::string);
 };
 
diff --git a/src/commands/notation/FixNotationQuantizeCommand.h b/src/commands/notation/FixNotationQuantizeCommand.h
index 3a5d334..05ea393 100644
--- a/src/commands/notation/FixNotationQuantizeCommand.h
+++ b/src/commands/notation/FixNotationQuantizeCommand.h
@@ -23,8 +23,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RG_ADJUSTMENUFIXNOTATIONQUANTIZECOMMAND_H_
-#define _RG_ADJUSTMENUFIXNOTATIONQUANTIZECOMMAND_H_
+#ifndef _RG_ADJUSTMENUFIXNOTATIONTQUANTIZECOMMAND_H_
+#define _RG_ADJUSTMENUFIXNOTATIONTQUANTIZECOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
diff --git a/src/commands/notation/InterpretCommand.cpp b/src/commands/notation/InterpretCommand.cpp
index 6d1b18b..1652b2f 100644
--- a/src/commands/notation/InterpretCommand.cpp
+++ b/src/commands/notation/InterpretCommand.cpp
@@ -154,7 +154,7 @@ InterpretCommand::applyTextDynamics()
         }
 
         if (t >= startTime &&
-                (*i)->isa(Note::EventType) && m_selection->contains(*i)) {
+                (*i)->isa(Note::EventType) && m_selection->tqcontains(*i)) {
             (*i)->set
             <Int>(VELOCITY, velocity);
         }
diff --git a/src/commands/notation/InterpretCommand.h b/src/commands/notation/InterpretCommand.h
index a50a0f7..445bc5c 100644
--- a/src/commands/notation/InterpretCommand.h
+++ b/src/commands/notation/InterpretCommand.h
@@ -48,7 +48,7 @@ class Event;
 class InterpretCommand : public BasicSelectionCommand
 {
 public:
-    // bit masks: pass an OR of these to the constructor
+    // bit tqmasks: pass an OR of these to the constructor
     static const int NoInterpretation;
     static const int GuessDirections;    // allegro, rit, pause &c: kinda bogus
     static const int ApplyTextDynamics;  // mp, ff
diff --git a/src/commands/notation/KeyInsertionCommand.h b/src/commands/notation/KeyInsertionCommand.h
index 1a03383..7adfd6b 100644
--- a/src/commands/notation/KeyInsertionCommand.h
+++ b/src/commands/notation/KeyInsertionCommand.h
@@ -62,7 +62,7 @@ public:
 
     static TQString getGlobalName(Key *key = 0) {
         if (key) {
-            return i18n("Change to &Key %1...").arg(strtoqstr(key->getName()));
+            return i18n("Change to &Key %1...").tqarg(strtoqstr(key->getName()));
         } else {
             return i18n("Add &Key Change...");
         }
diff --git a/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp b/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp
index 73ebffb..611419f 100644
--- a/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp
+++ b/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp
@@ -36,7 +36,7 @@
 namespace Rosegarden
 {
 
-QString
+TQString
 MakeAccidentalsCautionaryCommand::getGlobalName(bool cautionary)
 {
     if (cautionary)
diff --git a/src/commands/notation/MultiKeyInsertionCommand.h b/src/commands/notation/MultiKeyInsertionCommand.h
index 644e877..9683589 100644
--- a/src/commands/notation/MultiKeyInsertionCommand.h
+++ b/src/commands/notation/MultiKeyInsertionCommand.h
@@ -60,7 +60,7 @@ public:
 
     static TQString getGlobalName(Key *key = 0) {
         if (key) {
-            return i18n("Change all to &Key %1...").arg(strtoqstr(key->getName()));
+            return i18n("Change all to &Key %1...").tqarg(strtoqstr(key->getName()));
         } else {
             return i18n("Add &Key Change...");
         }
diff --git a/src/commands/notation/RemoveNotationQuantizeCommand.h b/src/commands/notation/RemoveNotationQuantizeCommand.h
index 8fb3b53..3a5f946 100644
--- a/src/commands/notation/RemoveNotationQuantizeCommand.h
+++ b/src/commands/notation/RemoveNotationQuantizeCommand.h
@@ -23,8 +23,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RG_ADJUSTMENUREMOVENOTATIONQUANTIZECOMMAND_H_
-#define _RG_ADJUSTMENUREMOVENOTATIONQUANTIZECOMMAND_H_
+#ifndef _RG_ADJUSTMENUREMOVENOTATIONTQUANTIZECOMMAND_H_
+#define _RG_ADJUSTMENUREMOVENOTATIONTQUANTIZECOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
diff --git a/src/commands/notation/RespellCommand.cpp b/src/commands/notation/RespellCommand.cpp
index 6264a0e..81e635f 100644
--- a/src/commands/notation/RespellCommand.cpp
+++ b/src/commands/notation/RespellCommand.cpp
@@ -38,7 +38,7 @@ namespace Rosegarden
 using namespace BaseProperties;
 using namespace Accidentals;
 
-QString
+TQString
 RespellCommand::getGlobalName(Type type, Accidental accidental)
 {
     switch (type) {
@@ -47,17 +47,17 @@ RespellCommand::getGlobalName(Type type, Accidental accidental)
             TQString s(i18n("Respell with %1"));
             //!!! should be in notationstrings:
             if (accidental == DoubleSharp) {
-                s = s.arg(i18n("Do&uble Sharp"));
+                s = s.tqarg(i18n("Do&uble Sharp"));
             } else if (accidental == Sharp) {
-                s = s.arg(i18n("&Sharp"));
+                s = s.tqarg(i18n("&Sharp"));
             } else if (accidental == Flat) {
-                s = s.arg(i18n("&Flat"));
+                s = s.tqarg(i18n("&Flat"));
             } else if (accidental == DoubleFlat) {
-                s = s.arg(i18n("Dou&ble Flat"));
+                s = s.tqarg(i18n("Dou&ble Flat"));
             } else if (accidental == Natural) {
-                s = s.arg(i18n("&Natural"));
+                s = s.tqarg(i18n("&Natural"));
             } else {
-                s = s.arg(i18n("N&one"));
+                s = s.tqarg(i18n("N&one"));
             }
             return s;
         }
diff --git a/src/commands/notation/TieNotesCommand.cpp b/src/commands/notation/TieNotesCommand.cpp
index ff7f3ab..e65865d 100644
--- a/src/commands/notation/TieNotesCommand.cpp
+++ b/src/commands/notation/TieNotesCommand.cpp
@@ -59,7 +59,7 @@ TieNotesCommand::modifySegment()
         Segment::iterator sj;
         while ((sj = helper.getNextAdjacentNote(si, true, false)) !=
                 segment.end()) {
-            if (!m_selection->contains(*sj))
+            if (!m_selection->tqcontains(*sj))
                 break;
             (*si)->set<Bool>(TIED_FORWARD, true);
             (*si)->unset(TIE_IS_ABOVE);
diff --git a/src/commands/segment/AudioSegmentSplitCommand.cpp b/src/commands/segment/AudioSegmentSplitCommand.cpp
index 6657b7b..2f547db 100644
--- a/src/commands/segment/AudioSegmentSplitCommand.cpp
+++ b/src/commands/segment/AudioSegmentSplitCommand.cpp
@@ -101,7 +101,7 @@ AudioSegmentSplitCommand::execute()
         m_segmentLabel = m_segment->getLabel();
         TQString newLabel = strtoqstr(m_segmentLabel);
         if (!newLabel.endsWith(i18n(" (split)"))) {
-            newLabel = i18n("%1 (split)").arg(newLabel);
+            newLabel = i18n("%1 (split)").tqarg(newLabel);
         }
         m_segment->setLabel(qstrtostr(newLabel));
         m_newSegment->setLabel(m_segment->getLabel());
diff --git a/src/commands/segment/SegmentChangePlayableRangeCommand.cpp b/src/commands/segment/SegmentChangePlayableRangeCommand.cpp
index 026e9e1..7590c78 100644
--- a/src/commands/segment/SegmentChangePlayableRangeCommand.cpp
+++ b/src/commands/segment/SegmentChangePlayableRangeCommand.cpp
@@ -63,14 +63,14 @@ SegmentChangePlayableRangeCommand::unexecute()
    	m_segment->setHighestPlayable(m_oldHighestPlayableNote);
 }
 
-QString
+TQString
 SegmentChangePlayableRangeCommand::getGlobalName(int low, int high)
 {
     bool unit = false; // fake code to allow trunk/ to compile!
     if (!unit) {
         return "Undo change playable range";
     } else {
-        return TQString("Change playable range to %1-%2").arg(low, high);
+        return TQString("Change playable range to %1-%2").tqarg(low, high);
     }
 }
 
diff --git a/src/commands/segment/SegmentChangeQuantizationCommand.cpp b/src/commands/segment/SegmentChangeQuantizationCommand.cpp
index e26c235..ceb021e 100644
--- a/src/commands/segment/SegmentChangeQuantizationCommand.cpp
+++ b/src/commands/segment/SegmentChangeQuantizationCommand.cpp
@@ -100,7 +100,7 @@ SegmentChangeQuantizationCommand::addSegment(Segment *s)
     m_records.push_back(rec);
 }
 
-QString
+TQString
 SegmentChangeQuantizationCommand::getGlobalName(timeT unit)
 {
     if (!unit) {
@@ -108,7 +108,7 @@ SegmentChangeQuantizationCommand::getGlobalName(timeT unit)
     } else {
         timeT error = 0;
         TQString label = NotationStrings::makeNoteMenuLabel(unit, true, error);
-        return TQString("Quantize to %1").arg(label);
+        return TQString("Quantize to %1").tqarg(label);
     }
 }
 
diff --git a/src/commands/segment/SegmentChangeQuantizationCommand.h b/src/commands/segment/SegmentChangeQuantizationCommand.h
index 6c69728..032773e 100644
--- a/src/commands/segment/SegmentChangeQuantizationCommand.h
+++ b/src/commands/segment/SegmentChangeQuantizationCommand.h
@@ -23,8 +23,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RG_SEGMENTCHANGEQUANTIZATIONCOMMAND_H_
-#define _RG_SEGMENTCHANGEQUANTIZATIONCOMMAND_H_
+#ifndef _RG_SEGMENTCHANGETQUANTIZATIONCOMMAND_H_
+#define _RG_SEGMENTCHANGETQUANTIZATIONCOMMAND_H_
 
 #include <kcommand.h>
 #include <tqstring.h>
diff --git a/src/commands/segment/SegmentChangeTransposeCommand.cpp b/src/commands/segment/SegmentChangeTransposeCommand.cpp
index e7a8697..828f759 100644
--- a/src/commands/segment/SegmentChangeTransposeCommand.cpp
+++ b/src/commands/segment/SegmentChangeTransposeCommand.cpp
@@ -59,13 +59,13 @@ SegmentChangeTransposeCommand::unexecute()
    	m_segment->setTranspose(m_oldUnit);
 }
 
-QString
+TQString
 SegmentChangeTransposeCommand::getGlobalName(int unit)
 {
     if (!unit) {
         return "Undo change transposition";
     } else {
-        return TQString("Change transposition to %1").arg(unit);
+        return TQString("Change transposition to %1").tqarg(unit);
     }
 }
 
diff --git a/src/commands/segment/SegmentQuickCopyCommand.h b/src/commands/segment/SegmentQuickCopyCommand.h
index 7e97781..b078f8f 100644
--- a/src/commands/segment/SegmentQuickCopyCommand.h
+++ b/src/commands/segment/SegmentQuickCopyCommand.h
@@ -23,8 +23,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RG_SEGMENQUICKCOPYCOMMAND_H_
-#define _RG_SEGMENQUICKCOPYCOMMAND_H_
+#ifndef _RG_SEGMENTQUICKCOPYCOMMAND_H_
+#define _RG_SEGMENTQUICKCOPYCOMMAND_H_
 
 #include <kcommand.h>
 #include <tqstring.h>
diff --git a/src/commands/segment/SegmentSplitCommand.cpp b/src/commands/segment/SegmentSplitCommand.cpp
index 9fbcdf6..9d4b1af 100644
--- a/src/commands/segment/SegmentSplitCommand.cpp
+++ b/src/commands/segment/SegmentSplitCommand.cpp
@@ -133,10 +133,10 @@ SegmentSplitCommand::execute()
     m_segmentLabel = m_segment->getLabel();
     TQString newLabel = strtoqstr(m_segmentLabel);
     if (!newLabel.endsWith(i18n(" (split)"))) {
-        newLabel = i18n("%1 (split)").arg(newLabel);
+        newLabel = i18n("%1 (split)").tqarg(newLabel);
     }
-    m_newSegmentA->setLabel(newLabel);
-    m_newSegmentB->setLabel(newLabel);
+    m_newSegmentA->setLabel(newLabel.ascii());
+    m_newSegmentB->setLabel(newLabel.ascii());
 
     m_newSegmentB->setColourIndex(m_segment->getColourIndex());
     m_newSegmentB->setTranspose(m_segment->getTranspose());
diff --git a/src/commands/studio/CreateOrDeleteDeviceCommand.cpp b/src/commands/studio/CreateOrDeleteDeviceCommand.cpp
index 3933483..c3f7d8e 100644
--- a/src/commands/studio/CreateOrDeleteDeviceCommand.cpp
+++ b/src/commands/studio/CreateOrDeleteDeviceCommand.cpp
@@ -84,7 +84,7 @@ CreateOrDeleteDeviceCommand::execute()
 
         if (!rgapp->sequencerCall("addDevice(int, unsigned int)",
                                   replyType, replyData, data)) {
-            SEQMAN_DEBUG << "CreateDeviceCommand::execute - "
+            SETQMAN_DEBUG << "CreateDeviceCommand::execute - "
             << "failure in sequencer addDevice" << endl;
             return ;
         }
@@ -93,12 +93,12 @@ CreateOrDeleteDeviceCommand::execute()
         reply >> m_deviceId;
 
         if (m_deviceId == Device::NO_DEVICE) {
-            SEQMAN_DEBUG << "CreateDeviceCommand::execute - "
+            SETQMAN_DEBUG << "CreateDeviceCommand::execute - "
             << "sequencer addDevice failed" << endl;
             return ;
         }
 
-        SEQMAN_DEBUG << "CreateDeviceCommand::execute - "
+        SETQMAN_DEBUG << "CreateDeviceCommand::execute - "
         << " added device " << m_deviceId << endl;
 
         arg.device()->reset();
@@ -107,12 +107,12 @@ CreateOrDeleteDeviceCommand::execute()
 
         if (!rgapp->sequencerCall("setConnection(unsigned int, TQString)",
                                   replyType, replyData, data)) {
-            SEQMAN_DEBUG << "CreateDeviceCommand::execute - "
+            SETQMAN_DEBUG << "CreateDeviceCommand::execute - "
             << "failure in sequencer setConnection" << endl;
             return ;
         }
 
-        SEQMAN_DEBUG << "CreateDeviceCommand::execute - "
+        SETQMAN_DEBUG << "CreateDeviceCommand::execute - "
         << " reconnected device " << m_deviceId
         << " to " << m_connection << endl;
 
@@ -143,12 +143,12 @@ CreateOrDeleteDeviceCommand::execute()
 
         if (!rgapp->sequencerCall("removeDevice(unsigned int)",
                                   replyType, replyData, data)) {
-            SEQMAN_DEBUG << "CreateDeviceCommand::execute - "
+            SETQMAN_DEBUG << "CreateDeviceCommand::execute - "
             << "failure in sequencer addDevice" << endl;
             return ;
         }
 
-        SEQMAN_DEBUG << "CreateDeviceCommand::unexecute - "
+        SETQMAN_DEBUG << "CreateDeviceCommand::unexecute - "
         << " removed device " << m_deviceId << endl;
 
         m_studio->removeDevice(m_deviceId);
diff --git a/src/commands/studio/ReconnectDeviceCommand.cpp b/src/commands/studio/ReconnectDeviceCommand.cpp
index 3d28185..b798a2c 100644
--- a/src/commands/studio/ReconnectDeviceCommand.cpp
+++ b/src/commands/studio/ReconnectDeviceCommand.cpp
@@ -56,12 +56,12 @@ ReconnectDeviceCommand::execute()
 
         if (!rgapp->sequencerCall("setConnection(unsigned int, TQString)",
                                   replyType, replyData, data)) {
-            SEQMAN_DEBUG << "ReconnectDeviceCommand::execute - "
+            SETQMAN_DEBUG << "ReconnectDeviceCommand::execute - "
             << "failure in sequencer setConnection" << endl;
             return ;
         }
 
-        SEQMAN_DEBUG << "ReconnectDeviceCommand::execute - "
+        SETQMAN_DEBUG << "ReconnectDeviceCommand::execute - "
         << " reconnected device " << m_deviceId
         << " to " << m_newConnection << endl;
     }
@@ -84,12 +84,12 @@ ReconnectDeviceCommand::unexecute()
 
         if (!rgapp->sequencerCall("setConnection(unsigned int, TQString)",
                                   replyType, replyData, data)) {
-            SEQMAN_DEBUG << "ReconnectDeviceCommand::unexecute - "
+            SETQMAN_DEBUG << "ReconnectDeviceCommand::unexecute - "
             << "failure in sequencer setConnection" << endl;
             return ;
         }
 
-        SEQMAN_DEBUG << "ReconnectDeviceCommand::unexecute - "
+        SETQMAN_DEBUG << "ReconnectDeviceCommand::unexecute - "
         << " reconnected device " << m_deviceId
         << " to " << m_oldConnection << endl;
     }