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

1 files changed, 34 insertions, 34 deletions

diff --git a/src/gui/configuration/DocumentMetaConfigurationPage.cpp b/src/gui/configuration/DocumentMetaConfigurationPage.cpp
index fbcf519..7be758d 100644
--- a/src/gui/configuration/DocumentMetaConfigurationPage.cpp
+++ b/src/gui/configuration/DocumentMetaConfigurationPage.cpp
@@ -53,7 +53,7 @@
 #include <tqtable.h>
 #include <tqtabwidget.h>
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 
 namespace Rosegarden
@@ -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;
 	}
@@ -126,42 +126,42 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
     }
 
     TQFrame *frame = new TQFrame(m_tabWidget);
-    TQGridLayout *tqlayout = new TQGridLayout(frame,
+    TQGridLayout *layout = new TQGridLayout(frame,
                              6, 2,
                              10, 5);
 
-    tqlayout->addWidget(new TQLabel(i18n("Filename:"), frame), 0, 0);
-    tqlayout->addWidget(new TQLabel(doc->getTitle(), frame), 0, 1);
+    layout->addWidget(new TQLabel(i18n("Filename:"), frame), 0, 0);
+    layout->addWidget(new TQLabel(doc->getTitle(), frame), 0, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Formal duration (to end marker):"), frame), 1, 0);
+    layout->addWidget(new TQLabel(i18n("Formal duration (to end marker):"), frame), 1, 0);
     timeT d = comp.getEndMarker();
     RealTime rtd = comp.getElapsedRealTime(d);
-    tqlayout->addWidget(new TQLabel(durationToString(comp, 0, d, rtd), frame), 1, 1);
+    layout->addWidget(new TQLabel(durationToString(comp, 0, d, rtd), frame), 1, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Playing duration:"), frame), 2, 0);
+    layout->addWidget(new TQLabel(i18n("Playing duration:"), frame), 2, 0);
     d = comp.getDuration();
     rtd = comp.getElapsedRealTime(d);
-    tqlayout->addWidget(new TQLabel(durationToString(comp, 0, d, rtd), frame), 2, 1);
+    layout->addWidget(new TQLabel(durationToString(comp, 0, d, rtd), frame), 2, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Tracks:"), frame), 3, 0);
-    tqlayout->addWidget(new TQLabel(i18n("%1 used, %2 total")
-                                 .tqarg(usedTracks.size())
-                                 .tqarg(comp.getNbTracks()),
+    layout->addWidget(new TQLabel(i18n("Tracks:"), frame), 3, 0);
+    layout->addWidget(new TQLabel(i18n("%1 used, %2 total")
+                                 .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),
+    layout->addWidget(new TQLabel(i18n("Segments:"), frame), 4, 0);
+    layout->addWidget(new TQLabel(i18n("%1 MIDI, %2 audio, %3 total")
+                                 .arg(internalSegments)
+                                 .arg(audioSegments)
+                                 .arg(internalSegments + audioSegments),
                                  frame), 4, 1);
 
-    tqlayout->setRowStretch(5, 2);
+    layout->setRowStretch(5, 2);
 
     addTab(frame, i18n("Statistics"));
 
     frame = new TQFrame(m_tabWidget);
-    tqlayout = new TQGridLayout(frame, 1, 1, 10, 5);
+    layout = new TQGridLayout(frame, 1, 1, 10, 5);
 
     TQTable *table = new TQTable(1, 11, frame, "Segment Table");
     table->setSelectionMode(TQTable::NoSelection);
@@ -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
@@ -312,7 +312,7 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
         ++i;
     }
 
-    tqlayout->addWidget(table, 0, 0);
+    layout->addWidget(table, 0, 0);
 
     addTab(frame, i18n("Segment Summary"));