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

22 files changed, 153 insertions, 153 deletions

diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp
index 581e065..160a09f 100644
--- a/src/gui/editors/segment/ControlEditorDialog.cpp
+++ b/src/gui/editors/segment/ControlEditorDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "ControlEditorDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <kapplication.h>
 
 #include <klocale.h>
@@ -96,7 +96,7 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
 
     // spacing hack!
     new TQLabel("", mainFrame);
-    new TQLabel(i18n("  Control Events for %1 (device %2)").tqarg(deviceName).
+    new TQLabel(i18n("  Control Events for %1 (device %2)").arg(deviceName).
                arg(device), mainFrame);
     new TQLabel("", mainFrame);
 
@@ -121,10 +121,10 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
 
     TQFrame* btnBox = new TQFrame(mainFrame);
 
-    btnBox->tqsetSizePolicy(
+    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()));
@@ -220,7 +220,7 @@ ControlEditorDialog::slotUpdate()
         if (colour == "")
             colour = i18n("<default>");
 
-        TQString position = TQString("%1").tqarg(it->getIPBPosition());
+        TQString position = TQString("%1").arg(it->getIPBPosition());
         if (position.toInt() == -1)
             position = notShowing;
 
@@ -235,9 +235,9 @@ ControlEditorDialog::slotUpdate()
                                             strtoqstr(it->getType()),
                                             TQString("-"),
                                             strtoqstr(it->getDescription()),
-                                            TQString("%1").tqarg(it->getMin()),
-                                            TQString("%1").tqarg(it->getMax()),
-                                            TQString("%1").tqarg(it->getDefault()),
+                                            TQString("%1").arg(it->getMin()),
+                                            TQString("%1").arg(it->getMax()),
+                                            TQString("%1").arg(it->getDefault()),
                                             colour,
                                             position);
         } else {
@@ -247,9 +247,9 @@ ControlEditorDialog::slotUpdate()
                                             strtoqstr(it->getType()),
                                             value,
                                             strtoqstr(it->getDescription()),
-                                            TQString("%1").tqarg(it->getMin()),
-                                            TQString("%1").tqarg(it->getMax()),
-                                            TQString("%1").tqarg(it->getDefault()),
+                                            TQString("%1").arg(it->getMin()),
+                                            TQString("%1").arg(it->getMax()),
+                                            TQString("%1").arg(it->getDefault()),
                                             colour,
                                             position);
         }
diff --git a/src/gui/editors/segment/ControlParameterEditDialog.cpp b/src/gui/editors/segment/ControlParameterEditDialog.cpp
index b00ac83..6c0921e 100644
--- a/src/gui/editors/segment/ControlParameterEditDialog.cpp
+++ b/src/gui/editors/segment/ControlParameterEditDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "ControlParameterEditDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include "misc/Debug.h"
@@ -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&)));
@@ -182,7 +182,7 @@ ControlParameterEditDialog::ControlParameterEditDialog(
     //
     m_ipbPosition->insertItem(notShowing);
     for (unsigned int i = 0; i < 32; i++)
-        m_ipbPosition->insertItem(TQString("%1").tqarg(i));
+        m_ipbPosition->insertItem(TQString("%1").arg(i));
 
     if (m_control->getType() == Controller::EventType)
         m_typeCombo->setCurrentItem(0);
diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index 029ff9c..2eb8b3f 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -25,7 +25,7 @@
 
 #include "MarkerEditor.h"
 #include "MarkerEditorViewItem.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <kapplication.h>
 
 #include <klocale.h>
@@ -105,10 +105,10 @@ MarkerEditor::MarkerEditor(TQWidget *parent,
 
     TQFrame* btnBox = new TQFrame(mainFrame);
 
-    btnBox->tqsetSizePolicy(
+    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()));
@@ -182,7 +182,7 @@ void
 MarkerEditor::updatePosition()
 {
     timeT pos = m_doc->getComposition().getPosition();
-    m_absoluteTime->setText(TQString("%1").tqarg(pos));
+    m_absoluteTime->setText(TQString("%1").arg(pos));
 
     RealTime rT = m_doc->getComposition().getElapsedRealTime(pos);
     long hours = rT.sec / (60 * 60);
@@ -192,9 +192,9 @@ MarkerEditor::updatePosition()
 
     TQString realTime, secsStr;
     if (hours)
-        realTime += TQString("%1h ").tqarg(hours);
+        realTime += TQString("%1h ").arg(hours);
     if (mins)
-        realTime += TQString("%1m ").tqarg(mins);
+        realTime += TQString("%1m ").arg(mins);
     secsStr.sprintf("%ld.%03lds", secs, msecs);
     realTime += secsStr;
 
@@ -203,7 +203,7 @@ MarkerEditor::updatePosition()
         m_realTime->setText(realTime);
 
     TQString barTime =
-        TQString("%1").tqarg(m_doc->getComposition().getBarNumber(pos) + 1);
+        TQString("%1").arg(m_doc->getComposition().getBarNumber(pos) + 1);
 
     // again only update if needed
     if (m_barTime->text() != barTime)
@@ -542,27 +542,27 @@ MarkerEditor::makeTimeString(timeT time, int timeMode)
             (time, bar, beat, fraction, remainder);
             ++bar;
             return TQString("%1%2%3-%4%5-%6%7-%8%9   ")
-                   .tqarg(bar / 100)
-                   .tqarg((bar % 100) / 10)
-                   .tqarg(bar % 10)
-                   .tqarg(beat / 10)
-                   .tqarg(beat % 10)
-                   .tqarg(fraction / 10)
-                   .tqarg(fraction % 10)
-                   .tqarg(remainder / 10)
-                   .tqarg(remainder % 10);
+                   .arg(bar / 100)
+                   .arg((bar % 100) / 10)
+                   .arg(bar % 10)
+                   .arg(beat / 10)
+                   .arg(beat % 10)
+                   .arg(fraction / 10)
+                   .arg(fraction % 10)
+                   .arg(remainder / 10)
+                   .arg(remainder % 10);
         }
 
     case 1:  // real time
         {
             RealTime rt =
                 m_doc->getComposition().getElapsedRealTime(time);
-            //        return TQString("%1   ").tqarg(rt.toString().c_str());
-            return TQString("%1   ").tqarg(rt.toText().c_str());
+            //        return TQString("%1   ").arg(rt.toString().c_str());
+            return TQString("%1   ").arg(rt.toText().c_str());
         }
 
     default:
-        return TQString("%1   ").tqarg(time);
+        return TQString("%1   ").arg(time);
     }
 }
 
diff --git a/src/gui/editors/segment/PlayList.cpp b/src/gui/editors/segment/PlayList.cpp
index 95d9cfc..7fa094d 100644
--- a/src/gui/editors/segment/PlayList.cpp
+++ b/src/gui/editors/segment/PlayList.cpp
@@ -27,7 +27,7 @@
 #include "PlayListView.h"
 #include "PlayListViewItem.h"
 #include "document/ConfigGroups.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <kconfig.h>
diff --git a/src/gui/editors/segment/TrackButtons.cpp b/src/gui/editors/segment/TrackButtons.cpp
index 2e779fd..6ebe281 100644
--- a/src/gui/editors/segment/TrackButtons.cpp
+++ b/src/gui/editors/segment/TrackButtons.cpp
@@ -24,7 +24,7 @@
 
 
 #include "TrackButtons.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <kstddirs.h>
@@ -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
@@ -647,17 +647,17 @@ TrackButtons::populateInstrumentPopup(Instrument *thisTrackInstr, TQPopupMenu* i
             KGlobal::dirs()->findResource("appdata", "pixmaps/");
 
         connectedPixmap.load
-            (TQString("%1/misc/connected.xpm").tqarg(pixmapDir));
+            (TQString("%1/misc/connected.xpm").arg(pixmapDir));
         connectedUsedPixmap.load
-            (TQString("%1/misc/connected-used.xpm").tqarg(pixmapDir));
+            (TQString("%1/misc/connected-used.xpm").arg(pixmapDir));
         connectedSelectedPixmap.load
-            (TQString("%1/misc/connected-selected.xpm").tqarg(pixmapDir));
+            (TQString("%1/misc/connected-selected.xpm").arg(pixmapDir));
         unconnectedPixmap.load
-            (TQString("%1/misc/unconnected.xpm").tqarg(pixmapDir));
+            (TQString("%1/misc/unconnected.xpm").arg(pixmapDir));
         unconnectedUsedPixmap.load
-            (TQString("%1/misc/unconnected-used.xpm").tqarg(pixmapDir));
+            (TQString("%1/misc/unconnected-used.xpm").arg(pixmapDir));
         unconnectedSelectedPixmap.load
-            (TQString("%1/misc/unconnected-selected.xpm").tqarg(pixmapDir));
+            (TQString("%1/misc/unconnected-selected.xpm").arg(pixmapDir));
 
         havePixmaps = true;
     }
@@ -706,7 +706,7 @@ TrackButtons::populateInstrumentPopup(Instrument *thisTrackInstr, TQPopupMenu* i
                         pname = strtoqstr(plugin->getDistinctiveConfigurationText());
                     }
                     if (pname != "") {
-                        pname = TQString("%1: %2").tqarg(label).tqarg(pname);
+                        pname = TQString("%1: %2").arg(label).arg(pname);
                     } else {
                         pname = label;
                     }
@@ -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/TrackEditor.cpp b/src/gui/editors/segment/TrackEditor.cpp
index 3fa85ba..c6812dc 100644
--- a/src/gui/editors/segment/TrackEditor.cpp
+++ b/src/gui/editors/segment/TrackEditor.cpp
@@ -24,7 +24,7 @@
 
 
 #include "TrackEditor.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <kapplication.h>
 
 #include <klocale.h>
@@ -76,7 +76,7 @@
 #include <tqwidget.h>
 #include <tqvalidator.h>
 #include <tqdragobject.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 
 namespace Rosegarden
@@ -331,7 +331,7 @@ void TrackEditor::slotReadjustCanvasSize()
 
 void TrackEditor::slotTrackButtonsWidthChanged()
 {
-    // We need to make sure the trackButtons tqgeometry is fully updated
+    // We need to make sure the trackButtons geometry is fully updated
     //
     ProgressDialog::processEvents();
 
@@ -360,13 +360,13 @@ int TrackEditor::getTrackCellHeight() const
 
 bool TrackEditor::isCompositionModified()
 {
-    return m_doc->getComposition().getRefreshtqStatus
+    return m_doc->getComposition().getRefreshStatus
            (m_compositionRefreshStatusId).needsRefresh();
 }
 
 void TrackEditor::setCompositionModified(bool c)
 {
-    m_doc->getComposition().getRefreshtqStatus
+    m_doc->getComposition().getRefreshStatus
     (m_compositionRefreshStatusId).setNeedsRefresh(c);
 }
 
@@ -444,7 +444,7 @@ void TrackEditor::addSegment(int track, int time, unsigned int duration)
 void TrackEditor::slotSegmentOrderChanged(int section, int fromIdx, int toIdx)
 {
     RG_DEBUG << TQString("TrackEditor::segmentOrderChanged(section : %1, from %2, to %3)")
-    .tqarg(section).tqarg(fromIdx).tqarg(toIdx) << endl;
+    .arg(section).arg(fromIdx).arg(toIdx) << endl;
 
     //!!! how do we get here? need to involve a command
     emit needUpdate();
@@ -490,7 +490,7 @@ TrackEditor::slotSetPointerPosition(timeT position)
     if (distance >= 1.0) {
 
         if (m_doc && m_doc->getSequenceManager() &&
-            (m_doc->getSequenceManager()->getTransporttqStatus() != STOPPED)) {
+            (m_doc->getSequenceManager()->getTransportStatus() != STOPPED)) {
             
             if (m_playTracking) {
                 getSegmentCanvas()->slotScrollHoriz(int(double(position) / ruler->getUnitsPerPixel()));
@@ -547,7 +547,7 @@ bool TrackEditor::handleAutoScroll(int currentPosition, timeT newTimePosition, d
     if (moveDetected) {
 
         if (m_doc && m_doc->getSequenceManager() &&
-                (m_doc->getSequenceManager()->getTransporttqStatus() != STOPPED)) {
+                (m_doc->getSequenceManager()->getTransportStatus() != STOPPED)) {
 
             if (m_playTracking) {
                 getSegmentCanvas()->slotScrollHoriz(int(double(newTimePosition) / ruler->getUnitsPerPixel()));
diff --git a/src/gui/editors/segment/TrackHeader.cpp b/src/gui/editors/segment/TrackHeader.cpp
index 84b850b..3806c6d 100644
--- a/src/gui/editors/segment/TrackHeader.cpp
+++ b/src/gui/editors/segment/TrackHeader.cpp
@@ -41,7 +41,7 @@ void
 TrackHeader::paintEvent(TQPaintEvent *e)
 {
     TQPainter p( this );
-    p.setPen( tqcolorGroup().buttonText() );
+    p.setPen( colorGroup().buttonText() );
     int pos = (orientation() == Qt::Horizontal)
               ? e->rect().left()
               : e->rect().top();
diff --git a/src/gui/editors/segment/TrackLabel.cpp b/src/gui/editors/segment/TrackLabel.cpp
index 144fcd6..49b3afc 100644
--- a/src/gui/editors/segment/TrackLabel.cpp
+++ b/src/gui/editors/segment/TrackLabel.cpp
@@ -124,18 +124,18 @@ TrackLabel::setSelected(bool on)
     if (on) {
         m_selected = true;
 
-        m_instrumentLabel->setPaletteBackgroundColor(tqcolorGroup().highlight());
-        m_instrumentLabel->setPaletteForegroundColor(tqcolorGroup().highlightedText());
-        m_trackLabel->setPaletteBackgroundColor(tqcolorGroup().highlight());
-        m_trackLabel->setPaletteForegroundColor(tqcolorGroup().highlightedText());
+        m_instrumentLabel->setPaletteBackgroundColor(colorGroup().highlight());
+        m_instrumentLabel->setPaletteForegroundColor(colorGroup().highlightedText());
+        m_trackLabel->setPaletteBackgroundColor(colorGroup().highlight());
+        m_trackLabel->setPaletteForegroundColor(colorGroup().highlightedText());
 
     } else {
         m_selected = false;
 
-        m_instrumentLabel->setPaletteBackgroundColor(tqcolorGroup().background());
-        m_trackLabel->setPaletteBackgroundColor(tqcolorGroup().background());
-        m_instrumentLabel->setPaletteForegroundColor(tqcolorGroup().text());
-        m_trackLabel->setPaletteForegroundColor(tqcolorGroup().text());
+        m_instrumentLabel->setPaletteBackgroundColor(colorGroup().background());
+        m_trackLabel->setPaletteBackgroundColor(colorGroup().background());
+        m_instrumentLabel->setPaletteForegroundColor(colorGroup().text());
+        m_trackLabel->setPaletteForegroundColor(colorGroup().text());
     }
     if (visibleWidget())
         visibleWidget()->update();
diff --git a/src/gui/editors/segment/TrackVUMeter.cpp b/src/gui/editors/segment/TrackVUMeter.cpp
index ad91278..f8acbe8 100644
--- a/src/gui/editors/segment/TrackVUMeter.cpp
+++ b/src/gui/editors/segment/TrackVUMeter.cpp
@@ -43,7 +43,7 @@ TrackVUMeter::TrackVUMeter(TQWidget *parent,
         VUMeter(parent, type, false, false, width, height, VUMeter::Horizontal, name),
         m_position(position), m_textHeight(12)
 {
-    tqsetAlignment(AlignCenter);
+    setAlignment(AlignCenter);
 
     TQFont font;
     font.setPointSize(font.pointSize() * 95 / 100);
@@ -67,7 +67,7 @@ TrackVUMeter::meterStop()
 {
     setMinimumHeight(m_textHeight);
     setMaximumHeight(m_textHeight);
-    setText(TQString("%1").tqarg(m_position + 1));
+    setText(TQString("%1").arg(m_position + 1));
     if (m_active) {
         m_active = false;
         update();
diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp
index 29b7bf0..e1e7513 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.cpp
+++ b/src/gui/editors/segment/TriggerSegmentManager.cpp
@@ -25,7 +25,7 @@
 
 #include "TriggerSegmentManager.h"
 #include "TriggerManagerItem.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <kapplication.h>
 
 #include "base/BaseProperties.h"
@@ -99,10 +99,10 @@ TriggerSegmentManager::TriggerSegmentManager(TQWidget *parent,
 
     TQFrame* btnBox = new TQFrame(mainFrame);
 
-    btnBox->tqsetSizePolicy(
+    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()));
@@ -246,16 +246,16 @@ TriggerSegmentManager::slotUpdate()
 
         TQString used = i18n("%1 on 1 track",
                             "%1 on %n tracks",
-                            tracks.size()).tqarg(uses);
+                            tracks.size()).arg(uses);
 
         TQString pitch = TQString("%1 (%2)")
-                        .tqarg(MidiPitchLabel((*it)->getBasePitch()).getTQString())
-                        .tqarg((*it)->getBasePitch());
+                        .arg(MidiPitchLabel((*it)->getBasePitch()).getTQString())
+                        .arg((*it)->getBasePitch());
 
-        TQString velocity = TQString("%1").tqarg((*it)->getBaseVelocity());
+        TQString velocity = TQString("%1").arg((*it)->getBaseVelocity());
 
         item = new TriggerManagerItem
-               (m_listView, TQString("%1").tqarg(i + 1), TQString("%1").tqarg((*it)->getId()),
+               (m_listView, TQString("%1").arg(i + 1), TQString("%1").arg((*it)->getId()),
                 label, timeString, pitch, velocity, used);
 
         item->setRawDuration(duration);
@@ -523,15 +523,15 @@ TriggerSegmentManager::makeDurationString(timeT time,
             m_doc->getComposition().getMusicalTimeForDuration
             (time, duration, bar, beat, fraction, remainder);
             return TQString("%1%2%3-%4%5-%6%7-%8%9   ")
-                   .tqarg(bar / 100)
-                   .tqarg((bar % 100) / 10)
-                   .tqarg(bar % 10)
-                   .tqarg(beat / 10)
-                   .tqarg(beat % 10)
-                   .tqarg(fraction / 10)
-                   .tqarg(fraction % 10)
-                   .tqarg(remainder / 10)
-                   .tqarg(remainder % 10);
+                   .arg(bar / 100)
+                   .arg((bar % 100) / 10)
+                   .arg(bar % 10)
+                   .arg(beat / 10)
+                   .arg(beat % 10)
+                   .arg(fraction / 10)
+                   .arg(fraction % 10)
+                   .arg(remainder / 10)
+                   .arg(remainder % 10);
         }
 
     case 1:  // real time
@@ -539,12 +539,12 @@ TriggerSegmentManager::makeDurationString(timeT time,
             RealTime rt =
                 m_doc->getComposition().getRealTimeDifference
                 (time, time + duration);
-            //	return TQString("%1  ").tqarg(rt.toString().c_str());
-            return TQString("%1  ").tqarg(rt.toText().c_str());
+            //	return TQString("%1  ").arg(rt.toString().c_str());
+            return TQString("%1  ").arg(rt.toText().c_str());
         }
 
     default:
-        return TQString("%1  ").tqarg(duration);
+        return TQString("%1  ").arg(duration);
     }
 }
 
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionItemHelper.cpp b/src/gui/editors/segment/segmentcanvas/CompositionItemHelper.cpp
index fe4b926..9579ba2 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionItemHelper.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionItemHelper.cpp
@@ -60,12 +60,12 @@ timeT CompositionItemHelper::getEndTime(const CompositionItem& item, const Roseg
     timeT t = 0;
 
     if (item) {
-        TQRect tqitemRect = item->rect();
+        TQRect itemRect = item->rect();
         
-        t = std::max(grid.snapX(tqitemRect.x() + tqitemRect.width()), 0L);
+        t = std::max(grid.snapX(itemRect.x() + itemRect.width()), 0L);
 
 //         RG_DEBUG << "CompositionItemHelper::getEndTime() : rect width = "
-//                  << tqitemRect.width()
+//                  << itemRect.width()
 //                  << " - item is repeating : " << item->isRepeating()
 //                  << " - endTime = " << t
 //                  << endl;
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionItemImpl.cpp b/src/gui/editors/segment/segmentcanvas/CompositionItemImpl.cpp
index 76cbe70..4b2926e 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionItemImpl.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionItemImpl.cpp
@@ -28,7 +28,7 @@
 #include "misc/Debug.h"
 #include "base/Segment.h"
 #include "CompositionRect.h"
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcolor.h>
 #include <tqpen.h>
 #include <tqpoint.h>
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp
index eb79e45..e9cc333 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp
@@ -50,7 +50,7 @@
 #include "AudioPreviewPainter.h"
 #include "gui/general/GUIPalette.h"
 #include "SegmentOrderer.h"
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcolor.h>
 #include <tqpen.h>
 #include <tqpoint.h>
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionRect.cpp b/src/gui/editors/segment/segmentcanvas/CompositionRect.cpp
index ec4bef0..679ffce 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionRect.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionRect.cpp
@@ -26,7 +26,7 @@
 #include "CompositionRect.h"
 #include "base/ColourMap.h"
 
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcolor.h>
 #include <tqpen.h>
 #include <tqpoint.h>
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionRect.h b/src/gui/editors/segment/segmentcanvas/CompositionRect.h
index 53dcc2e..e969d17 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionRect.h
+++ b/src/gui/editors/segment/segmentcanvas/CompositionRect.h
@@ -26,7 +26,7 @@
 #ifndef _RG_COMPOSITIONRECT_H_
 #define _RG_COMPOSITIONRECT_H_
 
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcolor.h>
 #include <tqpen.h>
 #include <tqrect.h>
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
index 75216b8..516573e 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
@@ -47,7 +47,7 @@
 #include "SegmentToolBox.h"
 #include "SegmentTool.h"
 #include <kmessagebox.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcolor.h>
 #include <tqevent.h>
 #include <tqfont.h>
@@ -227,7 +227,7 @@ void CompositionView::slotUpdateSize()
 
     RulerScale *ruler = grid().getRulerScale();
 
-    int minWidth = tqsizeHint().width();
+    int minWidth = sizeHint().width();
     int computedWidth = int(nearbyint(ruler->getTotalWidth()));
 
     int width = std::max(computedWidth, minWidth);
@@ -327,7 +327,7 @@ void CompositionView::slotSetTool(const TQString& toolName)
     if (m_tool)
         m_tool->ready();
     else {
-        KMessageBox::error(0, TQString("CompositionView::slotSetTool() : unknown tool name %1").tqarg(toolName));
+        KMessageBox::error(0, TQString("CompositionView::slotSetTool() : unknown tool name %1").arg(toolName));
     }
 }
 
@@ -495,7 +495,7 @@ void CompositionView::resizeEvent(TQResizeEvent* e)
 
 void CompositionView::viewportPaintEvent(TQPaintEvent* e)
 {
-    TQMemArray<TQRect> rects = TQRegion(e->region()).tqrects();
+    TQMemArray<TQRect> rects = TQRegion(e->region()).rects();
 
     for (unsigned int i = 0; i < rects.size(); ++i) {
         viewportPaintRect(rects[i]);
@@ -682,7 +682,7 @@ void CompositionView::refreshArtifactsDrawBuffer(const TQRect& rect)
     //               << rect << endl;
 
     TQPainter p;
-    p.tqbegin(&m_artifactsDrawBuffer, viewport());
+    p.begin(&m_artifactsDrawBuffer, viewport());
     p.translate( -contentsX(), -contentsY());
     //     TQRect r(contentsX(), contentsY(), m_artifactsDrawBuffer.width(), m_artifactsDrawBuffer.height());
     drawAreaArtifacts(&p, rect);
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.h b/src/gui/editors/segment/segmentcanvas/CompositionView.h
index a1f6f07..95a1926 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.h
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.h
@@ -30,7 +30,7 @@
 #include "CompositionModel.h"
 #include "CompositionItem.h"
 #include "gui/general/RosegardenScrollView.h"
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcolor.h>
 #include <tqpen.h>
 #include <tqpixmap.h>
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h b/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h
index cdf373e..d1bb9a7 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h
@@ -59,7 +59,7 @@ public:
     PreviewState getPreviewState() const { return m_previewState; }
 
     /**
-     * Sets whether the preview tqshape shown in the segment needs
+     * Sets whether the preview shape shown in the segment needs
      * to be refreshed
      */
     void setPreviewCurrent(bool c)
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp b/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
index e2970ab..04da855 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
@@ -328,8 +328,8 @@ int SegmentMover::handleMouseMove(TQMouseEvent *e)
     comp.getMusicalTimeForAbsoluteTime(currentItemStartTime, bar, beat, fraction, remainder);
 
     TQString posString = TQString("%1.%2s (%3, %4, %5)")
-        .tqarg(time.sec).tqarg(ms)
-        .tqarg(bar + 1).tqarg(beat).tqarg(fraction);
+        .arg(time.sec).arg(ms)
+        .arg(bar + 1).arg(beat).arg(fraction);
 
     m_canvas->setTextFloat(guideX + 10, guideY - 30, posString);
     m_canvas->updateContents();
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
index 964bc3b..c1b1f4b 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
@@ -466,8 +466,8 @@ SegmentSelector::handleMouseMove(TQMouseEvent *e)
         comp.getMusicalTimeForAbsoluteTime(currentItemStartTime, bar, beat, fraction, remainder);
 
         TQString posString = TQString("%1.%2s (%3, %4, %5)")
-                            .tqarg(time.sec).tqarg(ms)
-                            .tqarg(bar + 1).tqarg(beat).tqarg(fraction);
+                            .arg(time.sec).arg(ms)
+                            .arg(bar + 1).arg(beat).arg(fraction);
 
         m_canvas->setTextFloat(guideX + 10, guideY - 30, posString);
         m_canvas->updateContents();
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
index 68bee60..5ce8a58 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
@@ -84,7 +84,7 @@ SegmentTool* SegmentToolBox::createTool(const TQString& toolName)
 
     else {
         KMessageBox::error(0, TQString("SegmentToolBox::createTool : unrecognised toolname %1 (%2)")
-                           .tqarg(toolName).tqarg(toolNamelc));
+                           .arg(toolName).arg(toolNamelc));
         return 0;
     }