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

12 files changed, 261 insertions, 261 deletions

diff --git a/src/gui/configuration/AudioConfigurationPage.cpp b/src/gui/configuration/AudioConfigurationPage.cpp
index 90403b7..8c34193 100644
--- a/src/gui/configuration/AudioConfigurationPage.cpp
+++ b/src/gui/configuration/AudioConfigurationPage.cpp
@@ -50,7 +50,7 @@
 #include <tqlineedit.h>
 #include <tqobject.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqslider.h>
 #include <tqspinbox.h>
 #include <tqstring.h>
@@ -78,7 +78,7 @@ AudioConfigurationPage::AudioConfigurationPage(
     m_cfg->setGroup(SequencerOptionsConfigGroup);
 
     TQFrame *frame = new TQFrame(m_tabWidget);
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 7, 2, 10, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 7, 2, 10, 5);
 
     TQLabel *label = 0;
 
@@ -86,17 +86,17 @@ AudioConfigurationPage::AudioConfigurationPage(
 
     m_cfg->setGroup(GeneralOptionsConfigGroup);
 
-    tqlayout->setRowSpacing(row, 15);
+    layout->setRowSpacing(row, 15);
     ++row;
 
-    tqlayout->addWidget(new TQLabel(i18n("Audio preview scale"),
+    layout->addWidget(new TQLabel(i18n("Audio preview scale"),
                                  frame), row, 0);
 
     m_previewStyle = new KComboBox(frame);
     m_previewStyle->insertItem(i18n("Linear - easier to see loud peaks"));
     m_previewStyle->insertItem(i18n("Meter scaling - easier to see quiet activity"));
     m_previewStyle->setCurrentItem(m_cfg->readUnsignedNumEntry("audiopreviewstyle", 1));
-    tqlayout->addMultiCellWidget(m_previewStyle, row, row, 1, 2);
+    layout->addMultiCellWidget(m_previewStyle, row, row, 1, 2);
     ++row;
 
 #ifdef HAVE_LIBJACK
@@ -107,14 +107,14 @@ AudioConfigurationPage::AudioConfigurationPage(
     m_audioRecFormat->insertItem(i18n("16-bit PCM WAV format (smaller files)"));
     m_audioRecFormat->insertItem(i18n("32-bit float WAV format (higher quality)"));
     m_audioRecFormat->setCurrentItem(m_cfg->readUnsignedNumEntry("audiorecordfileformat", 1));
-    tqlayout->addWidget(label, row, 0);
-    tqlayout->addMultiCellWidget(m_audioRecFormat, row, row, 1, 2);
+    layout->addWidget(label, row, 0);
+    layout->addMultiCellWidget(m_audioRecFormat, row, row, 1, 2);
     ++row;
 #endif
 
     m_cfg->setGroup(GeneralOptionsConfigGroup);
 
-    tqlayout->addWidget(new TQLabel(i18n("External audio editor"), frame),
+    layout->addWidget(new TQLabel(i18n("External audio editor"), frame),
                       row, 0);
 
     TQString defaultAudioEditor = getBestAvailableAudioEditor();
@@ -131,18 +131,18 @@ AudioConfigurationPage::AudioConfigurationPage(
 
     m_externalAudioEditorPath = new TQLineEdit(externalAudioEditor, frame);
 //    m_externalAudioEditorPath->setMinimumWidth(150);
-    tqlayout->addWidget(m_externalAudioEditorPath, row, 1);
+    layout->addWidget(m_externalAudioEditorPath, row, 1);
     
     TQPushButton *changePathButton =
         new TQPushButton(i18n("Choose..."), frame);
 
-    tqlayout->addWidget(changePathButton, row, 2);
+    layout->addWidget(changePathButton, row, 2);
     connect(changePathButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotFileDialog()));
     ++row;
 
     m_cfg->setGroup(SequencerOptionsConfigGroup);
 
-    tqlayout->addWidget(new TQLabel(i18n("Create JACK outputs"), frame),
+    layout->addWidget(new TQLabel(i18n("Create JACK outputs"), frame),
                       row, 0);
 //    ++row;
 
@@ -150,20 +150,20 @@ AudioConfigurationPage::AudioConfigurationPage(
     m_createFaderOuts = new TQCheckBox(i18n("for individual audio instruments"), frame);
     m_createFaderOuts->setChecked(m_cfg->readBoolEntry("audiofaderouts", false));
 
-//    tqlayout->addWidget(label, row, 0, TQt::AlignRight);
-    tqlayout->addWidget(m_createFaderOuts, row, 1);
+//    layout->addWidget(label, row, 0, TQt::AlignRight);
+    layout->addWidget(m_createFaderOuts, row, 1);
     ++row;
 
     m_createSubmasterOuts = new TQCheckBox(i18n("for submasters"), frame);
     m_createSubmasterOuts->setChecked(m_cfg->readBoolEntry("audiosubmasterouts",
                                       false));
 
-//    tqlayout->addWidget(label, row, 0, TQt::AlignRight);
-    tqlayout->addWidget(m_createSubmasterOuts, row, 1);
+//    layout->addWidget(label, row, 0, TQt::AlignRight);
+    layout->addWidget(m_createSubmasterOuts, row, 1);
     ++row;
 #endif
 
-    tqlayout->setRowStretch(row, 10);
+    layout->setRowStretch(row, 10);
 
     addTab(frame, i18n("General"));
 
@@ -174,17 +174,17 @@ AudioConfigurationPage::AudioConfigurationPage(
 #ifdef OFFER_JACK_START_OPTION
 
     frame = new TQFrame(m_tabWidget);
-    tqlayout = new TQGridLayout(frame, 8, 4, 10, 5);
+    layout = new TQGridLayout(frame, 8, 4, 10, 5);
 
     row = 0;
 
-    tqlayout->setRowSpacing(row, 15);
+    layout->setRowSpacing(row, 15);
     ++row;
 
     label = new TQLabel(i18n("Rosegarden can start the JACK audio daemon (jackd) for you automatically if it isn't already running when Rosegarden starts.\n\nThis is recommended for beginners and those who use Rosegarden as their main audio application, but it might not be to the liking of advanced users.\n\nIf you want to start JACK automatically, make sure the command includes a full path where necessary as well as any command-line arguments you want to use.\n\nFor example: /usr/local/bin/jackd -d alsa -d hw -r44100 -p 2048 -n 2\n\n"), frame);
-    label->tqsetAlignment(TQt::WordBreak);
+    label->setAlignment(TQt::WordBreak);
 
-    tqlayout->addMultiCellWidget(label, row, row, 0, 3);
+    layout->addMultiCellWidget(label, row, row, 0, 3);
     ++row;
 
     // JACK control things
@@ -193,12 +193,12 @@ AudioConfigurationPage::AudioConfigurationPage(
     m_startJack = new TQCheckBox(frame);
     m_startJack->setChecked(startJack);
 
-    tqlayout->addWidget(new TQLabel(i18n("Start JACK when Rosegarden starts"), frame), 2, 0);
+    layout->addWidget(new TQLabel(i18n("Start JACK when Rosegarden starts"), frame), 2, 0);
 
-    tqlayout->addWidget(m_startJack, row, 1);
+    layout->addWidget(m_startJack, row, 1);
     ++row;
 
-    tqlayout->addWidget(new TQLabel(i18n("JACK command"), frame),
+    layout->addWidget(new TQLabel(i18n("JACK command"), frame),
                       row, 0);
 
     TQString jackPath = m_cfg->readEntry("jackcommand",
@@ -206,10 +206,10 @@ AudioConfigurationPage::AudioConfigurationPage(
                                         "/usr/bin/qjackctl -s");
     m_jackPath = new TQLineEdit(jackPath, frame);
 
-    tqlayout->addMultiCellWidget(m_jackPath, row, row, 1, 3);
+    layout->addMultiCellWidget(m_jackPath, row, row, 1, 3);
     ++row;
 
-    tqlayout->setRowStretch(row, 10);
+    layout->setRowStretch(row, 10);
 
     addTab(frame, i18n("JACK Startup"));
 
@@ -259,7 +259,7 @@ AudioConfigurationPage::apply()
     if (extpath != "") {
         TQFileInfo info(extpath);
         if (!info.exists() || !info.isExecutable()) {
-            KMessageBox::error(0, i18n("External audio editor \"%1\" not found or not executable").tqarg(extpath));
+            KMessageBox::error(0, i18n("External audio editor \"%1\" not found or not executable").arg(extpath));
             m_cfg->writeEntry("externalaudioeditor", "");
         } else {
             m_cfg->writeEntry("externalaudioeditor", externalAudioEditor);
@@ -306,7 +306,7 @@ AudioConfigurationPage::getBestAvailableAudioEditor()
 
             if (fi.exists() && fi.isExecutable()) {
                 if (n == "rezound") {
-                    result = TQString("%1 --audio-method=jack").tqarg(fp);
+                    result = TQString("%1 --audio-method=jack").arg(fp);
                 } else {
                     result = fp;
                 }
diff --git a/src/gui/configuration/AudioPropertiesPage.cpp b/src/gui/configuration/AudioPropertiesPage.cpp
index b81655b..23c60ec 100644
--- a/src/gui/configuration/AudioPropertiesPage.cpp
+++ b/src/gui/configuration/AudioPropertiesPage.cpp
@@ -45,7 +45,7 @@
 #include <tqstring.h>
 #include <tqtabwidget.h>
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 
 namespace Rosegarden
@@ -59,28 +59,28 @@ AudioPropertiesPage::AudioPropertiesPage(RosegardenGUIDoc *doc,
     AudioFileManager &afm = doc->getAudioFileManager();
 
     TQFrame *frame = new TQFrame(m_tabWidget);
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 10, 5);
-    tqlayout->addWidget(new TQLabel(i18n("Audio file path:"), frame), 0, 0);
+    TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 10, 5);
+    layout->addWidget(new TQLabel(i18n("Audio file path:"), frame), 0, 0);
     m_path = new TQLabel(TQString(afm.getAudioPath().c_str()), frame);
-    tqlayout->addWidget(m_path, 0, 1);
+    layout->addWidget(m_path, 0, 1);
 
     m_changePathButton =
         new TQPushButton(i18n("Choose..."), frame);
 
-    tqlayout->addWidget(m_changePathButton, 0, 2);
+    layout->addWidget(m_changePathButton, 0, 2);
 
     m_diskSpace = new TQLabel(frame);
-    tqlayout->addWidget(new TQLabel(i18n("Disk space remaining:"), frame), 1, 0);
-    tqlayout->addWidget(m_diskSpace, 1, 1);
+    layout->addWidget(new TQLabel(i18n("Disk space remaining:"), frame), 1, 0);
+    layout->addWidget(m_diskSpace, 1, 1);
 
     m_minutesAtStereo = new TQLabel(frame);
-    tqlayout->addWidget(
+    layout->addWidget(
         new TQLabel(i18n("Equivalent minutes of 16-bit stereo:"),
                    frame), 2, 0);
 
-    tqlayout->addWidget(m_minutesAtStereo, 2, 1, AlignCenter);
+    layout->addWidget(m_minutesAtStereo, 2, 1, AlignCenter);
 
-    tqlayout->setRowStretch(3, 2);
+    layout->setRowStretch(3, 2);
 
     calculateStats();
 
@@ -111,9 +111,9 @@ AudioPropertiesPage::slotFoundMountPoint(const TQString&,
         unsigned long kBAvail )
 {
     m_diskSpace->setText(i18n("%1 out of %2 (%3% used)")
-                         .tqarg(KIO::convertSizeFromKB(kBAvail))
-                         .tqarg(KIO::convertSizeFromKB(kBSize))
-                         .tqarg( 100 - (int)(100.0 * kBAvail / kBSize) ));
+                         .arg(KIO::convertSizeFromKB(kBAvail))
+                         .arg(KIO::convertSizeFromKB(kBSize))
+                         .arg( 100 - (int)(100.0 * kBAvail / kBSize) ));
 
 
     AudioPluginManager *apm = m_doc->getPluginManager();
@@ -140,9 +140,9 @@ AudioPropertiesPage::slotFoundMountPoint(const TQString&,
     minsStr.sprintf("%8.1f", stereoMins);
 
     m_minutesAtStereo->
-    setText(TQString("%1 %2 %3Hz").tqarg(minsStr)
-            .tqarg(i18n("minutes at"))
-            .tqarg(sampleRate));
+    setText(TQString("%1 %2 %3Hz").arg(minsStr)
+            .arg(i18n("minutes at"))
+            .arg(sampleRate));
 }
 
 void
diff --git a/src/gui/configuration/ColourConfigurationPage.cpp b/src/gui/configuration/ColourConfigurationPage.cpp
index 8196125..35938b8 100644
--- a/src/gui/configuration/ColourConfigurationPage.cpp
+++ b/src/gui/configuration/ColourConfigurationPage.cpp
@@ -45,7 +45,7 @@
 #include <tqstring.h>
 #include <tqtabwidget.h>
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 
 namespace Rosegarden
@@ -57,7 +57,7 @@ ColourConfigurationPage::ColourConfigurationPage(RosegardenGUIDoc *doc,
         : TabbedConfigurationPage(doc, parent, name)
 {
     TQFrame *frame = new TQFrame(m_tabWidget);
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2,
+    TQGridLayout *layout = new TQGridLayout(frame, 2, 2,
                                           10, 5);
 
     m_map = m_doc->getComposition().getSegmentColourMap();
@@ -65,15 +65,15 @@ ColourConfigurationPage::ColourConfigurationPage(RosegardenGUIDoc *doc,
     m_colourtable = new ColourTable(frame, m_map, m_listmap);
     m_colourtable->setFixedHeight(280);
 
-    tqlayout->addMultiCellWidget(m_colourtable, 0, 0, 0, 1);
+    layout->addMultiCellWidget(m_colourtable, 0, 0, 0, 1);
 
     TQPushButton* addColourButton = new TQPushButton(i18n("Add New Color"),
                                    frame);
-    tqlayout->addWidget(addColourButton, 1, 0, TQt::AlignHCenter);
+    layout->addWidget(addColourButton, 1, 0, TQt::AlignHCenter);
 
     TQPushButton* deleteColourButton = new TQPushButton(i18n("Delete Color"),
                                       frame);
-    tqlayout->addWidget(deleteColourButton, 1, 1, TQt::AlignHCenter);
+    layout->addWidget(deleteColourButton, 1, 1, TQt::AlignHCenter);
 
     connect(addColourButton, TQT_SIGNAL(clicked()),
             this, TQT_SLOT(slotAddNew()));
diff --git a/src/gui/configuration/DocumentMetaConfigurationPage.cpp b/src/gui/configuration/DocumentMetaConfigurationPage.cpp
index fbcf519..7be758d 100644
--- a/src/gui/configuration/DocumentMetaConfigurationPage.cpp
+++ b/src/gui/configuration/DocumentMetaConfigurationPage.cpp
@@ -53,7 +53,7 @@
 #include <tqtable.h>
 #include <tqtabwidget.h>
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 
 namespace Rosegarden
@@ -65,9 +65,9 @@ static TQString durationToString(Rosegarden::Composition &comp,
 				Rosegarden::RealTime rt)
 {
     return i18n("%1 minutes %2.%3%4 seconds (%5 units, %6 measures)") // TODO - PLURAL
-	.tqarg(rt.sec / 60).tqarg(rt.sec % 60)
-	.tqarg(rt.msec() / 100).tqarg((rt.msec() / 10) % 10)
-	.tqarg(duration).tqarg(comp.getBarNumber(absTime + duration) -
+	.arg(rt.sec / 60).arg(rt.sec % 60)
+	.arg(rt.msec() / 100).arg((rt.msec() / 10) % 10)
+	.arg(duration).arg(comp.getBarNumber(absTime + duration) -
 			   comp.getBarNumber(absTime));
 }
 
@@ -76,7 +76,7 @@ class SegmentDataItem : public TQTableItem
 public:
     SegmentDataItem(TQTable *t, TQString s) :
 	TQTableItem(t, TQTableItem::Never, s) { }
-    virtual int tqalignment() const { return TQt::AlignCenter; }
+    virtual int alignment() const { return TQt::AlignCenter; }
 
     virtual TQString key() const {
 
@@ -96,7 +96,7 @@ public:
 
 	TQString s(text());
 	if (s[0].digitValue() >= 0) {
-	    return TQString("%1%2").tqarg(s.length()).tqarg(s);
+	    return TQString("%1%2").arg(s.length()).arg(s);
 	} else {
 	    return s;
 	}
@@ -126,42 +126,42 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
     }
 
     TQFrame *frame = new TQFrame(m_tabWidget);
-    TQGridLayout *tqlayout = new TQGridLayout(frame,
+    TQGridLayout *layout = new TQGridLayout(frame,
                              6, 2,
                              10, 5);
 
-    tqlayout->addWidget(new TQLabel(i18n("Filename:"), frame), 0, 0);
-    tqlayout->addWidget(new TQLabel(doc->getTitle(), frame), 0, 1);
+    layout->addWidget(new TQLabel(i18n("Filename:"), frame), 0, 0);
+    layout->addWidget(new TQLabel(doc->getTitle(), frame), 0, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Formal duration (to end marker):"), frame), 1, 0);
+    layout->addWidget(new TQLabel(i18n("Formal duration (to end marker):"), frame), 1, 0);
     timeT d = comp.getEndMarker();
     RealTime rtd = comp.getElapsedRealTime(d);
-    tqlayout->addWidget(new TQLabel(durationToString(comp, 0, d, rtd), frame), 1, 1);
+    layout->addWidget(new TQLabel(durationToString(comp, 0, d, rtd), frame), 1, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Playing duration:"), frame), 2, 0);
+    layout->addWidget(new TQLabel(i18n("Playing duration:"), frame), 2, 0);
     d = comp.getDuration();
     rtd = comp.getElapsedRealTime(d);
-    tqlayout->addWidget(new TQLabel(durationToString(comp, 0, d, rtd), frame), 2, 1);
+    layout->addWidget(new TQLabel(durationToString(comp, 0, d, rtd), frame), 2, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Tracks:"), frame), 3, 0);
-    tqlayout->addWidget(new TQLabel(i18n("%1 used, %2 total")
-                                 .tqarg(usedTracks.size())
-                                 .tqarg(comp.getNbTracks()),
+    layout->addWidget(new TQLabel(i18n("Tracks:"), frame), 3, 0);
+    layout->addWidget(new TQLabel(i18n("%1 used, %2 total")
+                                 .arg(usedTracks.size())
+                                 .arg(comp.getNbTracks()),
                                  frame), 3, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Segments:"), frame), 4, 0);
-    tqlayout->addWidget(new TQLabel(i18n("%1 MIDI, %2 audio, %3 total")
-                                 .tqarg(internalSegments)
-                                 .tqarg(audioSegments)
-                                 .tqarg(internalSegments + audioSegments),
+    layout->addWidget(new TQLabel(i18n("Segments:"), frame), 4, 0);
+    layout->addWidget(new TQLabel(i18n("%1 MIDI, %2 audio, %3 total")
+                                 .arg(internalSegments)
+                                 .arg(audioSegments)
+                                 .arg(internalSegments + audioSegments),
                                  frame), 4, 1);
 
-    tqlayout->setRowStretch(5, 2);
+    layout->setRowStretch(5, 2);
 
     addTab(frame, i18n("Statistics"));
 
     frame = new TQFrame(m_tabWidget);
-    tqlayout = new TQGridLayout(frame, 1, 1, 10, 5);
+    layout = new TQGridLayout(frame, 1, 1, 10, 5);
 
     TQTable *table = new TQTable(1, 11, frame, "Segment Table");
     table->setSelectionMode(TQTable::NoSelection);
@@ -205,7 +205,7 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
 
         table->setItem(i, 1, new SegmentDataItem
                        (table,
-                        TQString("%1").tqarg(s->getTrack() + 1)));
+                        TQString("%1").arg(s->getTrack() + 1)));
 
         TQPixmap colourPixmap(16, 16);
         Colour colour =
@@ -219,11 +219,11 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
 
         table->setItem(i, 3, new SegmentDataItem
                        (table,
-                        TQString("%1").tqarg(s->getStartTime())));
+                        TQString("%1").arg(s->getStartTime())));
 
         table->setItem(i, 4, new SegmentDataItem
                        (table,
-                        TQString("%1").tqarg(s->getEndMarkerTime() -
+                        TQString("%1").arg(s->getEndMarkerTime() -
                                           s->getStartTime())));
 
         std::set<long> notesOn;
@@ -254,11 +254,11 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
 
         table->setItem(i, 5, new SegmentDataItem
                        (table,
-                        TQString("%1").tqarg(events)));
+                        TQString("%1").arg(events)));
 
         table->setItem(i, 6, new SegmentDataItem
                        (table,
-                        TQString("%1").tqarg(maxPoly)));
+                        TQString("%1").arg(maxPoly)));
 
         table->setItem(i, 7, new SegmentDataItem
                        (table,
@@ -280,16 +280,16 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
 
         table->setItem(i, 9, new SegmentDataItem
                        (table,
-                        TQString("%1").tqarg(s->getTranspose())));
+                        TQString("%1").arg(s->getTranspose())));
 
         if (s->getDelay() != 0) {
             if (s->getRealTimeDelay() != RealTime::zeroTime) {
                 table->setItem(i, 10, new SegmentDataItem
                                (table,
                                 TQString("%1 + %2 ms")
-                                .tqarg(NotationStrings::makeNoteMenuLabel
+                                .arg(NotationStrings::makeNoteMenuLabel
                                      (s->getDelay(), true, discard, false))
-                                .tqarg(s->getRealTimeDelay().sec * 1000 +
+                                .arg(s->getRealTimeDelay().sec * 1000 +
                                      s->getRealTimeDelay().msec())));
             } else {
                 table->setItem(i, 10, new SegmentDataItem
@@ -301,7 +301,7 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
             table->setItem(i, 10, new SegmentDataItem
                            (table,
                             TQString("%2 ms")
-                            .tqarg(s->getRealTimeDelay().sec * 1000 +
+                            .arg(s->getRealTimeDelay().sec * 1000 +
                                  s->getRealTimeDelay().msec())));
         } else {
             table->setItem(i, 10, new SegmentDataItem
@@ -312,7 +312,7 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
         ++i;
     }
 
-    tqlayout->addWidget(table, 0, 0);
+    layout->addWidget(table, 0, 0);
 
     addTab(frame, i18n("Segment Summary"));
 
diff --git a/src/gui/configuration/GeneralConfigurationPage.cpp b/src/gui/configuration/GeneralConfigurationPage.cpp
index 11b4c31..92da20d 100644
--- a/src/gui/configuration/GeneralConfigurationPage.cpp
+++ b/src/gui/configuration/GeneralConfigurationPage.cpp
@@ -51,7 +51,7 @@
 #include <tqtabwidget.h>
 #include <tqvbox.h>
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 
 namespace Rosegarden
@@ -69,7 +69,7 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
     m_cfg->setGroup(GeneralOptionsConfigGroup);
 
     TQFrame *frame;
-    TQGridLayout *tqlayout;
+    TQGridLayout *layout;
     TQLabel *label = 0;
     int row = 0;
 
@@ -77,14 +77,14 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
     // "Behavior" tab
     //
     frame = new TQFrame(m_tabWidget);
-    tqlayout = new TQGridLayout(frame,
+    layout = new TQGridLayout(frame,
                              6, 2,  // nbrow, nbcol
                              10, 5);
 
-    tqlayout->setRowSpacing(row, 15);
+    layout->setRowSpacing(row, 15);
     ++row;
 
-    tqlayout->addWidget(new TQLabel(i18n("Double-click opens segment in"),
+    layout->addWidget(new TQLabel(i18n("Double-click opens segment in"),
                                  frame), row, 0);
 
     m_client = new KComboBox(frame);
@@ -93,20 +93,20 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
     m_client->insertItem(i18n("Event List editor"));
     m_client->setCurrentItem(m_cfg->readUnsignedNumEntry("doubleclickclient", NotationView));
 
-    tqlayout->addMultiCellWidget(m_client, row, row, 1, 2);
+    layout->addMultiCellWidget(m_client, row, row, 1, 2);
     ++row;
 
-    tqlayout->addWidget(new TQLabel(i18n("Number of count-in measures when recording"),
+    layout->addWidget(new TQLabel(i18n("Number of count-in measures when recording"),
                                  frame), row, 0);
 
     m_countIn = new TQSpinBox(frame);
     m_countIn->setValue(m_cfg->readUnsignedNumEntry("countinbars", 0));
     m_countIn->setMaxValue(10);
     m_countIn->setMinValue(0);
-    tqlayout->addMultiCellWidget(m_countIn, row, row, 1, 2);
+    layout->addMultiCellWidget(m_countIn, row, row, 1, 2);
     ++row;
 
-    tqlayout->addWidget(new TQLabel(i18n("Auto-save interval"), frame), row, 0);
+    layout->addWidget(new TQLabel(i18n("Auto-save interval"), frame), row, 0);
     
     m_autoSave = new KComboBox(frame);
     m_autoSave->insertItem(i18n("Every 30 seconds"));
@@ -129,7 +129,7 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
         m_autoSave->setCurrentItem(3);
     }
 
-    tqlayout->addMultiCellWidget(m_autoSave, row, row, 1, 2);
+    layout->addMultiCellWidget(m_autoSave, row, row, 1, 2);
     ++row;
 
     // JACK Transport
@@ -138,10 +138,10 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
     m_cfg->setGroup(SequencerOptionsConfigGroup);
 
     label = new TQLabel(i18n("Use JACK transport"), frame);
-    tqlayout->addWidget(label, row, 0);
+    layout->addWidget(label, row, 0);
 
     m_jackTransport = new TQCheckBox(frame);
-    tqlayout->addMultiCellWidget(m_jackTransport, row, row, 1, 2);
+    layout->addMultiCellWidget(m_jackTransport, row, row, 1, 2);
 
 //    m_jackTransport->insertItem(i18n("Ignore JACK transport"));
 //    m_jackTransport->insertItem(i18n("Sync"));
@@ -165,16 +165,16 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
     m_cfg->setGroup(GeneralOptionsConfigGroup);
 #endif
 
-    tqlayout->setRowSpacing(row, 20);
+    layout->setRowSpacing(row, 20);
     ++row;
 
-    tqlayout->addWidget(new TQLabel(i18n("Sequencer status"), frame), row, 0);
+    layout->addWidget(new TQLabel(i18n("Sequencer status"), frame), row, 0);
 
     TQString status(i18n("Unknown"));
     SequenceManager *mgr = doc->getSequenceManager();
     if (mgr) {
-        int drivertqStatus = mgr->getSoundDrivertqStatus() & (AUDIO_OK | MIDI_OK);
-        switch (drivertqStatus) {
+        int driverStatus = mgr->getSoundDriverStatus() & (AUDIO_OK | MIDI_OK);
+        switch (driverStatus) {
         case AUDIO_OK:
             status = i18n("No MIDI, audio OK");
             break;
@@ -190,16 +190,16 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
         }
     }
 
-    tqlayout->addWidget(new TQLabel(status, frame), row, 1);
+    layout->addWidget(new TQLabel(status, frame), row, 1);
 
     TQPushButton *showStatusButton = new TQPushButton(i18n("Details..."),
                                     frame);
     TQObject::connect(showStatusButton, TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(slotShowtqStatus()));
-    tqlayout->addWidget(showStatusButton, row, 2, TQt::AlignRight);
+                     this, TQT_SLOT(slotShowStatus()));
+    layout->addWidget(showStatusButton, row, 2, TQt::AlignRight);
     ++row;
 
-    tqlayout->setRowStretch(row, 10);
+    layout->setRowStretch(row, 10);
 
     addTab(frame, i18n("Behavior"));
 
@@ -207,16 +207,16 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
     // "Appearance" tab
     //
     frame = new TQFrame(m_tabWidget);
-    tqlayout = new TQGridLayout(frame,
-                                          7, 4,  // nbrow, nbcol -- one extra row improves tqlayout
+    layout = new TQGridLayout(frame,
+                                          7, 4,  // nbrow, nbcol -- one extra row improves layout
                                           10, 5);
 
     row = 0;
 
-    tqlayout->setRowSpacing(row, 15);
+    layout->setRowSpacing(row, 15);
     ++row;
 
-    tqlayout->addWidget(new TQLabel(i18n("Side-bar parameter box tqlayout"),
+    layout->addWidget(new TQLabel(i18n("Side-bar parameter box layout"),
                                  frame), row, 0);
 
     m_sidebarStyle = new KComboBox(frame);
@@ -227,38 +227,38 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
 
     m_sidebarStyle->setCurrentItem(m_cfg->readUnsignedNumEntry("sidebarstyle",
                                    0));
-    tqlayout->addMultiCellWidget(m_sidebarStyle, row, row, 1, 3);
+    layout->addMultiCellWidget(m_sidebarStyle, row, row, 1, 3);
     ++row;
 
-    tqlayout->addWidget(new TQLabel(i18n("Note name style"),
+    layout->addWidget(new TQLabel(i18n("Note name style"),
                                  frame), row, 0);
 
     m_nameStyle = new KComboBox(frame);
     m_nameStyle->insertItem(i18n("Always use US names (e.g. quarter, 8th)"));
     m_nameStyle->insertItem(i18n("Localized (where available)"));
     m_nameStyle->setCurrentItem(m_cfg->readUnsignedNumEntry("notenamestyle", Local));
-    tqlayout->addMultiCellWidget(m_nameStyle, row, row, 1, 3);
+    layout->addMultiCellWidget(m_nameStyle, row, row, 1, 3);
     ++row;
 /*
-    tqlayout->addWidget(new TQLabel(i18n("Show tool context help in status bar"), frame), row, 0);
+    layout->addWidget(new TQLabel(i18n("Show tool context help in status bar"), frame), row, 0);
 
     m_toolContextHelp = new TQCheckBox(frame);
-    tqlayout->addWidget(m_toolContextHelp, row, 1);
+    layout->addWidget(m_toolContextHelp, row, 1);
     m_toolContextHelp->setChecked(m_cfg->readBoolEntry
                                   ("toolcontexthelp", true));
     ++row;
 */
 
-    tqlayout->addWidget(new TQLabel(i18n("Show textured background on"), frame), row, 0);
+    layout->addWidget(new TQLabel(i18n("Show textured background on"), frame), row, 0);
 
     m_backgroundTextures = new TQCheckBox(i18n("Main window"), frame);
-    tqlayout->addWidget(m_backgroundTextures, row, 1);
+    layout->addWidget(m_backgroundTextures, row, 1);
 
     m_matrixBackgroundTextures = new TQCheckBox(i18n("Matrix"), frame);
-    tqlayout->addWidget(m_matrixBackgroundTextures, row, 2);
+    layout->addWidget(m_matrixBackgroundTextures, row, 2);
 
     m_notationBackgroundTextures = new TQCheckBox(i18n("Notation"), frame);
-    tqlayout->addWidget(m_notationBackgroundTextures, row, 3);
+    layout->addWidget(m_notationBackgroundTextures, row, 3);
 
     m_backgroundTextures->setChecked(m_cfg->readBoolEntry
                                      ("backgroundtextures", true));
@@ -272,24 +272,24 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
     m_cfg->setGroup(GeneralOptionsConfigGroup);
     ++row;
 
-    tqlayout->addWidget(new TQLabel(i18n("Use bundled Klearlook theme"), frame), row, 0);
+    layout->addWidget(new TQLabel(i18n("Use bundled Klearlook theme"), frame), row, 0);
     m_globalStyle = new KComboBox(frame);
     m_globalStyle->insertItem(i18n("Never"));
     m_globalStyle->insertItem(i18n("When not running under KDE"));
     m_globalStyle->insertItem(i18n("Always"));
     m_globalStyle->setCurrentItem(m_cfg->readUnsignedNumEntry("Install Own Theme", 1));
-    tqlayout->addMultiCellWidget(m_globalStyle, row, row, 1, 3);
+    layout->addMultiCellWidget(m_globalStyle, row, row, 1, 3);
 
     ++row;
 
-    tqlayout->setRowStretch(row, 10);
+    layout->setRowStretch(row, 10);
 
     addTab(frame, i18n("Presentation"));
 
 }
 
 void
-GeneralConfigurationPage::slotShowtqStatus()
+GeneralConfigurationPage::slotShowStatus()
 {
     ShowSequencerStatusDialog dialog(this);
     dialog.exec();
diff --git a/src/gui/configuration/GeneralConfigurationPage.h b/src/gui/configuration/GeneralConfigurationPage.h
index 9dc7190..36ca725 100644
--- a/src/gui/configuration/GeneralConfigurationPage.h
+++ b/src/gui/configuration/GeneralConfigurationPage.h
@@ -85,7 +85,7 @@ signals:
     void updateSidebarStyle(unsigned int);
 
 protected slots:
-    void slotShowtqStatus();
+    void slotShowStatus();
 
 protected:
     int getCountInSpin()            { return m_countIn->value(); }
diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp
index f853d1c..cb39468 100644
--- a/src/gui/configuration/HeadersConfigurationPage.cpp
+++ b/src/gui/configuration/HeadersConfigurationPage.cpp
@@ -37,7 +37,7 @@
 #include <klocale.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqstring.h>
@@ -141,7 +141,7 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *parent,
 	}
 
 	// editHeader->setReadOnly( true );
-	editHeader->tqsetAlignment( (col == 0 ? TQt::AlignLeft : (col >= 3 ? TQt::AlignRight : TQt::AlignCenter) ));
+	editHeader->setAlignment( (col == 0 ? TQt::AlignLeft : (col >= 3 ? TQt::AlignRight : TQt::AlignCenter) ));
 
 	layoutHeaders->addMultiCellWidget(editHeader, row, row, col, col+(width-1) );
 
@@ -153,7 +153,7 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *parent,
 	shown.insert(key);
     }
     TQLabel *separator = new TQLabel(i18n("The composition comes here."), frameHeaders);
-    separator->tqsetAlignment( TQt::AlignCenter );
+    separator->setAlignment( TQt::AlignCenter );
     layoutHeaders->addMultiCellWidget(separator, 7, 7, 1, 4 );
 
     //
@@ -233,7 +233,7 @@ HeadersConfigurationPage::slotAddNewProperty()
 
     while (1) {
         propertyName =
-            (i > 0 ? i18n("{new property %1}").tqarg(i) : i18n("{new property}"));
+            (i > 0 ? i18n("{new property %1}").arg(i) : i18n("{new property}"));
         if (!m_doc->getComposition().getMetadata().has(qstrtostr(propertyName)) &&
 	    m_metadata->findItem(propertyName,0) == 0)
             break;
diff --git a/src/gui/configuration/LatencyConfigurationPage.cpp b/src/gui/configuration/LatencyConfigurationPage.cpp
index a1929aa..4410308 100644
--- a/src/gui/configuration/LatencyConfigurationPage.cpp
+++ b/src/gui/configuration/LatencyConfigurationPage.cpp
@@ -24,7 +24,7 @@
 
 
 #include "LatencyConfigurationPage.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include "document/ConfigGroups.h"
 #include "ConfigurationPage.h"
@@ -56,19 +56,19 @@ LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
 #ifdef HAVE_LIBJACK
 
     frame = new TQFrame(m_tabWidget, i18n("JACK latency"));
-    tqlayout = new TQGridLayout(frame, 6, 5, 10, 10);
+    layout = new TQGridLayout(frame, 6, 5, 10, 10);
 
-    tqlayout->addMultiCellWidget(new TQLabel(i18n("Use the \"Fetch JACK latencies\" button to discover the latency values set at\nthe sequencer.  It's recommended that you use the returned values but it's also\npossible to override them manually using the sliders.  Note that if you change\nyour JACK server parameters you should always fetch the latency values again.\nThe latency values will be stored by Rosegarden for use next time."), frame),
+    layout->addMultiCellWidget(new TQLabel(i18n("Use the \"Fetch JACK latencies\" button to discover the latency values set at\nthe sequencer.  It's recommended that you use the returned values but it's also\npossible to override them manually using the sliders.  Note that if you change\nyour JACK server parameters you should always fetch the latency values again.\nThe latency values will be stored by Rosegarden for use next time."), frame),
                                0, 0,
                                0, 3);
 
-    tqlayout->addWidget(new TQLabel(i18n("JACK playback latency (in ms)"), frame), 1, 0);
-    tqlayout->addWidget(new TQLabel(i18n("JACK record latency (in ms)"), frame), 3, 0);
+    layout->addWidget(new TQLabel(i18n("JACK playback latency (in ms)"), frame), 1, 0);
+    layout->addWidget(new TQLabel(i18n("JACK record latency (in ms)"), frame), 3, 0);
 
     m_fetchLatencyValues = new TQPushButton(i18n("Fetch JACK latencies"),
                                            frame);
 
-    tqlayout->addWidget(m_fetchLatencyValues, 1, 3);
+    layout->addWidget(m_fetchLatencyValues, 1, 3);
 
     connect(m_fetchLatencyValues, TQT_SIGNAL(released()),
             TQT_SLOT(slotFetchLatencyValues()));
@@ -80,19 +80,19 @@ LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
 
     m_jackPlayback = new TQSlider(Horizontal, frame);
     m_jackPlayback->setTickmarks(TQSlider::Below);
-    tqlayout->addMultiCellWidget(m_jackPlayback, 3, 3, 2, 3);
+    layout->addMultiCellWidget(m_jackPlayback, 3, 3, 2, 3);
 
-    TQLabel *jackPlaybackLabel = new TQLabel(TQString("%1").tqarg(jackPlaybackValue),
+    TQLabel *jackPlaybackLabel = new TQLabel(TQString("%1").arg(jackPlaybackValue),
                                            frame);
-    tqlayout->addWidget(jackPlaybackLabel, 2, 2, TQt::AlignHCenter);
+    layout->addWidget(jackPlaybackLabel, 2, 2, TQt::AlignHCenter);
     connect(m_jackPlayback, TQT_SIGNAL(valueChanged(int)),
             jackPlaybackLabel, TQT_SLOT(setNum(int)));
 
     m_jackPlayback->setMinValue(0);
-    tqlayout->addWidget(new TQLabel("0", frame), 3, 1, TQt::AlignRight);
+    layout->addWidget(new TQLabel("0", frame), 3, 1, TQt::AlignRight);
 
     m_jackPlayback->setMaxValue(500);
-    tqlayout->addWidget(new TQLabel("500", frame), 3, 4, TQt::AlignLeft);
+    layout->addWidget(new TQLabel("500", frame), 3, 4, TQt::AlignLeft);
 
     m_jackPlayback->setValue(jackPlaybackValue);
 
@@ -103,20 +103,20 @@ LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
 
     m_jackRecord = new TQSlider(Horizontal, frame);
     m_jackRecord->setTickmarks(TQSlider::Below);
-    tqlayout->addMultiCellWidget(m_jackRecord, 5, 5, 2, 3);
+    layout->addMultiCellWidget(m_jackRecord, 5, 5, 2, 3);
 
-    TQLabel *jackRecordLabel = new TQLabel(TQString("%1").tqarg(jackRecordValue),
+    TQLabel *jackRecordLabel = new TQLabel(TQString("%1").arg(jackRecordValue),
                                          frame);
-    tqlayout->addWidget(jackRecordLabel, 4, 2, TQt::AlignHCenter);
+    layout->addWidget(jackRecordLabel, 4, 2, TQt::AlignHCenter);
     connect(m_jackRecord, TQT_SIGNAL(valueChanged(int)),
             jackRecordLabel, TQT_SLOT(setNum(int)));
 
     m_jackRecord->setMinValue(0);
-    tqlayout->addWidget(new TQLabel("0", frame), 5, 1, TQt::AlignRight);
+    layout->addWidget(new TQLabel("0", frame), 5, 1, TQt::AlignRight);
 
     m_jackRecord->setMaxValue(500);
     m_jackRecord->setValue(jackRecordValue);
-    tqlayout->addWidget(new TQLabel("500", frame), 5, 4, TQt::AlignLeft);
+    layout->addWidget(new TQLabel("500", frame), 5, 4, TQt::AlignLeft);
 
     addTab(frame, i18n("JACK Latency"));
 #endif  // HAVE_LIBJACK
diff --git a/src/gui/configuration/MIDIConfigurationPage.cpp b/src/gui/configuration/MIDIConfigurationPage.cpp
index 44c4c49..d161fb0 100644
--- a/src/gui/configuration/MIDIConfigurationPage.cpp
+++ b/src/gui/configuration/MIDIConfigurationPage.cpp
@@ -50,7 +50,7 @@
 #include <tqlineedit.h>
 #include <tqobject.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqslider.h>
 #include <tqspinbox.h>
 #include <tqstring.h>
@@ -78,38 +78,38 @@ MIDIConfigurationPage::MIDIConfigurationPage(
     // ---------------- General tab ------------------
     //
     TQFrame *frame = new TQFrame(m_tabWidget);
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 9, 4, 10, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 9, 4, 10, 5);
 
     int row = 0;
 
-    tqlayout->setRowSpacing(row, 15);
+    layout->setRowSpacing(row, 15);
     ++row;
 
     TQLabel *label = 0;
 
     m_cfg->setGroup(GeneralOptionsConfigGroup);
 
-    tqlayout->addMultiCellWidget(new TQLabel(i18n("Base octave number for MIDI pitch display"),
+    layout->addMultiCellWidget(new TQLabel(i18n("Base octave number for MIDI pitch display"),
 					  frame), row, row, 0, 1);
     
     m_midiPitchOctave = new TQSpinBox(frame);
     m_midiPitchOctave->setMaxValue(10);
     m_midiPitchOctave->setMinValue( -10);
     m_midiPitchOctave->setValue(m_cfg->readNumEntry("midipitchoctave", -2));
-    tqlayout->addMultiCellWidget(m_midiPitchOctave, row, row, 2, 3);
+    layout->addMultiCellWidget(m_midiPitchOctave, row, row, 2, 3);
     ++row;
 
-    tqlayout->setRowSpacing(row, 20);
+    layout->setRowSpacing(row, 20);
     ++row;
 
     m_cfg->setGroup(GeneralOptionsConfigGroup);
 
-    tqlayout->addMultiCellWidget(new TQLabel(i18n("Always use default studio when loading files"),
+    layout->addMultiCellWidget(new TQLabel(i18n("Always use default studio when loading files"),
 					  frame), row, row, 0, 1);
 
     m_studio = new TQCheckBox(frame);
     m_studio->setChecked(m_cfg->readBoolEntry("alwaysusedefaultstudio", false));
-    tqlayout->addWidget(m_studio, row, 2);
+    layout->addWidget(m_studio, row, 2);
     ++row;
 
     // Send Controllers
@@ -121,14 +121,14 @@ MIDIConfigurationPage::MIDIConfigurationPage(
     TQString controllerTip = i18n("Rosegarden can send all MIDI Controllers (Pan, Reverb etc) to all MIDI devices every\ntime you hit play if you so wish.  Please note that this option will usually incur a\ndelay at the start of playback due to the amount of data being transmitted.");
     TQToolTip::add
         (label, controllerTip);
-    tqlayout->addMultiCellWidget(label, row, row, 0, 1);
+    layout->addMultiCellWidget(label, row, row, 0, 1);
 
     m_sendControllersAtPlay = new TQCheckBox(frame);
     bool sendControllers = m_cfg->readBoolEntry("alwayssendcontrollers", false);
     m_sendControllersAtPlay->setChecked(sendControllers);
     TQToolTip::add
         (m_sendControllersAtPlay, controllerTip);
-    tqlayout->addWidget(m_sendControllersAtPlay, row, 2);
+    layout->addWidget(m_sendControllersAtPlay, row, 2);
     ++row;
 
     // Timer selection
@@ -136,10 +136,10 @@ MIDIConfigurationPage::MIDIConfigurationPage(
     m_cfg->setGroup(SequencerOptionsConfigGroup);
 
     label = new TQLabel(i18n("Sequencer timing source"), frame);
-    tqlayout->addMultiCellWidget(label, row, row, 0, 1);
+    layout->addMultiCellWidget(label, row, row, 0, 1);
 
     m_timer = new KComboBox(frame);
-    tqlayout->addMultiCellWidget(m_timer, row, row, 2, 3);
+    layout->addMultiCellWidget(m_timer, row, row, 2, 3);
 
     TQStringList timers = m_doc->getTimers();
     m_origTimer = m_doc->getCurrentTimer();
@@ -153,7 +153,7 @@ MIDIConfigurationPage::MIDIConfigurationPage(
 
     ++row;
 
-    tqlayout->setRowSpacing(row, 20);
+    layout->setRowSpacing(row, 20);
     ++row;
 
     m_cfg->setGroup(SequencerOptionsConfigGroup);
@@ -163,25 +163,25 @@ MIDIConfigurationPage::MIDIConfigurationPage(
     TQLabel* lbl = new TQLabel(i18n("Load SoundFont to SoundBlaster card at startup"), frame);
     TQString tooltip = i18n("Check this box to enable soundfont loading on EMU10K-based cards when Rosegarden is launched");
     TQToolTip::add(lbl, tooltip);
-    tqlayout->addMultiCellWidget(lbl, row, row, 0, 1);
+    layout->addMultiCellWidget(lbl, row, row, 0, 1);
 
     m_sfxLoadEnabled = new TQCheckBox(frame);
-    tqlayout->addWidget(m_sfxLoadEnabled, row, 2);
+    layout->addWidget(m_sfxLoadEnabled, row, 2);
     TQToolTip::add(m_sfxLoadEnabled, tooltip);
     ++row;
 
-    tqlayout->addWidget(new TQLabel(i18n("Path to 'asfxload' or 'sfxload' command"), frame), row, 0);
+    layout->addWidget(new TQLabel(i18n("Path to 'asfxload' or 'sfxload' command"), frame), row, 0);
     m_sfxLoadPath = new TQLineEdit(m_cfg->readEntry("sfxloadpath", "/bin/sfxload"), frame);
-    tqlayout->addMultiCellWidget(m_sfxLoadPath, row, row, 1, 2);
+    layout->addMultiCellWidget(m_sfxLoadPath, row, row, 1, 2);
     m_sfxLoadChoose = new TQPushButton("Choose...", frame);
-    tqlayout->addWidget(m_sfxLoadChoose, row, 3);
+    layout->addWidget(m_sfxLoadChoose, row, 3);
     ++row;
 
-    tqlayout->addWidget(new TQLabel(i18n("SoundFont"), frame), row, 0);
+    layout->addWidget(new TQLabel(i18n("SoundFont"), frame), row, 0);
     m_soundFontPath = new TQLineEdit(m_cfg->readEntry("soundfontpath", ""), frame);
-    tqlayout->addMultiCellWidget(m_soundFontPath, row, row, 1, 2);
+    layout->addMultiCellWidget(m_soundFontPath, row, row, 1, 2);
     m_soundFontChoose = new TQPushButton("Choose...", frame);
-    tqlayout->addWidget(m_soundFontChoose, row, 3);
+    layout->addWidget(m_soundFontChoose, row, 3);
     ++row;
 
     bool sfxLoadEnabled = m_cfg->readBoolEntry("sfxloadenabled", false);
@@ -202,7 +202,7 @@ MIDIConfigurationPage::MIDIConfigurationPage(
     connect(m_soundFontChoose, TQT_SIGNAL(clicked()),
             this, TQT_SLOT(slotSoundFontChoose()));
 
-    tqlayout->setRowStretch(row, 10);
+    layout->setRowStretch(row, 10);
 
     addTab(frame, i18n("General"));
 
@@ -211,19 +211,19 @@ MIDIConfigurationPage::MIDIConfigurationPage(
     //  -------------- Synchronisation tab -----------------
     //
     frame = new TQFrame(m_tabWidget);
-    tqlayout = new TQGridLayout(frame, 7, 2, 10, 5);
+    layout = new TQGridLayout(frame, 7, 2, 10, 5);
 
     row = 0;
 
-    tqlayout->setRowSpacing(row, 15);
+    layout->setRowSpacing(row, 15);
     ++row;
 
     // MIDI Clock and System Realtime Messages
     //
     label = new TQLabel(i18n("MIDI Clock and System messages"), frame);
-    tqlayout->addWidget(label, row, 0);
+    layout->addWidget(label, row, 0);
     m_midiSync = new KComboBox(frame);
-    tqlayout->addWidget(m_midiSync, row, 1);
+    layout->addWidget(m_midiSync, row, 1);
 
     m_midiSync->insertItem(i18n("Off"));
     m_midiSync->insertItem(i18n("Send MIDI Clock, Start and Stop"));
@@ -239,10 +239,10 @@ MIDIConfigurationPage::MIDIConfigurationPage(
     // MMC Transport
     //
     label = new TQLabel(i18n("MIDI Machine Control mode"), frame);
-    tqlayout->addWidget(label, row, 0);
+    layout->addWidget(label, row, 0);
 
     m_mmcTransport = new KComboBox(frame);
-    tqlayout->addWidget(m_mmcTransport, row, 1); //, TQt::AlignHCenter);
+    layout->addWidget(m_mmcTransport, row, 1); //, TQt::AlignHCenter);
 
     m_mmcTransport->insertItem(i18n("Off"));
     m_mmcTransport->insertItem(i18n("MMC Master"));
@@ -258,10 +258,10 @@ MIDIConfigurationPage::MIDIConfigurationPage(
     // MTC transport
     //
     label = new TQLabel(i18n("MIDI Time Code mode"), frame);
-    tqlayout->addWidget(label, row, 0);
+    layout->addWidget(label, row, 0);
 
     m_mtcTransport = new KComboBox(frame);
-    tqlayout->addWidget(m_mtcTransport, row, 1);
+    layout->addWidget(m_mtcTransport, row, 1);
 
     m_mtcTransport->insertItem(i18n("Off"));
     m_mtcTransport->insertItem(i18n("MTC Master"));
@@ -276,18 +276,18 @@ MIDIConfigurationPage::MIDIConfigurationPage(
 
     TQHBox *hbox = new TQHBox(frame);
     hbox->setSpacing(5);
-    tqlayout->addMultiCellWidget(hbox, row, row, 0, 1);
+    layout->addMultiCellWidget(hbox, row, row, 0, 1);
 
     label = new TQLabel(i18n("Automatically connect sync output to all devices in use"), hbox);
-//    tqlayout->addWidget(label, row, 0);
+//    layout->addWidget(label, row, 0);
     m_midiSyncAuto = new TQCheckBox(hbox);
-//    tqlayout->addWidget(m_midiSyncAuto, row, 1);
+//    layout->addWidget(m_midiSyncAuto, row, 1);
 
     m_midiSyncAuto->setChecked(m_cfg->readBoolEntry("midisyncautoconnect", false));
 
     ++row;
 
-    tqlayout->setRowStretch(row, 10);
+    layout->setRowStretch(row, 10);
 
     addTab(frame, i18n("MIDI Sync"));
 }
diff --git a/src/gui/configuration/MatrixConfigurationPage.cpp b/src/gui/configuration/MatrixConfigurationPage.cpp
index c5adbd9..9d7200a 100644
--- a/src/gui/configuration/MatrixConfigurationPage.cpp
+++ b/src/gui/configuration/MatrixConfigurationPage.cpp
@@ -37,7 +37,7 @@
 #include <tqstring.h>
 #include <tqtabwidget.h>
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 namespace Rosegarden
 {
@@ -50,11 +50,11 @@ MatrixConfigurationPage::MatrixConfigurationPage(KConfig *cfg,
     m_cfg->setGroup(MatrixViewConfigGroup);
 
     TQFrame *frame = new TQFrame(m_tabWidget);
-    TQGridLayout *tqlayout = new TQGridLayout(frame,
+    TQGridLayout *layout = new TQGridLayout(frame,
                                           4, 2,  // nbrow, nbcol
                                           10, 5);
 
-    tqlayout->addWidget(new TQLabel("Nothing here yet", frame), 0, 0);
+    layout->addWidget(new TQLabel("Nothing here yet", frame), 0, 0);
 
     addTab(frame, i18n("General"));
 }
diff --git a/src/gui/configuration/NotationConfigurationPage.cpp b/src/gui/configuration/NotationConfigurationPage.cpp
index 4296773..41d2deb 100644
--- a/src/gui/configuration/NotationConfigurationPage.cpp
+++ b/src/gui/configuration/NotationConfigurationPage.cpp
@@ -24,7 +24,7 @@
 
 
 #include "NotationConfigurationPage.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include "misc/Strings.h"
 #include "document/ConfigGroups.h"
@@ -74,31 +74,31 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
     m_cfg->setGroup(NotationViewConfigGroup);
 
     TQFrame *frame;
-    TQGridLayout *tqlayout;
+    TQGridLayout *layout;
 
     frame = new TQFrame(m_tabWidget);
-    tqlayout = new TQGridLayout(frame, 9, 3, 10, 5);
+    layout = new TQGridLayout(frame, 9, 3, 10, 5);
 
     int row = 0;
 
-    tqlayout->setRowSpacing(row, 15);
+    layout->setRowSpacing(row, 15);
     ++row;
 
-    tqlayout->addWidget(new TQLabel(i18n("Default tqlayout mode"), frame), row, 0);
+    layout->addWidget(new TQLabel(i18n("Default layout mode"), frame), row, 0);
 
     m_layoutMode = new KComboBox(frame);
     m_layoutMode->setEditable(false);
-    m_layoutMode->insertItem(i18n("Linear tqlayout"));
-    m_layoutMode->insertItem(i18n("Continuous page tqlayout"));
-    m_layoutMode->insertItem(i18n("Multiple page tqlayout"));
+    m_layoutMode->insertItem(i18n("Linear layout"));
+    m_layoutMode->insertItem(i18n("Continuous page layout"));
+    m_layoutMode->insertItem(i18n("Multiple page layout"));
     int defaultLayoutMode = m_cfg->readNumEntry("layoutmode", 0);
     if (defaultLayoutMode >= 0 && defaultLayoutMode <= 2) {
         m_layoutMode->setCurrentItem(defaultLayoutMode);
     }
-    tqlayout->addMultiCellWidget(m_layoutMode, row, row, 1, 2);
+    layout->addMultiCellWidget(m_layoutMode, row, row, 1, 2);
     ++row;
 
-    tqlayout->addWidget(new TQLabel(i18n("Default spacing"), frame), row, 0);
+    layout->addWidget(new TQLabel(i18n("Default spacing"), frame), row, 0);
 
     m_spacing = new KComboBox(frame);
     m_spacing->setEditable(false);
@@ -111,18 +111,18 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
         TQString text("%1 %");
         if (*i == 100)
             text = "%1 % (normal)";
-        m_spacing->insertItem(text.tqarg(*i));
+        m_spacing->insertItem(text.arg(*i));
 
         if (*i == defaultSpacing) {
             m_spacing->setCurrentItem(m_spacing->count() - 1);
         }
     }
 
-    tqlayout->addMultiCellWidget(m_spacing, row, row, 1, 2);
+    layout->addMultiCellWidget(m_spacing, row, row, 1, 2);
 
     ++row;
 
-    tqlayout->addWidget(new TQLabel(i18n("Default duration factor"), frame), row, 0);
+    layout->addWidget(new TQLabel(i18n("Default duration factor"), frame), row, 0);
 
     m_proportion = new KComboBox(frame);
     m_proportion->setEditable(false);
@@ -132,7 +132,7 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
 
     for (std::vector<int>::iterator i = s.begin(); i != s.end(); ++i) {
 
-        TQString text = TQString("%1 %").tqarg(*i);
+        TQString text = TQString("%1 %").arg(*i);
         if (*i == 40)
             text = "40 % (normal)";
         else if (*i == 0)
@@ -146,10 +146,10 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
         }
     }
 
-    tqlayout->addMultiCellWidget(m_proportion, row, row, 1, 2);
+    layout->addMultiCellWidget(m_proportion, row, row, 1, 2);
     ++row;
 
-    tqlayout->addWidget(new TQLabel(i18n("Show track headers (linear tqlayout only)"),
+    layout->addWidget(new TQLabel(i18n("Show track headers (linear layout only)"),
                                       frame), row, 0);
 
     m_showTrackHeaders = new KComboBox(frame);
@@ -167,76 +167,76 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
         "\"When needed\" means \"when staves are too many to all fit"
         " in the current window\"")));
 
-    tqlayout->addMultiCellWidget(m_showTrackHeaders, row, row, 1, 2);
+    layout->addMultiCellWidget(m_showTrackHeaders, row, row, 1, 2);
     ++row;
 
-    tqlayout->setRowSpacing(row, 20);
+    layout->setRowSpacing(row, 20);
     ++row;
 
-    tqlayout->addMultiCellWidget
+    layout->addMultiCellWidget
         (new TQLabel
          (i18n("Show non-notation events as question marks"), frame),
          row, row, 0, 1);
     m_showUnknowns = new TQCheckBox(frame);
     bool defaultShowUnknowns = m_cfg->readBoolEntry("showunknowns", false);
     m_showUnknowns->setChecked(defaultShowUnknowns);
-    tqlayout->addWidget(m_showUnknowns, row, 2);
+    layout->addWidget(m_showUnknowns, row, 2);
     ++row;
 
-    tqlayout->addMultiCellWidget
+    layout->addMultiCellWidget
         (new TQLabel
          (i18n("Show notation-quantized notes in a different color"), frame),
          row, row, 0, 1);
     m_colourQuantize = new TQCheckBox(frame);
     bool defaultColourQuantize = m_cfg->readBoolEntry("colourquantize", false);
     m_colourQuantize->setChecked(defaultColourQuantize);
-    tqlayout->addWidget(m_colourQuantize, row, 2);
+    layout->addWidget(m_colourQuantize, row, 2);
     ++row;
 
-    tqlayout->addMultiCellWidget
+    layout->addMultiCellWidget
         (new TQLabel
          (i18n("Show \"invisible\" events in grey"), frame),
          row, row, 0, 1);
     m_showInvisibles = new TQCheckBox(frame);
     bool defaultShowInvisibles = m_cfg->readBoolEntry("showinvisibles", true);
     m_showInvisibles->setChecked(defaultShowInvisibles);
-    tqlayout->addWidget(m_showInvisibles, row, 2);
+    layout->addWidget(m_showInvisibles, row, 2);
     ++row;
 
-    tqlayout->addMultiCellWidget
+    layout->addMultiCellWidget
         (new TQLabel
          (i18n("Show notes outside suggested playable range in red"), frame),
          row, row, 0, 1);
     m_showRanges = new TQCheckBox(frame);
     bool defaultShowRanges = m_cfg->readBoolEntry("showranges", true);
     m_showRanges->setChecked(defaultShowRanges);
-    tqlayout->addWidget(m_showRanges, row, 2);
+    layout->addWidget(m_showRanges, row, 2);
     ++row;
 
-    tqlayout->addMultiCellWidget
+    layout->addMultiCellWidget
         (new TQLabel
          (i18n("Highlight superimposed notes with a halo effect"), frame),
          row, row, 0, 1);
     m_showCollisions = new TQCheckBox(frame);
     bool defaultShowCollisions = m_cfg->readBoolEntry("showcollisions", true);
     m_showCollisions->setChecked(defaultShowCollisions);
-    tqlayout->addWidget(m_showCollisions, row, 2);
+    layout->addWidget(m_showCollisions, row, 2);
     ++row;
 
-    tqlayout->setRowSpacing(row, 20);
+    layout->setRowSpacing(row, 20);
     ++row;
 
-    tqlayout->addMultiCellWidget
+    layout->addMultiCellWidget
         (new TQLabel
          (i18n("When recording MIDI, split-and-tie long notes at barlines"), frame),
          row, row, 0, 1);
     m_splitAndTie = new TQCheckBox(frame);
     bool defaultSplitAndTie = m_cfg->readBoolEntry("quantizemakeviable", false);
     m_splitAndTie->setChecked(defaultSplitAndTie);
-    tqlayout->addWidget(m_splitAndTie, row, 2);
+    layout->addWidget(m_splitAndTie, row, 2);
     ++row;
 
-    tqlayout->setRowStretch(row, 10);
+    layout->setRowStretch(row, 10);
 
 
     addTab(frame, i18n("Layout"));
@@ -244,18 +244,18 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
 
 
     frame = new TQFrame(m_tabWidget);
-    tqlayout = new TQGridLayout(frame, 6, 3, 10, 5);
+    layout = new TQGridLayout(frame, 6, 3, 10, 5);
 
     row = 0;
 
-    tqlayout->setRowSpacing(row, 15);
+    layout->setRowSpacing(row, 15);
     ++row;
 
-    tqlayout->addMultiCellWidget
+    layout->addMultiCellWidget
         (new TQLabel(i18n("Default note style for new notes"), frame),
          row, row, 0, 1);
 
-    tqlayout->setColStretch(2, 10);
+    layout->setColStretch(2, 10);
 
     m_noteStyle = new KComboBox(frame);
     m_noteStyle->setEditable(false);
@@ -277,13 +277,13 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
         }
     }
 
-    tqlayout->addWidget(m_noteStyle, row, 2);
+    layout->addWidget(m_noteStyle, row, 2);
     ++row;
 
-    tqlayout->setRowSpacing(row, 20);
+    layout->setRowSpacing(row, 20);
     ++row;
 
-    tqlayout->addWidget
+    layout->addWidget
     (new TQLabel(i18n("When inserting notes..."), frame), row, 0);
 
     int defaultInsertType = m_cfg->readNumEntry("inserttype", 0);
@@ -295,36 +295,36 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
     m_insertType->insertItem(i18n("Ignore existing durations"));
     m_insertType->setCurrentItem(defaultInsertType);
 
-    tqlayout->addMultiCellWidget(m_insertType, row, row, 1, 2);
+    layout->addMultiCellWidget(m_insertType, row, row, 1, 2);
     ++row;
 
     bool autoBeam = m_cfg->readBoolEntry("autobeam", true);
 
-    tqlayout->addMultiCellWidget
+    layout->addMultiCellWidget
         (new TQLabel
          (i18n("Auto-beam on insert when appropriate"), frame),
          row, row, 0, 1);
     m_autoBeam = new TQCheckBox(frame);
     m_autoBeam->setChecked(autoBeam);
-    tqlayout->addMultiCellWidget(m_autoBeam, row, row, 2, 2);
+    layout->addMultiCellWidget(m_autoBeam, row, row, 2, 2);
 
     ++row;
 
     bool collapse = m_cfg->readBoolEntry("collapse", false);
 
-    tqlayout->addMultiCellWidget
+    layout->addMultiCellWidget
         (new TQLabel
          (i18n("Collapse rests after erase"), frame),
          row, row, 0, 1);
     m_collapseRests = new TQCheckBox(frame);
     m_collapseRests->setChecked(collapse);
-    tqlayout->addMultiCellWidget(m_collapseRests, row, row, 2, 2);
+    layout->addMultiCellWidget(m_collapseRests, row, row, 2, 2);
     ++row;
 
-    tqlayout->setRowSpacing(row, 20);
+    layout->setRowSpacing(row, 20);
     ++row;
 
-    tqlayout->addWidget
+    layout->addWidget
     (new TQLabel(i18n("Default paste type"), frame), row, 0);
 
     m_pasteType = new KComboBox(frame);
@@ -342,24 +342,24 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
     }
 
     m_pasteType->setCurrentItem(defaultPasteType);
-    tqlayout->addMultiCellWidget(m_pasteType, row, row, 1, 2);
+    layout->addMultiCellWidget(m_pasteType, row, row, 1, 2);
     ++row;
 
-    tqlayout->setRowStretch(row, 10);
+    layout->setRowStretch(row, 10);
 
     addTab(frame, i18n("Editing"));
 
 
 
     frame = new TQFrame(m_tabWidget);
-    tqlayout = new TQGridLayout(frame, 4, 2, 10, 5);
+    layout = new TQGridLayout(frame, 4, 2, 10, 5);
     
     row = 0;
 
-    tqlayout->setRowSpacing(row, 15);
+    layout->setRowSpacing(row, 15);
     ++row;
 
-    tqlayout->addWidget(new TQLabel(i18n("Accidentals in one octave..."), frame), row, 0);
+    layout->addWidget(new TQLabel(i18n("Accidentals in one octave..."), frame), row, 0);
     m_accOctavePolicy = new KComboBox(frame);
     m_accOctavePolicy->insertItem(i18n("Affect only that octave"));
     m_accOctavePolicy->insertItem(i18n("Require cautionaries in other octaves"));
@@ -368,10 +368,10 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
     if (accOctaveMode >= 0 && accOctaveMode < 3) {
         m_accOctavePolicy->setCurrentItem(accOctaveMode);
     }
-    tqlayout->addWidget(m_accOctavePolicy, row, 1);
+    layout->addWidget(m_accOctavePolicy, row, 1);
     ++row;
 
-    tqlayout->addWidget(new TQLabel(i18n("Accidentals in one bar..."), frame), row, 0);
+    layout->addWidget(new TQLabel(i18n("Accidentals in one bar..."), frame), row, 0);
     m_accBarPolicy = new KComboBox(frame);
     m_accBarPolicy->insertItem(i18n("Affect only that bar"));
     m_accBarPolicy->insertItem(i18n("Require cautionary resets in following bar"));
@@ -380,10 +380,10 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
     if (accBarMode >= 0 && accBarMode < 3) {
         m_accBarPolicy->setCurrentItem(accBarMode);
     }
-    tqlayout->addWidget(m_accBarPolicy, row, 1);
+    layout->addWidget(m_accBarPolicy, row, 1);
     ++row;
 
-    tqlayout->addWidget(new TQLabel(i18n("Key signature cancellation style"), frame), row, 0);
+    layout->addWidget(new TQLabel(i18n("Key signature cancellation style"), frame), row, 0);
     m_keySigCancelMode = new KComboBox(frame);
     m_keySigCancelMode->insertItem(i18n("Cancel only when entering C major or A minor"));
     m_keySigCancelMode->insertItem(i18n("Cancel whenever removing sharps or flats"));
@@ -392,10 +392,10 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
     if (cancelMode >= 0 && cancelMode < 3) {
         m_keySigCancelMode->setCurrentItem(cancelMode);
     }
-    tqlayout->addWidget(m_keySigCancelMode, row, 1);
+    layout->addWidget(m_keySigCancelMode, row, 1);
     ++row;
 
-    tqlayout->setRowStretch(row, 10);
+    layout->setRowStretch(row, 10);
 
     addTab(frame, i18n("Accidentals"));
 
@@ -431,25 +431,25 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
 
 //    TQFrame *mainFrame = new TQFrame(m_tabWidget);
     frame = new TQFrame(m_tabWidget);
-    tqlayout = new TQGridLayout(frame, 2, 4, 10, 5);
+    layout = new TQGridLayout(frame, 2, 4, 10, 5);
 
 //    frame = new TQFrame(noteFontBox);
-//    tqlayout = new TQGridLayout(frame, 5, 2, 10, 5);
+//    layout = new TQGridLayout(frame, 5, 2, 10, 5);
 
     m_viewButton = 0;
 
-    tqlayout->addWidget(new TQLabel(i18n("Notation font"), frame), 0, 0);
+    layout->addWidget(new TQLabel(i18n("Notation font"), frame), 0, 0);
 
     m_font = new KComboBox(frame);
 
 #ifdef HAVE_XFT
     m_viewButton = new TQPushButton(i18n("View"), frame);
-    tqlayout->addMultiCellWidget(m_font, row, row, 1, 2);
-    tqlayout->addWidget(m_viewButton, row, 3);
+    layout->addMultiCellWidget(m_font, row, row, 1, 2);
+    layout->addWidget(m_viewButton, row, 3);
     TQObject::connect(m_viewButton, TQT_SIGNAL(clicked()),
                      this, TQT_SLOT(slotViewButtonPressed()));
 #else
-    tqlayout->addMultiCellWidget(m_font, row, row, 1, 3);
+    layout->addMultiCellWidget(m_font, row, row, 1, 3);
 #endif
     m_font->setEditable(false);
     TQObject::connect(m_font, TQT_SIGNAL(activated(int)),
@@ -481,11 +481,11 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
     subLayout->addWidget(typeLabel, 3, 0);
 
     m_fontOriginLabel = new TQLabel(subFrame);
-    m_fontOriginLabel->tqsetAlignment(TQt::WordBreak);
+    m_fontOriginLabel->setAlignment(TQt::WordBreak);
     m_fontOriginLabel->setFont(font);
 //    m_fontOriginLabel->setFixedWidth(250);
     m_fontCopyrightLabel = new TQLabel(subFrame);
-    m_fontCopyrightLabel->tqsetAlignment(TQt::WordBreak);
+    m_fontCopyrightLabel->setAlignment(TQt::WordBreak);
     m_fontCopyrightLabel->setFont(font);
 //    m_fontCopyrightLabel->setFixedWidth(250);
     m_fontMappedByLabel = new TQLabel(subFrame);
@@ -499,70 +499,70 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
 
     subLayout->setColStretch(1, 10);
 
-    tqlayout->addMultiCellWidget(subFrame,
+    layout->addMultiCellWidget(subFrame,
                                row, row,
                                0, 3);
     ++row;
 
-    tqlayout->addMultiCellWidget
+    layout->addMultiCellWidget
         (new TQLabel(i18n("Font size for single-staff views"), frame),
          row, row, 0, 1);
     m_singleStaffSize = new KComboBox(frame);
     m_singleStaffSize->setEditable(false);
-    tqlayout->addMultiCellWidget(m_singleStaffSize, row, row, 2, 2);
+    layout->addMultiCellWidget(m_singleStaffSize, row, row, 2, 2);
     ++row;
 
-    tqlayout->addMultiCellWidget
+    layout->addMultiCellWidget
         (new TQLabel(i18n("Font size for multi-staff views"), frame),
          row, row, 0, 1);
     m_multiStaffSize = new KComboBox(frame);
     m_multiStaffSize->setEditable(false);
-    tqlayout->addMultiCellWidget(m_multiStaffSize, row, row, 2, 2);
+    layout->addMultiCellWidget(m_multiStaffSize, row, row, 2, 2);
     ++row;
 
-    tqlayout->addMultiCellWidget
+    layout->addMultiCellWidget
         (new TQLabel(i18n("Font size for printing (pt)"), frame),
          row, row, 0, 1);
     m_printingSize = new KComboBox(frame);
     m_printingSize->setEditable(false);
-    tqlayout->addMultiCellWidget(m_printingSize, row, row, 2, 2);
+    layout->addMultiCellWidget(m_printingSize, row, row, 2, 2);
     ++row;
 
     slotPopulateFontCombo(false);
 
-    tqlayout->setRowSpacing(row, 15);
+    layout->setRowSpacing(row, 15);
     ++row;
 
     TQFont defaultTextFont(NotePixmapFactory::defaultSerifFontFamily),
         defaultSansFont(NotePixmapFactory::defaultSansSerifFontFamily),
         defaultTimeSigFont(NotePixmapFactory::defaultTimeSigFontFamily);
 
-    tqlayout->addWidget
+    layout->addWidget
         (new TQLabel(i18n("Text font"), frame), row, 0);
     m_textFont = new KFontRequester(frame);
     TQFont textFont = m_cfg->readFontEntry("textfont", &defaultTextFont);
     m_textFont->setFont(textFont);
-    tqlayout->addMultiCellWidget(m_textFont, row, row, 1, 3);
+    layout->addMultiCellWidget(m_textFont, row, row, 1, 3);
     ++row;
 
-    tqlayout->addWidget
+    layout->addWidget
         (new TQLabel(i18n("Sans-serif font"), frame), row, 0);
     m_sansFont = new KFontRequester(frame);
     TQFont sansFont = m_cfg->readFontEntry("sansfont", &defaultSansFont);
     m_sansFont->setFont(sansFont);
-    tqlayout->addMultiCellWidget(m_sansFont, row, row, 1, 3);
+    layout->addMultiCellWidget(m_sansFont, row, row, 1, 3);
     ++row;
 
 /*!!! No -- not much point in having the time sig font here: it's only
  * used if the time sig characters are not found in the notation font,
  * and our default notation font has all the characters we need
 
-    tqlayout->addWidget
+    layout->addWidget
         (new TQLabel(i18n("Time Signature font"), frame), row, 0);
     m_timeSigFont = new KFontRequester(frame);
     TQFont timeSigFont = m_cfg->readFontEntry("timesigfont", &defaultTimeSigFont);
     m_timeSigFont->setFont(timeSigFont);
-    tqlayout->addMultiCellWidget(m_timeSigFont, row, row, 1, 3);
+    layout->addMultiCellWidget(m_timeSigFont, row, row, 1, 3);
     ++row;
 */
 
@@ -646,7 +646,7 @@ NotationConfigurationPage::slotFontComboChanged(int index)
 
     int printpt = m_cfg->readUnsignedNumEntry("printingnotesize", 5);
     for (int i = 2; i < 16; ++i) {
-        m_printingSize->insertItem(TQString("%1").tqarg(i));
+        m_printingSize->insertItem(TQString("%1").arg(i));
         if (i == printpt) {
             m_printingSize->setCurrentItem(m_printingSize->count() - 1);
         }
@@ -661,10 +661,10 @@ NotationConfigurationPage::slotFontComboChanged(int index)
         m_fontMappedByLabel->setText(i18n(strtoqstr(map.getMappedBy()).ascii()));
         if (map.isSmooth()) {
             m_fontTypeLabel->setText(
-                i18n("%1 (smooth)").tqarg(i18n(strtoqstr(map.getType()).ascii())));
+                i18n("%1 (smooth)").arg(i18n(strtoqstr(map.getType()).ascii())));
         } else {
             m_fontTypeLabel->setText(
-                i18n("%1 (jaggy)").tqarg(i18n(strtoqstr(map.getType()).ascii())));
+                i18n("%1 (jaggy)").arg(i18n(strtoqstr(map.getType()).ascii())));
         }
         if (m_viewButton) {
             m_viewButton->setEnabled(map.getSystemFontNames().count() > 0);
@@ -683,7 +683,7 @@ NotationConfigurationPage::populateSizeCombo(TQComboBox *combo,
     combo->clear();
 
     for (std::vector<int>::iterator i = sizes.begin(); i != sizes.end(); ++i) {
-        combo->insertItem(TQString("%1").tqarg(*i));
+        combo->insertItem(TQString("%1").arg(*i));
         if (*i == defaultSize)
             combo->setCurrentItem(combo->count() - 1);
     }
diff --git a/src/gui/configuration/TabbedConfigurationPage.cpp b/src/gui/configuration/TabbedConfigurationPage.cpp
index ae64894..30b5f2c 100644
--- a/src/gui/configuration/TabbedConfigurationPage.cpp
+++ b/src/gui/configuration/TabbedConfigurationPage.cpp
@@ -32,7 +32,7 @@
 #include <tqstring.h>
 #include <tqtabwidget.h>
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 
 namespace Rosegarden