Remove additional unneeded tq method conversions

12 files changed, 61 insertions, 61 deletions

diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp
index 4766aeb..8a19fee 100644
--- a/src/gui/editors/segment/ControlEditorDialog.cpp
+++ b/src/gui/editors/segment/ControlEditorDialog.cpp
@@ -96,7 +96,7 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
 
     // spacing hack!
     new TQLabel("", mainFrame);
-    new TQLabel(i18n("  Control Events for %1 (device %2)").tqarg(deviceName).
+    new TQLabel(i18n("  Control Events for %1 (device %2)").arg(deviceName).
                arg(device), mainFrame);
     new TQLabel("", mainFrame);
 
@@ -220,7 +220,7 @@ ControlEditorDialog::slotUpdate()
         if (colour == "")
             colour = i18n("<default>");
 
-        TQString position = TQString("%1").tqarg(it->getIPBPosition());
+        TQString position = TQString("%1").arg(it->getIPBPosition());
         if (position.toInt() == -1)
             position = notShowing;
 
@@ -235,9 +235,9 @@ ControlEditorDialog::slotUpdate()
                                             strtoqstr(it->getType()),
                                             TQString("-"),
                                             strtoqstr(it->getDescription()),
-                                            TQString("%1").tqarg(it->getMin()),
-                                            TQString("%1").tqarg(it->getMax()),
-                                            TQString("%1").tqarg(it->getDefault()),
+                                            TQString("%1").arg(it->getMin()),
+                                            TQString("%1").arg(it->getMax()),
+                                            TQString("%1").arg(it->getDefault()),
                                             colour,
                                             position);
         } else {
@@ -247,9 +247,9 @@ ControlEditorDialog::slotUpdate()
                                             strtoqstr(it->getType()),
                                             value,
                                             strtoqstr(it->getDescription()),
-                                            TQString("%1").tqarg(it->getMin()),
-                                            TQString("%1").tqarg(it->getMax()),
-                                            TQString("%1").tqarg(it->getDefault()),
+                                            TQString("%1").arg(it->getMin()),
+                                            TQString("%1").arg(it->getMax()),
+                                            TQString("%1").arg(it->getDefault()),
                                             colour,
                                             position);
         }
diff --git a/src/gui/editors/segment/ControlParameterEditDialog.cpp b/src/gui/editors/segment/ControlParameterEditDialog.cpp
index b00ac83..340c608 100644
--- a/src/gui/editors/segment/ControlParameterEditDialog.cpp
+++ b/src/gui/editors/segment/ControlParameterEditDialog.cpp
@@ -182,7 +182,7 @@ ControlParameterEditDialog::ControlParameterEditDialog(
     //
     m_ipbPosition->insertItem(notShowing);
     for (unsigned int i = 0; i < 32; i++)
-        m_ipbPosition->insertItem(TQString("%1").tqarg(i));
+        m_ipbPosition->insertItem(TQString("%1").arg(i));
 
     if (m_control->getType() == Controller::EventType)
         m_typeCombo->setCurrentItem(0);
diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index 3d8d11d..0b47cb8 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -182,7 +182,7 @@ void
 MarkerEditor::updatePosition()
 {
     timeT pos = m_doc->getComposition().getPosition();
-    m_absoluteTime->setText(TQString("%1").tqarg(pos));
+    m_absoluteTime->setText(TQString("%1").arg(pos));
 
     RealTime rT = m_doc->getComposition().getElapsedRealTime(pos);
     long hours = rT.sec / (60 * 60);
@@ -192,9 +192,9 @@ MarkerEditor::updatePosition()
 
     TQString realTime, secsStr;
     if (hours)
-        realTime += TQString("%1h ").tqarg(hours);
+        realTime += TQString("%1h ").arg(hours);
     if (mins)
-        realTime += TQString("%1m ").tqarg(mins);
+        realTime += TQString("%1m ").arg(mins);
     secsStr.sprintf("%ld.%03lds", secs, msecs);
     realTime += secsStr;
 
@@ -203,7 +203,7 @@ MarkerEditor::updatePosition()
         m_realTime->setText(realTime);
 
     TQString barTime =
-        TQString("%1").tqarg(m_doc->getComposition().getBarNumber(pos) + 1);
+        TQString("%1").arg(m_doc->getComposition().getBarNumber(pos) + 1);
 
     // again only update if needed
     if (m_barTime->text() != barTime)
@@ -542,27 +542,27 @@ MarkerEditor::makeTimeString(timeT time, int timeMode)
             (time, bar, beat, fraction, remainder);
             ++bar;
             return TQString("%1%2%3-%4%5-%6%7-%8%9   ")
-                   .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);
+                   .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);
         }
 
     case 1:  // real time
         {
             RealTime rt =
                 m_doc->getComposition().getElapsedRealTime(time);
-            //        return TQString("%1   ").tqarg(rt.toString().c_str());
-            return TQString("%1   ").tqarg(rt.toText().c_str());
+            //        return TQString("%1   ").arg(rt.toString().c_str());
+            return TQString("%1   ").arg(rt.toText().c_str());
         }
 
     default:
-        return TQString("%1   ").tqarg(time);
+        return TQString("%1   ").arg(time);
     }
 }
 
diff --git a/src/gui/editors/segment/TrackButtons.cpp b/src/gui/editors/segment/TrackButtons.cpp
index 2e779fd..ad70d95 100644
--- a/src/gui/editors/segment/TrackButtons.cpp
+++ b/src/gui/editors/segment/TrackButtons.cpp
@@ -647,17 +647,17 @@ TrackButtons::populateInstrumentPopup(Instrument *thisTrackInstr, TQPopupMenu* i
             KGlobal::dirs()->findResource("appdata", "pixmaps/");
 
         connectedPixmap.load
-            (TQString("%1/misc/connected.xpm").tqarg(pixmapDir));
+            (TQString("%1/misc/connected.xpm").arg(pixmapDir));
         connectedUsedPixmap.load
-            (TQString("%1/misc/connected-used.xpm").tqarg(pixmapDir));
+            (TQString("%1/misc/connected-used.xpm").arg(pixmapDir));
         connectedSelectedPixmap.load
-            (TQString("%1/misc/connected-selected.xpm").tqarg(pixmapDir));
+            (TQString("%1/misc/connected-selected.xpm").arg(pixmapDir));
         unconnectedPixmap.load
-            (TQString("%1/misc/unconnected.xpm").tqarg(pixmapDir));
+            (TQString("%1/misc/unconnected.xpm").arg(pixmapDir));
         unconnectedUsedPixmap.load
-            (TQString("%1/misc/unconnected-used.xpm").tqarg(pixmapDir));
+            (TQString("%1/misc/unconnected-used.xpm").arg(pixmapDir));
         unconnectedSelectedPixmap.load
-            (TQString("%1/misc/unconnected-selected.xpm").tqarg(pixmapDir));
+            (TQString("%1/misc/unconnected-selected.xpm").arg(pixmapDir));
 
         havePixmaps = true;
     }
@@ -706,7 +706,7 @@ TrackButtons::populateInstrumentPopup(Instrument *thisTrackInstr, TQPopupMenu* i
                         pname = strtoqstr(plugin->getDistinctiveConfigurationText());
                     }
                     if (pname != "") {
-                        pname = TQString("%1: %2").tqarg(label).tqarg(pname);
+                        pname = TQString("%1: %2").arg(label).arg(pname);
                     } else {
                         pname = label;
                     }
diff --git a/src/gui/editors/segment/TrackEditor.cpp b/src/gui/editors/segment/TrackEditor.cpp
index 9559bdf..9eeb21b 100644
--- a/src/gui/editors/segment/TrackEditor.cpp
+++ b/src/gui/editors/segment/TrackEditor.cpp
@@ -331,7 +331,7 @@ void TrackEditor::slotReadjustCanvasSize()
 
 void TrackEditor::slotTrackButtonsWidthChanged()
 {
-    // We need to make sure the trackButtons tqgeometry is fully updated
+    // We need to make sure the trackButtons geometry is fully updated
     //
     ProgressDialog::processEvents();
 
@@ -444,7 +444,7 @@ void TrackEditor::addSegment(int track, int time, unsigned int duration)
 void TrackEditor::slotSegmentOrderChanged(int section, int fromIdx, int toIdx)
 {
     RG_DEBUG << TQString("TrackEditor::segmentOrderChanged(section : %1, from %2, to %3)")
-    .tqarg(section).tqarg(fromIdx).tqarg(toIdx) << endl;
+    .arg(section).arg(fromIdx).arg(toIdx) << endl;
 
     //!!! how do we get here? need to involve a command
     emit needUpdate();
diff --git a/src/gui/editors/segment/TrackVUMeter.cpp b/src/gui/editors/segment/TrackVUMeter.cpp
index dbf2d5d..f8acbe8 100644
--- a/src/gui/editors/segment/TrackVUMeter.cpp
+++ b/src/gui/editors/segment/TrackVUMeter.cpp
@@ -67,7 +67,7 @@ TrackVUMeter::meterStop()
 {
     setMinimumHeight(m_textHeight);
     setMaximumHeight(m_textHeight);
-    setText(TQString("%1").tqarg(m_position + 1));
+    setText(TQString("%1").arg(m_position + 1));
     if (m_active) {
         m_active = false;
         update();
diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp
index 1dc2094..078835b 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.cpp
+++ b/src/gui/editors/segment/TriggerSegmentManager.cpp
@@ -246,16 +246,16 @@ TriggerSegmentManager::slotUpdate()
 
         TQString used = i18n("%1 on 1 track",
                             "%1 on %n tracks",
-                            tracks.size()).tqarg(uses);
+                            tracks.size()).arg(uses);
 
         TQString pitch = TQString("%1 (%2)")
-                        .tqarg(MidiPitchLabel((*it)->getBasePitch()).getTQString())
-                        .tqarg((*it)->getBasePitch());
+                        .arg(MidiPitchLabel((*it)->getBasePitch()).getTQString())
+                        .arg((*it)->getBasePitch());
 
-        TQString velocity = TQString("%1").tqarg((*it)->getBaseVelocity());
+        TQString velocity = TQString("%1").arg((*it)->getBaseVelocity());
 
         item = new TriggerManagerItem
-               (m_listView, TQString("%1").tqarg(i + 1), TQString("%1").tqarg((*it)->getId()),
+               (m_listView, TQString("%1").arg(i + 1), TQString("%1").arg((*it)->getId()),
                 label, timeString, pitch, velocity, used);
 
         item->setRawDuration(duration);
@@ -523,15 +523,15 @@ TriggerSegmentManager::makeDurationString(timeT time,
             m_doc->getComposition().getMusicalTimeForDuration
             (time, duration, bar, beat, fraction, remainder);
             return TQString("%1%2%3-%4%5-%6%7-%8%9   ")
-                   .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);
+                   .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);
         }
 
     case 1:  // real time
@@ -539,12 +539,12 @@ TriggerSegmentManager::makeDurationString(timeT time,
             RealTime rt =
                 m_doc->getComposition().getRealTimeDifference
                 (time, time + duration);
-            //	return TQString("%1  ").tqarg(rt.toString().c_str());
-            return TQString("%1  ").tqarg(rt.toText().c_str());
+            //	return TQString("%1  ").arg(rt.toString().c_str());
+            return TQString("%1  ").arg(rt.toText().c_str());
         }
 
     default:
-        return TQString("%1  ").tqarg(duration);
+        return TQString("%1  ").arg(duration);
     }
 }
 
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
index 178dd0e..f8ae518 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
@@ -327,7 +327,7 @@ void CompositionView::slotSetTool(const TQString& toolName)
     if (m_tool)
         m_tool->ready();
     else {
-        KMessageBox::error(0, TQString("CompositionView::slotSetTool() : unknown tool name %1").tqarg(toolName));
+        KMessageBox::error(0, TQString("CompositionView::slotSetTool() : unknown tool name %1").arg(toolName));
     }
 }
 
@@ -495,7 +495,7 @@ void CompositionView::resizeEvent(TQResizeEvent* e)
 
 void CompositionView::viewportPaintEvent(TQPaintEvent* e)
 {
-    TQMemArray<TQRect> rects = TQRegion(e->region()).tqrects();
+    TQMemArray<TQRect> rects = TQRegion(e->region()).rects();
 
     for (unsigned int i = 0; i < rects.size(); ++i) {
         viewportPaintRect(rects[i]);
@@ -682,7 +682,7 @@ void CompositionView::refreshArtifactsDrawBuffer(const TQRect& rect)
     //               << rect << endl;
 
     TQPainter p;
-    p.tqbegin(&m_artifactsDrawBuffer, viewport());
+    p.begin(&m_artifactsDrawBuffer, viewport());
     p.translate( -contentsX(), -contentsY());
     //     TQRect r(contentsX(), contentsY(), m_artifactsDrawBuffer.width(), m_artifactsDrawBuffer.height());
     drawAreaArtifacts(&p, rect);
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h b/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h
index cdf373e..d1bb9a7 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h
@@ -59,7 +59,7 @@ public:
     PreviewState getPreviewState() const { return m_previewState; }
 
     /**
-     * Sets whether the preview tqshape shown in the segment needs
+     * Sets whether the preview shape shown in the segment needs
      * to be refreshed
      */
     void setPreviewCurrent(bool c)
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp b/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
index e2970ab..04da855 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
@@ -328,8 +328,8 @@ int SegmentMover::handleMouseMove(TQMouseEvent *e)
     comp.getMusicalTimeForAbsoluteTime(currentItemStartTime, bar, beat, fraction, remainder);
 
     TQString posString = TQString("%1.%2s (%3, %4, %5)")
-        .tqarg(time.sec).tqarg(ms)
-        .tqarg(bar + 1).tqarg(beat).tqarg(fraction);
+        .arg(time.sec).arg(ms)
+        .arg(bar + 1).arg(beat).arg(fraction);
 
     m_canvas->setTextFloat(guideX + 10, guideY - 30, posString);
     m_canvas->updateContents();
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
index 964bc3b..c1b1f4b 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
@@ -466,8 +466,8 @@ SegmentSelector::handleMouseMove(TQMouseEvent *e)
         comp.getMusicalTimeForAbsoluteTime(currentItemStartTime, bar, beat, fraction, remainder);
 
         TQString posString = TQString("%1.%2s (%3, %4, %5)")
-                            .tqarg(time.sec).tqarg(ms)
-                            .tqarg(bar + 1).tqarg(beat).tqarg(fraction);
+                            .arg(time.sec).arg(ms)
+                            .arg(bar + 1).arg(beat).arg(fraction);
 
         m_canvas->setTextFloat(guideX + 10, guideY - 30, posString);
         m_canvas->updateContents();
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
index 68bee60..5ce8a58 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
@@ -84,7 +84,7 @@ SegmentTool* SegmentToolBox::createTool(const TQString& toolName)
 
     else {
         KMessageBox::error(0, TQString("SegmentToolBox::createTool : unrecognised toolname %1 (%2)")
-                           .tqarg(toolName).tqarg(toolNamelc));
+                           .arg(toolName).arg(toolNamelc));
         return 0;
     }