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

1 files changed, 20 insertions, 20 deletions

diff --git a/src/gui/dialogs/TempoDialog.cpp b/src/gui/dialogs/TempoDialog.cpp
index 92d7165..c2c54a3 100644
--- a/src/gui/dialogs/TempoDialog.cpp
+++ b/src/gui/dialogs/TempoDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "TempoDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include "misc/Debug.h"
@@ -63,18 +63,18 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc,
     TQGroupBox *groupBox = new TQGroupBox(1, Qt::Horizontal, i18n("Tempo"), vbox);
 
     TQFrame *frame = new TQFrame(groupBox);
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 5, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 5, 5);
 
     // Set tempo
-    tqlayout->addWidget(new TQLabel(i18n("New tempo:"), frame), 0, 1);
+    layout->addWidget(new TQLabel(i18n("New tempo:"), frame), 0, 1);
     m_tempoValueSpinBox = new HSpinBox(frame, 0, 100000, 0.0, 1000.0, 5);
-    tqlayout->addWidget(m_tempoValueSpinBox, 0, 2);
+    layout->addWidget(m_tempoValueSpinBox, 0, 2);
 
     connect(m_tempoValueSpinBox, TQT_SIGNAL(valueChanged(const TQString &)),
             TQT_SLOT(slotTempoChanged(const TQString &)));
 
     m_tempoTap= new TQPushButton(i18n("Tap"), frame);
-    tqlayout->addWidget(m_tempoTap, 0, 3);
+    layout->addWidget(m_tempoTap, 0, 3);
     connect(m_tempoTap, TQT_SIGNAL(clicked()), TQT_SLOT(slotTapClicked()));
 
 
@@ -85,13 +85,13 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc,
     //    m_tempoTargetCheckBox = new TQCheckBox(i18n("Ramping to:"), frame);
     m_tempoTargetSpinBox = new HSpinBox(frame, 0, 100000, 0.0, 1000.0, 5);
 
-    //    tqlayout->addMultiCellWidget(m_tempoTargetCheckBox, 1, 1, 0, 1, AlignRight);
-    //    tqlayout->addWidget(m_tempoTargetSpinBox, 1, 2);
+    //    layout->addMultiCellWidget(m_tempoTargetCheckBox, 1, 1, 0, 1, AlignRight);
+    //    layout->addWidget(m_tempoTargetSpinBox, 1, 2);
 
-    tqlayout->addMultiCellWidget(m_tempoConstant, 1, 1, 1, 2);
-    tqlayout->addMultiCellWidget(m_tempoRampToNext, 2, 2, 1, 2);
-    tqlayout->addWidget(m_tempoRampToTarget, 3, 1);
-    tqlayout->addWidget(m_tempoTargetSpinBox, 3, 2);
+    layout->addMultiCellWidget(m_tempoConstant, 1, 1, 1, 2);
+    layout->addMultiCellWidget(m_tempoRampToNext, 2, 2, 1, 2);
+    layout->addWidget(m_tempoRampToTarget, 3, 1);
+    layout->addWidget(m_tempoTargetSpinBox, 3, 2);
 
     //    connect(m_tempoTargetCheckBox, TQT_SIGNAL(clicked()),
     //            TQT_SLOT(slotTargetCheckBoxClicked()));
@@ -105,13 +105,13 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc,
             TQT_SLOT(slotTargetChanged(const TQString &)));
 
     m_tempoBeatLabel = new TQLabel(frame);
-    tqlayout->addWidget(m_tempoBeatLabel, 0, 4);
+    layout->addWidget(m_tempoBeatLabel, 0, 4);
 
     m_tempoBeat = new TQLabel(frame);
-    tqlayout->addWidget(m_tempoBeat, 0, 5);
+    layout->addWidget(m_tempoBeat, 0, 5);
 
     m_tempoBeatsPerMinute = new TQLabel(frame);
-    tqlayout->addWidget(m_tempoBeatsPerMinute, 0, 6);
+    layout->addWidget(m_tempoBeatsPerMinute, 0, 6);
 
     m_timeEditor = 0;
 
@@ -253,17 +253,17 @@ TempoDialog::populateTempo()
     RealTime tempoTime = comp.getElapsedRealTime(m_tempoTime);
     TQString milliSeconds;
     milliSeconds.sprintf("%03d", tempoTime.msec());
-    m_tempoTimeLabel->setText(i18n("%1.%2 s,").tqarg(tempoTime.sec)
-                              .tqarg(milliSeconds));
+    m_tempoTimeLabel->setText(i18n("%1.%2 s,").arg(tempoTime.sec)
+                              .arg(milliSeconds));
 
     int barNo = comp.getBarNumber(m_tempoTime);
     if (comp.getBarStart(barNo) == m_tempoTime) {
         m_tempoBarLabel->setText
-        (i18n("at the start of measure %1.").tqarg(barNo + 1));
+        (i18n("at the start of measure %1.").arg(barNo + 1));
         m_tempoChangeStartOfBar->setEnabled(false);
     } else {
         m_tempoBarLabel->setText(
-            i18n("in the middle of measure %1.").tqarg(barNo + 1));
+            i18n("in the middle of measure %1.").arg(barNo + 1));
         m_tempoChangeStartOfBar->setEnabled(true);
     }
 
@@ -282,8 +282,8 @@ TempoDialog::populateTempo()
             lastms.sprintf("%03d", lastRT.msec());
             int lastBar = comp.getBarNumber(lastTempoTime);
             m_tempoChangeBeforeAt->setText
-            (i18n("        (at %1.%2 s, in measure %3)").tqarg(lastRT.sec)
-             .tqarg(lastms).tqarg(lastBar + 1));
+            (i18n("        (at %1.%2 s, in measure %3)").arg(lastRT.sec)
+             .arg(lastms).arg(lastBar + 1));
             m_tempoChangeBeforeAt->show();
 
             m_tempoChangeBefore->setEnabled(true);