Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.

14 files changed, 20 insertions, 20 deletions

diff --git a/src/commands/edit/CopyCommand.cpp b/src/commands/edit/CopyCommand.cpp
index cd86359..3214e03 100644
--- a/src/commands/edit/CopyCommand.cpp
+++ b/src/commands/edit/CopyCommand.cpp
@@ -61,7 +61,7 @@ CopyCommand::CopyCommand(SegmentSelection &selection,
             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/PasteEventsCommand.cpp b/src/commands/edit/PasteEventsCommand.cpp
index 2e2e458..6726dc7 100644
--- a/src/commands/edit/PasteEventsCommand.cpp
+++ b/src/commands/edit/PasteEventsCommand.cpp
@@ -54,7 +54,7 @@ PasteEventsCommand::PasteEventsCommand(Segment &segment,
 {
     if (pasteType != OpenAndPaste) {
 
-        // paste clef or key -> relayout to end
+        // paste clef or key -> retqlayout to end
 
         if (clipboard->isSingleSegment()) {
 
diff --git a/src/commands/notation/AddFingeringMarkCommand.cpp b/src/commands/notation/AddFingeringMarkCommand.cpp
index 2a6a310..4715951 100644
--- a/src/commands/notation/AddFingeringMarkCommand.cpp
+++ b/src/commands/notation/AddFingeringMarkCommand.cpp
@@ -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
diff --git a/src/commands/notation/AddIndicationCommand.cpp b/src/commands/notation/AddIndicationCommand.cpp
index e6b4493..fd24930 100644
--- a/src/commands/notation/AddIndicationCommand.cpp
+++ b/src/commands/notation/AddIndicationCommand.cpp
@@ -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/AddMarkCommand.cpp b/src/commands/notation/AddMarkCommand.cpp
index 49c69ec..5386eac 100644
--- a/src/commands/notation/AddMarkCommand.cpp
+++ b/src/commands/notation/AddMarkCommand.cpp
@@ -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/ClefInsertionCommand.cpp b/src/commands/notation/ClefInsertionCommand.cpp
index 2268325..701b873 100644
--- a/src/commands/notation/ClefInsertionCommand.cpp
+++ b/src/commands/notation/ClefInsertionCommand.cpp
@@ -68,7 +68,7 @@ ClefInsertionCommand::getGlobalName(Clef *)
         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...");
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/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/RespellCommand.cpp b/src/commands/notation/RespellCommand.cpp
index 983622a..81e635f 100644
--- a/src/commands/notation/RespellCommand.cpp
+++ b/src/commands/notation/RespellCommand.cpp
@@ -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/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 f4ed525..7590c78 100644
--- a/src/commands/segment/SegmentChangePlayableRangeCommand.cpp
+++ b/src/commands/segment/SegmentChangePlayableRangeCommand.cpp
@@ -70,7 +70,7 @@ SegmentChangePlayableRangeCommand::getGlobalName(int low, int high)
     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 1baa86e..ceb021e 100644
--- a/src/commands/segment/SegmentChangeQuantizationCommand.cpp
+++ b/src/commands/segment/SegmentChangeQuantizationCommand.cpp
@@ -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/SegmentChangeTransposeCommand.cpp b/src/commands/segment/SegmentChangeTransposeCommand.cpp
index 317f44b..828f759 100644
--- a/src/commands/segment/SegmentChangeTransposeCommand.cpp
+++ b/src/commands/segment/SegmentChangeTransposeCommand.cpp
@@ -65,7 +65,7 @@ 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/SegmentSplitCommand.cpp b/src/commands/segment/SegmentSplitCommand.cpp
index 5de234c..9d4b1af 100644
--- a/src/commands/segment/SegmentSplitCommand.cpp
+++ b/src/commands/segment/SegmentSplitCommand.cpp
@@ -133,7 +133,7 @@ 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.ascii());
     m_newSegmentB->setLabel(newLabel.ascii());