Rename obsolete tq methods to standard names

1 files changed, 13 insertions, 13 deletions

diff --git a/src/gui/editors/segment/TrackButtons.cpp b/src/gui/editors/segment/TrackButtons.cpp
index ad70d95..2d5a66d 100644
--- a/src/gui/editors/segment/TrackButtons.cpp
+++ b/src/gui/editors/segment/TrackButtons.cpp
@@ -77,7 +77,7 @@ TrackButtons::TrackButtons(RosegardenGUIDoc* doc,
                            WFlags f)
         : TQFrame(parent, name, f),
         m_doc(doc),
-        m_tqlayout(new TQVBoxLayout(this)),
+        m_layout(new TQVBoxLayout(this)),
         m_recordSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))),
         m_muteSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))),
         m_clickedSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))),
@@ -100,13 +100,13 @@ TrackButtons::TrackButtons(RosegardenGUIDoc* doc,
 
     // Set the spacing between vertical elements
     //
-    m_tqlayout->setSpacing(m_borderGap);
+    m_layout->setSpacing(m_borderGap);
 
     // Now draw the buttons and labels and meters
     //
     makeButtons();
 
-    m_tqlayout->addStretch(20);
+    m_layout->addStretch(20);
 
     connect(m_recordSigMapper, TQT_SIGNAL(mapped(int)),
             this, TQT_SLOT(slotToggleRecordTrack(int)));
@@ -152,7 +152,7 @@ TrackButtons::makeButtons()
             TQFrame *trackHBox = makeButton(track->getId());
 
             if (trackHBox) {
-                m_tqlayout->addWidget(trackHBox);
+                m_layout->addWidget(trackHBox);
                 m_trackHBoxes.push_back(trackHBox);
             }
         }
@@ -297,7 +297,7 @@ TrackButtons::slotUpdateTracks()
 
                 if (trackHBox) {
                     trackHBox->show();
-                    m_tqlayout->insertWidget(i, trackHBox);
+                    m_layout->insertWidget(i, trackHBox);
                     m_trackHBoxes.push_back(trackHBox);
                 }
             } else
@@ -1021,7 +1021,7 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
     // Create a horizontal box for each track
     //
     trackHBox = new TQFrame(this);
-    TQHBoxLayout *hbtqlayout = new TQHBoxLayout(trackHBox);
+    TQHBoxLayout *hblayout = new TQHBoxLayout(trackHBox);
         
     trackHBox->setMinimumSize(labelWidth, m_cellSize * multiple - m_borderGap);
     trackHBox->setFixedHeight(m_cellSize * multiple - m_borderGap);
@@ -1033,7 +1033,7 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
     trackHBox->setFrameShadow(Raised);
 
     // Insert a little gap
-    hbtqlayout->addSpacing(vuSpacing);
+    hblayout->addSpacing(vuSpacing);
 
     // Create a VU meter
     vuMeter = new TrackVUMeter(trackHBox,
@@ -1044,10 +1044,10 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
 
     m_trackMeters.push_back(vuMeter);
 
-    hbtqlayout->addWidget(vuMeter);
+    hblayout->addWidget(vuMeter);
 
     // Create another little gap
-    hbtqlayout->addSpacing(vuSpacing);
+    hblayout->addSpacing(vuSpacing);
 
     //
     // 'mute' and 'record' leds
@@ -1056,12 +1056,12 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
     mute = new KLedButton(Rosegarden::GUIPalette::getColour
               (Rosegarden::GUIPalette::MuteTrackLED), trackHBox);
     TQToolTip::add(mute, i18n("Mute track"));
-    hbtqlayout->addWidget(mute);
+    hblayout->addWidget(mute);
 
     record = new KLedButton(Rosegarden::GUIPalette::getColour
                 (Rosegarden::GUIPalette::RecordMIDITrackLED), trackHBox);
     TQToolTip::add(record, i18n("Record on this track"));
-    hbtqlayout->addWidget(record);
+    hblayout->addWidget(record);
 
     record->setLook(KLed::Sunken);
     mute->setLook(KLed::Sunken);
@@ -1084,8 +1084,8 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
     // Track label
     //
     trackLabel = new TrackLabel(trackId, track->getPosition(), trackHBox);
-    hbtqlayout->addWidget(trackLabel);
-    hbtqlayout->addSpacing(vuSpacing);
+    hblayout->addWidget(trackLabel);
+    hblayout->addSpacing(vuSpacing);
 
     if (track->getLabel() == std::string("")) {
     Rosegarden::Instrument *ins =