Remove additional unneeded tq method conversions

9 files changed, 35 insertions, 35 deletions

diff --git a/src/gui/studio/AudioMixerWindow.cpp b/src/gui/studio/AudioMixerWindow.cpp
index 781dd66..fa5a1a3 100644
--- a/src/gui/studio/AudioMixerWindow.cpp
+++ b/src/gui/studio/AudioMixerWindow.cpp
@@ -184,7 +184,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
             new KRadioAction(i18n("1 Input", "%n Inputs", i),
                              0, TQT_TQOBJECT(this),
                              TQT_SLOT(slotSetInputCountFromAction()), actionCollection(),
-                             TQString("inputs_%1").tqarg(i).ascii());
+                             TQString("inputs_%1").arg(i).ascii());
         action->setExclusiveGroup("inputs");
         if (i == int(m_studio->getRecordIns().size()))
             action->setChecked(true);
@@ -203,7 +203,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
                  (i18n("1 Submaster", "%n Submasters", i),
                   0, TQT_TQOBJECT(this),
                   TQT_SLOT(slotSetSubmasterCountFromAction()), actionCollection(),
-                  TQString("submasters_%1").tqarg(i).ascii());
+                  TQString("submasters_%1").arg(i).ascii());
         action->setExclusiveGroup("submasters");
         if (i == int(m_studio->getBusses().size()) - 1)
             action->setChecked(true);
@@ -268,8 +268,8 @@ AudioMixerWindow::populate()
     BussList busses = m_studio->getBusses();
 
     TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
-    m_monoPixmap.load(TQString("%1/misc/mono.xpm").tqarg(pixmapDir));
-    m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").tqarg(pixmapDir));
+    m_monoPixmap.load(TQString("%1/misc/mono.xpm").arg(pixmapDir));
+    m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").arg(pixmapDir));
 
     // Total cols: is 2 for each fader, submaster or master, plus 1
     // for each spacer.
@@ -397,11 +397,11 @@ AudioMixerWindow::populate()
         TQLabel *idLabel;
         TQString idString;
         if ((*i)->getType() == Instrument::Audio) {
-            idString = i18n("Audio %1").tqarg((*i)->getId() -
+            idString = i18n("Audio %1").arg((*i)->getId() -
                                             AudioInstrumentBase + 1);
             idLabel = new TQLabel(idString, m_mainBox, "audioIdLabel");
         } else {
-            idString = i18n("Synth %1").tqarg((*i)->getId() -
+            idString = i18n("Synth %1").arg((*i)->getId() -
                                             SoftSynthInstrumentBase + 1);
             idLabel = new TQLabel(idString, m_mainBox, "synthIdLabel");
         }
@@ -525,7 +525,7 @@ AudioMixerWindow::populate()
                     this, TQT_SLOT(slotSelectPlugin()));
         }
 
-        TQLabel *idLabel = new TQLabel(i18n("Sub %1").tqarg(count), m_mainBox, "subMaster");
+        TQLabel *idLabel = new TQLabel(i18n("Sub %1").arg(count), m_mainBox, "subMaster");
         idLabel->setFont(boldFont);
 
         //	mainLayout->addWidget(idLabel, 2, col, TQt::AlignCenter);
diff --git a/src/gui/studio/AudioPluginOSCGUIManager.cpp b/src/gui/studio/AudioPluginOSCGUIManager.cpp
index 01ade9c..13da726 100644
--- a/src/gui/studio/AudioPluginOSCGUIManager.cpp
+++ b/src/gui/studio/AudioPluginOSCGUIManager.cpp
@@ -345,18 +345,18 @@ AudioPluginOSCGUIManager::getOSCUrl(InstrumentId instrument, int position,
         baseUrl += '/';
 
     TQString url = TQString("%1%2/%3/%4/%5/%6")
-                  .tqarg(baseUrl)
-                  .tqarg("plugin")
-                  .tqarg(type)
-                  .tqarg(instrument);
+                  .arg(baseUrl)
+                  .arg("plugin")
+                  .arg(type)
+                  .arg(instrument);
 
     if (position == int(Instrument::SYNTH_PLUGIN_POSITION)) {
-        url = url.tqarg("synth");
+        url = url.arg("synth");
     } else {
-        url = url.tqarg(position);
+        url = url.arg(position);
     }
 
-    url = url.tqarg(label);
+    url = url.arg(label);
 
     return url;
 }
@@ -444,10 +444,10 @@ AudioPluginOSCGUIManager::getFriendlyName(InstrumentId instrument, int position,
         return i18n("Rosegarden Plugin");
     else {
         if (position == int(Instrument::SYNTH_PLUGIN_POSITION)) {
-            return i18n("Rosegarden: %1").tqarg(strtoqstr(container->getPresentationName()));
+            return i18n("Rosegarden: %1").arg(strtoqstr(container->getPresentationName()));
         } else {
-            return i18n("Rosegarden: %1: %2").tqarg(strtoqstr(container->getPresentationName()))
-                   .tqarg(i18n("Plugin slot %1").tqarg(position));
+            return i18n("Rosegarden: %1: %2").arg(strtoqstr(container->getPresentationName()))
+                   .arg(i18n("Plugin slot %1").arg(position));
         }
     }
 }
diff --git a/src/gui/studio/BankEditorDialog.cpp b/src/gui/studio/BankEditorDialog.cpp
index b0bbba5..fa88568 100644
--- a/src/gui/studio/BankEditorDialog.cpp
+++ b/src/gui/studio/BankEditorDialog.cpp
@@ -593,7 +593,7 @@ BankEditorDialog::updateDeviceItem(MidiDeviceListViewItem* deviceItem)
 
     // delete banks which are no longer present
     //
-    std::vector<TQListViewItem*> tqchildrenToDelete;
+    std::vector<TQListViewItem*> childrenToDelete;
 
     TQListViewItem* child = deviceItem->firstChild();
 
@@ -603,7 +603,7 @@ BankEditorDialog::updateDeviceItem(MidiDeviceListViewItem* deviceItem)
             dynamic_cast<MidiBankListViewItem *>(child);
         if (bankItem) {
             if (bankItem->getBank() >= int(banks.size()))
-                tqchildrenToDelete.push_back(child);
+                childrenToDelete.push_back(child);
             else { // update the banks MSB/LSB which might have changed
                 bankItem->setPercussion(banks[bankItem->getBank()].isPercussion());
                 bankItem->setMSB(banks[bankItem->getBank()].getMSB());
@@ -615,15 +615,15 @@ BankEditorDialog::updateDeviceItem(MidiDeviceListViewItem* deviceItem)
             dynamic_cast<MidiKeyMapListViewItem *>(child);
         if (keyItem) {
             if (!midiDevice->getKeyMappingByName(qstrtostr(keyItem->getName()))) {
-                tqchildrenToDelete.push_back(child);
+                childrenToDelete.push_back(child);
             }
         }
 
         child = child->nextSibling();
     }
 
-    for (unsigned int i = 0; i < tqchildrenToDelete.size(); ++i)
-        delete tqchildrenToDelete[i];
+    for (unsigned int i = 0; i < childrenToDelete.size(); ++i)
+        delete childrenToDelete[i];
 }
 
 bool
@@ -1045,7 +1045,7 @@ BankEditorDialog::slotAddKeyMapping()
             if (n == 1)
                 name = i18n("<new mapping>");
             else
-                name = i18n("<new mapping %1>").tqarg(n);
+                name = i18n("<new mapping %1>").arg(n);
         }
 
         MidiKeyMapping newKeyMapping(qstrtostr(name));
diff --git a/src/gui/studio/DeviceEditorDialog.cpp b/src/gui/studio/DeviceEditorDialog.cpp
index 79f0fbc..dc80ff6 100644
--- a/src/gui/studio/DeviceEditorDialog.cpp
+++ b/src/gui/studio/DeviceEditorDialog.cpp
@@ -145,7 +145,7 @@ DeviceEditorDialog::populate()
         MidiDevice *md = static_cast<MidiDevice *>(*it);
 
         // if you change this string ("Device %1"), change test in slotApply
-        TQString deviceName = i18n("Device %1").tqarg(md->getId() + 1);
+        TQString deviceName = i18n("Device %1").arg(md->getId() + 1);
         TQString deviceLabel = strtoqstr(md->getName());
         TQString connectionName = strtoqstr(md->getConnection());
 
diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp
index 833032e..6a8ef2f 100644
--- a/src/gui/studio/DeviceManagerDialog.cpp
+++ b/src/gui/studio/DeviceManagerDialog.cpp
@@ -326,7 +326,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
 
             m_playTable->insertRows(deviceCount, 1);
 
-            TQString deviceName = i18n("%1").tqarg(deviceCount + 1);
+            TQString deviceName = i18n("%1").arg(deviceCount + 1);
             TQString connectionName = strtoqstr((*it)->getConnection());
 
             m_playTable->setText(deviceCount, PLAY_NAME_COL,
@@ -360,7 +360,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
 
             m_recordTable->insertRows(deviceCount, 1);
 
-            TQString deviceName = i18n("%1").tqarg(deviceCount + 1);
+            TQString deviceName = i18n("%1").arg(deviceCount + 1);
             TQString connectionName = strtoqstr((*it)->getConnection());
 
             m_recordTable->setText(deviceCount, RECORD_NAME_COL,
diff --git a/src/gui/studio/MidiMixerWindow.cpp b/src/gui/studio/MidiMixerWindow.cpp
index 04de306..e41539f 100644
--- a/src/gui/studio/MidiMixerWindow.cpp
+++ b/src/gui/studio/MidiMixerWindow.cpp
@@ -178,7 +178,7 @@ MidiMixerWindow::setupTabs()
             //
             //TQLabel *label = new TQLabel(TQString("%1 %2").
             //arg(strtoqstr(dev->getName()))
-            //.tqarg(i18n("MIDI Mixer")), m_tabFrame);
+            //.arg(i18n("MIDI Mixer")), m_tabFrame);
 
             TQLabel *label = new TQLabel("", m_tabFrame);
             mainLayout->addMultiCellWidget(label, 0, 0, 0, 16, TQt::AlignCenter);
@@ -306,8 +306,8 @@ MidiMixerWindow::setupTabs()
                 faderCount++;
             }
 
-            TQString name = TQString("%1 (%2)").tqarg(strtoqstr(dev->getName()))
-                           .tqarg(deviceCount++);
+            TQString name = TQString("%1 (%2)").arg(strtoqstr(dev->getName()))
+                           .arg(deviceCount++);
 
             addTab(m_tabFrame, name);
         }
diff --git a/src/gui/studio/MidiProgramsEditor.cpp b/src/gui/studio/MidiProgramsEditor.cpp
index 4186130..735260a 100644
--- a/src/gui/studio/MidiProgramsEditor.cpp
+++ b/src/gui/studio/MidiProgramsEditor.cpp
@@ -251,7 +251,7 @@ MidiProgramsEditor::populate(TQListViewItem* item)
                     getEntryButton(i)->setPixmap(keyPixmap);
                     TQToolTip::add
                         (getEntryButton(i),
-                                i18n("Key Mapping: %1").tqarg(
+                                i18n("Key Mapping: %1").arg(
                                     strtoqstr(m_device->getKeyMappingForProgram(*it)->getName())));
                 }
 
@@ -538,7 +538,7 @@ MidiProgramsEditor::slotEntryMenuItemSelected(int i)
             btn->setPixmap(TQPixmap(file));
         }
         TQToolTip::add
-            (btn, i18n("Key Mapping: %1").tqarg(strtoqstr(newMapping)));
+            (btn, i18n("Key Mapping: %1").arg(strtoqstr(newMapping)));
     }
     btn->setEnabled(haveKeyMappings);
 }
diff --git a/src/gui/studio/NameSetEditor.cpp b/src/gui/studio/NameSetEditor.cpp
index 9bfdcdc..cda327f 100644
--- a/src/gui/studio/NameSetEditor.cpp
+++ b/src/gui/studio/NameSetEditor.cpp
@@ -99,7 +99,7 @@ NameSetEditor::NameSetEditor(BankEditorDialog* bankEditor,
 
             for (unsigned int row = 0; row < 128 / (tabs*cols); ++row) {
                 numBox = new TQHBox(v);
-                TQString numberText = TQString("%1").tqarg(labelId + 1);
+                TQString numberText = TQString("%1").arg(labelId + 1);
 
                 if (tab == 0 && col == 0 && row == 0) {
                     // Initial label; button to adjust whether labels start at 0 or 1
@@ -178,11 +178,11 @@ NameSetEditor::slotToggleInitialLabel()
     else
         index = 0;
 
-    m_initialLabel->setText(TQString("%1").tqarg(index++));
+    m_initialLabel->setText(TQString("%1").arg(index++));
     for (std::vector<TQLabel*>::iterator it( m_labels.begin() );
             it != m_labels.end();
             ++it) {
-        (*it)->setText(TQString("%1").tqarg(index++));
+        (*it)->setText(TQString("%1").arg(index++));
     }
 }
 
diff --git a/src/gui/studio/SynthPluginManagerDialog.cpp b/src/gui/studio/SynthPluginManagerDialog.cpp
index ec7f087..12e0716 100644
--- a/src/gui/studio/SynthPluginManagerDialog.cpp
+++ b/src/gui/studio/SynthPluginManagerDialog.cpp
@@ -105,7 +105,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
 
             //	pluginLayout->addWidget(new TQLabel(instrument->getPresentationName().c_str(),
             //					   pluginFrame), i, 0);
-            pluginLayout->addWidget(new TQLabel(TQString("%1").tqarg(i + 1),
+            pluginLayout->addWidget(new TQLabel(TQString("%1").arg(i + 1),
                                                pluginFrame), i, 0);
 
             AudioPluginInstance *plugin = instrument->getPlugin