Rename obsolete tq methods to standard names

6 files changed, 66 insertions, 66 deletions

diff --git a/src/gui/widgets/CollapsingFrame.cpp b/src/gui/widgets/CollapsingFrame.cpp
index 56c530b..7889a78 100644
--- a/src/gui/widgets/CollapsingFrame.cpp
+++ b/src/gui/widgets/CollapsingFrame.cpp
@@ -47,7 +47,7 @@ CollapsingFrame::CollapsingFrame(TQString label, TQWidget *parent, const char *n
         m_fill(false),
         m_collapsed(false)
 {
-    m_tqlayout = new TQGridLayout(this, 3, 3, 0, 0);
+    m_layout = new TQGridLayout(this, 3, 3, 0, 0);
 
     m_toggleButton = new TQToolButton(this);
     m_toggleButton->setTextLabel(label);
@@ -66,7 +66,7 @@ CollapsingFrame::CollapsingFrame(TQString label, TQWidget *parent, const char *n
 
     connect(m_toggleButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggle()));
 
-    m_tqlayout->addMultiCellWidget(m_toggleButton, 0, 0, 0, 2);
+    m_layout->addMultiCellWidget(m_toggleButton, 0, 0, 0, 2);
 }
 
 CollapsingFrame::~CollapsingFrame()
@@ -96,9 +96,9 @@ CollapsingFrame::setWidget(TQWidget *widget)
     assert(!m_widget);
     m_widget = widget;
     if (m_fill) {
-        m_tqlayout->addMultiCellWidget(widget, 1, 1, 0, 2);
+        m_layout->addMultiCellWidget(widget, 1, 1, 0, 2);
     } else {
-        m_tqlayout->addWidget(widget, 1, 1);
+        m_layout->addWidget(widget, 1, 1);
     }
 
     bool expanded = true;
diff --git a/src/gui/widgets/CollapsingFrame.h b/src/gui/widgets/CollapsingFrame.h
index 6ae6feb..8e3bdc0 100644
--- a/src/gui/widgets/CollapsingFrame.h
+++ b/src/gui/widgets/CollapsingFrame.h
@@ -62,7 +62,7 @@ public slots:
     void toggle();
 
 protected:
-    TQGridLayout *m_tqlayout;
+    TQGridLayout *m_layout;
     TQToolButton *m_toggleButton;
     TQWidget *m_widget;
     bool m_fill;
diff --git a/src/gui/widgets/PluginControl.cpp b/src/gui/widgets/PluginControl.cpp
index 2a66a8b..cc94394 100644
--- a/src/gui/widgets/PluginControl.cpp
+++ b/src/gui/widgets/PluginControl.cpp
@@ -44,7 +44,7 @@ namespace Rosegarden
 {
 
 PluginControl::PluginControl(TQWidget *parent,
-                             TQGridLayout *tqlayout,
+                             TQGridLayout *layout,
                              ControlType type,
                              PluginPort *port,
                              AudioPluginManager *aPM,
@@ -53,7 +53,7 @@ PluginControl::PluginControl(TQWidget *parent,
                              bool showBounds,
                              bool hidden):
         TQObject(parent),
-        m_tqlayout(tqlayout),
+        m_layout(layout),
         m_type(type),
         m_port(port),
         m_pluginManager(aPM),
@@ -166,7 +166,7 @@ PluginControl::PluginControl(TQWidget *parent,
             controlTitle->show();
             item = new TQWidgetItem(controlTitle);
             item->setAlignment(TQt::AlignRight | TQt::AlignBottom);
-            m_tqlayout->addItem(item);
+            m_layout->addItem(item);
         } else {
             controlTitle->hide();
         }
@@ -175,7 +175,7 @@ PluginControl::PluginControl(TQWidget *parent,
             low->show();
             item = new TQWidgetItem(low);
             item->setAlignment(TQt::AlignRight | TQt::AlignBottom);
-            m_tqlayout->addItem(item);
+            m_layout->addItem(item);
         } else {
             low->hide();
         }
@@ -184,7 +184,7 @@ PluginControl::PluginControl(TQWidget *parent,
             m_dial->show();
             item = new TQWidgetItem(m_dial);
             item->setAlignment(TQt::AlignCenter);
-            m_tqlayout->addItem(item);
+            m_layout->addItem(item);
         } else {
             m_dial->hide();
         }
@@ -193,7 +193,7 @@ PluginControl::PluginControl(TQWidget *parent,
             upp->show();
             item = new TQWidgetItem(upp);
             item->setAlignment(TQt::AlignLeft | TQt::AlignBottom);
-            m_tqlayout->addItem(item);
+            m_layout->addItem(item);
         } else {
             upp->hide();
         }
diff --git a/src/gui/widgets/PluginControl.h b/src/gui/widgets/PluginControl.h
index de90836..09eb928 100644
--- a/src/gui/widgets/PluginControl.h
+++ b/src/gui/widgets/PluginControl.h
@@ -57,7 +57,7 @@ public:
     } ControlType;
 
     PluginControl(TQWidget *parent,
-                  TQGridLayout *tqlayout,
+                  TQGridLayout *layout,
                   ControlType type,
                   PluginPort *port,
                   AudioPluginManager *pluginManager,
@@ -84,7 +84,7 @@ protected:
 
     //--------------- Data members ---------------------------------
 
-    TQGridLayout         *m_tqlayout;
+    TQGridLayout         *m_layout;
 
     ControlType          m_type;
     PluginPort          *m_port;
diff --git a/src/gui/widgets/QuantizeParameters.cpp b/src/gui/widgets/QuantizeParameters.cpp
index ff4841c..9e55e0d 100644
--- a/src/gui/widgets/QuantizeParameters.cpp
+++ b/src/gui/widgets/QuantizeParameters.cpp
@@ -82,18 +82,18 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
     m_mainLayout->addWidget(quantizerBox, zero, 0);
     TQFrame *typeFrame = new TQFrame(quantizerBox);
 
-    TQGridLayout *tqlayout = new TQGridLayout(typeFrame, 2, 2, 5, 3);
-    tqlayout->addWidget(new TQLabel(i18n("Quantizer type:"), typeFrame), 0, 0);
+    TQGridLayout *layout = new TQGridLayout(typeFrame, 2, 2, 5, 3);
+    layout->addWidget(new TQLabel(i18n("Quantizer type:"), typeFrame), 0, 0);
     m_typeCombo = new KComboBox(typeFrame);
     m_typeCombo->insertItem(i18n("Grid quantizer"));
     m_typeCombo->insertItem(i18n("Legato quantizer"));
     m_typeCombo->insertItem(i18n("Heuristic notation quantizer"));
-    tqlayout->addWidget(m_typeCombo, 0, 1);
+    layout->addWidget(m_typeCombo, 0, 1);
 
     m_notationTarget = new TQCheckBox
                        (i18n("Quantize for notation only (leave performance unchanged)"),
                         typeFrame);
-    tqlayout->addMultiCellWidget(m_notationTarget, 1, 1, 0, 1);
+    layout->addMultiCellWidget(m_notationTarget, 1, 1, 0, 1);
     if (!showNotationOption)
         m_notationTarget->hide();
 
@@ -104,14 +104,14 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
                     (1, Qt::Horizontal, i18n("Notation parameters"), parameterBox);
     TQFrame *notationFrame = new TQFrame(m_notationBox);
 
-    tqlayout = new TQGridLayout(notationFrame, 4, 2, 5, 3);
+    layout = new TQGridLayout(notationFrame, 4, 2, 5, 3);
 
-    tqlayout->addWidget(new TQLabel(i18n("Base grid unit:"), notationFrame),
+    layout->addWidget(new TQLabel(i18n("Base grid unit:"), notationFrame),
                       1, 0);
     m_notationUnitCombo = new KComboBox(notationFrame);
-    tqlayout->addWidget(m_notationUnitCombo, 1, 1);
+    layout->addWidget(m_notationUnitCombo, 1, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Complexity:"),
+    layout->addWidget(new TQLabel(i18n("Complexity:"),
                                  notationFrame), 0, 0);
 
     m_simplicityCombo = new KComboBox(notationFrame);
@@ -120,9 +120,9 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
     m_simplicityCombo->insertItem(i18n("Normal"));
     m_simplicityCombo->insertItem(i18n("Low"));
     m_simplicityCombo->insertItem(i18n("Very low"));
-    tqlayout->addWidget(m_simplicityCombo, 0, 1);
+    layout->addWidget(m_simplicityCombo, 0, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Tuplet level:"),
+    layout->addWidget(new TQLabel(i18n("Tuplet level:"),
                                  notationFrame), 2, 0);
     m_maxTuplet = new KComboBox(notationFrame);
     m_maxTuplet->insertItem(i18n("None"));
@@ -136,34 +136,34 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
         m_maxTuplet->insertItem(i18n("8-Tuplet"));
     */
     m_maxTuplet->insertItem(i18n("Any"));
-    tqlayout->addWidget(m_maxTuplet, 2, 1);
+    layout->addWidget(m_maxTuplet, 2, 1);
 
     m_counterpoint = new TQCheckBox(i18n("Permit counterpoint"), notationFrame);
-    tqlayout->addMultiCellWidget(m_counterpoint, 3, 3, 0, 1);
+    layout->addMultiCellWidget(m_counterpoint, 3, 3, 0, 1);
 
     m_gridBox = new TQGroupBox
                 (1, Qt::Horizontal, i18n("Grid parameters"), parameterBox);
     TQFrame *gridFrame = new TQFrame(m_gridBox);
 
-    tqlayout = new TQGridLayout(gridFrame, 4, 2, 5, 3);
+    layout = new TQGridLayout(gridFrame, 4, 2, 5, 3);
 
-    tqlayout->addWidget(new TQLabel(i18n("Base grid unit:"), gridFrame), 0, 0);
+    layout->addWidget(new TQLabel(i18n("Base grid unit:"), gridFrame), 0, 0);
     m_gridUnitCombo = new KComboBox(gridFrame);
-    tqlayout->addWidget(m_gridUnitCombo, 0, 1);
+    layout->addWidget(m_gridUnitCombo, 0, 1);
 
     m_swingLabel = new TQLabel(i18n("Swing:"), gridFrame);
-    tqlayout->addWidget(m_swingLabel, 1, 0);
+    layout->addWidget(m_swingLabel, 1, 0);
     m_swingCombo = new KComboBox(gridFrame);
-    tqlayout->addWidget(m_swingCombo, 1, 1);
+    layout->addWidget(m_swingCombo, 1, 1);
 
     m_iterativeLabel = new TQLabel(i18n("Iterative amount:"), gridFrame);
-    tqlayout->addWidget(m_iterativeLabel, 2, 0);
+    layout->addWidget(m_iterativeLabel, 2, 0);
     m_iterativeCombo = new KComboBox(gridFrame);
-    tqlayout->addWidget(m_iterativeCombo, 2, 1);
+    layout->addWidget(m_iterativeCombo, 2, 1);
 
     m_durationCheckBox = new TQCheckBox
                          (i18n("Quantize durations as well as start times"), gridFrame);
-    tqlayout->addMultiCellWidget(m_durationCheckBox, 3, 3, 0, 1);
+    layout->addMultiCellWidget(m_durationCheckBox, 3, 3, 0, 1);
 
     m_postProcessingBox = new TQGroupBox
                           (1, Qt::Horizontal, i18n("After quantization"), this);
@@ -188,17 +188,17 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
 
     TQFrame *postFrame = new TQFrame(m_postProcessingBox);
 
-    tqlayout = new TQGridLayout(postFrame, 4, 1, 5, 3);
+    layout = new TQGridLayout(postFrame, 4, 1, 5, 3);
     m_rebeam = new TQCheckBox(i18n("Re-beam"), postFrame);
     m_articulate = new TQCheckBox
                    (i18n("Add articulations (staccato, tenuto, slurs)"), postFrame);
     m_makeViable = new TQCheckBox(i18n("Tie notes at barlines etc"), postFrame);
     m_deCounterpoint = new TQCheckBox(i18n("Split-and-tie overlapping chords"), postFrame);
 
-    tqlayout->addWidget(m_rebeam, 0, 0);
-    tqlayout->addWidget(m_articulate, 1, 0);
-    tqlayout->addWidget(m_makeViable, 2, 0);
-    tqlayout->addWidget(m_deCounterpoint, 3, 0);
+    layout->addWidget(m_rebeam, 0, 0);
+    layout->addWidget(m_articulate, 1, 0);
+    layout->addWidget(m_makeViable, 2, 0);
+    layout->addWidget(m_deCounterpoint, 3, 0);
 
     TQPixmap noMap = NotePixmapFactory::toTQPixmap
                     (NotePixmapFactory::makeToolbarPixmap("menu-no-note"));
diff --git a/src/gui/widgets/TimeWidget.cpp b/src/gui/widgets/TimeWidget.cpp
index a949ed1..0edc963 100644
--- a/src/gui/widgets/TimeWidget.cpp
+++ b/src/gui/widgets/TimeWidget.cpp
@@ -93,14 +93,14 @@ TimeWidget::init(bool editable)
     editable = true;
 
     TQFrame *frame = new TQFrame(this);
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 7, 3, 5, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 7, 3, 5, 5);
     TQLabel *label = 0;
 
     if (m_isDuration) {
 
         label = new TQLabel(i18n("Note:"), frame);
         label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
-        tqlayout->addWidget(label, 0, 0);
+        layout->addWidget(label, 0, 0);
 
         if (editable) {
             m_note = new TQComboBox(frame);
@@ -133,7 +133,7 @@ TimeWidget::init(bool editable)
             }
             connect(m_note, TQT_SIGNAL(activated(int)),
                     this, TQT_SLOT(slotNoteChanged(int)));
-            tqlayout->addMultiCellWidget(m_note, 0, 0, 1, 3);
+            layout->addMultiCellWidget(m_note, 0, 0, 1, 3);
 
         } else {
 
@@ -145,12 +145,12 @@ TimeWidget::init(bool editable)
                 label = i18n("<inexact>");
             TQLineEdit *le = new TQLineEdit(label, frame);
             le->setReadOnly(true);
-            tqlayout->addMultiCellWidget(le, 0, 0, 1, 3);
+            layout->addMultiCellWidget(le, 0, 0, 1, 3);
         }
 
         label = new TQLabel(i18n("Units:"), frame);
         label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
-        tqlayout->addWidget(label, 0, 4);
+        layout->addWidget(label, 0, 4);
 
         if (editable) {
             m_timeT = new TQSpinBox(frame);
@@ -158,12 +158,12 @@ TimeWidget::init(bool editable)
             (Note(Note::Shortest).getDuration());
             connect(m_timeT, TQT_SIGNAL(valueChanged(int)),
                     this, TQT_SLOT(slotTimeTChanged(int)));
-            tqlayout->addWidget(m_timeT, 0, 5);
+            layout->addWidget(m_timeT, 0, 5);
         } else {
             m_timeT = 0;
             TQLineEdit *le = new TQLineEdit(TQString("%1").arg(m_time), frame);
             le->setReadOnly(true);
-            tqlayout->addWidget(le, 0, 5);
+            layout->addWidget(le, 0, 5);
         }
 
     } else {
@@ -172,7 +172,7 @@ TimeWidget::init(bool editable)
 
         label = new TQLabel(i18n("Time:"), frame);
         label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
-        tqlayout->addWidget(label, 0, 0);
+        layout->addWidget(label, 0, 0);
 
         if (editable) {
             m_timeT = new TQSpinBox(frame);
@@ -180,19 +180,19 @@ TimeWidget::init(bool editable)
             (Note(Note::Shortest).getDuration());
             connect(m_timeT, TQT_SIGNAL(valueChanged(int)),
                     this, TQT_SLOT(slotTimeTChanged(int)));
-            tqlayout->addWidget(m_timeT, 0, 1);
-            tqlayout->addWidget(new TQLabel(i18n("units"), frame), 0, 2);
+            layout->addWidget(m_timeT, 0, 1);
+            layout->addWidget(new TQLabel(i18n("units"), frame), 0, 2);
         } else {
             m_timeT = 0;
             TQLineEdit *le = new TQLineEdit(TQString("%1").arg(m_time), frame);
             le->setReadOnly(true);
-            tqlayout->addWidget(le, 0, 2);
+            layout->addWidget(le, 0, 2);
         }
     }
 
     label = new TQLabel(m_isDuration ? i18n("Measures:") : i18n("Measure:"), frame);
     label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
-    tqlayout->addWidget(label, 1, 0);
+    layout->addWidget(label, 1, 0);
 
     if (editable) {
         m_barLabel = 0;
@@ -201,17 +201,17 @@ TimeWidget::init(bool editable)
             m_bar->setMinValue(0);
         connect(m_bar, TQT_SIGNAL(valueChanged(int)),
                 this, TQT_SLOT(slotBarBeatOrFractionChanged(int)));
-        tqlayout->addWidget(m_bar, 1, 1);
+        layout->addWidget(m_bar, 1, 1);
     } else {
         m_bar = 0;
         m_barLabel = new TQLineEdit(frame);
         m_barLabel->setReadOnly(true);
-        tqlayout->addWidget(m_barLabel, 1, 1);
+        layout->addWidget(m_barLabel, 1, 1);
     }
 
     label = new TQLabel(m_isDuration ? i18n("beats:") : i18n("beat:"), frame);
     label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
-    tqlayout->addWidget(label, 1, 2);
+    layout->addWidget(label, 1, 2);
 
     if (editable) {
         m_beatLabel = 0;
@@ -219,12 +219,12 @@ TimeWidget::init(bool editable)
         m_beat->setMinValue(1);
         connect(m_beat, TQT_SIGNAL(valueChanged(int)),
                 this, TQT_SLOT(slotBarBeatOrFractionChanged(int)));
-        tqlayout->addWidget(m_beat, 1, 3);
+        layout->addWidget(m_beat, 1, 3);
     } else {
         m_beat = 0;
         m_beatLabel = new TQLineEdit(frame);
         m_beatLabel->setReadOnly(true);
-        tqlayout->addWidget(m_beatLabel, 1, 3);
+        layout->addWidget(m_beatLabel, 1, 3);
     }
 
     label = new TQLabel(i18n("%1:").arg(NotationStrings::getShortNoteName
@@ -232,7 +232,7 @@ TimeWidget::init(bool editable)
                                         (Note::Shortest), true)),
                        frame);
     label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
-    tqlayout->addWidget(label, 1, 4);
+    layout->addWidget(label, 1, 4);
 
     if (editable) {
         m_fractionLabel = 0;
@@ -240,20 +240,20 @@ TimeWidget::init(bool editable)
         m_fraction->setMinValue(1);
         connect(m_fraction, TQT_SIGNAL(valueChanged(int)),
                 this, TQT_SLOT(slotBarBeatOrFractionChanged(int)));
-        tqlayout->addWidget(m_fraction, 1, 5);
+        layout->addWidget(m_fraction, 1, 5);
     } else {
         m_fraction = 0;
         m_fractionLabel = new TQLineEdit(frame);
         m_fractionLabel->setReadOnly(true);
-        tqlayout->addWidget(m_fractionLabel, 1, 5);
+        layout->addWidget(m_fractionLabel, 1, 5);
     }
 
     m_timeSig = new TQLabel(frame);
-    tqlayout->addWidget(m_timeSig, 1, 6);
+    layout->addWidget(m_timeSig, 1, 6);
 
     label = new TQLabel(i18n("Seconds:"), frame);
     label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
-    tqlayout->addWidget(label, 2, 0);
+    layout->addWidget(label, 2, 0);
 
     if (editable) {
         m_secLabel = 0;
@@ -262,17 +262,17 @@ TimeWidget::init(bool editable)
             m_sec->setMinValue(0);
         connect(m_sec, TQT_SIGNAL(valueChanged(int)),
                 this, TQT_SLOT(slotSecOrMSecChanged(int)));
-        tqlayout->addWidget(m_sec, 2, 1);
+        layout->addWidget(m_sec, 2, 1);
     } else {
         m_sec = 0;
         m_secLabel = new TQLineEdit(frame);
         m_secLabel->setReadOnly(true);
-        tqlayout->addWidget(m_secLabel, 2, 1);
+        layout->addWidget(m_secLabel, 2, 1);
     }
 
     label = new TQLabel(i18n("msec:"), frame);
     label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
-    tqlayout->addWidget(label, 2, 2);
+    layout->addWidget(label, 2, 2);
 
     if (editable) {
         m_msecLabel = 0;
@@ -281,17 +281,17 @@ TimeWidget::init(bool editable)
         m_msec->setLineStep(10);
         connect(m_msec, TQT_SIGNAL(valueChanged(int)),
                 this, TQT_SLOT(slotSecOrMSecChanged(int)));
-        tqlayout->addWidget(m_msec, 2, 3);
+        layout->addWidget(m_msec, 2, 3);
     } else {
         m_msec = 0;
         m_msecLabel = new TQLineEdit(frame);
         m_msecLabel->setReadOnly(true);
-        tqlayout->addWidget(m_msecLabel, 2, 3);
+        layout->addWidget(m_msecLabel, 2, 3);
     }
 
     if (m_isDuration) {
         m_tempo = new TQLabel(frame);
-        tqlayout->addWidget(m_tempo, 2, 6);
+        layout->addWidget(m_tempo, 2, 6);
     } else {
         m_tempo = 0;
     }