Rename obsolete tq methods to standard names

6 files changed, 57 insertions, 57 deletions

diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp
index 8a19fee..7818efd 100644
--- a/src/gui/editors/segment/ControlEditorDialog.cpp
+++ b/src/gui/editors/segment/ControlEditorDialog.cpp
@@ -124,7 +124,7 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
     btnBox->setSizePolicy(
         TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
 
-    TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10);
+    TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 4, 10);
 
     m_addButton = new TQPushButton(i18n("Add"), btnBox);
     m_deleteButton = new TQPushButton(i18n("Delete"), btnBox);
@@ -143,13 +143,13 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
         (m_closeButton,
                 i18n("Close the Control Parameter editor"));
 
-    tqlayout->addStretch(10);
-    tqlayout->addWidget(m_addButton);
-    tqlayout->addWidget(m_deleteButton);
-    tqlayout->addSpacing(30);
+    layout->addStretch(10);
+    layout->addWidget(m_addButton);
+    layout->addWidget(m_deleteButton);
+    layout->addSpacing(30);
 
-    tqlayout->addWidget(m_closeButton);
-    tqlayout->addSpacing(5);
+    layout->addWidget(m_closeButton);
+    layout->addSpacing(5);
 
     connect(m_addButton, TQT_SIGNAL(released()),
             TQT_SLOT(slotAdd()));
diff --git a/src/gui/editors/segment/ControlParameterEditDialog.cpp b/src/gui/editors/segment/ControlParameterEditDialog.cpp
index 340c608..a7d794b 100644
--- a/src/gui/editors/segment/ControlParameterEditDialog.cpp
+++ b/src/gui/editors/segment/ControlParameterEditDialog.cpp
@@ -72,47 +72,47 @@ ControlParameterEditDialog::ControlParameterEditDialog(
 
     TQFrame *frame = new TQFrame(groupBox);
 
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 10, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 10, 5);
 
-    tqlayout->addWidget(new TQLabel(i18n("Name:"), frame), 0, 0);
+    layout->addWidget(new TQLabel(i18n("Name:"), frame), 0, 0);
     m_nameEdit = new TQLineEdit(frame);
-    tqlayout->addWidget(m_nameEdit, 0, 1);
+    layout->addWidget(m_nameEdit, 0, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Type:"), frame), 1, 0);
+    layout->addWidget(new TQLabel(i18n("Type:"), frame), 1, 0);
     m_typeCombo = new KComboBox(frame);
-    tqlayout->addMultiCellWidget(m_typeCombo, 1, 1, 1, 2);
+    layout->addMultiCellWidget(m_typeCombo, 1, 1, 1, 2);
 
-    tqlayout->addWidget(new TQLabel(i18n("Description:"), frame), 2, 0);
+    layout->addWidget(new TQLabel(i18n("Description:"), frame), 2, 0);
     m_description = new TQLineEdit(frame);
-    tqlayout->addMultiCellWidget(m_description, 2, 2, 1, 2);
+    layout->addMultiCellWidget(m_description, 2, 2, 1, 2);
 
     // hex value alongside decimal value
     m_hexValue = new TQLabel(frame);
-    tqlayout->addWidget(m_hexValue, 3, 1);
+    layout->addWidget(m_hexValue, 3, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Control Event value:"), frame), 3, 0);
+    layout->addWidget(new TQLabel(i18n("Control Event value:"), frame), 3, 0);
     m_controllerBox = new TQSpinBox(frame);
-    tqlayout->addWidget(m_controllerBox, 3, 2);
+    layout->addWidget(m_controllerBox, 3, 2);
 
-    tqlayout->addWidget(new TQLabel(i18n("Minimum value:"), frame), 4, 0);
+    layout->addWidget(new TQLabel(i18n("Minimum value:"), frame), 4, 0);
     m_minBox = new TQSpinBox(frame);
-    tqlayout->addMultiCellWidget(m_minBox, 4, 4, 1, 2);
+    layout->addMultiCellWidget(m_minBox, 4, 4, 1, 2);
 
-    tqlayout->addWidget(new TQLabel(i18n("Maximum value:"), frame), 5, 0);
+    layout->addWidget(new TQLabel(i18n("Maximum value:"), frame), 5, 0);
     m_maxBox = new TQSpinBox(frame);
-    tqlayout->addMultiCellWidget(m_maxBox, 5, 5, 1, 2);
+    layout->addMultiCellWidget(m_maxBox, 5, 5, 1, 2);
 
-    tqlayout->addWidget(new TQLabel(i18n("Default value:"), frame), 6, 0);
+    layout->addWidget(new TQLabel(i18n("Default value:"), frame), 6, 0);
     m_defaultBox = new TQSpinBox(frame);
-    tqlayout->addMultiCellWidget(m_defaultBox, 6, 6, 1, 2);
+    layout->addMultiCellWidget(m_defaultBox, 6, 6, 1, 2);
 
-    tqlayout->addWidget(new TQLabel(i18n("Color:"), frame), 7, 0);
+    layout->addWidget(new TQLabel(i18n("Color:"), frame), 7, 0);
     m_colourCombo = new KComboBox(frame);
-    tqlayout->addMultiCellWidget(m_colourCombo, 7, 7, 1, 2);
+    layout->addMultiCellWidget(m_colourCombo, 7, 7, 1, 2);
 
-    tqlayout->addWidget(new TQLabel(i18n("Instrument Parameter Box position:"), frame), 8, 0);
+    layout->addWidget(new TQLabel(i18n("Instrument Parameter Box position:"), frame), 8, 0);
     m_ipbPosition = new KComboBox(frame);
-    tqlayout->addMultiCellWidget(m_ipbPosition, 8, 8, 1, 2);
+    layout->addMultiCellWidget(m_ipbPosition, 8, 8, 1, 2);
 
     connect(m_nameEdit, TQT_SIGNAL(textChanged(const TQString&)),
             TQT_SLOT(slotNameChanged(const TQString&)));
diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index 0b47cb8..20fb211 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -108,7 +108,7 @@ MarkerEditor::MarkerEditor(TQWidget *parent,
     btnBox->setSizePolicy(
         TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
 
-    TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10);
+    TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 4, 10);
 
     m_addButton = new TQPushButton(i18n("Add"), btnBox);
     m_deleteButton = new TQPushButton(i18n("Delete"), btnBox);
@@ -132,14 +132,14 @@ MarkerEditor::MarkerEditor(TQWidget *parent,
         (m_closeButton,
                 i18n("Close the Marker Editor"));
 
-    tqlayout->addStretch(10);
-    tqlayout->addWidget(m_addButton);
-    tqlayout->addWidget(m_deleteButton);
-    tqlayout->addWidget(m_deleteAllButton);
-    tqlayout->addSpacing(30);
+    layout->addStretch(10);
+    layout->addWidget(m_addButton);
+    layout->addWidget(m_deleteButton);
+    layout->addWidget(m_deleteAllButton);
+    layout->addSpacing(30);
 
-    tqlayout->addWidget(m_closeButton);
-    tqlayout->addSpacing(5);
+    layout->addWidget(m_closeButton);
+    layout->addSpacing(5);
 
     connect(m_addButton, TQT_SIGNAL(released()),
             TQT_SLOT(slotAdd()));
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 =
diff --git a/src/gui/editors/segment/TrackButtons.h b/src/gui/editors/segment/TrackButtons.h
index 0622642..184ed19 100644
--- a/src/gui/editors/segment/TrackButtons.h
+++ b/src/gui/editors/segment/TrackButtons.h
@@ -186,7 +186,7 @@ protected:
 
     RosegardenGUIDoc                 *m_doc;
 
-    TQVBoxLayout                      *m_tqlayout;
+    TQVBoxLayout                      *m_layout;
 
     std::vector<KLedButton *>         m_muteLeds;
     std::vector<KLedButton *>         m_recordLeds;
diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp
index 078835b..62fd06b 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.cpp
+++ b/src/gui/editors/segment/TriggerSegmentManager.cpp
@@ -102,7 +102,7 @@ TriggerSegmentManager::TriggerSegmentManager(TQWidget *parent,
     btnBox->setSizePolicy(
         TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
 
-    TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10);
+    TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 4, 10);
 
     m_addButton = new TQPushButton(i18n("Add"), btnBox);
     m_deleteButton = new TQPushButton(i18n("Delete"), btnBox);
@@ -126,14 +126,14 @@ TriggerSegmentManager::TriggerSegmentManager(TQWidget *parent,
         (m_closeButton,
                 i18n("Close the Triggered Segment Manager"));
 
-    tqlayout->addStretch(10);
-    tqlayout->addWidget(m_addButton);
-    tqlayout->addWidget(m_deleteButton);
-    tqlayout->addWidget(m_deleteAllButton);
-    tqlayout->addSpacing(30);
+    layout->addStretch(10);
+    layout->addWidget(m_addButton);
+    layout->addWidget(m_deleteButton);
+    layout->addWidget(m_deleteAllButton);
+    layout->addSpacing(30);
 
-    tqlayout->addWidget(m_closeButton);
-    tqlayout->addSpacing(5);
+    layout->addWidget(m_closeButton);
+    layout->addSpacing(5);
 
     connect(m_addButton, TQT_SIGNAL(released()),
             TQT_SLOT(slotAdd()));