Remove additional unneeded tq method conversions

6 files changed, 36 insertions, 36 deletions

diff --git a/src/gui/configuration/AudioConfigurationPage.cpp b/src/gui/configuration/AudioConfigurationPage.cpp
index c861a41..5783d83 100644
--- a/src/gui/configuration/AudioConfigurationPage.cpp
+++ b/src/gui/configuration/AudioConfigurationPage.cpp
@@ -259,7 +259,7 @@ AudioConfigurationPage::apply()
     if (extpath != "") {
         TQFileInfo info(extpath);
         if (!info.exists() || !info.isExecutable()) {
-            KMessageBox::error(0, i18n("External audio editor \"%1\" not found or not executable").tqarg(extpath));
+            KMessageBox::error(0, i18n("External audio editor \"%1\" not found or not executable").arg(extpath));
             m_cfg->writeEntry("externalaudioeditor", "");
         } else {
             m_cfg->writeEntry("externalaudioeditor", externalAudioEditor);
@@ -306,7 +306,7 @@ AudioConfigurationPage::getBestAvailableAudioEditor()
 
             if (fi.exists() && fi.isExecutable()) {
                 if (n == "rezound") {
-                    result = TQString("%1 --audio-method=jack").tqarg(fp);
+                    result = TQString("%1 --audio-method=jack").arg(fp);
                 } else {
                     result = fp;
                 }
diff --git a/src/gui/configuration/AudioPropertiesPage.cpp b/src/gui/configuration/AudioPropertiesPage.cpp
index b81655b..bd10bf6 100644
--- a/src/gui/configuration/AudioPropertiesPage.cpp
+++ b/src/gui/configuration/AudioPropertiesPage.cpp
@@ -111,9 +111,9 @@ AudioPropertiesPage::slotFoundMountPoint(const TQString&,
         unsigned long kBAvail )
 {
     m_diskSpace->setText(i18n("%1 out of %2 (%3% used)")
-                         .tqarg(KIO::convertSizeFromKB(kBAvail))
-                         .tqarg(KIO::convertSizeFromKB(kBSize))
-                         .tqarg( 100 - (int)(100.0 * kBAvail / kBSize) ));
+                         .arg(KIO::convertSizeFromKB(kBAvail))
+                         .arg(KIO::convertSizeFromKB(kBSize))
+                         .arg( 100 - (int)(100.0 * kBAvail / kBSize) ));
 
 
     AudioPluginManager *apm = m_doc->getPluginManager();
@@ -140,9 +140,9 @@ AudioPropertiesPage::slotFoundMountPoint(const TQString&,
     minsStr.sprintf("%8.1f", stereoMins);
 
     m_minutesAtStereo->
-    setText(TQString("%1 %2 %3Hz").tqarg(minsStr)
-            .tqarg(i18n("minutes at"))
-            .tqarg(sampleRate));
+    setText(TQString("%1 %2 %3Hz").arg(minsStr)
+            .arg(i18n("minutes at"))
+            .arg(sampleRate));
 }
 
 void
diff --git a/src/gui/configuration/DocumentMetaConfigurationPage.cpp b/src/gui/configuration/DocumentMetaConfigurationPage.cpp
index fbcf519..ef8b995 100644
--- a/src/gui/configuration/DocumentMetaConfigurationPage.cpp
+++ b/src/gui/configuration/DocumentMetaConfigurationPage.cpp
@@ -65,9 +65,9 @@ static TQString durationToString(Rosegarden::Composition &comp,
 				Rosegarden::RealTime rt)
 {
     return i18n("%1 minutes %2.%3%4 seconds (%5 units, %6 measures)") // TODO - PLURAL
-	.tqarg(rt.sec / 60).tqarg(rt.sec % 60)
-	.tqarg(rt.msec() / 100).tqarg((rt.msec() / 10) % 10)
-	.tqarg(duration).tqarg(comp.getBarNumber(absTime + duration) -
+	.arg(rt.sec / 60).arg(rt.sec % 60)
+	.arg(rt.msec() / 100).arg((rt.msec() / 10) % 10)
+	.arg(duration).arg(comp.getBarNumber(absTime + duration) -
 			   comp.getBarNumber(absTime));
 }
 
@@ -76,7 +76,7 @@ class SegmentDataItem : public TQTableItem
 public:
     SegmentDataItem(TQTable *t, TQString s) :
 	TQTableItem(t, TQTableItem::Never, s) { }
-    virtual int tqalignment() const { return TQt::AlignCenter; }
+    virtual int alignment() const { return TQt::AlignCenter; }
 
     virtual TQString key() const {
 
@@ -96,7 +96,7 @@ public:
 
 	TQString s(text());
 	if (s[0].digitValue() >= 0) {
-	    return TQString("%1%2").tqarg(s.length()).tqarg(s);
+	    return TQString("%1%2").arg(s.length()).arg(s);
 	} else {
 	    return s;
 	}
@@ -145,15 +145,15 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
 
     tqlayout->addWidget(new TQLabel(i18n("Tracks:"), frame), 3, 0);
     tqlayout->addWidget(new TQLabel(i18n("%1 used, %2 total")
-                                 .tqarg(usedTracks.size())
-                                 .tqarg(comp.getNbTracks()),
+                                 .arg(usedTracks.size())
+                                 .arg(comp.getNbTracks()),
                                  frame), 3, 1);
 
     tqlayout->addWidget(new TQLabel(i18n("Segments:"), frame), 4, 0);
     tqlayout->addWidget(new TQLabel(i18n("%1 MIDI, %2 audio, %3 total")
-                                 .tqarg(internalSegments)
-                                 .tqarg(audioSegments)
-                                 .tqarg(internalSegments + audioSegments),
+                                 .arg(internalSegments)
+                                 .arg(audioSegments)
+                                 .arg(internalSegments + audioSegments),
                                  frame), 4, 1);
 
     tqlayout->setRowStretch(5, 2);
@@ -205,7 +205,7 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
 
         table->setItem(i, 1, new SegmentDataItem
                        (table,
-                        TQString("%1").tqarg(s->getTrack() + 1)));
+                        TQString("%1").arg(s->getTrack() + 1)));
 
         TQPixmap colourPixmap(16, 16);
         Colour colour =
@@ -219,11 +219,11 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
 
         table->setItem(i, 3, new SegmentDataItem
                        (table,
-                        TQString("%1").tqarg(s->getStartTime())));
+                        TQString("%1").arg(s->getStartTime())));
 
         table->setItem(i, 4, new SegmentDataItem
                        (table,
-                        TQString("%1").tqarg(s->getEndMarkerTime() -
+                        TQString("%1").arg(s->getEndMarkerTime() -
                                           s->getStartTime())));
 
         std::set<long> notesOn;
@@ -254,11 +254,11 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
 
         table->setItem(i, 5, new SegmentDataItem
                        (table,
-                        TQString("%1").tqarg(events)));
+                        TQString("%1").arg(events)));
 
         table->setItem(i, 6, new SegmentDataItem
                        (table,
-                        TQString("%1").tqarg(maxPoly)));
+                        TQString("%1").arg(maxPoly)));
 
         table->setItem(i, 7, new SegmentDataItem
                        (table,
@@ -280,16 +280,16 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
 
         table->setItem(i, 9, new SegmentDataItem
                        (table,
-                        TQString("%1").tqarg(s->getTranspose())));
+                        TQString("%1").arg(s->getTranspose())));
 
         if (s->getDelay() != 0) {
             if (s->getRealTimeDelay() != RealTime::zeroTime) {
                 table->setItem(i, 10, new SegmentDataItem
                                (table,
                                 TQString("%1 + %2 ms")
-                                .tqarg(NotationStrings::makeNoteMenuLabel
+                                .arg(NotationStrings::makeNoteMenuLabel
                                      (s->getDelay(), true, discard, false))
-                                .tqarg(s->getRealTimeDelay().sec * 1000 +
+                                .arg(s->getRealTimeDelay().sec * 1000 +
                                      s->getRealTimeDelay().msec())));
             } else {
                 table->setItem(i, 10, new SegmentDataItem
@@ -301,7 +301,7 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
             table->setItem(i, 10, new SegmentDataItem
                            (table,
                             TQString("%2 ms")
-                            .tqarg(s->getRealTimeDelay().sec * 1000 +
+                            .arg(s->getRealTimeDelay().sec * 1000 +
                                  s->getRealTimeDelay().msec())));
         } else {
             table->setItem(i, 10, new SegmentDataItem
diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp
index 3263443..0558c25 100644
--- a/src/gui/configuration/HeadersConfigurationPage.cpp
+++ b/src/gui/configuration/HeadersConfigurationPage.cpp
@@ -233,7 +233,7 @@ HeadersConfigurationPage::slotAddNewProperty()
 
     while (1) {
         propertyName =
-            (i > 0 ? i18n("{new property %1}").tqarg(i) : i18n("{new property}"));
+            (i > 0 ? i18n("{new property %1}").arg(i) : i18n("{new property}"));
         if (!m_doc->getComposition().getMetadata().has(qstrtostr(propertyName)) &&
 	    m_metadata->findItem(propertyName,0) == 0)
             break;
diff --git a/src/gui/configuration/LatencyConfigurationPage.cpp b/src/gui/configuration/LatencyConfigurationPage.cpp
index a1929aa..b786797 100644
--- a/src/gui/configuration/LatencyConfigurationPage.cpp
+++ b/src/gui/configuration/LatencyConfigurationPage.cpp
@@ -82,7 +82,7 @@ LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
     m_jackPlayback->setTickmarks(TQSlider::Below);
     tqlayout->addMultiCellWidget(m_jackPlayback, 3, 3, 2, 3);
 
-    TQLabel *jackPlaybackLabel = new TQLabel(TQString("%1").tqarg(jackPlaybackValue),
+    TQLabel *jackPlaybackLabel = new TQLabel(TQString("%1").arg(jackPlaybackValue),
                                            frame);
     tqlayout->addWidget(jackPlaybackLabel, 2, 2, TQt::AlignHCenter);
     connect(m_jackPlayback, TQT_SIGNAL(valueChanged(int)),
@@ -105,7 +105,7 @@ LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
     m_jackRecord->setTickmarks(TQSlider::Below);
     tqlayout->addMultiCellWidget(m_jackRecord, 5, 5, 2, 3);
 
-    TQLabel *jackRecordLabel = new TQLabel(TQString("%1").tqarg(jackRecordValue),
+    TQLabel *jackRecordLabel = new TQLabel(TQString("%1").arg(jackRecordValue),
                                          frame);
     tqlayout->addWidget(jackRecordLabel, 4, 2, TQt::AlignHCenter);
     connect(m_jackRecord, TQT_SIGNAL(valueChanged(int)),
diff --git a/src/gui/configuration/NotationConfigurationPage.cpp b/src/gui/configuration/NotationConfigurationPage.cpp
index 7e31c28..7bf857a 100644
--- a/src/gui/configuration/NotationConfigurationPage.cpp
+++ b/src/gui/configuration/NotationConfigurationPage.cpp
@@ -111,7 +111,7 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
         TQString text("%1 %");
         if (*i == 100)
             text = "%1 % (normal)";
-        m_spacing->insertItem(text.tqarg(*i));
+        m_spacing->insertItem(text.arg(*i));
 
         if (*i == defaultSpacing) {
             m_spacing->setCurrentItem(m_spacing->count() - 1);
@@ -132,7 +132,7 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
 
     for (std::vector<int>::iterator i = s.begin(); i != s.end(); ++i) {
 
-        TQString text = TQString("%1 %").tqarg(*i);
+        TQString text = TQString("%1 %").arg(*i);
         if (*i == 40)
             text = "40 % (normal)";
         else if (*i == 0)
@@ -646,7 +646,7 @@ NotationConfigurationPage::slotFontComboChanged(int index)
 
     int printpt = m_cfg->readUnsignedNumEntry("printingnotesize", 5);
     for (int i = 2; i < 16; ++i) {
-        m_printingSize->insertItem(TQString("%1").tqarg(i));
+        m_printingSize->insertItem(TQString("%1").arg(i));
         if (i == printpt) {
             m_printingSize->setCurrentItem(m_printingSize->count() - 1);
         }
@@ -661,10 +661,10 @@ NotationConfigurationPage::slotFontComboChanged(int index)
         m_fontMappedByLabel->setText(i18n(strtoqstr(map.getMappedBy()).ascii()));
         if (map.isSmooth()) {
             m_fontTypeLabel->setText(
-                i18n("%1 (smooth)").tqarg(i18n(strtoqstr(map.getType()).ascii())));
+                i18n("%1 (smooth)").arg(i18n(strtoqstr(map.getType()).ascii())));
         } else {
             m_fontTypeLabel->setText(
-                i18n("%1 (jaggy)").tqarg(i18n(strtoqstr(map.getType()).ascii())));
+                i18n("%1 (jaggy)").arg(i18n(strtoqstr(map.getType()).ascii())));
         }
         if (m_viewButton) {
             m_viewButton->setEnabled(map.getSystemFontNames().count() > 0);
@@ -683,7 +683,7 @@ NotationConfigurationPage::populateSizeCombo(TQComboBox *combo,
     combo->clear();
 
     for (std::vector<int>::iterator i = sizes.begin(); i != sizes.end(); ++i) {
-        combo->insertItem(TQString("%1").tqarg(*i));
+        combo->insertItem(TQString("%1").arg(*i));
         if (*i == defaultSize)
             combo->setCurrentItem(combo->count() - 1);
     }