Rename obsolete tq methods to standard names

12 files changed, 102 insertions, 102 deletions

diff --git a/src/gui/dialogs/BeatsBarsDialog.cpp b/src/gui/dialogs/BeatsBarsDialog.cpp
index 1624e03..3d02b64 100644
--- a/src/gui/dialogs/BeatsBarsDialog.cpp
+++ b/src/gui/dialogs/BeatsBarsDialog.cpp
@@ -50,16 +50,16 @@ BeatsBarsDialog::BeatsBarsDialog(TQWidget* parent) :
                                     i18n("The selected audio segment contains:"), hbox);
 
     TQFrame *frame = new TQFrame(gbox);
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 1, 2, 5, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 1, 2, 5, 5);
 
     m_spinBox = new TQSpinBox(1, INT_MAX, 1, frame, "glee");
-    tqlayout->addWidget(m_spinBox, 0, 0);
+    layout->addWidget(m_spinBox, 0, 0);
 
     m_comboBox = new KComboBox(false, frame);
     m_comboBox->insertItem(i18n("beat(s)"));
     m_comboBox->insertItem(i18n("bar(s)"));
     m_comboBox->setCurrentItem(0);
-    tqlayout->addWidget(m_comboBox, 0, 1);
+    layout->addWidget(m_comboBox, 0, 1);
 }
 
 }
diff --git a/src/gui/dialogs/CountdownDialog.cpp b/src/gui/dialogs/CountdownDialog.cpp
index d1d5fc9..537bc2b 100644
--- a/src/gui/dialogs/CountdownDialog.cpp
+++ b/src/gui/dialogs/CountdownDialog.cpp
@@ -48,14 +48,14 @@ CountdownDialog::CountdownDialog(TQWidget *parent, int seconds):
         m_progressBarWidth(150),
         m_progressBarHeight(15)
 {
-    TQBoxLayout *tqlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 10, 14);
+    TQBoxLayout *layout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 10, 14);
     setCaption(i18n("Recording..."));
 
     TQHBox *hBox = new TQHBox(this);
     m_label = new TQLabel(hBox);
     m_time = new TQLabel(hBox);
 
-    tqlayout->addWidget(hBox, 0, AlignCenter);
+    layout->addWidget(hBox, 0, AlignCenter);
 
     m_label->setText(i18n("Recording time remaining:  "));
     m_progressBar =
@@ -68,8 +68,8 @@ CountdownDialog::CountdownDialog(TQWidget *parent, int seconds):
     m_stopButton = new TQPushButton(i18n("Stop"), this);
     m_stopButton->setFixedWidth(60);
 
-    tqlayout->addWidget(m_progressBar, 0, AlignCenter);
-    tqlayout->addWidget(m_stopButton, 0, AlignRight);
+    layout->addWidget(m_progressBar, 0, AlignCenter);
+    layout->addWidget(m_stopButton, 0, AlignRight);
 
     connect (m_stopButton, TQT_SIGNAL(released()), this, TQT_SIGNAL(stopped()));
 
diff --git a/src/gui/dialogs/EventFilterDialog.h b/src/gui/dialogs/EventFilterDialog.h
index 4e3f5f8..471c67d 100644
--- a/src/gui/dialogs/EventFilterDialog.h
+++ b/src/gui/dialogs/EventFilterDialog.h
@@ -143,7 +143,7 @@ protected slots:
 private:
     //---------[ data members ]-----------------------------
 
-    TQGridLayout* tqlayout;
+    TQGridLayout* layout;
 
     TQComboBox*   m_noteDurationFromComboBox;
     TQComboBox*   m_noteDurationIncludeComboBox;
diff --git a/src/gui/dialogs/ManageMetronomeDialog.cpp b/src/gui/dialogs/ManageMetronomeDialog.cpp
index 50dcaca..8335a83 100644
--- a/src/gui/dialogs/ManageMetronomeDialog.cpp
+++ b/src/gui/dialogs/ManageMetronomeDialog.cpp
@@ -77,11 +77,11 @@ ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent,
                            (1, Qt::Horizontal, i18n("Metronome Instrument"), vbox);
 
     TQFrame *frame = new TQFrame(deviceBox);
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2, 10, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 2, 2, 10, 5);
 
-    tqlayout->addWidget(new TQLabel(i18n("Device"), frame), 0, 0);
+    layout->addWidget(new TQLabel(i18n("Device"), frame), 0, 0);
     m_metronomeDevice = new KComboBox(frame);
-    tqlayout->addWidget(m_metronomeDevice, 0, 1);
+    layout->addWidget(m_metronomeDevice, 0, 1);
 
     DeviceList *devices = doc->getStudio().getDevices();
     DeviceListConstIterator it;
@@ -108,47 +108,47 @@ ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent,
         }
     }
 
-    tqlayout->addWidget(new TQLabel(i18n("Instrument"), frame), 1, 0);
+    layout->addWidget(new TQLabel(i18n("Instrument"), frame), 1, 0);
     m_metronomeInstrument = new KComboBox(frame);
     connect(m_metronomeInstrument, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetModified()));
     connect(m_metronomeInstrument, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInstrumentChanged(int)));
-    tqlayout->addWidget(m_metronomeInstrument, 1, 1);
+    layout->addWidget(m_metronomeInstrument, 1, 1);
 
     TQGroupBox *beatBox = new TQGroupBox
                          (1, Qt::Horizontal, i18n("Beats"), vbox);
 
     frame = new TQFrame(beatBox);
-    tqlayout = new TQGridLayout(frame, 4, 2, 10, 5);
+    layout = new TQGridLayout(frame, 4, 2, 10, 5);
 
-    tqlayout->addWidget(new TQLabel(i18n("Resolution"), frame), 0, 0);
+    layout->addWidget(new TQLabel(i18n("Resolution"), frame), 0, 0);
     m_metronomeResolution = new KComboBox(frame);
     m_metronomeResolution->insertItem(i18n("None"));
     m_metronomeResolution->insertItem(i18n("Bars only"));
     m_metronomeResolution->insertItem(i18n("Bars and beats"));
     m_metronomeResolution->insertItem(i18n("Bars, beats, and divisions"));
     connect(m_metronomeResolution, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotResolutionChanged(int)));
-    tqlayout->addWidget(m_metronomeResolution, 0, 1);
+    layout->addWidget(m_metronomeResolution, 0, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Bar velocity"), frame), 1, 0);
+    layout->addWidget(new TQLabel(i18n("Bar velocity"), frame), 1, 0);
     m_metronomeBarVely = new TQSpinBox(frame);
     m_metronomeBarVely->setMinValue(0);
     m_metronomeBarVely->setMaxValue(127);
     connect(m_metronomeBarVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified()));
-    tqlayout->addWidget(m_metronomeBarVely, 1, 1);
+    layout->addWidget(m_metronomeBarVely, 1, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Beat velocity"), frame), 2, 0);
+    layout->addWidget(new TQLabel(i18n("Beat velocity"), frame), 2, 0);
     m_metronomeBeatVely = new TQSpinBox(frame);
     m_metronomeBeatVely->setMinValue(0);
     m_metronomeBeatVely->setMaxValue(127);
     connect(m_metronomeBeatVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified()));
-    tqlayout->addWidget(m_metronomeBeatVely, 2, 1);
+    layout->addWidget(m_metronomeBeatVely, 2, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Sub-beat velocity"), frame), 3, 0);
+    layout->addWidget(new TQLabel(i18n("Sub-beat velocity"), frame), 3, 0);
     m_metronomeSubBeatVely = new TQSpinBox(frame);
     m_metronomeSubBeatVely->setMinValue(0);
     m_metronomeSubBeatVely->setMaxValue(127);
     connect(m_metronomeSubBeatVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified()));
-    tqlayout->addWidget(m_metronomeSubBeatVely, 3, 1);
+    layout->addWidget(m_metronomeSubBeatVely, 3, 1);
 
     vbox = new TQVBox(hbox);
 
diff --git a/src/gui/dialogs/MarkerModifyDialog.cpp b/src/gui/dialogs/MarkerModifyDialog.cpp
index b5c8c2c..9308303 100644
--- a/src/gui/dialogs/MarkerModifyDialog.cpp
+++ b/src/gui/dialogs/MarkerModifyDialog.cpp
@@ -80,9 +80,9 @@ MarkerModifyDialog::initialise(Composition *composition,
 
     /*!!!
      
-        tqlayout->addWidget(new TQLabel(i18n("Absolute Time:"), frame), 0, 0);
+        layout->addWidget(new TQLabel(i18n("Absolute Time:"), frame), 0, 0);
         m_timeEdit = new TQSpinBox(frame);
-        tqlayout->addWidget(m_timeEdit, 0, 1);
+        layout->addWidget(m_timeEdit, 0, 1);
      
         m_timeEdit->setMinValue(INT_MIN);
         m_timeEdit->setMaxValue(INT_MAX);
@@ -95,15 +95,15 @@ MarkerModifyDialog::initialise(Composition *composition,
 
     TQFrame *frame = new TQFrame(groupBox);
 
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2, 5, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 2, 2, 5, 5);
 
-    tqlayout->addWidget(new TQLabel(i18n("Text:"), frame), 0, 0);
+    layout->addWidget(new TQLabel(i18n("Text:"), frame), 0, 0);
     m_nameEdit = new TQLineEdit(name, frame);
-    tqlayout->addWidget(m_nameEdit, 0, 1);
+    layout->addWidget(m_nameEdit, 0, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Description:"), frame), 1, 0);
+    layout->addWidget(new TQLabel(i18n("Description:"), frame), 1, 0);
     m_desEdit = new TQLineEdit(des, frame);
-    tqlayout->addWidget(m_desEdit, 1, 1);
+    layout->addWidget(m_desEdit, 1, 1);
 
     m_nameEdit->selectAll();
     m_nameEdit->setFocus();
diff --git a/src/gui/dialogs/PitchPickerDialog.cpp b/src/gui/dialogs/PitchPickerDialog.cpp
index ed09662..3853818 100644
--- a/src/gui/dialogs/PitchPickerDialog.cpp
+++ b/src/gui/dialogs/PitchPickerDialog.cpp
@@ -43,10 +43,10 @@ PitchPickerDialog::PitchPickerDialog(TQWidget *parent, int initialPitch, TQStrin
 
     TQFrame *frame = new TQFrame(vBox);
 
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 10, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 10, 5);
 
     m_pitch = new PitchChooser(text, frame, initialPitch);
-    tqlayout->addMultiCellWidget(m_pitch, 0, 0, 0, 2, TQt::AlignHCenter);
+    layout->addMultiCellWidget(m_pitch, 0, 0, 0, 2, TQt::AlignHCenter);
 }
 
 PitchPickerDialog::~PitchPickerDialog()
diff --git a/src/gui/dialogs/SimpleEventEditDialog.cpp b/src/gui/dialogs/SimpleEventEditDialog.cpp
index d9ff2d5..5ff0791 100644
--- a/src/gui/dialogs/SimpleEventEditDialog.cpp
+++ b/src/gui/dialogs/SimpleEventEditDialog.cpp
@@ -76,16 +76,16 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
 
     TQFrame *frame = new TQFrame(groupBox);
 
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 7, 3, 5, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 7, 3, 5, 5);
 
-    tqlayout->addWidget(new TQLabel(i18n("Event type:"), frame), 0, 0);
+    layout->addWidget(new TQLabel(i18n("Event type:"), frame), 0, 0);
 
     if (inserting) {
 
         m_typeLabel = 0;
 
         m_typeCombo = new KComboBox(frame);
-        tqlayout->addWidget(m_typeCombo, 0, 1);
+        layout->addWidget(m_typeCombo, 0, 1);
 
         m_typeCombo->insertItem(strtoqstr(Note::EventType));
         m_typeCombo->insertItem(strtoqstr(Controller::EventType));
@@ -111,15 +111,15 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
         m_typeCombo = 0;
 
         m_typeLabel = new TQLabel(frame);
-        tqlayout->addWidget(m_typeLabel, 0, 1);
+        layout->addWidget(m_typeLabel, 0, 1);
     }
 
     m_timeLabel = new TQLabel(i18n("Absolute time:"), frame);
-    tqlayout->addWidget(m_timeLabel, 1, 0);
+    layout->addWidget(m_timeLabel, 1, 0);
     m_timeSpinBox = new TQSpinBox(INT_MIN, INT_MAX, Note(Note::Shortest).getDuration(), frame);
     m_timeEditButton = new TQPushButton("edit", frame);
-    tqlayout->addWidget(m_timeSpinBox, 1, 1);
-    tqlayout->addWidget(m_timeEditButton, 1, 2);
+    layout->addWidget(m_timeSpinBox, 1, 1);
+    layout->addWidget(m_timeEditButton, 1, 2);
 
     connect(m_timeSpinBox, TQT_SIGNAL(valueChanged(int)),
             TQT_SLOT(slotAbsoluteTimeChanged(int)));
@@ -127,11 +127,11 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
             TQT_SLOT(slotEditAbsoluteTime()));
 
     m_durationLabel = new TQLabel(i18n("Duration:"), frame);
-    tqlayout->addWidget(m_durationLabel, 2, 0);
+    layout->addWidget(m_durationLabel, 2, 0);
     m_durationSpinBox = new TQSpinBox(0, INT_MAX, Note(Note::Shortest).getDuration(), frame);
     m_durationEditButton = new TQPushButton("edit", frame);
-    tqlayout->addWidget(m_durationSpinBox, 2, 1);
-    tqlayout->addWidget(m_durationEditButton, 2, 2);
+    layout->addWidget(m_durationSpinBox, 2, 1);
+    layout->addWidget(m_durationEditButton, 2, 2);
 
     connect(m_durationSpinBox, TQT_SIGNAL(valueChanged(int)),
             TQT_SLOT(slotDurationChanged(int)));
@@ -139,11 +139,11 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
             TQT_SLOT(slotEditDuration()));
 
     m_pitchLabel = new TQLabel(i18n("Pitch:"), frame);
-    tqlayout->addWidget(m_pitchLabel, 3, 0);
+    layout->addWidget(m_pitchLabel, 3, 0);
     m_pitchSpinBox = new TQSpinBox(frame);
     m_pitchEditButton = new TQPushButton("edit", frame);
-    tqlayout->addWidget(m_pitchSpinBox, 3, 1);
-    tqlayout->addWidget(m_pitchEditButton, 3, 2);
+    layout->addWidget(m_pitchSpinBox, 3, 1);
+    layout->addWidget(m_pitchEditButton, 3, 2);
 
     connect(m_pitchSpinBox, TQT_SIGNAL(valueChanged(int)),
             TQT_SLOT(slotPitchChanged(int)));
@@ -157,13 +157,13 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
     m_controllerLabelValue = new TQLabel(i18n("<none>"), frame);
     m_controllerLabelValue->setAlignment(TQLabel::AlignRight);
 
-    tqlayout->addWidget(m_controllerLabel, 4, 0);
-    tqlayout->addWidget(m_controllerLabelValue, 4, 1);
+    layout->addWidget(m_controllerLabel, 4, 0);
+    layout->addWidget(m_controllerLabelValue, 4, 1);
 
     m_velocityLabel = new TQLabel(i18n("Velocity:"), frame);
-    tqlayout->addWidget(m_velocityLabel, 5, 0);
+    layout->addWidget(m_velocityLabel, 5, 0);
     m_velocitySpinBox = new TQSpinBox(frame);
-    tqlayout->addWidget(m_velocitySpinBox, 5, 1);
+    layout->addWidget(m_velocitySpinBox, 5, 1);
 
     connect(m_velocitySpinBox, TQT_SIGNAL(valueChanged(int)),
             TQT_SLOT(slotVelocityChanged(int)));
@@ -172,14 +172,14 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
     m_velocitySpinBox->setMaxValue(MidiMaxValue);
 
     m_metaLabel = new TQLabel(i18n("Meta string:"), frame);
-    tqlayout->addWidget(m_metaLabel, 6, 0);
+    layout->addWidget(m_metaLabel, 6, 0);
     m_metaEdit = new TQLineEdit(frame);
-    tqlayout->addWidget(m_metaEdit, 6, 1);
+    layout->addWidget(m_metaEdit, 6, 1);
 
     m_sysexLoadButton = new TQPushButton(i18n("Load data"), frame);
-    tqlayout->addWidget(m_sysexLoadButton, 6, 2);
+    layout->addWidget(m_sysexLoadButton, 6, 2);
     m_sysexSaveButton = new TQPushButton(i18n("Save data"), frame);
-    tqlayout->addWidget(m_sysexSaveButton, 4, 2);
+    layout->addWidget(m_sysexSaveButton, 4, 2);
 
     connect(m_metaEdit, TQT_SIGNAL(textChanged(const TQString &)),
             TQT_SLOT(slotMetaChanged(const TQString &)));
@@ -193,21 +193,21 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
 
     frame = new TQFrame(m_notationGroupBox);
 
-    tqlayout = new TQGridLayout(frame, 3, 3, 5, 5);
+    layout = new TQGridLayout(frame, 3, 3, 5, 5);
 
     m_lockNotationValues = new TQCheckBox(i18n("Lock to changes in performed values"), frame);
-    tqlayout->addMultiCellWidget(m_lockNotationValues, 0, 0, 0, 2);
+    layout->addMultiCellWidget(m_lockNotationValues, 0, 0, 0, 2);
     m_lockNotationValues->setChecked(true);
 
     connect(m_lockNotationValues, TQT_SIGNAL(released()),
             TQT_SLOT(slotLockNotationChanged()));
 
     m_notationTimeLabel = new TQLabel(i18n("Notation time:"), frame);
-    tqlayout->addWidget(m_notationTimeLabel, 1, 0);
+    layout->addWidget(m_notationTimeLabel, 1, 0);
     m_notationTimeSpinBox = new TQSpinBox(INT_MIN, INT_MAX, Note(Note::Shortest).getDuration(), frame);
     m_notationTimeEditButton = new TQPushButton("edit", frame);
-    tqlayout->addWidget(m_notationTimeSpinBox, 1, 1);
-    tqlayout->addWidget(m_notationTimeEditButton, 1, 2);
+    layout->addWidget(m_notationTimeSpinBox, 1, 1);
+    layout->addWidget(m_notationTimeEditButton, 1, 2);
 
     connect(m_notationTimeSpinBox, TQT_SIGNAL(valueChanged(int)),
             TQT_SLOT(slotNotationAbsoluteTimeChanged(int)));
@@ -215,11 +215,11 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
             TQT_SLOT(slotEditNotationAbsoluteTime()));
 
     m_notationDurationLabel = new TQLabel(i18n("Notation duration:"), frame);
-    tqlayout->addWidget(m_notationDurationLabel, 2, 0);
+    layout->addWidget(m_notationDurationLabel, 2, 0);
     m_notationDurationSpinBox = new TQSpinBox(0, INT_MAX, Note(Note::Shortest).getDuration(), frame);
     m_notationDurationEditButton = new TQPushButton("edit", frame);
-    tqlayout->addWidget(m_notationDurationSpinBox, 2, 1);
-    tqlayout->addWidget(m_notationDurationEditButton, 2, 2);
+    layout->addWidget(m_notationDurationSpinBox, 2, 1);
+    layout->addWidget(m_notationDurationEditButton, 2, 2);
 
     connect(m_notationDurationSpinBox, TQT_SIGNAL(valueChanged(int)),
             TQT_SLOT(slotNotationDurationChanged(int)));
diff --git a/src/gui/dialogs/SplitByPitchDialog.cpp b/src/gui/dialogs/SplitByPitchDialog.cpp
index 2c93253..aacad2c 100644
--- a/src/gui/dialogs/SplitByPitchDialog.cpp
+++ b/src/gui/dialogs/SplitByPitchDialog.cpp
@@ -49,27 +49,27 @@ SplitByPitchDialog::SplitByPitchDialog(TQWidget *parent) :
 
     TQFrame *frame = new TQFrame(vBox);
 
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 10, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 10, 5);
 
     m_pitch = new PitchChooser(i18n("Starting split pitch"), frame, 60);
-    tqlayout->addMultiCellWidget(m_pitch, 0, 0, 0, 2, TQt::AlignHCenter);
+    layout->addMultiCellWidget(m_pitch, 0, 0, 0, 2, TQt::AlignHCenter);
 
     m_range = new TQCheckBox(i18n("Range up and down to follow music"), frame);
-    tqlayout->addMultiCellWidget(m_range,
+    layout->addMultiCellWidget(m_range,
                                1, 1,  // fromRow, toRow
                                0, 2  // fromCol, toCol
                               );
 
     m_duplicate = new TQCheckBox(i18n("Duplicate non-note events"), frame);
-    tqlayout->addMultiCellWidget(m_duplicate, 2, 2, 0, 2);
+    layout->addMultiCellWidget(m_duplicate, 2, 2, 0, 2);
 
-    tqlayout->addWidget(new TQLabel(i18n("Clef handling:"), frame), 3, 0);
+    layout->addWidget(new TQLabel(i18n("Clef handling:"), frame), 3, 0);
 
     m_clefs = new KComboBox(frame);
     m_clefs->insertItem(i18n("Leave clefs alone"));
     m_clefs->insertItem(i18n("Guess new clefs"));
     m_clefs->insertItem(i18n("Use treble and bass clefs"));
-    tqlayout->addMultiCellWidget(m_clefs, 3, 3, 1, 2);
+    layout->addMultiCellWidget(m_clefs, 3, 3, 1, 2);
 
     m_range->setChecked(true);
     m_duplicate->setChecked(true);
diff --git a/src/gui/dialogs/SplitByRecordingSrcDialog.cpp b/src/gui/dialogs/SplitByRecordingSrcDialog.cpp
index 1609865..df23437 100644
--- a/src/gui/dialogs/SplitByRecordingSrcDialog.cpp
+++ b/src/gui/dialogs/SplitByRecordingSrcDialog.cpp
@@ -52,23 +52,23 @@ SplitByRecordingSrcDialog::SplitByRecordingSrcDialog(TQWidget *parent, Rosegarde
     TQGroupBox *groupBox = new TQGroupBox
                           (1, Qt::Horizontal, i18n("Recording Source"), vBox);
     TQFrame *frame = new TQFrame(groupBox);
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2, 10, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 2, 2, 10, 5);
 
-    tqlayout->addWidget(new TQLabel( i18n("Channel:"), frame ), 0, 0);
+    layout->addWidget(new TQLabel( i18n("Channel:"), frame ), 0, 0);
     m_channel = new KComboBox( frame );
     m_channel->setSizeLimit( 17 );
-    tqlayout->addWidget(m_channel, 0, 1);
+    layout->addWidget(m_channel, 0, 1);
     TQSpacerItem *spacer = new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    tqlayout->addItem( spacer, 0, 2 );
+    layout->addItem( spacer, 0, 2 );
 
     m_channel->insertItem(i18n("any"));
     for (int i = 1; i < 17; ++i) {
         m_channel->insertItem(TQString::number(i));
     }
 
-    tqlayout->addWidget(new TQLabel( i18n("Device:"), frame ), 1, 0);
+    layout->addWidget(new TQLabel( i18n("Device:"), frame ), 1, 0);
     m_device = new KComboBox( frame );
-    tqlayout->addMultiCellWidget( m_device, 1, 1, 1, 2 );
+    layout->addMultiCellWidget( m_device, 1, 1, 1, 2 );
 
     m_deviceIds.clear();
     m_deviceIds.push_back( -1);
diff --git a/src/gui/dialogs/TempoDialog.cpp b/src/gui/dialogs/TempoDialog.cpp
index f55d3fd..7d7bbd9 100644
--- a/src/gui/dialogs/TempoDialog.cpp
+++ b/src/gui/dialogs/TempoDialog.cpp
@@ -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;
 
diff --git a/src/gui/dialogs/TriggerSegmentDialog.cpp b/src/gui/dialogs/TriggerSegmentDialog.cpp
index ca97010..0d3c0e4 100644
--- a/src/gui/dialogs/TriggerSegmentDialog.cpp
+++ b/src/gui/dialogs/TriggerSegmentDialog.cpp
@@ -56,13 +56,13 @@ TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *parent,
     TQVBox *vbox = makeVBoxMainWidget();
 
     TQFrame *frame = new TQFrame(vbox);
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 3, 2, 5, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 3, 2, 5, 5);
 
     TQLabel *label = new TQLabel(i18n("Trigger segment: "), frame);
-    tqlayout->addWidget(label, 0, 0);
+    layout->addWidget(label, 0, 0);
 
     m_segment = new KComboBox(frame);
-    tqlayout->addWidget(m_segment, 0, 1);
+    layout->addWidget(m_segment, 0, 1);
 
     int n = 1;
     for (Composition::triggersegmentcontaineriterator i =
@@ -73,10 +73,10 @@ TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *parent,
     }
 
     label = new TQLabel(i18n("Perform with timing: "), frame);
-    tqlayout->addWidget(label, 1, 0);
+    layout->addWidget(label, 1, 0);
 
     m_adjustTime = new KComboBox(frame);
-    tqlayout->addWidget(m_adjustTime, 1, 1);
+    layout->addWidget(m_adjustTime, 1, 1);
 
     m_adjustTime->insertItem(i18n("As stored"));
     m_adjustTime->insertItem(i18n("Truncate if longer than note"));
@@ -86,7 +86,7 @@ TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *parent,
     m_retune = new TQCheckBox(i18n("Adjust pitch to note"), frame);
     m_retune->setChecked(true);
 
-    tqlayout->addWidget(m_retune, 2, 1);
+    layout->addWidget(m_retune, 2, 1);
 
     setupFromConfig();
 }
diff --git a/src/gui/dialogs/UseOrnamentDialog.cpp b/src/gui/dialogs/UseOrnamentDialog.cpp
index 23fff16..21c9220 100644
--- a/src/gui/dialogs/UseOrnamentDialog.cpp
+++ b/src/gui/dialogs/UseOrnamentDialog.cpp
@@ -63,13 +63,13 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
     TQGroupBox *notationBox = new TQGroupBox(1, Qt::Horizontal, i18n("Notation"), vbox);
 
     TQFrame *frame = new TQFrame(notationBox);
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 1, 5, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 4, 1, 5, 5);
 
     label = new TQLabel(i18n("Display as:  "), frame);
-    tqlayout->addWidget(label, 0, 0);
+    layout->addWidget(label, 0, 0);
 
     m_mark = new KComboBox(frame);
-    tqlayout->addWidget(m_mark, 0, 1);
+    layout->addWidget(m_mark, 0, 1);
 
     m_marks.push_back(Marks::Trill);
     m_marks.push_back(Marks::LongTrill);
@@ -96,21 +96,21 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
     connect(m_mark, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMarkChanged(int)));
 
     m_textLabel = new TQLabel(i18n("   Text:  "), frame);
-    tqlayout->addWidget(m_textLabel, 0, 2);
+    layout->addWidget(m_textLabel, 0, 2);
 
     m_text = new TQLineEdit(frame);
-    tqlayout->addWidget(m_text, 0, 3);
+    layout->addWidget(m_text, 0, 3);
 
     TQGroupBox *performBox = new TQGroupBox(1, Qt::Horizontal, i18n("Performance"), vbox);
 
     frame = new TQFrame(performBox);
-    tqlayout = new TQGridLayout(frame, 3, 2, 5, 5);
+    layout = new TQGridLayout(frame, 3, 2, 5, 5);
 
     label = new TQLabel(i18n("Perform using triggered segment: "), frame);
-    tqlayout->addWidget(label, 0, 0);
+    layout->addWidget(label, 0, 0);
 
     m_ornament = new KComboBox(frame);
-    tqlayout->addWidget(m_ornament, 0, 1);
+    layout->addWidget(m_ornament, 0, 1);
 
     int n = 1;
     for (Composition::triggersegmentcontaineriterator i =
@@ -121,10 +121,10 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
     }
 
     label = new TQLabel(i18n("Perform with timing: "), frame);
-    tqlayout->addWidget(label, 1, 0);
+    layout->addWidget(label, 1, 0);
 
     m_adjustTime = new KComboBox(frame);
-    tqlayout->addWidget(m_adjustTime, 1, 1);
+    layout->addWidget(m_adjustTime, 1, 1);
 
     m_adjustTime->insertItem(i18n("As stored"));
     m_adjustTime->insertItem(i18n("Truncate if longer than note"));
@@ -134,7 +134,7 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
     m_retune = new TQCheckBox(i18n("Adjust pitch to note"), frame);
     m_retune->setChecked(true);
 
-    tqlayout->addWidget(m_retune, 2, 1);
+    layout->addWidget(m_retune, 2, 1);
 
     setupFromConfig();
 }