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

This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.

1 files changed, 49 insertions, 49 deletions

diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp
index 67a233a..91b2b4d 100644
--- a/src/gui/editors/eventlist/EventView.cpp
+++ b/src/gui/editors/eventlist/EventView.cpp
@@ -76,7 +76,7 @@
 #include <tqgroupbox.h>
 #include <tqiconset.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistview.h>
 #include <tqpixmap.h>
 #include <tqpoint.h>
@@ -161,40 +161,40 @@ EventView::EventView(RosegardenGUIDoc *doc,
                               (1, Qt::Horizontal, i18n("Triggered Segment Properties"), getCentralWidget());
 
         TQFrame *frame = new TQFrame(groupBox);
-        TQGridLayout *layout = new TQGridLayout(frame, 5, 3, 5, 5);
+        TQGridLayout *tqlayout = new TQGridLayout(frame, 5, 3, 5, 5);
 
-        layout->addWidget(new TQLabel(i18n("Label:  "), frame), 0, 0);
+        tqlayout->addWidget(new TQLabel(i18n("Label:  "), frame), 0, 0);
         TQString label = strtoqstr(segments[0]->getLabel());
         if (label == "")
             label = i18n("<no label>");
         m_triggerName = new TQLabel(label, frame);
-        layout->addWidget(m_triggerName, 0, 1);
+        tqlayout->addWidget(m_triggerName, 0, 1);
         TQPushButton *editButton = new TQPushButton(i18n("edit"), frame);
-        layout->addWidget(editButton, 0, 2);
+        tqlayout->addWidget(editButton, 0, 2);
         connect(editButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotEditTriggerName()));
 
-        layout->addWidget(new TQLabel(i18n("Base pitch:  "), frame), 1, 0);
-        m_triggerPitch = new TQLabel(TQString("%1").arg(rec->getBasePitch()), frame);
-        layout->addWidget(m_triggerPitch, 1, 1);
+        tqlayout->addWidget(new TQLabel(i18n("Base pitch:  "), frame), 1, 0);
+        m_triggerPitch = new TQLabel(TQString("%1").tqarg(rec->getBasePitch()), frame);
+        tqlayout->addWidget(m_triggerPitch, 1, 1);
         editButton = new TQPushButton(i18n("edit"), frame);
-        layout->addWidget(editButton, 1, 2);
+        tqlayout->addWidget(editButton, 1, 2);
         connect(editButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotEditTriggerPitch()));
 
-        layout->addWidget(new TQLabel(i18n("Base velocity:  "), frame), 2, 0);
-        m_triggerVelocity = new TQLabel(TQString("%1").arg(rec->getBaseVelocity()), frame);
-        layout->addWidget(m_triggerVelocity, 2, 1);
+        tqlayout->addWidget(new TQLabel(i18n("Base velocity:  "), frame), 2, 0);
+        m_triggerVelocity = new TQLabel(TQString("%1").tqarg(rec->getBaseVelocity()), frame);
+        tqlayout->addWidget(m_triggerVelocity, 2, 1);
         editButton = new TQPushButton(i18n("edit"), frame);
-        layout->addWidget(editButton, 2, 2);
+        tqlayout->addWidget(editButton, 2, 2);
         connect(editButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotEditTriggerVelocity()));
 
         /*!!! Comment out these two options, which are not yet used
           anywhere else -- intended for use with library ornaments, not
           yet implemented
 
-        layout->addWidget(new TQLabel(i18n("Default timing:  "), frame), 3, 0);
+        tqlayout->addWidget(new TQLabel(i18n("Default timing:  "), frame), 3, 0);
 
         KComboBox *adjust = new KComboBox(frame);
-        layout->addMultiCellWidget(adjust, 3, 3, 1, 2);
+        tqlayout->addMultiCellWidget(adjust, 3, 3, 1, 2);
         adjust->insertItem(i18n("As stored"));
         adjust->insertItem(i18n("Truncate if longer than note"));
         adjust->insertItem(i18n("End at same time as note")); 
@@ -216,7 +216,7 @@ EventView::EventView(RosegardenGUIDoc *doc,
         TQCheckBox *retune = new TQCheckBox(i18n("Adjust pitch to trigger note by default"), frame);
         retune->setChecked(rec->getDefaultRetune());
         connect(retune, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotTriggerRetuneChanged()));
-        layout->addMultiCellWidget(retune, 4, 4, 1, 2);
+        tqlayout->addMultiCellWidget(retune, 4, 4, 1, 2);
 
         */
 
@@ -387,7 +387,7 @@ EventView::applyLayout(int /*staffNo*/)
                 int p = (*it)->get
                         <Int>(BaseProperties::PITCH);
                 pitchStr = TQString("%1 %2  ")
-                           .arg(p).arg(MidiPitchLabel(p).getTQString());
+                           .tqarg(p).tqarg(MidiPitchLabel(p).getTQString());
             } else if ((*it)->isa(Note::EventType)) {
                 pitchStr = "<not set>";
             }
@@ -613,27 +613,27 @@ EventView::makeTimeString(timeT time, int timeMode)
             (time, bar, beat, fraction, remainder);
             ++bar;
             return TQString("%1%2%3-%4%5-%6%7-%8%9   ")
-                   .arg(bar / 100)
-                   .arg((bar % 100) / 10)
-                   .arg(bar % 10)
-                   .arg(beat / 10)
-                   .arg(beat % 10)
-                   .arg(fraction / 10)
-                   .arg(fraction % 10)
-                   .arg(remainder / 10)
-                   .arg(remainder % 10);
+                   .tqarg(bar / 100)
+                   .tqarg((bar % 100) / 10)
+                   .tqarg(bar % 10)
+                   .tqarg(beat / 10)
+                   .tqarg(beat % 10)
+                   .tqarg(fraction / 10)
+                   .tqarg(fraction % 10)
+                   .tqarg(remainder / 10)
+                   .tqarg(remainder % 10);
         }
 
     case 1:  // real time
         {
             RealTime rt =
                 getDocument()->getComposition().getElapsedRealTime(time);
-            //	return TQString("%1  ").arg(rt.toString().c_str());
-            return TQString("%1  ").arg(rt.toText().c_str());
+            //	return TQString("%1  ").tqarg(rt.toString().c_str());
+            return TQString("%1  ").tqarg(rt.toText().c_str());
         }
 
     default:
-        return TQString("%1  ").arg(time);
+        return TQString("%1  ").tqarg(time);
     }
 }
 
@@ -649,15 +649,15 @@ EventView::makeDurationString(timeT time,
             getDocument()->getComposition().getMusicalTimeForDuration
             (time, duration, bar, beat, fraction, remainder);
             return TQString("%1%2%3-%4%5-%6%7-%8%9   ")
-                   .arg(bar / 100)
-                   .arg((bar % 100) / 10)
-                   .arg(bar % 10)
-                   .arg(beat / 10)
-                   .arg(beat % 10)
-                   .arg(fraction / 10)
-                   .arg(fraction % 10)
-                   .arg(remainder / 10)
-                   .arg(remainder % 10);
+                   .tqarg(bar / 100)
+                   .tqarg((bar % 100) / 10)
+                   .tqarg(bar % 10)
+                   .tqarg(beat / 10)
+                   .tqarg(beat % 10)
+                   .tqarg(fraction / 10)
+                   .tqarg(fraction % 10)
+                   .tqarg(remainder / 10)
+                   .tqarg(remainder % 10);
         }
 
     case 1:  // real time
@@ -665,12 +665,12 @@ EventView::makeDurationString(timeT time,
             RealTime rt =
                 getDocument()->getComposition().getRealTimeDifference
                 (time, time + duration);
-            //	return TQString("%1  ").arg(rt.toString().c_str());
-            return TQString("%1  ").arg(rt.toText().c_str());
+            //	return TQString("%1  ").tqarg(rt.toString().c_str());
+            return TQString("%1  ").tqarg(rt.toText().c_str());
         }
 
     default:
-        return TQString("%1  ").arg(duration);
+        return TQString("%1  ").tqarg(duration);
     }
 }
 
@@ -719,7 +719,7 @@ EventView::slotEditTriggerPitch()
     if (dlg->exec() == TQDialog::Accepted) {
         addCommandToHistory(new SetTriggerSegmentBasePitchCommand
                             (&getDocument()->getComposition(), id, dlg->getPitch()));
-        m_triggerPitch->setText(TQString("%1").arg(dlg->getPitch()));
+        m_triggerPitch->setText(TQString("%1").tqarg(dlg->getPitch()));
     }
 }
 
@@ -737,7 +737,7 @@ EventView::slotEditTriggerVelocity()
     if (dlg->exec() == TQDialog::Accepted) {
         addCommandToHistory(new SetTriggerSegmentBaseVelocityCommand
                             (&getDocument()->getComposition(), id, dlg->getVelocity()));
-        m_triggerVelocity->setText(TQString("%1").arg(dlg->getVelocity()));
+        m_triggerVelocity->setText(TQString("%1").tqarg(dlg->getVelocity()));
     }
 }
 
@@ -1575,8 +1575,8 @@ EventView::updateViewCaption()
     if (m_isTriggerSegment) {
 
         setCaption(i18n("%1 - Triggered Segment: %2")
-                   .arg(getDocument()->getTitle())
-                   .arg(strtoqstr(m_segments[0]->getLabel())));
+                   .tqarg(getDocument()->getTitle())
+                   .tqarg(strtoqstr(m_segments[0]->getLabel())));
 
 
     } else if (m_segments.size() == 1) {
@@ -1590,14 +1590,14 @@ EventView::updateViewCaption()
             trackPosition = track->getPosition();
 
         setCaption(i18n("%1 - Segment Track #%2 - Event List")
-                   .arg(getDocument()->getTitle())
-                   .arg(trackPosition + 1));
+                   .tqarg(getDocument()->getTitle())
+                   .tqarg(trackPosition + 1));
 
     } else {
 
         setCaption(i18n("%1 - %2 Segments - Event List")
-                   .arg(getDocument()->getTitle())
-                   .arg(m_segments.size()));
+                   .tqarg(getDocument()->getTitle())
+                   .tqarg(m_segments.size()));
     }
 
 }