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

281 files changed, 2523 insertions, 2523 deletions

diff --git a/src/base/Composition.h b/src/base/Composition.h
index b2f80a3..3514a86 100644
--- a/src/base/Composition.h
+++ b/src/base/Composition.h
@@ -799,8 +799,8 @@ public:
         return m_refreshStatusArray.getNewRefreshStatusId();
     }
     
-    RefreshtqStatus& getRefreshtqStatus(unsigned int id) {
-        return m_refreshStatusArray.getRefreshtqStatus(id);
+    RefreshStatus& getRefreshStatus(unsigned int id) {
+        return m_refreshStatusArray.getRefreshStatus(id);
     }
 
     /// Set all refresh statuses to true
@@ -989,7 +989,7 @@ protected:
     bool                              m_playMetronome;
     bool                              m_recordMetronome;
 
-    RefreshStatusArray<RefreshtqStatus> m_refreshStatusArray;
+    RefreshStatusArray<RefreshStatus> m_refreshStatusArray;
 
     // User defined markers in the composition
     //
diff --git a/src/base/LayoutEngine.h b/src/base/LayoutEngine.h
index 2116013..179d119 100644
--- a/src/base/LayoutEngine.h
+++ b/src/base/LayoutEngine.h
@@ -31,7 +31,7 @@ class TimeSignature;
 
 
 /**
- * Base classes for tqlayout engines.  The intention is that
+ * Base classes for layout engines.  The intention is that
  * different sorts of renderers (piano-roll, score etc) can be
  * implemented by simply plugging different implementations
  * of Staff and LayoutEngine into a single view class.
@@ -58,9 +58,9 @@ public:
                             timeT endTime = 0) = 0;
 
     /**
-     * Precomputes tqlayout data for a single staff, updating any
+     * Precomputes layout data for a single staff, updating any
      * internal data stores associated with that staff and updating
-     * any tqlayout-related properties in the events on the staff's
+     * any layout-related properties in the events on the staff's
      * segment.
      * 
      * If startTime == endTime, act on the whole staff; otherwise only
@@ -71,10 +71,10 @@ public:
                            timeT endTime = 0) = 0;
 
     /**
-     * Computes any tqlayout data that may depend on the results of
+     * Computes any layout data that may depend on the results of
      * scanning more than one staff.  This may mean doing most of
-     * the tqlayout (likely for horizontal tqlayout) or nothing at all
-     * (likely for vertical tqlayout).
+     * the layout (likely for horizontal layout) or nothing at all
+     * (likely for vertical layout).
      * 
      * If startTime == endTime, act on the whole staff; otherwise only
      * the given section.
@@ -82,7 +82,7 @@ public:
     virtual void finishLayout(timeT startTime = 0,
                               timeT endTime = 0) = 0;
 
-    unsigned int gettqStatus() const { return m_status; }
+    unsigned int getStatus() const { return m_status; }
 
 protected:
     unsigned int m_status;
@@ -97,9 +97,9 @@ public:
     virtual ~HorizontalLayoutEngine();
 
     /**
-     * Sets a page width for the tqlayout.
+     * Sets a page width for the layout.
      *
-     * A tqlayout implementation does not have to use this.  Some might
+     * A layout implementation does not have to use this.  Some might
      * use it (for example) to ensure that bar lines fall precisely at
      * the right-hand margin of each page.  The computed x-coordinates
      * will still require to be wrapped into lines by the staff or
diff --git a/src/base/RefreshStatus.h b/src/base/RefreshStatus.h
index f64a72c..4c39a18 100644
--- a/src/base/RefreshStatus.h
+++ b/src/base/RefreshStatus.h
@@ -26,10 +26,10 @@
 namespace Rosegarden 
 {
 
-class RefreshtqStatus
+class RefreshStatus
 {
 public:
-    RefreshtqStatus() : m_needsRefresh(true) {}
+    RefreshStatus() : m_needsRefresh(true) {}
 
     bool needsRefresh() { return m_needsRefresh; }
     void setNeedsRefresh(bool s) { m_needsRefresh = s; }
@@ -44,7 +44,7 @@ class RefreshStatusArray
 public:
     unsigned int getNewRefreshStatusId();
     size_t size() { return m_refreshStatuses.size(); }
-    RS& getRefreshtqStatus(unsigned int id) { return m_refreshStatuses[id]; }
+    RS& getRefreshStatus(unsigned int id) { return m_refreshStatuses[id]; }
     void updateRefreshStatuses();
 
 protected:
diff --git a/src/base/Segment.cpp b/src/base/Segment.cpp
index c8e3018..2f65acd 100644
--- a/src/base/Segment.cpp
+++ b/src/base/Segment.cpp
@@ -352,7 +352,7 @@ void
 Segment::updateRefreshStatuses(timeT startTime, timeT endTime)
 {
     for(unsigned int i = 0; i < m_refreshStatusArray.size(); ++i)
-        m_refreshStatusArray.getRefreshtqStatus(i).push(startTime, endTime);
+        m_refreshStatusArray.getRefreshStatus(i).push(startTime, endTime);
 }
 
 
@@ -1269,7 +1269,7 @@ SegmentHelper::~SegmentHelper() { }
 
 
 void 
-SegmentRefreshtqStatus::push(timeT from, timeT to)
+SegmentRefreshStatus::push(timeT from, timeT to)
 {
     if (!needsRefresh()) { // don't do anything subtle - just erase the old data
 
diff --git a/src/base/Segment.h b/src/base/Segment.h
index ac6e092..be2981b 100644
--- a/src/base/Segment.h
+++ b/src/base/Segment.h
@@ -37,10 +37,10 @@
 namespace Rosegarden 
 {
 
-class SegmentRefreshtqStatus : public RefreshtqStatus
+class SegmentRefreshStatus : public RefreshStatus
 {
 public:
-    SegmentRefreshtqStatus() : m_from(0), m_to(0) {}
+    SegmentRefreshStatus() : m_from(0), m_to(0) {}
 
     void push(timeT from, timeT to);
 
@@ -616,8 +616,8 @@ public:
         return m_refreshStatusArray.getNewRefreshStatusId();
     }
 
-    SegmentRefreshtqStatus &getRefreshtqStatus(unsigned int id) {
-        return m_refreshStatusArray.getRefreshtqStatus(id);
+    SegmentRefreshStatus &getRefreshStatus(unsigned int id) {
+        return m_refreshStatusArray.getRefreshStatus(id);
     }
 
     void updateRefreshStatuses(timeT startTime, timeT endTime);
@@ -657,7 +657,7 @@ private:
     int m_highestPlayable;      // suggestion for highest playable note (notation)
     int m_lowestPlayable;       // suggestion for lowest playable note (notation)
 
-    RefreshStatusArray<SegmentRefreshtqStatus> m_refreshStatusArray;
+    RefreshStatusArray<SegmentRefreshStatus> m_refreshStatusArray;
 
     struct ClefKeyCmp {
         bool operator()(const Event *e1, const Event *e2) const;
diff --git a/src/base/SegmentNotationHelper.cpp b/src/base/SegmentNotationHelper.cpp
index 33dfe70..a6c8ab8 100644
--- a/src/base/SegmentNotationHelper.cpp
+++ b/src/base/SegmentNotationHelper.cpp
@@ -1767,7 +1767,7 @@ SegmentNotationHelper::removeRests(timeT time, timeT &duration, bool testOnly)
     segment().erase(from, to);
 
     // we must defer calling makeRestViable() until after erase,
-    // because it will tqinvalidate 'to'
+    // because it will invalidate 'to'
     //
     if (checkLastRest) makeRestViable(lastEvent);
 
diff --git a/src/base/ViewElement.h b/src/base/ViewElement.h
index 58d312d..8cc3d09 100644
--- a/src/base/ViewElement.h
+++ b/src/base/ViewElement.h
@@ -53,7 +53,7 @@ public:
 
     /**
      * Returns the X coordinate of the element, as computed by the
-     * tqlayout. This is not the coordinate of the associated canvas
+     * layout. This is not the coordinate of the associated canvas
      * item.
      *
      * @see getCanvasX()
@@ -62,7 +62,7 @@ public:
 
     /**
      * Returns the Y coordinate of the element, as computed by the
-     * tqlayout. This is not the coordinate of the associated canvas
+     * layout. This is not the coordinate of the associated canvas
      * item.
      *
      * @see getCanvasY()
@@ -70,13 +70,13 @@ public:
     virtual double getLayoutY() const   { return m_layoutY; }
 
     /**
-     * Sets the X coordinate which was computed by the tqlayout engine
+     * Sets the X coordinate which was computed by the layout engine
      * @see getLayoutX()
      */
     virtual void   setLayoutX(double x) { m_layoutX = x; }
 
     /**
-     * Sets the Y coordinate which was computed by the tqlayout engine
+     * Sets the Y coordinate which was computed by the layout engine
      * @see getLayoutY()
      */
     virtual void   setLayoutY(double y) { m_layoutY = y; }
diff --git a/src/commands/edit/CopyCommand.cpp b/src/commands/edit/CopyCommand.cpp
index 3214e03..cd86359 100644
--- a/src/commands/edit/CopyCommand.cpp
+++ b/src/commands/edit/CopyCommand.cpp
@@ -61,7 +61,7 @@ CopyCommand::CopyCommand(SegmentSelection &selection,
             m_sourceClipboard->newSegment(*i);
         } else {
             m_sourceClipboard->newSegment(*i)->
-            setLabel(qstrtostr(i18n("%1 (copied)").tqarg(newLabel)));
+            setLabel(qstrtostr(i18n("%1 (copied)").arg(newLabel)));
         }
     }
 }
diff --git a/src/commands/edit/PasteEventsCommand.cpp b/src/commands/edit/PasteEventsCommand.cpp
index 6726dc7..2e2e458 100644
--- a/src/commands/edit/PasteEventsCommand.cpp
+++ b/src/commands/edit/PasteEventsCommand.cpp
@@ -54,7 +54,7 @@ PasteEventsCommand::PasteEventsCommand(Segment &segment,
 {
     if (pasteType != OpenAndPaste) {
 
-        // paste clef or key -> retqlayout to end
+        // paste clef or key -> relayout to end
 
         if (clipboard->isSingleSegment()) {
 
diff --git a/src/commands/notation/AddFingeringMarkCommand.cpp b/src/commands/notation/AddFingeringMarkCommand.cpp
index 4715951..2a6a310 100644
--- a/src/commands/notation/AddFingeringMarkCommand.cpp
+++ b/src/commands/notation/AddFingeringMarkCommand.cpp
@@ -46,7 +46,7 @@ AddFingeringMarkCommand::getGlobalName(TQString fingering)
     else if (fingering == "0")
         return i18n("Add Fingering &0 (Thumb)");
     else
-        return i18n("Add Fingering &%1").tqarg(fingering);
+        return i18n("Add Fingering &%1").arg(fingering);
 }
 
 void
diff --git a/src/commands/notation/AddIndicationCommand.cpp b/src/commands/notation/AddIndicationCommand.cpp
index fd24930..e6b4493 100644
--- a/src/commands/notation/AddIndicationCommand.cpp
+++ b/src/commands/notation/AddIndicationCommand.cpp
@@ -164,7 +164,7 @@ AddIndicationCommand::getGlobalName(std::string indicationType)
         return i18n("Add &Glissando");
     }
 
-    TQString n = i18n("Add &%1%2").tqarg((char)toupper(indicationType[0])).tqarg(strtoqstr(indicationType.substr(1)));
+    TQString n = i18n("Add &%1%2").arg((char)toupper(indicationType[0])).arg(strtoqstr(indicationType.substr(1)));
     return n;
 }
 
diff --git a/src/commands/notation/AddMarkCommand.cpp b/src/commands/notation/AddMarkCommand.cpp
index 5386eac..49c69ec 100644
--- a/src/commands/notation/AddMarkCommand.cpp
+++ b/src/commands/notation/AddMarkCommand.cpp
@@ -81,12 +81,12 @@ AddMarkCommand::getGlobalName(Mark markType)
     else if (markType == Marks::MordentLongInverted)
         m = i18n("Lon&g Inverted Mordent");
     else
-        m = i18n("&%1%2").tqarg(m[0].upper()).tqarg(m.right(m.length() - 1));
+        m = i18n("&%1%2").arg(m[0].upper()).arg(m.right(m.length() - 1));
     // FIXME: That last i18n has very little chance of working, unless
     // by some miracle the exact same string was translated elsewhere already
     // but we'll leave it as a warning
 
-    m = i18n("Add %1").tqarg(m);
+    m = i18n("Add %1").arg(m);
     return m;
 }
 
diff --git a/src/commands/notation/ClefInsertionCommand.cpp b/src/commands/notation/ClefInsertionCommand.cpp
index 701b873..2268325 100644
--- a/src/commands/notation/ClefInsertionCommand.cpp
+++ b/src/commands/notation/ClefInsertionCommand.cpp
@@ -68,7 +68,7 @@ ClefInsertionCommand::getGlobalName(Clef *)
         if (clef) {
     	TQString name(strtoqstr(clef->getClefType()));
     	name = name.left(1).upper() + name.right(name.length()-1);
-    	return i18n("Change to %1 Cle&f...").tqarg(name);
+    	return i18n("Change to %1 Cle&f...").arg(name);
         } else {
     */ 
     return i18n("Add Cle&f Change...");
diff --git a/src/commands/notation/KeyInsertionCommand.h b/src/commands/notation/KeyInsertionCommand.h
index 7adfd6b..1a03383 100644
--- a/src/commands/notation/KeyInsertionCommand.h
+++ b/src/commands/notation/KeyInsertionCommand.h
@@ -62,7 +62,7 @@ public:
 
     static TQString getGlobalName(Key *key = 0) {
         if (key) {
-            return i18n("Change to &Key %1...").tqarg(strtoqstr(key->getName()));
+            return i18n("Change to &Key %1...").arg(strtoqstr(key->getName()));
         } else {
             return i18n("Add &Key Change...");
         }
diff --git a/src/commands/notation/MultiKeyInsertionCommand.h b/src/commands/notation/MultiKeyInsertionCommand.h
index 9683589..644e877 100644
--- a/src/commands/notation/MultiKeyInsertionCommand.h
+++ b/src/commands/notation/MultiKeyInsertionCommand.h
@@ -60,7 +60,7 @@ public:
 
     static TQString getGlobalName(Key *key = 0) {
         if (key) {
-            return i18n("Change all to &Key %1...").tqarg(strtoqstr(key->getName()));
+            return i18n("Change all to &Key %1...").arg(strtoqstr(key->getName()));
         } else {
             return i18n("Add &Key Change...");
         }
diff --git a/src/commands/notation/RespellCommand.cpp b/src/commands/notation/RespellCommand.cpp
index 81e635f..983622a 100644
--- a/src/commands/notation/RespellCommand.cpp
+++ b/src/commands/notation/RespellCommand.cpp
@@ -47,17 +47,17 @@ RespellCommand::getGlobalName(Type type, Accidental accidental)
             TQString s(i18n("Respell with %1"));
             //!!! should be in notationstrings:
             if (accidental == DoubleSharp) {
-                s = s.tqarg(i18n("Do&uble Sharp"));
+                s = s.arg(i18n("Do&uble Sharp"));
             } else if (accidental == Sharp) {
-                s = s.tqarg(i18n("&Sharp"));
+                s = s.arg(i18n("&Sharp"));
             } else if (accidental == Flat) {
-                s = s.tqarg(i18n("&Flat"));
+                s = s.arg(i18n("&Flat"));
             } else if (accidental == DoubleFlat) {
-                s = s.tqarg(i18n("Dou&ble Flat"));
+                s = s.arg(i18n("Dou&ble Flat"));
             } else if (accidental == Natural) {
-                s = s.tqarg(i18n("&Natural"));
+                s = s.arg(i18n("&Natural"));
             } else {
-                s = s.tqarg(i18n("N&one"));
+                s = s.arg(i18n("N&one"));
             }
             return s;
         }
diff --git a/src/commands/segment/AudioSegmentSplitCommand.cpp b/src/commands/segment/AudioSegmentSplitCommand.cpp
index 2f547db..6657b7b 100644
--- a/src/commands/segment/AudioSegmentSplitCommand.cpp
+++ b/src/commands/segment/AudioSegmentSplitCommand.cpp
@@ -101,7 +101,7 @@ AudioSegmentSplitCommand::execute()
         m_segmentLabel = m_segment->getLabel();
         TQString newLabel = strtoqstr(m_segmentLabel);
         if (!newLabel.endsWith(i18n(" (split)"))) {
-            newLabel = i18n("%1 (split)").tqarg(newLabel);
+            newLabel = i18n("%1 (split)").arg(newLabel);
         }
         m_segment->setLabel(qstrtostr(newLabel));
         m_newSegment->setLabel(m_segment->getLabel());
diff --git a/src/commands/segment/SegmentChangePlayableRangeCommand.cpp b/src/commands/segment/SegmentChangePlayableRangeCommand.cpp
index 7590c78..f4ed525 100644
--- a/src/commands/segment/SegmentChangePlayableRangeCommand.cpp
+++ b/src/commands/segment/SegmentChangePlayableRangeCommand.cpp
@@ -70,7 +70,7 @@ SegmentChangePlayableRangeCommand::getGlobalName(int low, int high)
     if (!unit) {
         return "Undo change playable range";
     } else {
-        return TQString("Change playable range to %1-%2").tqarg(low, high);
+        return TQString("Change playable range to %1-%2").arg(low, high);
     }
 }
 
diff --git a/src/commands/segment/SegmentChangeQuantizationCommand.cpp b/src/commands/segment/SegmentChangeQuantizationCommand.cpp
index ceb021e..1baa86e 100644
--- a/src/commands/segment/SegmentChangeQuantizationCommand.cpp
+++ b/src/commands/segment/SegmentChangeQuantizationCommand.cpp
@@ -108,7 +108,7 @@ SegmentChangeQuantizationCommand::getGlobalName(timeT unit)
     } else {
         timeT error = 0;
         TQString label = NotationStrings::makeNoteMenuLabel(unit, true, error);
-        return TQString("Quantize to %1").tqarg(label);
+        return TQString("Quantize to %1").arg(label);
     }
 }
 
diff --git a/src/commands/segment/SegmentChangeTransposeCommand.cpp b/src/commands/segment/SegmentChangeTransposeCommand.cpp
index 828f759..317f44b 100644
--- a/src/commands/segment/SegmentChangeTransposeCommand.cpp
+++ b/src/commands/segment/SegmentChangeTransposeCommand.cpp
@@ -65,7 +65,7 @@ SegmentChangeTransposeCommand::getGlobalName(int unit)
     if (!unit) {
         return "Undo change transposition";
     } else {
-        return TQString("Change transposition to %1").tqarg(unit);
+        return TQString("Change transposition to %1").arg(unit);
     }
 }
 
diff --git a/src/commands/segment/SegmentSplitCommand.cpp b/src/commands/segment/SegmentSplitCommand.cpp
index 9d4b1af..5de234c 100644
--- a/src/commands/segment/SegmentSplitCommand.cpp
+++ b/src/commands/segment/SegmentSplitCommand.cpp
@@ -133,7 +133,7 @@ SegmentSplitCommand::execute()
     m_segmentLabel = m_segment->getLabel();
     TQString newLabel = strtoqstr(m_segmentLabel);
     if (!newLabel.endsWith(i18n(" (split)"))) {
-        newLabel = i18n("%1 (split)").tqarg(newLabel);
+        newLabel = i18n("%1 (split)").arg(newLabel);
     }
     m_newSegmentA->setLabel(newLabel.ascii());
     m_newSegmentB->setLabel(newLabel.ascii());
diff --git a/src/document/MultiViewCommandHistory.cpp b/src/document/MultiViewCommandHistory.cpp
index a987f0f..7e529fb 100644
--- a/src/document/MultiViewCommandHistory.cpp
+++ b/src/document/MultiViewCommandHistory.cpp
@@ -325,9 +325,9 @@ MultiViewCommandHistory::updateButton(bool undo,
             commandName.replace(TQRegExp("&"), "");
             commandName.replace(TQRegExp("\\.\\.\\.$"), "");
             if (undo)
-                text = i18n("Und&o %1").tqarg(commandName);
+                text = i18n("Und&o %1").arg(commandName);
             else
-                text = i18n("Re&do %1").tqarg(commandName);
+                text = i18n("Re&do %1").arg(commandName);
             action->setText(text);
         }
     }
@@ -369,9 +369,9 @@ MultiViewCommandHistory::updateMenu(bool undo,
 
             TQString text;
             if (undo)
-                text = i18n("Und&o %1").tqarg(commandName);
+                text = i18n("Und&o %1").arg(commandName);
             else
-                text = i18n("Re&do %1").tqarg(commandName);
+                text = i18n("Re&do %1").arg(commandName);
             menu->insertItem(text, j++);
         }
 
diff --git a/src/document/MultiViewCommandHistory.h b/src/document/MultiViewCommandHistory.h
index e3c902e..5341f56 100644
--- a/src/document/MultiViewCommandHistory.h
+++ b/src/document/MultiViewCommandHistory.h
@@ -113,7 +113,7 @@ signals:
      * (whether by addCommand, undo or redo).
      *
      * It should be connected to the update() slot of widgets
-     * which need to tqrepaint after a command
+     * which need to repaint after a command
      */
     void commandExecuted();
 
diff --git a/src/document/RoseXmlHandler.cpp b/src/document/RoseXmlHandler.cpp
index ea49839..87ed1f6 100644
--- a/src/document/RoseXmlHandler.cpp
+++ b/src/document/RoseXmlHandler.cpp
@@ -439,7 +439,7 @@ RoseXmlHandler::startElement(const TQString& namespaceURI,
             int minor = sminor.toInt();
 
             if (major > RosegardenGUIDoc::FILE_FORMAT_VERSION_MAJOR) {
-                m_errorString = i18n("This file was written by Rosegarden %1, and it uses\na different file format that cannot be read by this version.").tqarg(version);
+                m_errorString = i18n("This file was written by Rosegarden %1, and it uses\na different file format that cannot be read by this version.").arg(version);
                 return false;
             }
 
@@ -449,7 +449,7 @@ RoseXmlHandler::startElement(const TQString& namespaceURI,
                 CurrentProgressDialog::freeze();
                 KStartupLogo::hideIfStillThere();
 
-                KMessageBox::information(0, i18n("This file was written by Rosegarden %1, which is more recent than this version.\nThere may be some incompatibilities with the file format.").tqarg(version));
+                KMessageBox::information(0, i18n("This file was written by Rosegarden %1, which is more recent than this version.\nThere may be some incompatibilities with the file format.").arg(version));
 
                 CurrentProgressDialog::thaw();
             }
@@ -2200,9 +2200,9 @@ bool
 RoseXmlHandler::error(const TQXmlParseException& exception)
 {
     m_errorString = TQString("%1 at line %2, column %3")
-                    .tqarg(exception.message())
-                    .tqarg(exception.lineNumber())
-                    .tqarg(exception.columnNumber());
+                    .arg(exception.message())
+                    .arg(exception.lineNumber())
+                    .arg(exception.columnNumber());
     return TQXmlDefaultHandler::error( exception );
 }
 
@@ -2210,9 +2210,9 @@ bool
 RoseXmlHandler::fatalError(const TQXmlParseException& exception)
 {
     m_errorString = TQString("%1 at line %2, column %3")
-                    .tqarg(exception.message())
-                    .tqarg(exception.lineNumber())
-                    .tqarg(exception.columnNumber());
+                    .arg(exception.message())
+                    .arg(exception.lineNumber())
+                    .arg(exception.columnNumber());
     return TQXmlDefaultHandler::fatalError( exception );
 }
 
diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp
index 2e7a3ae..784c8fc 100644
--- a/src/document/RosegardenGUIDoc.cpp
+++ b/src/document/RosegardenGUIDoc.cpp
@@ -107,7 +107,7 @@
 #include <tqobject.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqwidget.h>
 #include "gui/widgets/ProgressBar.h"
 
@@ -229,7 +229,7 @@ void RosegardenGUIDoc::slotUpdateAllViews(RosegardenGUIView *sender)
 
     for (w = m_viewList.first(); w != 0; w = m_viewList.next()) {
         if (w != sender)
-            w->tqrepaint();
+            w->repaint();
     }
 }
 
@@ -239,7 +239,7 @@ void RosegardenGUIDoc::setModified(bool m)
     RG_DEBUG << "RosegardenGUIDoc[" << this << "]::setModified(" << m << ")\n";
 }
 
-void RosegardenGUIDoc::clearModifiedtqStatus()
+void RosegardenGUIDoc::clearModifiedStatus()
 {
     setModified(false);
     setAutoSaved(true);
@@ -349,10 +349,10 @@ bool RosegardenGUIDoc::saveIfModified()
             if (!completed) {
                 if (!errMsg.isNull()) {
                     KMessageBox::error(0, i18n(TQString("Could not save document at %1\n(%2)")
-                                               .tqarg(getAbsFilePath()).tqarg(errMsg).ascii()));
+                                               .arg(getAbsFilePath()).arg(errMsg).ascii()));
                 } else {
                     KMessageBox::error(0, i18n(TQString("Could not save document at %1")
-                                               .tqarg(getAbsFilePath()).ascii()));
+                                               .arg(getAbsFilePath()).ascii()));
                 }
             }
         }
@@ -463,7 +463,7 @@ RosegardenGUIDoc::deleteOrphanedAudioFiles(bool documentWillNotBeSaved)
         if (!file.remove()) {
             std::cerr << "WARNING: Failed to remove orphaned derived audio file \"" << derivedOrphans[i].ascii() << std::endl;
         }
-        TQFile peakFile(TQString("%1.pk").tqarg(derivedOrphans[i]));
+        TQFile peakFile(TQString("%1.pk").arg(derivedOrphans[i]));
         peakFile.remove();
     }
 
@@ -523,10 +523,10 @@ RosegardenGUIDoc::deleteOrphanedAudioFiles(bool documentWillNotBeSaved)
             TQFile file(recordedOrphans[i]);
             if (!file.remove()) {
                 KMessageBox::error(0, i18n("File %1 could not be deleted.")
-                                   .tqarg(recordedOrphans[i]));
+                                   .arg(recordedOrphans[i]));
             }
 
-            TQFile peakFile(TQString("%1.pk").tqarg(recordedOrphans[i]));
+            TQFile peakFile(TQString("%1.pk").arg(recordedOrphans[i]));
             peakFile.remove();
         }
     }
@@ -577,7 +577,7 @@ bool RosegardenGUIDoc::openDocument(const TQString& filename,
     // Check if file readable with fileInfo ?
     if (!fileInfo.isReadable() || fileInfo.isDir()) {
         KStartupLogo::hideIfStillThere();
-        TQString msg(i18n("Can't open file '%1'").tqarg(filename));
+        TQString msg(i18n("Can't open file '%1'").arg(filename));
         KMessageBox::sorry(0, msg);
         return false;
     }
@@ -639,8 +639,8 @@ bool RosegardenGUIDoc::openDocument(const TQString& filename,
     if (!okay) {
         KStartupLogo::hideIfStillThere();
         TQString msg(i18n("Error when parsing file '%1': \"%2\"")
-                    .tqarg(filename)
-                    .tqarg(errMsg));
+                    .arg(filename)
+                    .arg(errMsg));
 
         CurrentProgressDialog::freeze();
         KMessageBox::sorry(0, msg);
@@ -1152,7 +1152,7 @@ bool RosegardenGUIDoc::saveDocument(const TQString& filename,
 
     int status = temp.status();
     if (status != 0) {
-        errMsg = i18n(TQString("Could not create temporary file in directory of '%1': %2").tqarg(filename).tqarg(strerror(status)).ascii());
+        errMsg = i18n(TQString("Could not create temporary file in directory of '%1': %2").arg(filename).arg(strerror(status)).ascii());
         return false;
     }
 
@@ -1164,7 +1164,7 @@ bool RosegardenGUIDoc::saveDocument(const TQString& filename,
     if (!temp.close()) {
         status = temp.status();
         errMsg = i18n(TQString("Failure in temporary file handling for file '%1': %2")
-                      .tqarg(tempFileName).tqarg(strerror(status)).ascii());
+                      .arg(tempFileName).arg(strerror(status)).ascii());
         return false;
     }
 
@@ -1177,7 +1177,7 @@ bool RosegardenGUIDoc::saveDocument(const TQString& filename,
 
     TQDir dir(TQFileInfo(tempFileName).dir());
     if (!dir.rename(tempFileName, filename)) {
-        errMsg = i18n(TQString("Failed to rename temporary output file '%1' to desired output file '%2'").tqarg(tempFileName).tqarg(filename).ascii());
+        errMsg = i18n(TQString("Failed to rename temporary output file '%1' to desired output file '%2'").arg(tempFileName).arg(filename).ascii());
         return false;
     }
 
@@ -1198,7 +1198,7 @@ bool RosegardenGUIDoc::saveDocumentActual(const TQString& filename,
 
     if (!rc) {
         // do some error report
-        errMsg = i18n(TQString("Could not open file '%1' for writing").tqarg(filename).ascii());
+        errMsg = i18n(TQString("Could not open file '%1' for writing").arg(filename).ascii());
         delete fileCompressedDevice;
         return false; // couldn't open file
     }
@@ -1283,11 +1283,11 @@ bool RosegardenGUIDoc::saveDocumentActual(const TQString& filename,
 
         TQString triggerAtts = TQString
                               ("triggerid=\"%1\" triggerbasepitch=\"%2\" triggerbasevelocity=\"%3\" triggerretune=\"%4\" triggeradjusttimes=\"%5\" ")
-                              .tqarg((*ci)->getId())
-                              .tqarg((*ci)->getBasePitch())
-                              .tqarg((*ci)->getBaseVelocity())
-                              .tqarg((*ci)->getDefaultRetune())
-                              .tqarg(strtoqstr((*ci)->getDefaultTimeAdjust()));
+                              .arg((*ci)->getId())
+                              .arg((*ci)->getBasePitch())
+                              .arg((*ci)->getBaseVelocity())
+                              .arg((*ci)->getDefaultRetune())
+                              .arg(strtoqstr((*ci)->getDefaultTimeAdjust()));
 
         Segment *segment = (*ci)->getSegment();
         saveSegment(outStream, segment, progress, totalEvents, eventCount, triggerAtts);
@@ -1315,7 +1315,7 @@ bool RosegardenGUIDoc::saveDocumentActual(const TQString& filename,
     // check that all went ok
     //
     if (fileCompressedDevice->status() != IO_Ok) {
-        errMsg = i18n(TQString("Error while writing on '%1'").tqarg(filename).ascii());
+        errMsg = i18n(TQString("Error while writing on '%1'").arg(filename).ascii());
         delete fileCompressedDevice;
         return false;
     }
@@ -1380,8 +1380,8 @@ void RosegardenGUIDoc::saveSegment(TQTextStream& outStream, Segment *segment,
     TQString time;
 
     outStream << TQString("<segment track=\"%1\" start=\"%2\" ")
-    .tqarg(segment->getTrack())
-    .tqarg(segment->getStartTime());
+    .arg(segment->getTrack())
+    .arg(segment->getStartTime());
 
     if (!extraAttributes.isNull())
         outStream << extraAttributes << " ";
@@ -1612,7 +1612,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg,
     } else {
 
         if (getSequenceManager() &&
-            !(getSequenceManager()->getSoundDrivertqStatus() & AUDIO_OK)) {
+            !(getSequenceManager()->getSoundDriverStatus() & AUDIO_OK)) {
 
             KStartupLogo::hideIfStillThere();
             CurrentProgressDialog::freeze();
@@ -1662,7 +1662,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg,
                 KStartupLogo::hideIfStillThere();
                 CurrentProgressDialog::freeze();
 
-                KMessageBox::information(0, i18n("<h3>Incorrect audio sample rate</h3><p>This composition contains audio files that were recorded or imported with the audio server running at a different sample rate (%1 Hz) from the current JACK server sample rate (%2 Hz).</p><p>Rosegarden will play this composition at the correct speed, but any audio files in it will probably sound awful.</p><p>Please consider re-starting the JACK server at the correct rate (%3 Hz) and re-loading this composition before you do any more work with it.</p>").tqarg(er).tqarg(sr).tqarg(er));
+                KMessageBox::information(0, i18n("<h3>Incorrect audio sample rate</h3><p>This composition contains audio files that were recorded or imported with the audio server running at a different sample rate (%1 Hz) from the current JACK server sample rate (%2 Hz).</p><p>Rosegarden will play this composition at the correct speed, but any audio files in it will probably sound awful.</p><p>Please consider re-starting the JACK server at the correct rate (%3 Hz) and re-loading this composition before you do any more work with it.</p>").arg(er).arg(sr).arg(er));
 
                 CurrentProgressDialog::thaw();
                 shownWarning = true;
@@ -1672,7 +1672,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg,
                 KStartupLogo::hideIfStillThere();
                 CurrentProgressDialog::freeze();
                 
-                KMessageBox::information(0, i18n("<h3>Inconsistent audio sample rates</h3><p>This composition contains audio files at more than one sample rate.</p><p>Rosegarden will play them at the correct speed, but any audio files that were recorded or imported at rates different from the current JACK server sample rate (%1 Hz) will probably sound awful.</p><p>Please see the audio file manager dialog for more details, and consider resampling any files that are at the wrong rate.</p>").tqarg(sr),
+                KMessageBox::information(0, i18n("<h3>Inconsistent audio sample rates</h3><p>This composition contains audio files at more than one sample rate.</p><p>Rosegarden will play them at the correct speed, but any audio files that were recorded or imported at rates different from the current JACK server sample rate (%1 Hz) will probably sound awful.</p><p>Please see the audio file manager dialog for more details, and consider resampling any files that are at the wrong rate.</p>").arg(sr),
                                          i18n("Inconsistent sample rates"),
                                          "file-load-inconsistent-samplerates");
                     
@@ -1695,7 +1695,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg,
                     TQString type, soName, label;
                     PluginIdentifier::parseIdentifier(ident, type, soName, label);
                     TQString pluginFileName = TQFileInfo(soName).fileName();
-                    msg += i18n("<li>%1 (from %2)</li>").tqarg(label).tqarg(pluginFileName);
+                    msg += i18n("<li>%1 (from %2)</li>").arg(label).arg(pluginFileName);
                 }
                 msg += "</ul>";
                 
@@ -2557,7 +2557,7 @@ RosegardenGUIDoc::addRecordMIDISegment(TrackId tid)
         } else {
             label = track->getLabel();
         }
-        label = qstrtostr(i18n("%1 (recorded)").tqarg(strtoqstr(label)));
+        label = qstrtostr(i18n("%1 (recorded)").arg(strtoqstr(label)));
     }
 
     recordMIDISegment->setLabel(label);
diff --git a/src/document/RosegardenGUIDoc.h b/src/document/RosegardenGUIDoc.h
index 1218673..c2b348d 100644
--- a/src/document/RosegardenGUIDoc.h
+++ b/src/document/RosegardenGUIDoc.h
@@ -147,7 +147,7 @@ protected:
      * action on the view connected to the document.
      *
      * this is just an accessor, other components should call
-     * slotDocumentModified() and clearModifiedtqStatus() instead of
+     * slotDocumentModified() and clearModifiedStatus() instead of
      * this method, which perform all the related housework.
      * 
      */
@@ -164,7 +164,7 @@ public:
      * clears the 'modified' status of the document (sets it back to false).
      * 
      */
-    void clearModifiedtqStatus();
+    void clearModifiedStatus();
 
     /**
      * "save modified" - asks the user for saving if the document is
@@ -447,7 +447,7 @@ public:
 
 public slots:
     /**
-     * calls tqrepaint() on all views connected to the document object
+     * calls repaint() on all views connected to the document object
      * and is called by the view by which the document has been
      * changed.  As this view normally repaints itself, it is excluded
      * from the paintEvent.
diff --git a/src/document/io/HydrogenXMLHandler.cpp b/src/document/io/HydrogenXMLHandler.cpp
index 565fe6d..9854648 100644
--- a/src/document/io/HydrogenXMLHandler.cpp
+++ b/src/document/io/HydrogenXMLHandler.cpp
@@ -272,9 +272,9 @@ HydrogenXMLHandler::endElement(const TQString& /*namespaceURI*/,
             // whole bar unit segment.
             //
             m_segment->setEndMarkerTime(m_composition->getBarEnd(m_currentBar));
-            TQString label = TQString("%1 - %2 %3 %4").tqarg(strtoqstr(m_patternName))
-                            .tqarg(strtoqstr(m_sequenceName))
-                            .tqarg(i18n(" imported from Hydrogen ")).tqarg(strtoqstr(m_version));
+            TQString label = TQString("%1 - %2 %3 %4").arg(strtoqstr(m_patternName))
+                            .arg(strtoqstr(m_sequenceName))
+                            .arg(i18n(" imported from Hydrogen ")).arg(strtoqstr(m_version));
             m_segment->setLabel(qstrtostr(label));
 
             m_composition->addTrack(track);
diff --git a/src/document/io/LilyPondExporter.cpp b/src/document/io/LilyPondExporter.cpp
index 3c18d41..f3d1ba8 100644
--- a/src/document/io/LilyPondExporter.cpp
+++ b/src/document/io/LilyPondExporter.cpp
@@ -72,7 +72,7 @@
 #include <tqobject.h>
 #include <tqregexp.h>
 #include <tqstring.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <kapplication.h>
 #include <sstream>
 #include <algorithm>
@@ -137,7 +137,7 @@ LilyPondExporter::readConfigVariables(void)
     m_exportBeams = cfg->readBoolEntry("lilyexportbeamings", false);
     m_exportStaffMerge = cfg->readBoolEntry("lilyexportstaffmerge", false);
     m_exportStaffGroup = cfg->readBoolEntry("lilyexportstaffbrackets", true);
-    m_lyricsHAlignment = cfg->readBoolEntry("lilylyricshtqalignment", LEFT_ALIGN);
+    m_lyricsHAlignment = cfg->readBoolEntry("lilylyricshalignment", LEFT_ALIGN);
 
     m_languageLevel = cfg->readUnsignedNumEntry("lilylanguage", LILYPOND_VERSION_2_6);
     m_exportMarkerMode = cfg->readUnsignedNumEntry("lilyexportmarkermode", EXPORT_NO_MARKERS );
@@ -402,7 +402,7 @@ LilyPondExporter::write()
         CurrentProgressDialog::freeze();
         int reply = KMessageBox::warningContinueCancel(
                         0, i18n("LilyPond does not allow spaces or backslashes in filenames.\n\n"
-                                "Would you like to use\n\n %1\n\n instead?").tqarg(baseName));
+                                "Would you like to use\n\n %1\n\n instead?").arg(baseName));
         if (reply != KMessageBox::Continue)
             return false;
     }
@@ -452,7 +452,7 @@ LilyPondExporter::write()
 
     // LilyPond \header block
 
-    // set indention level to make future changes to horizontal tqlayout less
+    // set indention level to make future changes to horizontal layout less
     // tedious, ++col to indent a new level, --col to de-indent
     int col = 0;
 
@@ -583,7 +583,7 @@ LilyPondExporter::write()
         // bind staffs with or without staff group bracket
         str << indent(col) // indent
 	    << "<<" << " s4 " << ">>" << std::endl;
-        str << indent(col) << "\\tqlayout { }" << std::endl;
+        str << indent(col) << "\\layout { }" << std::endl;
         str << indent(--col) << "}" << std::endl;
         return true;
     }
@@ -1202,13 +1202,13 @@ LilyPondExporter::write()
 			    str << indent(col) << "\\lyricsto \"" << voiceNumber.str() << "\""
 			        << " \\new Lyrics \\lyricmode {" << std::endl;
 			    if (m_lyricsHAlignment == RIGHT_ALIGN) {
-				str << indent(++col) << "\\override LyricText #'self-tqalignment-X = #RIGHT"
+				str << indent(++col) << "\\override LyricText #'self-alignment-X = #RIGHT"
 				    << std::endl;
 			    } else if (m_lyricsHAlignment == CENTER_ALIGN) {
-				str << indent(++col) << "\\override LyricText #'self-tqalignment-X = #CENTER"
+				str << indent(++col) << "\\override LyricText #'self-alignment-X = #CENTER"
 				    << std::endl;
 			    } else {
-				str << indent(++col) << "\\override LyricText #'self-tqalignment-X = #LEFT"
+				str << indent(++col) << "\\override LyricText #'self-alignment-X = #LEFT"
 				    << std::endl;
 			    }
 			    str << indent(col) << "\\set ignoreMelismata = ##t" << std::endl;
@@ -1253,8 +1253,8 @@ LilyPondExporter::write()
     str << std::endl << indent(--col) << ">> % notes" << std::endl << std::endl; // indent-
 //    str << std::endl << indent(col) << ">> % global wrapper" << std::endl;
 
-    // write \tqlayout block
-    str << indent(col) << "\\tqlayout { }" << std::endl;
+    // write \layout block
+    str << indent(col) << "\\layout { }" << std::endl;
 
     // write initial tempo in Midi block, if user wishes (added per user request...
     // makes debugging the .ly file easier because fewer "noisy" errors are
@@ -1430,7 +1430,7 @@ LilyPondExporter::writeBar(Segment *s,
         writtenDuration += note.getDuration();
         durationRatio = writeSkip(timeSignature, 0, note.getDuration(), true, str);
 	durationRatioSum = fractionSum(durationRatioSum,durationRatio);
-        // str << qstrtostr(TQString(" %{ %1/%2 %} ").tqarg(durationRatio.first).tqarg(durationRatio.second)); // DEBUG
+        // str << qstrtostr(TQString(" %{ %1/%2 %} ").arg(durationRatio.first).arg(durationRatio.second)); // DEBUG
     }
 
     timeT prevDuration = -1;
@@ -1496,7 +1496,7 @@ LilyPondExporter::writeBar(Segment *s,
                             groupId = -1;
                             groupType = "";
                         } else {
-                            startGroupBeamingsStr += TQString("\\times %1/%2 { ").tqarg(numerator).tqarg(denominator);
+                            startGroupBeamingsStr += TQString("\\times %1/%2 { ").arg(numerator).arg(denominator);
                             tupletRatio = std::pair<int, int>(numerator, denominator);
 			    // Require explicit beamed groups,
 			    // fixes bug #1683205.
@@ -1688,7 +1688,7 @@ LilyPondExporter::writeBar(Segment *s,
             writtenDuration += soundingDuration;
 	    std::pair<int,int> ratio = fractionProduct(durationRatio,tupletRatio);
 	    durationRatioSum = fractionSum(durationRatioSum, ratio);
-	    // str << qstrtostr(TQString(" %{ %1/%2 * %3/%4 = %5/%6 %} ").tqarg(durationRatio.first).tqarg(durationRatio.second).tqarg(tupletRatio.first).tqarg(tupletRatio.second).tqarg(ratio.first).tqarg(ratio.second)); // DEBUG
+	    // str << qstrtostr(TQString(" %{ %1/%2 * %3/%4 = %5/%6 %} ").arg(durationRatio.first).arg(durationRatio.second).arg(tupletRatio.first).arg(tupletRatio.second).arg(ratio.first).arg(ratio.second)); // DEBUG
 
             std::vector<Mark> marks(chord.getMarksForChord());
             // problem here: stem direction unavailable (it's a view-local property)
@@ -1869,7 +1869,7 @@ LilyPondExporter::writeBar(Segment *s,
             writtenDuration += soundingDuration;
 	    std::pair<int,int> ratio = fractionProduct(durationRatio,tupletRatio);
 	    durationRatioSum = fractionSum(durationRatioSum, ratio);
-	    // str << qstrtostr(TQString(" %{ %1/%2 * %3/%4 = %5/%6 %} ").tqarg(durationRatio.first).tqarg(durationRatio.second).tqarg(tupletRatio.first).tqarg(tupletRatio.second).tqarg(ratio.first).tqarg(ratio.second)); // DEBUG
+	    // str << qstrtostr(TQString(" %{ %1/%2 * %3/%4 = %5/%6 %} ").arg(durationRatio.first).arg(durationRatio.second).arg(tupletRatio.first).arg(tupletRatio.second).arg(ratio.first).arg(ratio.second)); // DEBUG
         } else if ((*i)->isa(Clef::EventType)) {
 
             try {
@@ -1992,16 +1992,16 @@ LilyPondExporter::writeBar(Segment *s,
                         str << "c:" << barreStart << "-" << barreEnd << "-" << barreFret << ";";
                     }
 
-                    if (fingering.getStringtqStatus( 6-stringNum ) == Guitar::Fingering::MUTED) {
+                    if (fingering.getStringStatus( 6-stringNum ) == Guitar::Fingering::MUTED) {
                         str << stringNum << "-x;";
-                    } else if (fingering.getStringtqStatus( 6-stringNum ) == Guitar::Fingering::OPEN) {
+                    } else if (fingering.getStringStatus( 6-stringNum ) == Guitar::Fingering::OPEN) {
                         str << stringNum << "-o;";
                     } else {
-                        int stringtqStatus = fingering.getStringtqStatus(6-stringNum);
+                        int stringStatus = fingering.getStringStatus(6-stringNum);
                         if ((stringNum <= barreStart) && (stringNum >= barreEnd)) {
                             str << stringNum << "-" << barreFret << ";";
                         } else {
-                            str << stringNum << "-" << stringtqStatus << ";";
+                            str << stringNum << "-" << stringStatus << ";";
                         }
                     }
                 }
diff --git a/src/document/io/RG21Loader.cpp b/src/document/io/RG21Loader.cpp
index c36a228..7f6d7ea 100644
--- a/src/document/io/RG21Loader.cpp
+++ b/src/document/io/RG21Loader.cpp
@@ -42,7 +42,7 @@
 #include <tqobject.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <string>
 #include <vector>
 
@@ -69,7 +69,7 @@ RG21Loader::RG21Loader(Studio *studio,
         m_currentClef(Clef::Treble),
         m_currentInstrumentId(MidiInstrumentBase),
         m_inGroup(false),
-        m_tietqStatus(0),
+        m_tieStatus(0),
         m_nbStaves(0)
 {}
 
@@ -106,8 +106,8 @@ bool RG21Loader::parseKey()
     }
 
     TQString keyName = TQString("%1 %2or")
-                      .tqarg(keyBase)
-                      .tqarg(m_tokens[3].lower());
+                      .arg(keyBase)
+                      .arg(m_tokens[3].lower());
 
     m_currentKey = Rosegarden::Key(qstrtostr(keyName));
     Event *keyEvent = m_currentKey.getAsEvent(m_currentSegmentTime);
@@ -173,10 +173,10 @@ bool RG21Loader::parseChordItem()
         noteEvent->set
         <Int>(PITCH, pitch);
 
-        if (m_tietqStatus == 1) {
+        if (m_tieStatus == 1) {
             noteEvent->set
             <Bool>(TIED_FORWARD, true);
-        } else if (m_tietqStatus == 2) {
+        } else if (m_tieStatus == 2) {
             noteEvent->set
             <Bool>(TIED_BACKWARD, true);
         }
@@ -199,10 +199,10 @@ bool RG21Loader::parseChordItem()
     }
 
     m_currentSegmentTime += duration;
-    if (m_tietqStatus == 2)
-        m_tietqStatus = 0;
-    else if (m_tietqStatus == 1)
-        m_tietqStatus = 2;
+    if (m_tieStatus == 2)
+        m_tieStatus = 0;
+    else if (m_tieStatus == 1)
+        m_tieStatus = 2;
 
     return true;
 }
@@ -348,13 +348,13 @@ bool RG21Loader::parseIndicationStart()
 
     if (indicationType == "tie") {
 
-        if (m_tietqStatus != 0) {
+        if (m_tieStatus != 0) {
             RG_DEBUG
             << "RG21Loader:: parseIndicationStart: WARNING: Found tie within "
             << "tie, ignoring" << endl;
             return true;
         }
-        // m_tietqStatus = 1;
+        // m_tieStatus = 1;
 
         Segment::iterator i = m_currentSegment->end();
         if (i != m_currentSegment->begin()) {
@@ -368,7 +368,7 @@ bool RG21Loader::parseIndicationStart()
                 --i;
             }
         }
-        m_tietqStatus = 2;
+        m_tieStatus = 2;
 
         RG_DEBUG << "rg21io: Indication start: it's a tie" << endl;
 
@@ -484,7 +484,7 @@ void RG21Loader::closeGroup()
 
                 // To change the time of an event, we need to erase &
                 // re-insert it.  But erasure will delete the event, and
-                // if it's an indication event that will tqinvalidate our
+                // if it's an indication event that will invalidate our
                 // indicationsExtant entry.  Hence this unpleasantness:
 
                 if ((*i)->isa(Indication::EventType)) {
diff --git a/src/document/io/RG21Loader.h b/src/document/io/RG21Loader.h
index 236d6c6..583367c 100644
--- a/src/document/io/RG21Loader.h
+++ b/src/document/io/RG21Loader.h
@@ -145,7 +145,7 @@ protected:
     int m_groupUntupledLength;
     int m_groupUntupledCount;
 
-    int m_tietqStatus; // 0 -> none, 1 -> tie started, 2 -> seen one note
+    int m_tieStatus; // 0 -> none, 1 -> tie started, 2 -> seen one note
 
     TQString m_currentLine;
     TQString m_currentStaffName;
diff --git a/src/gui/application/RosegardenApplication.cpp b/src/gui/application/RosegardenApplication.cpp
index 263397e..0168ae6 100644
--- a/src/gui/application/RosegardenApplication.cpp
+++ b/src/gui/application/RosegardenApplication.cpp
@@ -101,7 +101,7 @@ void RosegardenApplication::sfxLoadExited(KProcess *proc)
         config()->setGroup(configGroup);
 
         KMessageBox::error(mainWidget(),
-                           i18n("Failed to load soundfont %1").tqarg(soundFontPath));
+                           i18n("Failed to load soundfont %1").arg(soundFontPath));
     } else {
         RG_DEBUG << "RosegardenApplication::sfxLoadExited() : sfxload exited normally\n";
     }
@@ -114,7 +114,7 @@ void RosegardenApplication::slotSetStatusMessage(TQString msg)
     if (mainWindow) {
         if (msg.isEmpty())
             msg = KTmpStatusMsg::getDefaultMsg();
-        mainWindow->statusBar()->changeItem(TQString("  %1").tqarg(msg), KTmpStatusMsg::getDefaultId());
+        mainWindow->statusBar()->changeItem(TQString("  %1").arg(msg), KTmpStatusMsg::getDefaultId());
     }
 
 }
diff --git a/src/gui/application/RosegardenDCOP.h b/src/gui/application/RosegardenDCOP.h
index e82edbf..749c79b 100644
--- a/src/gui/application/RosegardenDCOP.h
+++ b/src/gui/application/RosegardenDCOP.h
@@ -44,7 +44,7 @@ typedef enum
      STARTING_TO_RECORD,
      RECORDING_ARMED,                   // gui only state
      TQUIT
-} TransporttqStatus;
+} TransportStatus;
 
 
 #endif // _ROSEGARDEN_DCOP_H_
diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp
index 268affe..c2f24e6 100644
--- a/src/gui/application/RosegardenGUIApp.cpp
+++ b/src/gui/application/RosegardenGUIApp.cpp
@@ -220,7 +220,7 @@
 #include <tqslider.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqtimer.h>
 #include <tqvaluevector.h>
 #include <tqwidget.h>
@@ -437,7 +437,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer,
         // problems.  This warning has to happen early, in case it
         // affects the ability to load plugins etc from a file on the
         // command line.
-        m_seqManager->checkSoundDrivertqStatus(true);
+        m_seqManager->checkSoundDriverStatus(true);
     }
 
     if (m_view) {
@@ -445,7 +445,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer,
                 m_view, TQT_SLOT(slotControllerDeviceEventReceived(MappedEvent *)));
     }
 
-    if (m_seqManager->getSoundDrivertqStatus() & AUDIO_OK) {
+    if (m_seqManager->getSoundDriverStatus() & AUDIO_OK) {
         slotStateChanged("got_audio", true);
     } else {
         slotStateChanged("got_audio", false);
@@ -1293,8 +1293,8 @@ void RosegardenGUIApp::initZoomToolbar()
     }
 
     // zoom labels
-    TQString minZoom = TQString("%1%").tqarg(factors[0] * 100.0);
-    TQString maxZoom = TQString("%1%").tqarg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0);
+    TQString minZoom = TQString("%1%").arg(factors[0] * 100.0);
+    TQString maxZoom = TQString("%1%").arg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0);
 
     m_zoomSlider = new ZoomSlider<double>
                    (zoomSizes, -1, Qt::Horizontal, zoomToolbar, "kde toolbar widget");
@@ -1631,7 +1631,7 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument)
             TQT_TQOBJECT(this), TQT_SLOT(slotDocumentDevicesResyncd()));
 
     m_doc->syncDevices();
-    m_doc->clearModifiedtqStatus();
+    m_doc->clearModifiedStatus();
 
     if (newDocument->getStudio().haveMidiDevices()) {
         stateChanged("got_midi_devices");
@@ -1658,7 +1658,7 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument)
 
     emit documentChanged(m_doc);
 
-    m_doc->clearModifiedtqStatus(); // because it's set as modified by the various
+    m_doc->clearModifiedStatus(); // because it's set as modified by the various
     // init operations
     // TODO: this sucks, have to sort it out somehow.
 
@@ -1716,7 +1716,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
     if (!info.exists()) {
         // can happen with command-line arg, so...
         KStartupLogo::hideIfStillThere();
-        KMessageBox::sorry(this, i18n("File \"%1\" does not exist").tqarg(filePath));
+        KMessageBox::sorry(this, i18n("File \"%1\" does not exist").arg(filePath));
         return 0;
     }
 
@@ -1731,7 +1731,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
     if (!file.open(IO_ReadOnly)) {
         KStartupLogo::hideIfStillThere();
         TQString errStr =
-            i18n("You do not have read permission for \"%1\"").tqarg(filePath);
+            i18n("You do not have read permission for \"%1\"").arg(filePath);
 
         KMessageBox::sorry(this, errStr);
         return 0;
@@ -1739,7 +1739,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
 
     // Stop if playing
     //
-    if (m_seqManager && m_seqManager->getTransporttqStatus() == PLAYING)
+    if (m_seqManager && m_seqManager->getTransportStatus() == PLAYING)
         slotStop();
 
     slotEnableTransport(false);
@@ -1834,7 +1834,7 @@ RosegardenGUIApp::createDocumentFromRGFile(TQString filePath)
             newDoc->setAbsFilePath(info.absFilePath());
             newDoc->setTitle(info.fileName());
         } else {
-            newDoc->clearModifiedtqStatus();
+            newDoc->clearModifiedStatus();
         }
     } else {
         delete newDoc;
@@ -1850,8 +1850,8 @@ void RosegardenGUIApp::slotSaveOptions()
 
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 2 : transport flap extended = %1").tqarg(getTransport()->isExpanded()));
-    _settingLog(TQString("SETTING 2 : show track labels = %1").tqarg(m_viewTrackLabels->isChecked()));
+    _settingLog(TQString("SETTING 2 : transport flap extended = %1").arg(getTransport()->isExpanded()));
+    _settingLog(TQString("SETTING 2 : show track labels = %1").arg(m_viewTrackLabels->isChecked()));
 #endif
 
     kapp->config()->setGroup(GeneralOptionsConfigGroup);
@@ -1893,13 +1893,13 @@ void RosegardenGUIApp::setupFileDialogSpeedbar()
 
         unsigned int n = config->readUnsignedNumEntry("Number of Entries", 0);
 
-        config->writeEntry(TQString("Description_%1").tqarg(n), i18n("Example Files"));
-        config->writeEntry(TQString("IconGroup_%1").tqarg(n), 4);
-        config->writeEntry(TQString("Icon_%1").tqarg(n), "folder");
-        config->writeEntry(TQString("URL_%1").tqarg(n),
+        config->writeEntry(TQString("Description_%1").arg(n), i18n("Example Files"));
+        config->writeEntry(TQString("IconGroup_%1").arg(n), 4);
+        config->writeEntry(TQString("Icon_%1").arg(n), "folder");
+        config->writeEntry(TQString("URL_%1").arg(n),
                            KGlobal::dirs()->findResource("appdata", "examples/"));
 
-        RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").tqarg(n)) << endl;
+        RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").arg(n)) << endl;
 
         config->writeEntry("Examples Set", true);
         config->writeEntry("Number of Entries", n + 1);
@@ -1936,7 +1936,7 @@ void RosegardenGUIApp::readOptions()
 
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 3 : transport flap extended = %1").tqarg(opt));
+    _settingLog(TQString("SETTING 3 : transport flap extended = %1").arg(opt));
 #endif
 
     if (opt)
@@ -1948,7 +1948,7 @@ void RosegardenGUIApp::readOptions()
 
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 3 : show track labels = %1").tqarg(opt));
+    _settingLog(TQString("SETTING 3 : show track labels = %1").arg(opt));
 #endif
 
     m_viewTrackLabels->setChecked(opt);
@@ -2010,10 +2010,10 @@ void RosegardenGUIApp::saveGlobalProperties(KConfig *cfg)
         if (!res) {
             if (!errMsg.isNull())
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                              .tqarg(tempname).tqarg(errMsg).ascii()));
+                                              .arg(tempname).arg(errMsg).ascii()));
             else
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                              .tqarg(tempname).ascii()));
+                                              .arg(tempname).ascii()));
         }
     }
 }
@@ -2061,8 +2061,8 @@ bool RosegardenGUIApp::queryClose()
     RG_DEBUG << "RosegardenGUIApp::queryClose" << endl;
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 1 : transport flap extended = %1").tqarg(getTransport()->isExpanded()));
-    _settingLog(TQString("SETTING 1 : show track labels = %1").tqarg(m_viewTrackLabels->isChecked()));
+    _settingLog(TQString("SETTING 1 : transport flap extended = %1").arg(getTransport()->isExpanded()));
+    _settingLog(TQString("SETTING 1 : show track labels = %1").arg(m_viewTrackLabels->isChecked()));
 #endif
 
     TQString errMsg;
@@ -2151,7 +2151,7 @@ void RosegardenGUIApp::openURL(const KURL& url)
 
     if (!url.isValid()) {
         TQString string;
-        string = i18n( "Malformed URL\n%1").tqarg(netFile);
+        string = i18n( "Malformed URL\n%1").arg(netFile);
 
         KMessageBox::sorry(this, string);
         return ;
@@ -2160,7 +2160,7 @@ void RosegardenGUIApp::openURL(const KURL& url)
     TQString target, caption(url.path());
 
     if (KIO::NetAccess::download(url, target, this) == false) {
-        KMessageBox::error(this, i18n("Cannot download file %1").tqarg(url.prettyURL()));
+        KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL()));
         return ;
     }
 
@@ -2192,7 +2192,7 @@ void RosegardenGUIApp::slotFileOpen()
         kapp->config()->setGroup("Recent Dirs");
         TQString recentString = kapp->config()->readEntry("ROSEGARDEN", "");
         kapp->config()->writeEntry
-        ("ROSEGARDEN", TQString("file:%1,%2").tqarg(examplesDir).tqarg(recentString));
+        ("ROSEGARDEN", TQString("file:%1,%2").arg(examplesDir).arg(recentString));
     }
 
     KURL url = KFileDialog::getOpenURL
@@ -2226,7 +2226,7 @@ void RosegardenGUIApp::slotMerge()
     TQString target;
 
     if (KIO::NetAccess::download(url, target, this) == false) {
-        KMessageBox::error(this, i18n("Cannot download file %1").tqarg(url.prettyURL()));
+        KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL()));
         return ;
     }
 
@@ -2273,10 +2273,10 @@ void RosegardenGUIApp::slotFileSave()
         if (!res) {
             if (!errMsg.isNull())
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                              .tqarg(docFilePath).tqarg(errMsg).ascii()));
+                                              .arg(docFilePath).arg(errMsg).ascii()));
             else
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                              .tqarg(docFilePath).ascii()));
+                                              .arg(docFilePath).ascii()));
         }
     }
 }
@@ -2376,10 +2376,10 @@ bool RosegardenGUIApp::slotFileSaveAs()
     if (!res) {
         if (!errMsg.isNull())
             KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                          .tqarg(newName).tqarg(errMsg).ascii()));
+                                          .arg(newName).arg(errMsg).ascii()));
         else
             KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                          .tqarg(newName).ascii()));
+                                          .arg(newName).ascii()));
 
     } else {
 
@@ -2764,7 +2764,7 @@ RosegardenGUIApp::testAudioPath(TQString op)
     } catch (AudioFileManager::BadAudioPathException) {
         if (KMessageBox::warningContinueCancel
             (this,
-	     i18n("The audio file path does not exist or is not writable.\nYou must set the audio file path to a valid directory in Document Properties before %1.\nWould you like to set it now?").tqarg(op),
+	     i18n("The audio file path does not exist or is not writable.\nYou must set the audio file path to a valid directory in Document Properties before %1.\nWould you like to set it now?").arg(op),
              i18n("Warning"),
              i18n("Set audio file path")) == KMessageBox::Continue) {
             slotOpenAudioPathSettings();
@@ -3714,7 +3714,7 @@ void RosegardenGUIApp::importProject(TQString filePath)
 
     if (!proc->normalExit() || proc->exitStatus()) {
         CurrentProgressDialog::freeze();
-        KMessageBox::sorry(this, i18n("Failed to import project file \"%1\"").tqarg(filePath));
+        KMessageBox::sorry(this, i18n("Failed to import project file \"%1\"").arg(filePath));
         CurrentProgressDialog::thaw();
         delete proc;
         return ;
@@ -4236,7 +4236,7 @@ RosegardenGUIApp::slotUpdatePlaybackPosition()
 
     //    std::cerr << "RosegardenGUIApp::slotUpdatePlaybackPosition: mapper timeT = " << elapsedTime << std::endl;
 
-    if (m_seqManager->getTransporttqStatus() == RECORDING) {
+    if (m_seqManager->getTransportStatus() == RECORDING) {
 
         MappedComposition mC;
         if (mapper->getRecordedEvents(mC) > 0) {
@@ -4358,10 +4358,10 @@ void RosegardenGUIApp::slotSetPointerPosition(timeT t)
     //    std::cerr << "RosegardenGUIApp::slotSetPointerPosition: t = " << t << std::endl;
 
     if (m_seqManager) {
-	    if ( m_seqManager->getTransporttqStatus() == PLAYING ||
-	            m_seqManager->getTransporttqStatus() == RECORDING ) {
+	    if ( m_seqManager->getTransportStatus() == PLAYING ||
+	            m_seqManager->getTransportStatus() == RECORDING ) {
 	        if (t > comp.getEndMarker()) {
-	            if (m_seqManager->getTransporttqStatus() == PLAYING) {
+	            if (m_seqManager->getTransportStatus() == PLAYING) {
 	
 	                slotStop();
 	                t = comp.getEndMarker();
@@ -4477,8 +4477,8 @@ void RosegardenGUIApp::slotDisplayBarTime(timeT t)
 
 void RosegardenGUIApp::slotRefreshTimeDisplay()
 {
-    if ( m_seqManager->getTransporttqStatus() == PLAYING ||
-            m_seqManager->getTransporttqStatus() == RECORDING ) {
+    if ( m_seqManager->getTransportStatus() == PLAYING ||
+            m_seqManager->getTransportStatus() == RECORDING ) {
         return ; // it'll be refreshed in a moment anyway
     }
     slotSetPointerPosition(m_doc->getComposition().getPosition());
@@ -4530,7 +4530,7 @@ void RosegardenGUIApp::slotTestStartupTester()
         } else {
             for (int i = 0; i < missing.count(); ++i) {
 //                if (missingFeatures.count() > 1) {
-                    allMissing.push_back(i18n("%1 - for project file support").tqarg(missing[i]));
+                    allMissing.push_back(i18n("%1 - for project file support").arg(missing[i]));
 //                } else {
 //                    allMissing.push_back(missing[i]);
 //                }
@@ -4551,7 +4551,7 @@ void RosegardenGUIApp::slotTestStartupTester()
         } else {
             for (int i = 0; i < missing.count(); ++i) {
                 if (missingFeatures.count() > 1) {
-                    allMissing.push_back(i18n("%1 - for LilyPond preview support").tqarg(missing[i]));
+                    allMissing.push_back(i18n("%1 - for LilyPond preview support").arg(missing[i]));
                 } else {
                     allMissing.push_back(missing[i]);
                 }
@@ -4560,7 +4560,7 @@ void RosegardenGUIApp::slotTestStartupTester()
     }
 
 #ifdef HAVE_LIBJACK
-    if (m_seqManager && (m_seqManager->getSoundDrivertqStatus() & AUDIO_OK)) {
+    if (m_seqManager && (m_seqManager->getSoundDriverStatus() & AUDIO_OK)) {
 
         m_haveAudioImporter = m_startupTester->haveAudioFileImporter(&missing);
 
@@ -4571,7 +4571,7 @@ void RosegardenGUIApp::slotTestStartupTester()
             } else {
                 for (int i = 0; i < missing.count(); ++i) {
                     if (missingFeatures.count() > 1) {
-                        allMissing.push_back(i18n("%1 - for audio file import").tqarg(missing[i]));
+                        allMissing.push_back(i18n("%1 - for audio file import").arg(missing[i]));
                     } else {
                         allMissing.push_back(missing[i]);
                     }
@@ -4585,13 +4585,13 @@ void RosegardenGUIApp::slotTestStartupTester()
         TQString message = i18n("<h3>Helper programs not found</h3><p>Rosegarden could not find one or more helper programs which it needs to provide some features.  The following features will not be available:</p>");
         message += i18n("<ul>");
         for (int i = 0; i < missingFeatures.count(); ++i) {
-            message += i18n("<li>%1</li>").tqarg(missingFeatures[i]);
+            message += i18n("<li>%1</li>").arg(missingFeatures[i]);
         }
         message += i18n("</ul>");
         message += i18n("<p>To fix this, you should install the following additional programs:</p>");
         message += i18n("<ul>");
         for (int i = 0; i < allMissing.count(); ++i) {
-            message += i18n("<li>%1</li>").tqarg(allMissing[i]);
+            message += i18n("<li>%1</li>").arg(allMissing[i]);
         }
         message += i18n("</ul>");
 
@@ -4623,7 +4623,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
 
     if (isSequencerRunning()) {
         RG_DEBUG << "RosegardenGUIApp::launchSequencer() - sequencer already running - returning\n";
-        if (m_seqManager) m_seqManager->checkSoundDrivertqStatus(false);
+        if (m_seqManager) m_seqManager->checkSoundDriverStatus(false);
         return true;
     }
 
@@ -4639,7 +4639,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
         << "existing DCOP registered sequencer found\n";
 
         if (useExisting) {
-            if (m_seqManager) m_seqManager->checkSoundDrivertqStatus(false);
+            if (m_seqManager) m_seqManager->checkSoundDriverStatus(false);
             m_sequencerProcess = (KProcess*)SequencerExternal;
             return true;
         }
@@ -4733,7 +4733,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
             try {
                 //                 if (m_seqManager) {
                 //                     RG_DEBUG << "RosegardenGUIApp::launchSequencer : checking sound driver status\n";
-                //                     m_seqManager->checkSoundDrivertqStatus();
+                //                     m_seqManager->checkSoundDriverStatus();
                 //                 }
 
                 stateChanged("sequencer_running");
@@ -4872,7 +4872,7 @@ void RosegardenGUIApp::slotExportProject()
     TQString errMsg;
     if (!m_doc->saveDocument(rgFile, errMsg,
                              true)) { // pretend it's autosave
-        KMessageBox::sorry(this, i18n("Saving Rosegarden file to package failed: %1").tqarg(errMsg));
+        KMessageBox::sorry(this, i18n("Saving Rosegarden file to package failed: %1").arg(errMsg));
         CurrentProgressDialog::thaw();
         return ;
     }
@@ -4886,7 +4886,7 @@ void RosegardenGUIApp::slotExportProject()
     proc->start(KProcess::Block, KProcess::All);
 
     if (!proc->normalExit() || proc->exitStatus()) {
-        KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").tqarg(fileName));
+        KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").arg(fileName));
         CurrentProgressDialog::thaw();
         delete proc;
         return ;
@@ -5168,9 +5168,9 @@ RosegardenGUIApp::slotToggleMetronome()
 {
     Composition &comp = m_doc->getComposition();
 
-    if (m_seqManager->getTransporttqStatus() == STARTING_TO_RECORD ||
-            m_seqManager->getTransporttqStatus() == RECORDING ||
-            m_seqManager->getTransporttqStatus() == RECORDING_ARMED) {
+    if (m_seqManager->getTransportStatus() == STARTING_TO_RECORD ||
+            m_seqManager->getTransportStatus() == RECORDING ||
+            m_seqManager->getTransportStatus() == RECORDING_ARMED) {
         if (comp.useRecordMetronome())
             comp.setRecordMetronome(false);
         else
@@ -5192,7 +5192,7 @@ RosegardenGUIApp::slotRewindToBeginning()
 {
     // ignore requests if recording
     //
-    if (m_seqManager->getTransporttqStatus() == RECORDING)
+    if (m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
     m_seqManager->rewindToBeginning();
@@ -5203,7 +5203,7 @@ RosegardenGUIApp::slotFastForwardToEnd()
 {
     // ignore requests if recording
     //
-    if (m_seqManager->getTransporttqStatus() == RECORDING)
+    if (m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
     m_seqManager->fastForwardToEnd();
@@ -5213,18 +5213,18 @@ void
 RosegardenGUIApp::slotSetPlayPosition(timeT time)
 {
     RG_DEBUG << "RosegardenGUIApp::slotSetPlayPosition(" << time << ")" << endl;
-    if (m_seqManager->getTransporttqStatus() == RECORDING)
+    if (m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
     m_doc->slotSetPointerPosition(time);
 
-    if (m_seqManager->getTransporttqStatus() == PLAYING)
+    if (m_seqManager->getTransportStatus() == PLAYING)
         return ;
 
     slotPlay();
 }
 
-void RosegardenGUIApp::notifySequencertqStatus(int status)
+void RosegardenGUIApp::notifySequencerStatus(int status)
 {
     stateChanged("not_playing",
                  (status == PLAYING ||
@@ -5232,7 +5232,7 @@ void RosegardenGUIApp::notifySequencertqStatus(int status)
                  KXMLGUIClient::StateReverse : KXMLGUIClient::StateNoReverse);
 
     if (m_seqManager)
-        m_seqManager->setTransporttqStatus((TransporttqStatus) status);
+        m_seqManager->setTransportStatus((TransportStatus) status);
 }
 
 void RosegardenGUIApp::processAsynchronousMidi(const MappedComposition &mC)
@@ -5261,10 +5261,10 @@ RosegardenGUIApp::slotRecord()
             return ;
     }
 
-    if (m_seqManager->getTransporttqStatus() == RECORDING) {
+    if (m_seqManager->getTransportStatus() == RECORDING) {
         slotStop();
         return ;
-    } else if (m_seqManager->getTransporttqStatus() == PLAYING) {
+    } else if (m_seqManager->getTransportStatus() == PLAYING) {
         slotToggleRecord();
         return ;
     }
@@ -5398,7 +5398,7 @@ void RosegardenGUIApp::slotPlay()
     // slotRecord ensures we don't toggle the recording state in
     // SequenceManager)
     //
-    if (m_seqManager->getTransporttqStatus() == RECORDING_ARMED) {
+    if (m_seqManager->getTransportStatus() == RECORDING_ARMED) {
         slotRecord();
         return ;
     }
@@ -5481,7 +5481,7 @@ void RosegardenGUIApp::slotRewind()
 {
     // ignore requests if recording
     //
-    if (m_seqManager->getTransporttqStatus() == RECORDING)
+    if (m_seqManager->getTransportStatus() == RECORDING)
         return ;
     if (m_seqManager)
         m_seqManager->rewind();
@@ -5491,7 +5491,7 @@ void RosegardenGUIApp::slotFastforward()
 {
     // ignore requests if recording
     //
-    if (m_seqManager->getTransporttqStatus() == RECORDING)
+    if (m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
     if (m_seqManager)
@@ -5790,7 +5790,7 @@ void RosegardenGUIApp::slotChangeZoom(int)
 {
     double duration44 = TimeSignature(4, 4).getBarDuration();
     double value = double(m_zoomSlider->getCurrentSize());
-    m_zoomLabel->setText(i18n("%1%").tqarg(duration44 / value));
+    m_zoomLabel->setText(i18n("%1%").arg(duration44 / value));
 
     RG_DEBUG << "RosegardenGUIApp::slotChangeZoom : zoom size = "
     << m_zoomSlider->getCurrentSize() << endl;
@@ -5858,7 +5858,7 @@ RosegardenGUIApp::slotChangeTempo(timeT time,
         timeT prevTime = comp.getTempoChange(index).first;
 
         KMacroCommand *macro =
-            new KMacroCommand(i18n("Replace Tempo Change at %1").tqarg(time));
+            new KMacroCommand(i18n("Replace Tempo Change at %1").arg(time));
 
         macro->addCommand(new RemoveTempoChangeCommand(&comp, index));
         macro->addCommand(new AddTempoChangeCommand(&comp, prevTime, value,
@@ -6307,8 +6307,8 @@ RosegardenGUIApp::slotAudioManager()
     connect(TQT_TQOBJECT(this), TQT_SIGNAL(documentAboutToChange()),
             m_audioManagerDialog, TQT_SLOT(close()));
 
-    m_audioManagerDialog->setAudioSubsystemtqStatus(
-        m_seqManager->getSoundDrivertqStatus() & AUDIO_OK);
+    m_audioManagerDialog->setAudioSubsystemStatus(
+        m_seqManager->getSoundDriverStatus() & AUDIO_OK);
 
     plugAccelerators(m_audioManagerDialog,
                      m_audioManagerDialog->getAccelerators());
@@ -6360,7 +6360,7 @@ RosegardenGUIApp::slotAddAudioFile(unsigned int id)
         int result;
         streamIn >> result;
         if (!result) {
-            KMessageBox::error(this, i18n("Sequencer failed to add audio file %1").tqarg(aF->getFilename().c_str()));
+            KMessageBox::error(this, i18n("Sequencer failed to add audio file %1").arg(aF->getFilename().c_str()));
         }
     }
 }
@@ -6385,7 +6385,7 @@ RosegardenGUIApp::slotDeleteAudioFile(unsigned int id)
         int result;
         streamIn >> result;
         if (!result) {
-            KMessageBox::error(this, i18n("Sequencer failed to remove audio file id %1").tqarg(id));
+            KMessageBox::error(this, i18n("Sequencer failed to remove audio file id %1").arg(id));
         }
     }
 }
@@ -7753,10 +7753,10 @@ RosegardenGUIApp::slotSaveDefaultStudio()
     if (!res) {
         if (!errMsg.isNull())
             KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1\nError was : %2")
-                                          .tqarg(autoloadFile).tqarg(errMsg).ascii()));
+                                          .arg(autoloadFile).arg(errMsg).ascii()));
         else
             KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1")
-                                          .tqarg(autoloadFile).ascii()));
+                                          .arg(autoloadFile).ascii()));
 
     }
 }
@@ -7808,7 +7808,7 @@ RosegardenGUIApp::slotImportStudio()
     TQString target;
     if (KIO::NetAccess::download(url, target, this) == false) {
         KMessageBox::error(this, i18n("Cannot download file %1")
-                           .tqarg(url.prettyURL()));
+                           .arg(url.prettyURL()));
         return ;
     }
 
@@ -7942,8 +7942,8 @@ void
 RosegardenGUIApp::slotAutoSave()
 {
     if (!m_seqManager ||
-        m_seqManager->getTransporttqStatus() == PLAYING ||
-        m_seqManager->getTransporttqStatus() == RECORDING)
+        m_seqManager->getTransportStatus() == PLAYING ||
+        m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
     KConfig* config = kapp->config();
@@ -8044,7 +8044,7 @@ RosegardenGUIApp::slotNewerVersionAvailable(TQString v)
         (this,
          i18n("<h3>Newer version available</h3><p>A newer version of Rosegarden may be available.<br>Please consult the <a href=\"http://www.rosegardenmusic.com/getting/\">Rosegarden website</a> for more information.</p>"),
          i18n("Newer version available"),
-         TQString("version-%1-available-show").tqarg(v),
+         TQString("version-%1-available-show").arg(v),
          KMessageBox::AllowLink);
     CurrentProgressDialog::thaw();
 }
diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig
index 0b6e768..9fea55c 100644
--- a/src/gui/application/RosegardenGUIApp.cpp.orig
+++ b/src/gui/application/RosegardenGUIApp.cpp.orig
@@ -220,7 +220,7 @@
 #include <tqslider.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqtimer.h>
 #include <tqvaluevector.h>
 #include <tqwidget.h>
@@ -437,7 +437,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer,
         // problems.  This warning has to happen early, in case it
         // affects the ability to load plugins etc from a file on the
         // command line.
-        m_seqManager->checkSoundDrivertqStatus(true);
+        m_seqManager->checkSoundDriverStatus(true);
     }
 
     if (m_view) {
@@ -445,7 +445,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer,
                 m_view, TQT_SLOT(slotControllerDeviceEventReceived(MappedEvent *)));
     }
 
-    if (m_seqManager->getSoundDrivertqStatus() & AUDIO_OK) {
+    if (m_seqManager->getSoundDriverStatus() & AUDIO_OK) {
         slotStateChanged("got_audio", true);
     } else {
         slotStateChanged("got_audio", false);
@@ -1293,8 +1293,8 @@ void RosegardenGUIApp::initZoomToolbar()
     }
 
     // zoom labels
-    TQString minZoom = TQString("%1%").tqarg(factors[0] * 100.0);
-    TQString maxZoom = TQString("%1%").tqarg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0);
+    TQString minZoom = TQString("%1%").arg(factors[0] * 100.0);
+    TQString maxZoom = TQString("%1%").arg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0);
 
     m_zoomSlider = new ZoomSlider<double>
                    (zoomSizes, -1, TQSlider::Horizontal, zoomToolbar, "kde toolbar widget");
@@ -1631,7 +1631,7 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument)
             this, TQT_SLOT(slotDocumentDevicesResyncd()));
 
     m_doc->syncDevices();
-    m_doc->clearModifiedtqStatus();
+    m_doc->clearModifiedStatus();
 
     if (newDocument->getStudio().haveMidiDevices()) {
         stateChanged("got_midi_devices");
@@ -1658,7 +1658,7 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument)
 
     emit documentChanged(m_doc);
 
-    m_doc->clearModifiedtqStatus(); // because it's set as modified by the various
+    m_doc->clearModifiedStatus(); // because it's set as modified by the various
     // init operations
     // TODO: this sucks, have to sort it out somehow.
 
@@ -1716,7 +1716,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
     if (!info.exists()) {
         // can happen with command-line arg, so...
         KStartupLogo::hideIfStillThere();
-        KMessageBox::sorry(this, i18n("File \"%1\" does not exist").tqarg(filePath));
+        KMessageBox::sorry(this, i18n("File \"%1\" does not exist").arg(filePath));
         return 0;
     }
 
@@ -1731,7 +1731,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
     if (!file.open(IO_ReadOnly)) {
         KStartupLogo::hideIfStillThere();
         TQString errStr =
-            i18n("You do not have read permission for \"%1\"").tqarg(filePath);
+            i18n("You do not have read permission for \"%1\"").arg(filePath);
 
         KMessageBox::sorry(this, errStr);
         return 0;
@@ -1739,7 +1739,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
 
     // Stop if playing
     //
-    if (m_seqManager && m_seqManager->getTransporttqStatus() == PLAYING)
+    if (m_seqManager && m_seqManager->getTransportStatus() == PLAYING)
         slotStop();
 
     slotEnableTransport(false);
@@ -1834,7 +1834,7 @@ RosegardenGUIApp::createDocumentFromRGFile(TQString filePath)
             newDoc->setAbsFilePath(info.absFilePath());
             newDoc->setTitle(info.fileName());
         } else {
-            newDoc->clearModifiedtqStatus();
+            newDoc->clearModifiedStatus();
         }
     } else {
         delete newDoc;
@@ -1850,8 +1850,8 @@ void RosegardenGUIApp::slotSaveOptions()
 
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 2 : transport flap extended = %1").tqarg(getTransport()->isExpanded()));
-    _settingLog(TQString("SETTING 2 : show track labels = %1").tqarg(m_viewTrackLabels->isChecked()));
+    _settingLog(TQString("SETTING 2 : transport flap extended = %1").arg(getTransport()->isExpanded()));
+    _settingLog(TQString("SETTING 2 : show track labels = %1").arg(m_viewTrackLabels->isChecked()));
 #endif
 
     kapp->config()->setGroup(GeneralOptionsConfigGroup);
@@ -1893,13 +1893,13 @@ void RosegardenGUIApp::setupFileDialogSpeedbar()
 
         unsigned int n = config->readUnsignedNumEntry("Number of Entries", 0);
 
-        config->writeEntry(TQString("Description_%1").tqarg(n), i18n("Example Files"));
-        config->writeEntry(TQString("IconGroup_%1").tqarg(n), 4);
-        config->writeEntry(TQString("Icon_%1").tqarg(n), "folder");
-        config->writeEntry(TQString("URL_%1").tqarg(n),
+        config->writeEntry(TQString("Description_%1").arg(n), i18n("Example Files"));
+        config->writeEntry(TQString("IconGroup_%1").arg(n), 4);
+        config->writeEntry(TQString("Icon_%1").arg(n), "folder");
+        config->writeEntry(TQString("URL_%1").arg(n),
                            KGlobal::dirs()->findResource("appdata", "examples/"));
 
-        RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").tqarg(n)) << endl;
+        RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").arg(n)) << endl;
 
         config->writeEntry("Examples Set", true);
         config->writeEntry("Number of Entries", n + 1);
@@ -1936,7 +1936,7 @@ void RosegardenGUIApp::readOptions()
 
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 3 : transport flap extended = %1").tqarg(opt));
+    _settingLog(TQString("SETTING 3 : transport flap extended = %1").arg(opt));
 #endif
 
     if (opt)
@@ -1948,7 +1948,7 @@ void RosegardenGUIApp::readOptions()
 
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 3 : show track labels = %1").tqarg(opt));
+    _settingLog(TQString("SETTING 3 : show track labels = %1").arg(opt));
 #endif
 
     m_viewTrackLabels->setChecked(opt);
@@ -2010,10 +2010,10 @@ void RosegardenGUIApp::saveGlobalProperties(KConfig *cfg)
         if (!res) {
             if (errMsg)
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                              .tqarg(tempname).tqarg(errMsg)));
+                                              .arg(tempname).arg(errMsg)));
             else
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                              .tqarg(tempname)));
+                                              .arg(tempname)));
         }
     }
 }
@@ -2061,8 +2061,8 @@ bool RosegardenGUIApp::queryClose()
     RG_DEBUG << "RosegardenGUIApp::queryClose" << endl;
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 1 : transport flap extended = %1").tqarg(getTransport()->isExpanded()));
-    _settingLog(TQString("SETTING 1 : show track labels = %1").tqarg(m_viewTrackLabels->isChecked()));
+    _settingLog(TQString("SETTING 1 : transport flap extended = %1").arg(getTransport()->isExpanded()));
+    _settingLog(TQString("SETTING 1 : show track labels = %1").arg(m_viewTrackLabels->isChecked()));
 #endif
 
     TQString errMsg;
@@ -2151,7 +2151,7 @@ void RosegardenGUIApp::openURL(const KURL& url)
 
     if (!url.isValid()) {
         TQString string;
-        string = i18n( "Malformed URL\n%1").tqarg(netFile);
+        string = i18n( "Malformed URL\n%1").arg(netFile);
 
         KMessageBox::sorry(this, string);
         return ;
@@ -2160,7 +2160,7 @@ void RosegardenGUIApp::openURL(const KURL& url)
     TQString target, caption(url.path());
 
     if (KIO::NetAccess::download(url, target, this) == false) {
-        KMessageBox::error(this, i18n("Cannot download file %1").tqarg(url.prettyURL()));
+        KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL()));
         return ;
     }
 
@@ -2192,7 +2192,7 @@ void RosegardenGUIApp::slotFileOpen()
         kapp->config()->setGroup("Recent Dirs");
         TQString recentString = kapp->config()->readEntry("ROSEGARDEN", "");
         kapp->config()->writeEntry
-        ("ROSEGARDEN", TQString("file:%1,%2").tqarg(examplesDir).tqarg(recentString));
+        ("ROSEGARDEN", TQString("file:%1,%2").arg(examplesDir).arg(recentString));
     }
 
     KURL url = KFileDialog::getOpenURL
@@ -2226,7 +2226,7 @@ void RosegardenGUIApp::slotMerge()
     TQString target;
 
     if (KIO::NetAccess::download(url, target, this) == false) {
-        KMessageBox::error(this, i18n("Cannot download file %1").tqarg(url.prettyURL()));
+        KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL()));
         return ;
     }
 
@@ -2273,10 +2273,10 @@ void RosegardenGUIApp::slotFileSave()
         if (!res) {
             if (errMsg)
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                              .tqarg(docFilePath).tqarg(errMsg)));
+                                              .arg(docFilePath).arg(errMsg)));
             else
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                              .tqarg(docFilePath)));
+                                              .arg(docFilePath)));
         }
     }
 }
@@ -2376,10 +2376,10 @@ bool RosegardenGUIApp::slotFileSaveAs()
     if (!res) {
         if (errMsg)
             KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                          .tqarg(newName).tqarg(errMsg)));
+                                          .arg(newName).arg(errMsg)));
         else
             KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                          .tqarg(newName)));
+                                          .arg(newName)));
 
     } else {
 
@@ -2764,7 +2764,7 @@ RosegardenGUIApp::testAudioPath(TQString op)
     } catch (AudioFileManager::BadAudioPathException) {
         if (KMessageBox::warningContinueCancel
             (this,
-	     i18n("The audio file path does not exist or is not writable.\nYou must set the audio file path to a valid directory in Document Properties before %1.\nWould you like to set it now?").tqarg(op),
+	     i18n("The audio file path does not exist or is not writable.\nYou must set the audio file path to a valid directory in Document Properties before %1.\nWould you like to set it now?").arg(op),
              i18n("Warning"),
              i18n("Set audio file path")) == KMessageBox::Continue) {
             slotOpenAudioPathSettings();
@@ -3714,7 +3714,7 @@ void RosegardenGUIApp::importProject(TQString filePath)
 
     if (!proc->normalExit() || proc->exitStatus()) {
         CurrentProgressDialog::freeze();
-        KMessageBox::sorry(this, i18n("Failed to import project file \"%1\"").tqarg(filePath));
+        KMessageBox::sorry(this, i18n("Failed to import project file \"%1\"").arg(filePath));
         CurrentProgressDialog::thaw();
         delete proc;
         return ;
@@ -4236,7 +4236,7 @@ RosegardenGUIApp::slotUpdatePlaybackPosition()
 
     //    std::cerr << "RosegardenGUIApp::slotUpdatePlaybackPosition: mapper timeT = " << elapsedTime << std::endl;
 
-    if (m_seqManager->getTransporttqStatus() == RECORDING) {
+    if (m_seqManager->getTransportStatus() == RECORDING) {
 
         MappedComposition mC;
         if (mapper->getRecordedEvents(mC) > 0) {
@@ -4358,10 +4358,10 @@ void RosegardenGUIApp::slotSetPointerPosition(timeT t)
     //    std::cerr << "RosegardenGUIApp::slotSetPointerPosition: t = " << t << std::endl;
 
     if (m_seqManager) {
-	    if ( m_seqManager->getTransporttqStatus() == PLAYING ||
-	            m_seqManager->getTransporttqStatus() == RECORDING ) {
+	    if ( m_seqManager->getTransportStatus() == PLAYING ||
+	            m_seqManager->getTransportStatus() == RECORDING ) {
 	        if (t > comp.getEndMarker()) {
-	            if (m_seqManager->getTransporttqStatus() == PLAYING) {
+	            if (m_seqManager->getTransportStatus() == PLAYING) {
 	
 	                slotStop();
 	                t = comp.getEndMarker();
@@ -4477,8 +4477,8 @@ void RosegardenGUIApp::slotDisplayBarTime(timeT t)
 
 void RosegardenGUIApp::slotRefreshTimeDisplay()
 {
-    if ( m_seqManager->getTransporttqStatus() == PLAYING ||
-            m_seqManager->getTransporttqStatus() == RECORDING ) {
+    if ( m_seqManager->getTransportStatus() == PLAYING ||
+            m_seqManager->getTransportStatus() == RECORDING ) {
         return ; // it'll be refreshed in a moment anyway
     }
     slotSetPointerPosition(m_doc->getComposition().getPosition());
@@ -4530,7 +4530,7 @@ void RosegardenGUIApp::slotTestStartupTester()
         } else {
             for (int i = 0; i < missing.count(); ++i) {
 //                if (missingFeatures.count() > 1) {
-                    allMissing.push_back(i18n("%1 - for project file support").tqarg(missing[i]));
+                    allMissing.push_back(i18n("%1 - for project file support").arg(missing[i]));
 //                } else {
 //                    allMissing.push_back(missing[i]);
 //                }
@@ -4551,7 +4551,7 @@ void RosegardenGUIApp::slotTestStartupTester()
         } else {
             for (int i = 0; i < missing.count(); ++i) {
                 if (missingFeatures.count() > 1) {
-                    allMissing.push_back(i18n("%1 - for LilyPond preview support").tqarg(missing[i]));
+                    allMissing.push_back(i18n("%1 - for LilyPond preview support").arg(missing[i]));
                 } else {
                     allMissing.push_back(missing[i]);
                 }
@@ -4560,7 +4560,7 @@ void RosegardenGUIApp::slotTestStartupTester()
     }
 
 #ifdef HAVE_LIBJACK
-    if (m_seqManager && (m_seqManager->getSoundDrivertqStatus() & AUDIO_OK)) {
+    if (m_seqManager && (m_seqManager->getSoundDriverStatus() & AUDIO_OK)) {
 
         m_haveAudioImporter = m_startupTester->haveAudioFileImporter(&missing);
 
@@ -4571,7 +4571,7 @@ void RosegardenGUIApp::slotTestStartupTester()
             } else {
                 for (int i = 0; i < missing.count(); ++i) {
                     if (missingFeatures.count() > 1) {
-                        allMissing.push_back(i18n("%1 - for audio file import").tqarg(missing[i]));
+                        allMissing.push_back(i18n("%1 - for audio file import").arg(missing[i]));
                     } else {
                         allMissing.push_back(missing[i]);
                     }
@@ -4585,13 +4585,13 @@ void RosegardenGUIApp::slotTestStartupTester()
         TQString message = i18n("<h3>Helper programs not found</h3><p>Rosegarden could not find one or more helper programs which it needs to provide some features.  The following features will not be available:</p>");
         message += i18n("<ul>");
         for (int i = 0; i < missingFeatures.count(); ++i) {
-            message += i18n("<li>%1</li>").tqarg(missingFeatures[i]);
+            message += i18n("<li>%1</li>").arg(missingFeatures[i]);
         }
         message += i18n("</ul>");
         message += i18n("<p>To fix this, you should install the following additional programs:</p>");
         message += i18n("<ul>");
         for (int i = 0; i < allMissing.count(); ++i) {
-            message += i18n("<li>%1</li>").tqarg(allMissing[i]);
+            message += i18n("<li>%1</li>").arg(allMissing[i]);
         }
         message += i18n("</ul>");
 
@@ -4623,7 +4623,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
 
     if (isSequencerRunning()) {
         RG_DEBUG << "RosegardenGUIApp::launchSequencer() - sequencer already running - returning\n";
-        if (m_seqManager) m_seqManager->checkSoundDrivertqStatus(false);
+        if (m_seqManager) m_seqManager->checkSoundDriverStatus(false);
         return true;
     }
 
@@ -4639,7 +4639,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
         << "existing DCOP registered sequencer found\n";
 
         if (useExisting) {
-            if (m_seqManager) m_seqManager->checkSoundDrivertqStatus(false);
+            if (m_seqManager) m_seqManager->checkSoundDriverStatus(false);
             m_sequencerProcess = (KProcess*)SequencerExternal;
             return true;
         }
@@ -4733,7 +4733,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
             try {
                 //                 if (m_seqManager) {
                 //                     RG_DEBUG << "RosegardenGUIApp::launchSequencer : checking sound driver status\n";
-                //                     m_seqManager->checkSoundDrivertqStatus();
+                //                     m_seqManager->checkSoundDriverStatus();
                 //                 }
 
                 stateChanged("sequencer_running");
@@ -4872,7 +4872,7 @@ void RosegardenGUIApp::slotExportProject()
     TQString errMsg;
     if (!m_doc->saveDocument(rgFile, errMsg,
                              true)) { // pretend it's autosave
-        KMessageBox::sorry(this, i18n("Saving Rosegarden file to package failed: %1").tqarg(errMsg));
+        KMessageBox::sorry(this, i18n("Saving Rosegarden file to package failed: %1").arg(errMsg));
         CurrentProgressDialog::thaw();
         return ;
     }
@@ -4886,7 +4886,7 @@ void RosegardenGUIApp::slotExportProject()
     proc->start(KProcess::Block, KProcess::All);
 
     if (!proc->normalExit() || proc->exitStatus()) {
-        KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").tqarg(fileName));
+        KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").arg(fileName));
         CurrentProgressDialog::thaw();
         delete proc;
         return ;
@@ -5168,9 +5168,9 @@ RosegardenGUIApp::slotToggleMetronome()
 {
     Composition &comp = m_doc->getComposition();
 
-    if (m_seqManager->getTransporttqStatus() == STARTING_TO_RECORD ||
-            m_seqManager->getTransporttqStatus() == RECORDING ||
-            m_seqManager->getTransporttqStatus() == RECORDING_ARMED) {
+    if (m_seqManager->getTransportStatus() == STARTING_TO_RECORD ||
+            m_seqManager->getTransportStatus() == RECORDING ||
+            m_seqManager->getTransportStatus() == RECORDING_ARMED) {
         if (comp.useRecordMetronome())
             comp.setRecordMetronome(false);
         else
@@ -5192,7 +5192,7 @@ RosegardenGUIApp::slotRewindToBeginning()
 {
     // ignore requests if recording
     //
-    if (m_seqManager->getTransporttqStatus() == RECORDING)
+    if (m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
     m_seqManager->rewindToBeginning();
@@ -5203,7 +5203,7 @@ RosegardenGUIApp::slotFastForwardToEnd()
 {
     // ignore requests if recording
     //
-    if (m_seqManager->getTransporttqStatus() == RECORDING)
+    if (m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
     m_seqManager->fastForwardToEnd();
@@ -5213,18 +5213,18 @@ void
 RosegardenGUIApp::slotSetPlayPosition(timeT time)
 {
     RG_DEBUG << "RosegardenGUIApp::slotSetPlayPosition(" << time << ")" << endl;
-    if (m_seqManager->getTransporttqStatus() == RECORDING)
+    if (m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
     m_doc->slotSetPointerPosition(time);
 
-    if (m_seqManager->getTransporttqStatus() == PLAYING)
+    if (m_seqManager->getTransportStatus() == PLAYING)
         return ;
 
     slotPlay();
 }
 
-void RosegardenGUIApp::notifySequencertqStatus(int status)
+void RosegardenGUIApp::notifySequencerStatus(int status)
 {
     stateChanged("not_playing",
                  (status == PLAYING ||
@@ -5232,7 +5232,7 @@ void RosegardenGUIApp::notifySequencertqStatus(int status)
                  KXMLGUIClient::StateReverse : KXMLGUIClient::StateNoReverse);
 
     if (m_seqManager)
-        m_seqManager->setTransporttqStatus((TransporttqStatus) status);
+        m_seqManager->setTransportStatus((TransportStatus) status);
 }
 
 void RosegardenGUIApp::processAsynchronousMidi(const MappedComposition &mC)
@@ -5261,10 +5261,10 @@ RosegardenGUIApp::slotRecord()
             return ;
     }
 
-    if (m_seqManager->getTransporttqStatus() == RECORDING) {
+    if (m_seqManager->getTransportStatus() == RECORDING) {
         slotStop();
         return ;
-    } else if (m_seqManager->getTransporttqStatus() == PLAYING) {
+    } else if (m_seqManager->getTransportStatus() == PLAYING) {
         slotToggleRecord();
         return ;
     }
@@ -5398,7 +5398,7 @@ void RosegardenGUIApp::slotPlay()
     // slotRecord ensures we don't toggle the recording state in
     // SequenceManager)
     //
-    if (m_seqManager->getTransporttqStatus() == RECORDING_ARMED) {
+    if (m_seqManager->getTransportStatus() == RECORDING_ARMED) {
         slotRecord();
         return ;
     }
@@ -5481,7 +5481,7 @@ void RosegardenGUIApp::slotRewind()
 {
     // ignore requests if recording
     //
-    if (m_seqManager->getTransporttqStatus() == RECORDING)
+    if (m_seqManager->getTransportStatus() == RECORDING)
         return ;
     if (m_seqManager)
         m_seqManager->rewind();
@@ -5491,7 +5491,7 @@ void RosegardenGUIApp::slotFastforward()
 {
     // ignore requests if recording
     //
-    if (m_seqManager->getTransporttqStatus() == RECORDING)
+    if (m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
     if (m_seqManager)
@@ -5790,7 +5790,7 @@ void RosegardenGUIApp::slotChangeZoom(int)
 {
     double duration44 = TimeSignature(4, 4).getBarDuration();
     double value = double(m_zoomSlider->getCurrentSize());
-    m_zoomLabel->setText(i18n("%1%").tqarg(duration44 / value));
+    m_zoomLabel->setText(i18n("%1%").arg(duration44 / value));
 
     RG_DEBUG << "RosegardenGUIApp::slotChangeZoom : zoom size = "
     << m_zoomSlider->getCurrentSize() << endl;
@@ -5858,7 +5858,7 @@ RosegardenGUIApp::slotChangeTempo(timeT time,
         timeT prevTime = comp.getTempoChange(index).first;
 
         KMacroCommand *macro =
-            new KMacroCommand(i18n("Replace Tempo Change at %1").tqarg(time));
+            new KMacroCommand(i18n("Replace Tempo Change at %1").arg(time));
 
         macro->addCommand(new RemoveTempoChangeCommand(&comp, index));
         macro->addCommand(new AddTempoChangeCommand(&comp, prevTime, value,
@@ -6307,8 +6307,8 @@ RosegardenGUIApp::slotAudioManager()
     connect(this, TQT_SIGNAL(documentAboutToChange()),
             m_audioManagerDialog, TQT_SLOT(close()));
 
-    m_audioManagerDialog->setAudioSubsystemtqStatus(
-        m_seqManager->getSoundDrivertqStatus() & AUDIO_OK);
+    m_audioManagerDialog->setAudioSubsystemStatus(
+        m_seqManager->getSoundDriverStatus() & AUDIO_OK);
 
     plugAccelerators(m_audioManagerDialog,
                      m_audioManagerDialog->getAccelerators());
@@ -6360,7 +6360,7 @@ RosegardenGUIApp::slotAddAudioFile(unsigned int id)
         int result;
         streamIn >> result;
         if (!result) {
-            KMessageBox::error(this, i18n("Sequencer failed to add audio file %1").tqarg(aF->getFilename().c_str()));
+            KMessageBox::error(this, i18n("Sequencer failed to add audio file %1").arg(aF->getFilename().c_str()));
         }
     }
 }
@@ -6385,7 +6385,7 @@ RosegardenGUIApp::slotDeleteAudioFile(unsigned int id)
         int result;
         streamIn >> result;
         if (!result) {
-            KMessageBox::error(this, i18n("Sequencer failed to remove audio file id %1").tqarg(id));
+            KMessageBox::error(this, i18n("Sequencer failed to remove audio file id %1").arg(id));
         }
     }
 }
@@ -7723,10 +7723,10 @@ RosegardenGUIApp::slotSaveDefaultStudio()
     if (!res) {
         if (errMsg)
             KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1\nError was : %2")
-                                          .tqarg(autoloadFile).tqarg(errMsg)));
+                                          .arg(autoloadFile).arg(errMsg)));
         else
             KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1")
-                                          .tqarg(autoloadFile)));
+                                          .arg(autoloadFile)));
 
     }
 }
@@ -7778,7 +7778,7 @@ RosegardenGUIApp::slotImportStudio()
     TQString target;
     if (KIO::NetAccess::download(url, target, this) == false) {
         KMessageBox::error(this, i18n("Cannot download file %1")
-                           .tqarg(url.prettyURL()));
+                           .arg(url.prettyURL()));
         return ;
     }
 
@@ -7912,8 +7912,8 @@ void
 RosegardenGUIApp::slotAutoSave()
 {
     if (!m_seqManager ||
-        m_seqManager->getTransporttqStatus() == PLAYING ||
-        m_seqManager->getTransporttqStatus() == RECORDING)
+        m_seqManager->getTransportStatus() == PLAYING ||
+        m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
     KConfig* config = kapp->config();
@@ -7982,7 +7982,7 @@ RosegardenGUIApp::awaitDialogClearance()
     
     while (haveDialog) {
 
-        const TQObjectList *c = tqchildren();
+        const TQObjectList *c = children();
         if (!c) return;
 
         haveDialog = false;
@@ -8014,7 +8014,7 @@ RosegardenGUIApp::slotNewerVersionAvailable(TQString v)
         (this,
          i18n("<h3>Newer version available</h3><p>A newer version of Rosegarden may be available.<br>Please consult the <a href=\"http://www.rosegardenmusic.com/getting/\">Rosegarden website</a> for more information.</p>"),
          i18n("Newer version available"),
-         TQString("version-%1-available-show").tqarg(v),
+         TQString("version-%1-available-show").arg(v),
          KMessageBox::AllowLink);
     CurrentProgressDialog::thaw();
 }
diff --git a/src/gui/application/RosegardenGUIApp.h b/src/gui/application/RosegardenGUIApp.h
index 6aeeb7a..0349f8b 100644
--- a/src/gui/application/RosegardenGUIApp.h
+++ b/src/gui/application/RosegardenGUIApp.h
@@ -280,7 +280,7 @@ public:
     /**
      * Set the sequencer status - pass through DCOP as an int
      */
-    virtual void notifySequencertqStatus(int status);
+    virtual void notifySequencerStatus(int status);
 
     /**
      * Handle some random incoming MIDI events.
@@ -1240,7 +1240,7 @@ public slots:
     
     /**
      * save general Options like all bar positions and status as well
-     * as the tqgeometry and the recent file list to the configuration
+     * as the geometry and the recent file list to the configuration
      * file
      */         
     void slotSaveOptions();
diff --git a/src/gui/application/RosegardenGUIView.cpp b/src/gui/application/RosegardenGUIView.cpp
index 702e6db..8bda485 100644
--- a/src/gui/application/RosegardenGUIView.cpp
+++ b/src/gui/application/RosegardenGUIView.cpp
@@ -907,19 +907,19 @@ void RosegardenGUIView::setZoomSize(double size)
     m_trackEditor->getSegmentCanvas()->slotUpdateSegmentsDrawBuffer();
 
     if (m_trackEditor->getTempoRuler()) {
-        m_trackEditor->getTempoRuler()->tqrepaint();
+        m_trackEditor->getTempoRuler()->repaint();
     }
 
     if (m_trackEditor->getChordNameRuler()) {
-        m_trackEditor->getChordNameRuler()->tqrepaint();
+        m_trackEditor->getChordNameRuler()->repaint();
     }
 
     if (m_trackEditor->getTopStandardRuler()) {
-        m_trackEditor->getTopStandardRuler()->tqrepaint();
+        m_trackEditor->getTopStandardRuler()->repaint();
     }
 
     if (m_trackEditor->getBottomStandardRuler()) {
-        m_trackEditor->getBottomStandardRuler()->tqrepaint();
+        m_trackEditor->getBottomStandardRuler()->repaint();
     }
 }
 
@@ -1196,7 +1196,7 @@ RosegardenGUIView::updateMeters(SequencerMapper *mapper)
             bool toSet = false;
 
             if (states[instrumentId] == newState &&
-                    (getDocument()->getSequenceManager()->getTransporttqStatus()
+                    (getDocument()->getSequenceManager()->getTransportStatus()
                      != STOPPED)) {
 
                 if (info.level != 0 || info.levelRight != 0) {
@@ -1212,7 +1212,7 @@ RosegardenGUIView::updateMeters(SequencerMapper *mapper)
 
             if (recStates[instrumentId] == newState &&
                     instrument->getType() == Instrument::Audio &&
-                    (getDocument()->getSequenceManager()->getTransporttqStatus()
+                    (getDocument()->getSequenceManager()->getTransportStatus()
                      != PLAYING)) {
 
                 if (recInfo.level != 0 || recInfo.levelRight != 0) {
@@ -1238,7 +1238,7 @@ RosegardenGUIView::updateMeters(SequencerMapper *mapper)
             if (info.level == 0)
                 continue;
 
-            if (getDocument()->getSequenceManager()->getTransporttqStatus()
+            if (getDocument()->getSequenceManager()->getTransportStatus()
                     != STOPPED) {
 
 				// The information in 'info' is specific for this instrument, not
diff --git a/src/gui/application/RosegardenIface.h b/src/gui/application/RosegardenIface.h
index 04ab1a2..046033c 100644
--- a/src/gui/application/RosegardenIface.h
+++ b/src/gui/application/RosegardenIface.h
@@ -86,7 +86,7 @@ k_dcop:
 
     // Sequencer updates GUI with status
     //
-    virtual void notifySequencertqStatus(int status) = 0;
+    virtual void notifySequencerStatus(int status) = 0;
 
     // Used to map unexpected (async) MIDI events to the user interface.
     // We can show these on the Transport or on a MIDI Mixer.
diff --git a/src/gui/application/SetWaitCursor.cpp b/src/gui/application/SetWaitCursor.cpp
index 19ef147..9d4472d 100644
--- a/src/gui/application/SetWaitCursor.cpp
+++ b/src/gui/application/SetWaitCursor.cpp
@@ -79,7 +79,7 @@ SetWaitCursor::~SetWaitCursor()
         m_guiApp->setCursor(m_saveCursor);
 
         if (viewport) {
-            if (currentSegmentCanvasCursor.tqshape() == KCursor::waitCursor().tqshape()) {
+            if (currentSegmentCanvasCursor.shape() == KCursor::waitCursor().shape()) {
                 viewport->setCursor(m_saveSegmentCanvasCursor);
             } else {
                 viewport->setCursor(currentSegmentCanvasCursor); // because m_guiApp->setCursor() has replaced it
diff --git a/src/gui/application/StartupTester.cpp b/src/gui/application/StartupTester.cpp
index 7a7850b..74704e1 100644
--- a/src/gui/application/StartupTester.cpp
+++ b/src/gui/application/StartupTester.cpp
@@ -147,7 +147,7 @@ StartupTester::isReady()
 void
 StartupTester::stdoutReceived(KProcess *, char *buffer, int len)
 {
-    m_stdoutBuffer += TQString::tqfromLatin1(buffer, len);
+    m_stdoutBuffer += TQString::fromLatin1(buffer, len);
 }
 
 void
diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp
index ff03584..b3147de 100644
--- a/src/gui/application/main.cpp
+++ b/src/gui/application/main.cpp
@@ -246,7 +246,7 @@ and Events (our basic music element).  To help lift the ambiguity,
     and time this corresponds to, that kind of stuff.  (In the
     Notation and Matrix views, the LinedStaff calculates mappings
     between coordinates and staff lines: the former is especially
-    complicated because of its support for page tqlayout.)\n
+    complicated because of its support for page layout.)\n
  -# The canvas view transmits this kind of info as a signal, which is
  connected to a slot in the parent EditView.
  -# The EditView delegates action to the current tool.\n
@@ -260,7 +260,7 @@ which "wraps" the complexity into simple calls and performs all the
 hidden tasks.
  
 The EditView also maintains (obviously) its visual appearance with the
-tqlayout classes, applying them when appropriate.
+layout classes, applying them when appropriate.
  
 \section sequencer Sequencer
  
@@ -379,7 +379,7 @@ void testInstalledVersion()
               " 2. The upgrade was installed in a non-standard directory,\n"
               "     and an old version was found in a standard directory.  If so,\n"
               "     you will need to add the correct directory to your TDEDIRS\n"
-              "     environment variable before you can run it.").tqarg(VERSION).tqarg(installedVersion),
+              "     environment variable before you can run it.").arg(VERSION).arg(installedVersion),
          i18n("Installation problem"));
 
     } else {
@@ -531,8 +531,8 @@ int main(int argc, char *argv[])
 	    startupSize = TQSize((desktopRect.width() * 4) / 5,
 				(desktopRect.height() * 4) / 5);
 	}
-	TQString widthKey = TQString("Width %1").tqarg(totalRect.width());
-	TQString heightKey = TQString("Height %1").tqarg(totalRect.height());
+	TQString widthKey = TQString("Width %1").arg(totalRect.width());
+	TQString heightKey = TQString("Height %1").arg(totalRect.height());
 	windowWidth = config->readUnsignedNumEntry
 	    (widthKey, startupSize.width());
 	windowHeight = config->readUnsignedNumEntry
@@ -722,7 +722,7 @@ int main(int argc, char *argv[])
 	TQVBox *mw = dialog->makeVBoxMainWidget();
 	TQHBox *hb = new TQHBox(mw);
 	TQLabel *image = new TQLabel(hb);
-	image->tqsetAlignment(TQt::AlignTop);
+	image->setAlignment(TQt::AlignTop);
 	TQString iconFile = locate("appdata", "pixmaps/misc/welcome-icon.png");
 	if (!iconFile.isNull()) {
 	    image->setPixmap(TQPixmap(iconFile));
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
diff --git a/src/gui/dialogs/AudioManagerDialog.cpp b/src/gui/dialogs/AudioManagerDialog.cpp
index 0c38cc2..e9a0f7c 100644
--- a/src/gui/dialogs/AudioManagerDialog.cpp
+++ b/src/gui/dialogs/AudioManagerDialog.cpp
@@ -343,7 +343,7 @@ AudioManagerDialog::slotPopulateFileList()
         //
         length = (*it)->getLength();
         msecs.sprintf("%03d", length.nsec / 1000000);
-        item->setText(1, TQString("%1.%2s").tqarg(length.sec).tqarg(msecs));
+        item->setText(1, TQString("%1.%2s").arg(length.sec).arg(msecs));
 
         // set start time and duration
         item->setStartTime(RealTime::zeroTime);
@@ -361,11 +361,11 @@ AudioManagerDialog::slotPopulateFileList()
 
         // Resolution
         //
-        item->setText(5, TQString("%1 bits").tqarg((*it)->getBitsPerSample()));
+        item->setText(5, TQString("%1 bits").arg((*it)->getBitsPerSample()));
 
         // Channels
         //
-        item->setText(4, TQString("%1").tqarg((*it)->getChannels()));
+        item->setText(4, TQString("%1").arg((*it)->getChannels()));
 
         // Sample rate
         //
@@ -384,7 +384,7 @@ AudioManagerDialog::slotPopulateFileList()
             findSelection = false;
         }
 
-        // Add tqchildren
+        // Add children
         //
         for (iit = segments.begin(); iit != segments.end(); iit++) {
             if ((*iit)->getAudioFileId() == (*it)->getId()) {
@@ -404,8 +404,8 @@ AudioManagerDialog::slotPopulateFileList()
                 //
                 msecs.sprintf("%03d", segmentDuration.nsec / 1000000);
                 childItem->setText(1, TQString("%1.%2s")
-                                   .tqarg(segmentDuration.sec)
-                                   .tqarg(msecs));
+                                   .arg(segmentDuration.sec)
+                                   .arg(msecs));
 
                 try {
                     m_doc->getAudioFileManager().
@@ -433,7 +433,7 @@ AudioManagerDialog::slotPopulateFileList()
                     foundSelection = true;
                 }
 
-                // Add tqchildren
+                // Add children
             }
         }
     }
@@ -607,7 +607,7 @@ AudioManagerDialog::slotRemove()
     if (haveSegments) {
 
         TQString question = i18n("This will unload audio file \"%1\" and remove all associated segments.  Are you sure?")
-                           .tqarg(TQString(audioFile->getFilename().c_str()));
+                           .arg(TQString(audioFile->getFilename().c_str()));
 
         // Ask the question
         int reply = KMessageBox::warningContinueCancel(this, question);
@@ -885,7 +885,7 @@ AudioManagerDialog::slotDeleteUnused()
                 std::cerr << i << ": " << names[i].ascii() << std::endl;
                 TQFile file(names[i]);
                 if (!file.remove()) {
-                    KMessageBox::error(this, i18n("File %1 could not be deleted.").tqarg(names[i]));
+                    KMessageBox::error(this, i18n("File %1 could not be deleted.").arg(names[i]));
                 } else {
                     if (nameMap.find(names[i]) != nameMap.end()) {
                         m_doc->getAudioFileManager().removeFile(nameMap[names[i]]);
@@ -894,7 +894,7 @@ AudioManagerDialog::slotDeleteUnused()
                         std::cerr << "WARNING: Audio file name " << names[i].ascii() << " not in name map" << std::endl;
                     }
 
-                    TQFile peakFile(TQString("%1.pk").tqarg(names[i]));
+                    TQFile peakFile(TQString("%1.pk").arg(names[i]));
                     peakFile.remove();
                 }
             }
@@ -1179,7 +1179,7 @@ AudioManagerDialog::slotClose()
 }
 
 void
-AudioManagerDialog::setAudioSubsystemtqStatus(bool ok)
+AudioManagerDialog::setAudioSubsystemStatus(bool ok)
 {
     // We can do something more fancy in the future but for the moment
     // this will suffice.
diff --git a/src/gui/dialogs/AudioManagerDialog.h b/src/gui/dialogs/AudioManagerDialog.h
index e6b9cdc..132b23c 100644
--- a/src/gui/dialogs/AudioManagerDialog.h
+++ b/src/gui/dialogs/AudioManagerDialog.h
@@ -88,7 +88,7 @@ public:
 
     // Can we playback audio currently?
     //
-    void setAudioSubsystemtqStatus(bool ok);
+    void setAudioSubsystemStatus(bool ok);
 
     // Return the accelerator object
     //
diff --git a/src/gui/dialogs/AudioPlayingDialog.cpp b/src/gui/dialogs/AudioPlayingDialog.cpp
index af711ac..524278e 100644
--- a/src/gui/dialogs/AudioPlayingDialog.cpp
+++ b/src/gui/dialogs/AudioPlayingDialog.cpp
@@ -44,7 +44,7 @@ AudioPlayingDialog::AudioPlayingDialog(TQWidget *parent,
 {
     TQHBox *w = makeHBoxMainWidget();
     TQLabel *label = new
-                    TQLabel(i18n("Playing audio file \"%1\"").tqarg(name), w);
+                    TQLabel(i18n("Playing audio file \"%1\"").arg(name), w);
 
     label->setMinimumHeight(80);
 
diff --git a/src/gui/dialogs/AudioPluginDialog.cpp b/src/gui/dialogs/AudioPluginDialog.cpp
index 97b4e7f..9df7c22 100644
--- a/src/gui/dialogs/AudioPluginDialog.cpp
+++ b/src/gui/dialogs/AudioPluginDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "AudioPluginDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include "misc/Debug.h"
@@ -86,7 +86,7 @@ AudioPluginDialog::AudioPluginDialog(TQWidget *parent,
 {
     setHelp("studio-plugins");
 
-    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
+    setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
                               TQSizePolicy::Fixed));
 
 #ifdef HAVE_LIBLO
@@ -125,12 +125,12 @@ AudioPluginDialog::AudioPluginDialog(TQWidget *parent,
 
 
     m_insOuts = new TQLabel(i18n("<ports>"), h);
-    m_insOuts->tqsetAlignment(AlignRight);
+    m_insOuts->setAlignment(AlignRight);
     TQToolTip::add
         (m_insOuts, i18n("Input and output port counts."));
 
     m_pluginId = new TQLabel(i18n("<id>"), h);
-    m_pluginId->tqsetAlignment(AlignRight);
+    m_pluginId->setAlignment(AlignRight);
     TQToolTip::add
         (m_pluginId, i18n("Unique ID of plugin."));
 
@@ -383,7 +383,7 @@ AudioPluginDialog::slotPluginSelected(int i)
 
     TQString caption =
         strtoqstr(m_pluginContainer->getName()) +
-        TQString(" [ %1 ] - ").tqarg(m_index + 1);
+        TQString(" [ %1 ] - ").arg(m_index + 1);
 
     if (number == 0) {
         setCaption(caption + i18n("<no plugin>"));
@@ -435,7 +435,7 @@ AudioPluginDialog::slotPluginSelected(int i)
 
     if (plugin) {
         setCaption(caption + plugin->getName());
-        m_pluginId->setText(i18n("Id: %1").tqarg(plugin->getUniqueId()));
+        m_pluginId->setText(i18n("Id: %1").arg(plugin->getUniqueId()));
 
         TQString pluginInfo = plugin->getAuthor() + TQString("\n") +
             plugin->getCopyright();
@@ -491,7 +491,7 @@ AudioPluginDialog::slotPluginSelected(int i)
         else if (ins == 2 && outs == 2)
             m_insOuts->setText(i18n("stereo"));
         else
-            m_insOuts->setText(i18n("%1 in, %2 out").tqarg(ins).tqarg(outs));
+            m_insOuts->setText(i18n("%1 in, %2 out").arg(ins).arg(outs));
 
         TQString shortName(plugin->getName());
         int parenIdx = shortName.find(" (");
@@ -503,7 +503,7 @@ AudioPluginDialog::slotPluginSelected(int i)
     }
 
     adjustSize();
-    setFixedSize(tqminimumSizeHint());
+    setFixedSize(minimumSizeHint());
 
     // tell the sequencer
     emit pluginSelected(m_containerId, m_index, number - 1);
diff --git a/src/gui/dialogs/AudioSplitDialog.cpp b/src/gui/dialogs/AudioSplitDialog.cpp
index 839e506..4988e55 100644
--- a/src/gui/dialogs/AudioSplitDialog.cpp
+++ b/src/gui/dialogs/AudioSplitDialog.cpp
@@ -39,7 +39,7 @@
 #include <tqcanvas.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqscrollview.h>
 #include <tqspinbox.h>
 #include <tqstring.h>
@@ -120,7 +120,7 @@ AudioSplitDialog::drawPreview()
     rect->setZ(1);
     rect->setPen(kapp->palette().color(TQPalette::Active, TQColorGroup::Dark));
     rect->setBrush(kapp->palette().color(TQPalette::Active, TQColorGroup::Base));
-    rect->tqsetVisible(true);
+    rect->setVisible(true);
 
     // Get preview in vector form
     //
@@ -143,7 +143,7 @@ AudioSplitDialog::drawPreview()
         text->setX(30);
         text->setY(30);
         text->setZ(4);
-        text->tqsetVisible(true);
+        text->setVisible(true);
         m_canvas->update();
         return ;
     }
@@ -192,7 +192,7 @@ AudioSplitDialog::drawPreview()
                      palette().color(TQPalette::Active, TQColorGroup::Shadow));
         line->setBrush(kapp->
                        palette().color(TQPalette::Active, TQColorGroup::Shadow));
-        line->tqsetVisible(true);
+        line->setVisible(true);
 
     }
 
@@ -205,15 +205,15 @@ AudioSplitDialog::drawPreview()
     rect->setPen(kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow));
     rect->setBrush(kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow));
     rect->setZ(4);
-    rect->tqsetVisible(true);
+    rect->setVisible(true);
 
     // Start time
     //
     char msecs[100];
     sprintf(msecs, "%03d", m_segment->getAudioStartTime().msec());
     TQString startText = TQString("%1.%2s")
-                        .tqarg(m_segment->getAudioStartTime().sec)
-                        .tqarg(msecs);
+                        .arg(m_segment->getAudioStartTime().sec)
+                        .arg(msecs);
     TQCanvasText *text = new TQCanvasText(m_canvas);
     text->setColor(
         kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow));
@@ -221,7 +221,7 @@ AudioSplitDialog::drawPreview()
     text->setX(startX - 20);
     text->setY(m_canvasHeight / 2 - m_previewHeight / 2 - 35);
     text->setZ(3);
-    text->tqsetVisible(true);
+    text->setVisible(true);
 
     rect = new TQCanvasRectangle(m_canvas);
     rect->setX(startX - 1);
@@ -229,14 +229,14 @@ AudioSplitDialog::drawPreview()
     rect->setSize(1, m_previewHeight + 28);
     rect->setPen(kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow));
     rect->setZ(3);
-    rect->tqsetVisible(true);
+    rect->setVisible(true);
 
     // End time
     //
     sprintf(msecs, "%03d", m_segment->getAudioEndTime().msec());
     TQString endText = TQString("%1.%2s")
-                      .tqarg(m_segment->getAudioEndTime().sec)
-                      .tqarg(msecs);
+                      .arg(m_segment->getAudioEndTime().sec)
+                      .arg(msecs);
     text = new TQCanvasText(m_canvas);
     text->setColor(
         kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow));
@@ -244,7 +244,7 @@ AudioSplitDialog::drawPreview()
     text->setX(startX + m_previewWidth - 20);
     text->setY(m_canvasHeight / 2 - m_previewHeight / 2 - 35);
     text->setZ(3);
-    text->tqsetVisible(true);
+    text->setVisible(true);
 
     rect = new TQCanvasRectangle(m_canvas);
     rect->setX(startX + m_previewWidth - 1);
@@ -252,7 +252,7 @@ AudioSplitDialog::drawPreview()
     rect->setSize(1, m_previewHeight + 28);
     rect->setPen(kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow));
     rect->setZ(3);
-    rect->tqsetVisible(true);
+    rect->setVisible(true);
 
     m_canvas->update();
 }
@@ -303,7 +303,7 @@ AudioSplitDialog::drawSplits(int threshold)
                      palette().color(TQPalette::Active, TQColorGroup::Mid));
         rect->setBrush(kapp->
                        palette().color(TQPalette::Active, TQColorGroup::Mid));
-        rect->tqsetVisible(true);
+        rect->setVisible(true);
         tempRects.push_back(rect);
     }
 
@@ -315,7 +315,7 @@ AudioSplitDialog::drawSplits(int threshold)
         // clear any previous preview boxes
         //
         for (pIt = m_previewBoxes.begin(); pIt != m_previewBoxes.end(); pIt++) {
-            //(*pIt)->tqsetVisible(false);
+            //(*pIt)->setVisible(false);
             delete (*pIt);
         }
         m_previewBoxes.erase(m_previewBoxes.begin(), m_previewBoxes.end());
diff --git a/src/gui/dialogs/BeatsBarsDialog.cpp b/src/gui/dialogs/BeatsBarsDialog.cpp
index 1624e03..c9d9773 100644
--- a/src/gui/dialogs/BeatsBarsDialog.cpp
+++ b/src/gui/dialogs/BeatsBarsDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "BeatsBarsDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include "base/Segment.h"
@@ -50,16 +50,16 @@ BeatsBarsDialog::BeatsBarsDialog(TQWidget* parent) :
                                     i18n("The selected audio segment contains:"), hbox);
 
     TQFrame *frame = new TQFrame(gbox);
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 1, 2, 5, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 1, 2, 5, 5);
 
     m_spinBox = new TQSpinBox(1, INT_MAX, 1, frame, "glee");
-    tqlayout->addWidget(m_spinBox, 0, 0);
+    layout->addWidget(m_spinBox, 0, 0);
 
     m_comboBox = new KComboBox(false, frame);
     m_comboBox->insertItem(i18n("beat(s)"));
     m_comboBox->insertItem(i18n("bar(s)"));
     m_comboBox->setCurrentItem(0);
-    tqlayout->addWidget(m_comboBox, 0, 1);
+    layout->addWidget(m_comboBox, 0, 1);
 }
 
 }
diff --git a/src/gui/dialogs/ClefDialog.cpp b/src/gui/dialogs/ClefDialog.cpp
index 30f49fb..c566948 100644
--- a/src/gui/dialogs/ClefDialog.cpp
+++ b/src/gui/dialogs/ClefDialog.cpp
@@ -77,7 +77,7 @@ ClefDialog::ClefDialog(TQWidget *parent,
         (m_octaveUp, i18n("Up an Octave"));
 
     m_clefLabel = new TQLabel(i18n("Clef"), clefLabelBox);
-    m_clefLabel->tqsetAlignment(AlignVCenter | AlignHCenter);
+    m_clefLabel->setAlignment(AlignVCenter | AlignHCenter);
 
     m_octaveDown = new BigArrowButton(clefLabelBox, Qt::DownArrow);
     TQToolTip::add
@@ -88,7 +88,7 @@ ClefDialog::ClefDialog(TQWidget *parent,
         (clefUp, i18n("Higher clef"));
 
     m_clefNameLabel = new TQLabel(i18n("Clef"), clefLabelBox);
-    m_clefNameLabel->tqsetAlignment(AlignVCenter | AlignHCenter);
+    m_clefNameLabel->setAlignment(AlignVCenter | AlignHCenter);
 
     if (showConversionOptions) {
         m_noConversionButton =
@@ -246,25 +246,25 @@ ClefDialog::redrawClefPixmap()
 
     std::string type = m_clef.getClefType();
     if (type == Clef::Treble)
-        name = name.tqarg(i18n("Treble"));
+        name = name.arg(i18n("Treble"));
     else if (type == Clef::French)
-        name = name.tqarg(i18n("French violin"));
+        name = name.arg(i18n("French violin"));
     else if (type == Clef::Soprano)
-        name = name.tqarg(i18n("Soprano"));
+        name = name.arg(i18n("Soprano"));
     else if (type == Clef::Mezzosoprano)
-        name = name.tqarg(i18n("Mezzo-soprano"));
+        name = name.arg(i18n("Mezzo-soprano"));
     else if (type == Clef::Alto)
-        name = name.tqarg(i18n("Alto"));
+        name = name.arg(i18n("Alto"));
     else if (type == Clef::Tenor)
-        name = name.tqarg(i18n("Tenor"));
+        name = name.arg(i18n("Tenor"));
     else if (type == Clef::Baritone)
-        name = name.tqarg(i18n("C-baritone"));
+        name = name.arg(i18n("C-baritone"));
     else if (type == Clef::Varbaritone)
-        name = name.tqarg(i18n("F-baritone"));
+        name = name.arg(i18n("F-baritone"));
     else if (type == Clef::Bass)
-        name = name.tqarg(i18n("Bass"));
+        name = name.arg(i18n("Bass"));
     else if (type == Clef::Subbass)
-        name = name.tqarg(i18n("Sub-bass"));
+        name = name.arg(i18n("Sub-bass"));
 
     m_clefNameLabel->setText(name);
 }
diff --git a/src/gui/dialogs/ConfigureDialog.cpp b/src/gui/dialogs/ConfigureDialog.cpp
index c8e7341..ba41797 100644
--- a/src/gui/dialogs/ConfigureDialog.cpp
+++ b/src/gui/dialogs/ConfigureDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "ConfigureDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include "ConfigureDialogBase.h"
@@ -54,7 +54,7 @@ static TQPixmap loadIcon(const char *name)
         return TQPixmap(fileBase + ".xpm");
     }
     TQPixmap pmap = KGlobal::instance()->iconLoader()
-        ->loadIcon(TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium);
+        ->loadIcon(TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium);
     return pmap;
 }
 
diff --git a/src/gui/dialogs/CountdownBar.cpp b/src/gui/dialogs/CountdownBar.cpp
index 5e77345..8d4d0b8 100644
--- a/src/gui/dialogs/CountdownBar.cpp
+++ b/src/gui/dialogs/CountdownBar.cpp
@@ -38,7 +38,7 @@ CountdownBar::CountdownBar(TQWidget *parent, int width, int height):
         TQFrame(parent), m_width(width), m_height(height), m_position(0)
 {
     resize(m_width, m_height);
-    tqrepaint();
+    repaint();
 }
 
 void
@@ -61,7 +61,7 @@ void
 CountdownBar::setPosition(int position)
 {
     m_position = position;
-    tqrepaint();
+    repaint();
 }
 
 }
diff --git a/src/gui/dialogs/CountdownDialog.cpp b/src/gui/dialogs/CountdownDialog.cpp
index 8b69eb8..c4a56ee 100644
--- a/src/gui/dialogs/CountdownDialog.cpp
+++ b/src/gui/dialogs/CountdownDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "CountdownDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include "CountdownBar.h"
@@ -48,14 +48,14 @@ CountdownDialog::CountdownDialog(TQWidget *parent, int seconds):
         m_progressBarWidth(150),
         m_progressBarHeight(15)
 {
-    TQBoxLayout *tqlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 10, 14);
+    TQBoxLayout *layout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 10, 14);
     setCaption(i18n("Recording..."));
 
     TQHBox *hBox = new TQHBox(this);
     m_label = new TQLabel(hBox);
     m_time = new TQLabel(hBox);
 
-    tqlayout->addWidget(hBox, 0, AlignCenter);
+    layout->addWidget(hBox, 0, AlignCenter);
 
     m_label->setText(i18n("Recording time remaining:  "));
     m_progressBar =
@@ -68,8 +68,8 @@ CountdownDialog::CountdownDialog(TQWidget *parent, int seconds):
     m_stopButton = new TQPushButton(i18n("Stop"), this);
     m_stopButton->setFixedWidth(60);
 
-    tqlayout->addWidget(m_progressBar, 0, AlignCenter);
-    tqlayout->addWidget(m_stopButton, 0, AlignRight);
+    layout->addWidget(m_progressBar, 0, AlignCenter);
+    layout->addWidget(m_stopButton, 0, AlignRight);
 
     connect (m_stopButton, TQT_SIGNAL(released()), this, TQT_SIGNAL(stopped()));
 
@@ -112,10 +112,10 @@ CountdownDialog::setElapsedTime(int elapsedSeconds)
 
     if (seconds < 3600) // less than an hour
     {
-        m_time->setText(TQString("%1:%2").tqarg(m).tqarg(s));
+        m_time->setText(TQString("%1:%2").arg(m).arg(s));
     } else if (seconds < 86400) // less than a day
     {
-        m_time->setText(TQString("%1:%2:%3").tqarg(h).tqarg(m).tqarg(s));
+        m_time->setText(TQString("%1:%2:%3").arg(h).arg(m).arg(s));
     } else {
         m_time->setText(i18n("Just how big is your hard disk?"));
     }
diff --git a/src/gui/dialogs/DocumentConfigureDialog.cpp b/src/gui/dialogs/DocumentConfigureDialog.cpp
index 06165e1..890637d 100644
--- a/src/gui/dialogs/DocumentConfigureDialog.cpp
+++ b/src/gui/dialogs/DocumentConfigureDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "DocumentConfigureDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include "ConfigureDialogBase.h"
@@ -53,7 +53,7 @@ static TQPixmap loadIcon(const char *name)
     }
 
     TQPixmap pmap = KGlobal::instance()->iconLoader()
-        ->loadIcon(TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium);
+        ->loadIcon(TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium);
     return pmap;
 }
 
@@ -100,7 +100,7 @@ DocumentConfigureDialog::DocumentConfigureDialog(RosegardenGUIDoc *doc,
     page->setPageIndex(pageIndex(pageWidget));
     m_configurationPages.push_back(page);
 
-    resize(tqminimumSize());
+    resize(minimumSize());
 }
 
 void
diff --git a/src/gui/dialogs/EventFilterDialog.cpp b/src/gui/dialogs/EventFilterDialog.cpp
index fbfcdb4..7aefd87 100644
--- a/src/gui/dialogs/EventFilterDialog.cpp
+++ b/src/gui/dialogs/EventFilterDialog.cpp
@@ -47,7 +47,7 @@
 #include <tqframe.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
 #include <tqsizepolicy.h>
@@ -134,7 +134,7 @@ EventFilterDialog::initDialog()
             TQT_SLOT(slotPitchFromChanged(int)));
 
     m_pitchFromChooserButton = new TQPushButton(i18n("edit"), noteFrame);
-    m_pitchFromChooserButton->tqsetSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)0,
+    m_pitchFromChooserButton->setSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)0,
                                             (TQSizePolicy::SizeType)0, 0, 0, m_pitchFromChooserButton->
                                             sizePolicy().hasHeightForWidth()));
     TQToolTip::add
diff --git a/src/gui/dialogs/EventFilterDialog.h b/src/gui/dialogs/EventFilterDialog.h
index 4e3f5f8..471c67d 100644
--- a/src/gui/dialogs/EventFilterDialog.h
+++ b/src/gui/dialogs/EventFilterDialog.h
@@ -143,7 +143,7 @@ protected slots:
 private:
     //---------[ data members ]-----------------------------
 
-    TQGridLayout* tqlayout;
+    TQGridLayout* layout;
 
     TQComboBox*   m_noteDurationFromComboBox;
     TQComboBox*   m_noteDurationIncludeComboBox;
diff --git a/src/gui/dialogs/EventParameterDialog.cpp b/src/gui/dialogs/EventParameterDialog.cpp
index 28beb95..98abb44 100644
--- a/src/gui/dialogs/EventParameterDialog.cpp
+++ b/src/gui/dialogs/EventParameterDialog.cpp
@@ -63,23 +63,23 @@ EventParameterDialog::EventParameterDialog(
 
     // create options
     // 0 flat
-    text = i18n("Flat - set %1 to value").tqarg(strtoqstr(property));
+    text = i18n("Flat - set %1 to value").arg(strtoqstr(property));
     m_patternCombo->insertItem(text);
 
     // 1 alternating
-    text = i18n("Alternating - set %1 to max and min on alternate events").tqarg(strtoqstr(property));
+    text = i18n("Alternating - set %1 to max and min on alternate events").arg(strtoqstr(property));
     m_patternCombo->insertItem(text);
 
     // 2 crescendo
-    text = i18n("Crescendo - set %1 rising from min to max").tqarg(strtoqstr(property));
+    text = i18n("Crescendo - set %1 rising from min to max").arg(strtoqstr(property));
     m_patternCombo->insertItem(text);
 
     // 3 diminuendo
-    text = i18n("Diminuendo - set %1 falling from max to min").tqarg(strtoqstr(property));
+    text = i18n("Diminuendo - set %1 falling from max to min").arg(strtoqstr(property));
     m_patternCombo->insertItem(text);
 
     // 4 ringing
-    text = i18n("Ringing - set %1 alternating from max to min with both dying to zero").tqarg(strtoqstr(property));
+    text = i18n("Ringing - set %1 alternating from max to min with both dying to zero").arg(strtoqstr(property));
     m_patternCombo->insertItem(text);
 
     connect(m_patternCombo, TQT_SIGNAL(activated(int)),
@@ -94,8 +94,8 @@ EventParameterDialog::EventParameterDialog(
     m_value2Combo = new KComboBox(value2Box);
 
     for (unsigned int i = 0; i < 128; i++) {
-        m_value1Combo->insertItem(TQString("%1").tqarg(i));
-        m_value2Combo->insertItem(TQString("%1").tqarg(i));
+        m_value1Combo->insertItem(TQString("%1").arg(i));
+        m_value2Combo->insertItem(TQString("%1").arg(i));
     }
     m_value1Combo->setCurrentItem(127);
 
diff --git a/src/gui/dialogs/ExportDeviceDialog.cpp b/src/gui/dialogs/ExportDeviceDialog.cpp
index b02ff47..348a5b8 100644
--- a/src/gui/dialogs/ExportDeviceDialog.cpp
+++ b/src/gui/dialogs/ExportDeviceDialog.cpp
@@ -48,7 +48,7 @@ ExportDeviceDialog::ExportDeviceDialog(TQWidget *parent, TQString deviceName) :
                                         vbox);
     m_exportAll = new TQRadioButton(i18n("Export all devices"), bg);
     m_exportOne = new TQRadioButton(i18n("Export selected device only"), bg);
-    new TQLabel(i18n("         (\"%1\")").tqarg(deviceName), bg);
+    new TQLabel(i18n("         (\"%1\")").arg(deviceName), bg);
 
     m_exportOne->setChecked(true);
 }
diff --git a/src/gui/dialogs/FileLocateDialog.cpp b/src/gui/dialogs/FileLocateDialog.cpp
index 2668ef4..cd85b8d 100644
--- a/src/gui/dialogs/FileLocateDialog.cpp
+++ b/src/gui/dialogs/FileLocateDialog.cpp
@@ -55,10 +55,10 @@ FileLocateDialog::FileLocateDialog(TQWidget *parent,
     TQHBox *w = makeHBoxMainWidget();
     TQString label =
         i18n("Can't find file \"%1\".\n"
-             "Would you like to try and locate this file or skip it?").tqarg(m_file);
+             "Would you like to try and locate this file or skip it?").arg(m_file);
 
     TQLabel *labelW = new TQLabel(label, w);
-    labelW->tqsetAlignment(TQt::AlignCenter);
+    labelW->setAlignment(TQt::AlignCenter);
     labelW->setMinimumHeight(60);
 }
 
@@ -69,8 +69,8 @@ FileLocateDialog::slotUser3()
         m_file = KFileDialog::getOpenFileName
                  (":WAVS",
                   i18n("%1|Requested file (%2)\n*.wav|WAV files (*.wav)")
-                  .tqarg(TQFileInfo(m_file).fileName())
-                  .tqarg(TQFileInfo(m_file).fileName()),
+                  .arg(TQFileInfo(m_file).fileName())
+                  .arg(TQFileInfo(m_file).fileName()),
                   this, i18n("Select an Audio File"));
 
         RG_DEBUG << "FileLocateDialog::slotUser3() : m_file = " << m_file << endl;
diff --git a/src/gui/dialogs/FloatEdit.cpp b/src/gui/dialogs/FloatEdit.cpp
index fc25fea..a73668f 100644
--- a/src/gui/dialogs/FloatEdit.cpp
+++ b/src/gui/dialogs/FloatEdit.cpp
@@ -59,7 +59,7 @@ FloatEdit::FloatEdit(TQWidget *parent,
     //std::cout << "CAL DP = " << calDP << ", dps = " << dps << std::endl;
 
     m_spin = new HSpinBox(inVbox, value, 1, min, max, dps);
-    new TQLabel(TQString("(min: %1, max: %2)").tqarg(min).tqarg(max), inVbox);
+    new TQLabel(TQString("(min: %1, max: %2)").arg(min).arg(max), inVbox);
 }
 
 float
diff --git a/src/gui/dialogs/IdentifyTextCodecDialog.cpp b/src/gui/dialogs/IdentifyTextCodecDialog.cpp
index a3d905d..1b77f92 100644
--- a/src/gui/dialogs/IdentifyTextCodecDialog.cpp
+++ b/src/gui/dialogs/IdentifyTextCodecDialog.cpp
@@ -33,7 +33,7 @@
 #include <tqfont.h>
 #include <tqlabel.h>
 #include <tqstring.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqvbox.h>
 #include <tqwidget.h>
 
@@ -120,7 +120,7 @@ IdentifyTextCodecDialog::IdentifyTextCodecDialog(TQWidget *parent,
         }
 
         if (description != "") {
-            description = i18n("%1 (%2)").tqarg(strtoqstr(name)).tqarg(description);
+            description = i18n("%1 (%2)").arg(strtoqstr(name)).arg(description);
         } else {
             description = strtoqstr(name);
         }
diff --git a/src/gui/dialogs/ImportDeviceDialog.cpp b/src/gui/dialogs/ImportDeviceDialog.cpp
index 6e8b494..4b24964 100644
--- a/src/gui/dialogs/ImportDeviceDialog.cpp
+++ b/src/gui/dialogs/ImportDeviceDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "ImportDeviceDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <kapplication.h>
 
 #include <klocale.h>
@@ -84,7 +84,7 @@ ImportDeviceDialog::doImport()
 
     TQString target;
     if (KIO::NetAccess::download(m_url, target) == false) {
-        KMessageBox::error(this, i18n("Cannot download file %1").tqarg(m_url.prettyURL()));
+        KMessageBox::error(this, i18n("Cannot download file %1").arg(m_url.prettyURL()));
         return false;
     }
 
@@ -96,14 +96,14 @@ ImportDeviceDialog::doImport()
     }
     if (!fileRead) {
         KMessageBox::error
-        (this, i18n("Cannot open file %1").tqarg(m_url.prettyURL()));
+        (this, i18n("Cannot open file %1").arg(m_url.prettyURL()));
         reject();
         close();
         return false;
     }
     if (m_devices.size() == 0) {
         KMessageBox::sorry
-        (this, i18n("No devices found in file %1").tqarg(m_url.prettyURL()));
+        (this, i18n("No devices found in file %1").arg(m_url.prettyURL()));
         reject();
         close();
         return false;
@@ -137,7 +137,7 @@ ImportDeviceDialog::doImport()
         if ((*i)->getName() != "") {
             showRenameOption = true;
         } else {
-            (*i)->setName(qstrtostr(i18n("Device %1").tqarg(count)));
+            (*i)->setName(qstrtostr(i18n("Device %1").arg(count)));
         }
         if (m_devices.size() > 1) {
             m_deviceCombo->insertItem(strtoqstr((*i)->getName()));
@@ -364,7 +364,7 @@ ImportDeviceDialog::importFromSF2(TQString filename)
 
         MidiBank bank
         (msb == 1, msb, lsb,
-         qstrtostr(i18n("Bank %1:%2").tqarg(msb).tqarg(lsb)));
+         qstrtostr(i18n("Bank %1:%2").arg(msb).arg(lsb)));
 
         banks.push_back(bank);
 
diff --git a/src/gui/dialogs/IntervalDialog.cpp b/src/gui/dialogs/IntervalDialog.cpp
index 0535e8e..b942f8e 100644
--- a/src/gui/dialogs/IntervalDialog.cpp
+++ b/src/gui/dialogs/IntervalDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "IntervalDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <iostream>
 #include <klocale.h>
@@ -61,12 +61,12 @@ IntervalDialog::IntervalDialog(TQWidget *parent, bool askChangeKey, bool askTran
     intervalChromatic = 0;
     intervalDiatonic = 0;
 
-    //m_intervalPitchLabel = new TQLabel( i18n("Pitch: %1").tqarg(intervalChromatic), hBox);
-    //m_intervalOctavesLabel = new TQLabel( i18n("Octaves: %1").tqarg(intervalDiatonic / 7), hBox);
-    //m_intervalStepsLabel = new TQLabel( i18n("Steps: %1").tqarg(intervalDiatonic % 7), hBox);
+    //m_intervalPitchLabel = new TQLabel( i18n("Pitch: %1").arg(intervalChromatic), hBox);
+    //m_intervalOctavesLabel = new TQLabel( i18n("Octaves: %1").arg(intervalDiatonic / 7), hBox);
+    //m_intervalStepsLabel = new TQLabel( i18n("Steps: %1").arg(intervalDiatonic % 7), hBox);
 
     m_intervalLabel = new TQLabel( i18n("a perfect unison"), vBox);
-    m_intervalLabel->tqsetAlignment(TQt::AlignCenter);
+    m_intervalLabel->setAlignment(TQt::AlignCenter);
     TQFont font(m_intervalLabel->font());
     font.setItalic(true);
     m_intervalLabel->setFont(font);
@@ -205,7 +205,7 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic)
            else if (deviation == 0)
                textIntervalDeviated += i18n("a perfect");
            else
-               textIntervalDeviated += i18n("an (unknown, %1)").tqarg(deviation);
+               textIntervalDeviated += i18n("an (unknown, %1)").arg(deviation);
            break;
         // Then the major/minor:
         case 1: // second
@@ -233,7 +233,7 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic)
            else if (deviation == 0)
                textIntervalDeviated += i18n("a perfect");
            else
-               textIntervalDeviated += i18n("an (unknown, %1)").tqarg(deviation);
+               textIntervalDeviated += i18n("an (unknown, %1)").arg(deviation);
            break;
         default:
            textIntervalDeviated += i18n("an (unknown)");
@@ -245,35 +245,35 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic)
 	    // "1 octave and a diminished octave" is better than
 	    // "2 octaves and a diminished unison"
 	    if (octaves > 0) {
-	      textInterval += i18n("%1 octave").tqarg(textIntervalDeviated);
+	      textInterval += i18n("%1 octave").arg(textIntervalDeviated);
 	      octaves--;
 	    } else if (octaves < 0) {
-	      textInterval += i18n("%1 octave").tqarg(textIntervalDeviated);
+	      textInterval += i18n("%1 octave").arg(textIntervalDeviated);
 	      octaves++;
 	    } else {
-	      textInterval += i18n("%1 unison").tqarg(textIntervalDeviated);
+	      textInterval += i18n("%1 unison").arg(textIntervalDeviated);
 	    }
 	    break;
 	case 1:
-	    textInterval += i18n("%1 second").tqarg(textIntervalDeviated);
+	    textInterval += i18n("%1 second").arg(textIntervalDeviated);
 	    break;
 	case 2:
-	    textInterval += i18n("%1 third").tqarg(textIntervalDeviated);
+	    textInterval += i18n("%1 third").arg(textIntervalDeviated);
 	    break;
 	case 3:
-	    textInterval += i18n("%1 fourth").tqarg(textIntervalDeviated);
+	    textInterval += i18n("%1 fourth").arg(textIntervalDeviated);
 	    break;
 	case 4:
-	    textInterval += i18n("%1 fifth").tqarg(textIntervalDeviated);
+	    textInterval += i18n("%1 fifth").arg(textIntervalDeviated);
 	    break;
 	case 5:
-	    textInterval += i18n("%1 sixth").tqarg(textIntervalDeviated);
+	    textInterval += i18n("%1 sixth").arg(textIntervalDeviated);
 	    break;
 	case 6:
-	    textInterval += i18n("%1 seventh").tqarg(textIntervalDeviated);
+	    textInterval += i18n("%1 seventh").arg(textIntervalDeviated);
 	    break;
         default:
-	    textInterval += i18n("%1").tqarg(textIntervalDeviated);
+	    textInterval += i18n("%1").arg(textIntervalDeviated);
         }
     }
     
@@ -285,14 +285,14 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic)
 		if (showStep) {
 		    return i18n("up 1 octave and %1",
 		           "up %n octaves and %1",
-			   octaves).tqarg(textInterval);
+			   octaves).arg(textInterval);
 		} else {
 		    return i18n("up 1 octave",
 		           "up %n octaves",
 			   octaves);
 		}
 	    } else {
-		return i18n("up %1").tqarg(textInterval);
+		return i18n("up %1").arg(textInterval);
 	    }
         }
         else
@@ -301,14 +301,14 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic)
 		if (showStep) {
 		    return i18n("down 1 octave and %1",
 		           "down %n octaves and %1",
-			   octaves).tqarg(textInterval);
+			   octaves).arg(textInterval);
 		} else {
 		    return i18n("down 1 octave",
 		           "down %n octaves",
 			   octaves);
 		}
 	    } else {
-		return i18n("down %1").tqarg(textInterval);
+		return i18n("down %1").arg(textInterval);
 	    }
         }
     } else {
diff --git a/src/gui/dialogs/KeySignatureDialog.cpp b/src/gui/dialogs/KeySignatureDialog.cpp
index a5e829d..c79ff35 100644
--- a/src/gui/dialogs/KeySignatureDialog.cpp
+++ b/src/gui/dialogs/KeySignatureDialog.cpp
@@ -98,7 +98,7 @@ KeySignatureDialog::KeySignatureDialog(TQWidget *parent,
         (keyDown, i18n("Flatten"));
 
     m_keyLabel = new TQLabel(i18n("Key"), keyBox);
-    m_keyLabel->tqsetAlignment(AlignVCenter | AlignHCenter);
+    m_keyLabel->setAlignment(AlignVCenter | AlignHCenter);
 
     BigArrowButton *keyUp = new BigArrowButton(keyBox, Qt::RightArrow);
     TQToolTip::add
diff --git a/src/gui/dialogs/LilyPondOptionsDialog.cpp b/src/gui/dialogs/LilyPondOptionsDialog.cpp
index b1adfec..aba8507 100644
--- a/src/gui/dialogs/LilyPondOptionsDialog.cpp
+++ b/src/gui/dialogs/LilyPondOptionsDialog.cpp
@@ -27,7 +27,7 @@
 #include "document/io/LilyPondExporter.h"
 #include "gui/configuration/HeadersConfigurationPage.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <kapplication.h>
 
 #include "document/ConfigGroups.h"
@@ -114,10 +114,10 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent,
 
     m_lilyLanguage = new KComboBox(frameBasic);
     // See also setDefaultLilyPondVersion below
-    m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.6"));
-    m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.8"));
-    m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.10"));
-    m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.12"));
+    m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.6"));
+    m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.8"));
+    m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.10"));
+    m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.12"));
     m_lilyLanguage->setCurrentItem(config->readUnsignedNumEntry("lilylanguage", 0));
     layoutBasic->addWidget(m_lilyLanguage, 0, 1);
 
@@ -154,7 +154,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent,
     m_lilyFontSize = new KComboBox(frameBasic);
     int sizes[] = { 11, 13, 16, 19, 20, 23, 26 };
     for (int i = 0; i < sizeof(sizes)/sizeof(sizes[0]); ++i) {
-        m_lilyFontSize->insertItem(i18n("%1 pt").tqarg(sizes[i]));
+        m_lilyFontSize->insertItem(i18n("%1 pt").arg(sizes[i]));
     }
     m_lilyFontSize->setCurrentItem(config->readUnsignedNumEntry
                                    ("lilyfontsize", 4));
@@ -251,10 +251,10 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent,
     m_lilyLyricsHAlignment->insertItem(i18n("Left"));
     m_lilyLyricsHAlignment->insertItem(i18n("Center"));
     m_lilyLyricsHAlignment->insertItem(i18n("Right"));
-    m_lilyLyricsHAlignment->setCurrentItem(config->readUnsignedNumEntry("lilylyricshtqalignment", 0));
+    m_lilyLyricsHAlignment->setCurrentItem(config->readUnsignedNumEntry("lilylyricshalignment", 0));
 
     layoutAdvancedLayout->addWidget(new TQLabel(
-                          i18n("Lyrics tqalignment"), frameAdvancedLayout), 0, 0);
+                          i18n("Lyrics alignment"), frameAdvancedLayout), 0, 0);
     layoutAdvancedLayout->addWidget(m_lilyLyricsHAlignment, 0, 1);
 
     m_lilyRaggedBottom = new TQCheckBox(
@@ -292,7 +292,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent,
     
     advancedGrid->setRowStretch(2, 10);
 
-    resize(tqminimumSize());
+    resize(minimumSize());
 }
 
 void
@@ -314,7 +314,7 @@ LilyPondOptionsDialog::slotApply()
     config->writeEntry("lilyexportbeamings", m_lilyExportBeams->isChecked());
     config->writeEntry("lilyexportstaffmerge", m_lilyExportStaffMerge->isChecked());
     config->writeEntry("lilyexportstaffbrackets", m_lilyExportStaffGroup->isChecked());
-    config->writeEntry("lilylyricshtqalignment", m_lilyLyricsHAlignment->currentItem());
+    config->writeEntry("lilylyricshalignment", m_lilyLyricsHAlignment->currentItem());
     config->writeEntry("lilyexportmarkermode", m_lilyMarkerMode->currentItem());
     m_headersPage->apply();
 }
diff --git a/src/gui/dialogs/LyricEditDialog.cpp b/src/gui/dialogs/LyricEditDialog.cpp
index a10cb72..66f3b24 100644
--- a/src/gui/dialogs/LyricEditDialog.cpp
+++ b/src/gui/dialogs/LyricEditDialog.cpp
@@ -37,7 +37,7 @@
 #include <tqgroupbox.h>
 #include <tqregexp.h>
 #include <tqstring.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqvbox.h>
 #include <tqwidget.h>
 #include <kcombobox.h>
@@ -81,7 +81,7 @@ LyricEditDialog::LyricEditDialog(TQWidget *parent,
     unparse();
     
     for (int i = 0; i < m_verseCount; ++i) {
-        m_verseNumber->insertItem(i18n("Verse %1").tqarg(i + 1));
+        m_verseNumber->insertItem(i18n("Verse %1").arg(i + 1));
     }
     m_currentVerse = 0;
     if (m_verseCount == 12) m_verseAddButton->setEnabled(false);
@@ -103,7 +103,7 @@ LyricEditDialog::slotAddVerse()
     NOTATION_DEBUG << "LyricEditDialog::slotAddVerse" << endl;
     m_verseCount++;
     m_texts.push_back(m_skeleton);
-    m_verseNumber->insertItem(i18n("Verse %1").tqarg(m_verseCount));
+    m_verseNumber->insertItem(i18n("Verse %1").arg(m_verseCount));
     m_verseNumber->setCurrentItem(m_verseCount - 1);
     slotVerseNumberChanged(m_verseCount - 1);
     if (m_verseCount == 12) m_verseAddButton->setEnabled(false);
@@ -148,7 +148,7 @@ LyricEditDialog::unparse()
     int lastBarNo = comp->getBarNumber(lastTime);
     std::map<int, bool> haveLyric;
 
-    TQString fragment = TQString("[%1] ").tqarg(lastBarNo + 1);
+    TQString fragment = TQString("[%1] ").arg(lastBarNo + 1);
 
     m_skeleton = fragment;
     m_texts.clear();
@@ -192,7 +192,7 @@ LyricEditDialog::unparse()
                 ++lastBarNo;
             }
 
-            fragment += TQString("\n[%1] ").tqarg(myBarNo + 1);
+            fragment += TQString("\n[%1] ").arg(myBarNo + 1);
 
             m_skeleton += fragment;
             for (size_t v = 0; v < m_verseCount; ++v) m_texts[v] += fragment;
diff --git a/src/gui/dialogs/ManageMetronomeDialog.cpp b/src/gui/dialogs/ManageMetronomeDialog.cpp
index 158cd07..7c3105b 100644
--- a/src/gui/dialogs/ManageMetronomeDialog.cpp
+++ b/src/gui/dialogs/ManageMetronomeDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "ManageMetronomeDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include "misc/Debug.h"
@@ -77,11 +77,11 @@ ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent,
                            (1, Qt::Horizontal, i18n("Metronome Instrument"), vbox);
 
     TQFrame *frame = new TQFrame(deviceBox);
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2, 10, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 2, 2, 10, 5);
 
-    tqlayout->addWidget(new TQLabel(i18n("Device"), frame), 0, 0);
+    layout->addWidget(new TQLabel(i18n("Device"), frame), 0, 0);
     m_metronomeDevice = new KComboBox(frame);
-    tqlayout->addWidget(m_metronomeDevice, 0, 1);
+    layout->addWidget(m_metronomeDevice, 0, 1);
 
     DeviceList *devices = doc->getStudio().getDevices();
     DeviceListConstIterator it;
@@ -108,47 +108,47 @@ ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent,
         }
     }
 
-    tqlayout->addWidget(new TQLabel(i18n("Instrument"), frame), 1, 0);
+    layout->addWidget(new TQLabel(i18n("Instrument"), frame), 1, 0);
     m_metronomeInstrument = new KComboBox(frame);
     connect(m_metronomeInstrument, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetModified()));
     connect(m_metronomeInstrument, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInstrumentChanged(int)));
-    tqlayout->addWidget(m_metronomeInstrument, 1, 1);
+    layout->addWidget(m_metronomeInstrument, 1, 1);
 
     TQGroupBox *beatBox = new TQGroupBox
                          (1, Qt::Horizontal, i18n("Beats"), vbox);
 
     frame = new TQFrame(beatBox);
-    tqlayout = new TQGridLayout(frame, 4, 2, 10, 5);
+    layout = new TQGridLayout(frame, 4, 2, 10, 5);
 
-    tqlayout->addWidget(new TQLabel(i18n("Resolution"), frame), 0, 0);
+    layout->addWidget(new TQLabel(i18n("Resolution"), frame), 0, 0);
     m_metronomeResolution = new KComboBox(frame);
     m_metronomeResolution->insertItem(i18n("None"));
     m_metronomeResolution->insertItem(i18n("Bars only"));
     m_metronomeResolution->insertItem(i18n("Bars and beats"));
     m_metronomeResolution->insertItem(i18n("Bars, beats, and divisions"));
     connect(m_metronomeResolution, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotResolutionChanged(int)));
-    tqlayout->addWidget(m_metronomeResolution, 0, 1);
+    layout->addWidget(m_metronomeResolution, 0, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Bar velocity"), frame), 1, 0);
+    layout->addWidget(new TQLabel(i18n("Bar velocity"), frame), 1, 0);
     m_metronomeBarVely = new TQSpinBox(frame);
     m_metronomeBarVely->setMinValue(0);
     m_metronomeBarVely->setMaxValue(127);
     connect(m_metronomeBarVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified()));
-    tqlayout->addWidget(m_metronomeBarVely, 1, 1);
+    layout->addWidget(m_metronomeBarVely, 1, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Beat velocity"), frame), 2, 0);
+    layout->addWidget(new TQLabel(i18n("Beat velocity"), frame), 2, 0);
     m_metronomeBeatVely = new TQSpinBox(frame);
     m_metronomeBeatVely->setMinValue(0);
     m_metronomeBeatVely->setMaxValue(127);
     connect(m_metronomeBeatVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified()));
-    tqlayout->addWidget(m_metronomeBeatVely, 2, 1);
+    layout->addWidget(m_metronomeBeatVely, 2, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Sub-beat velocity"), frame), 3, 0);
+    layout->addWidget(new TQLabel(i18n("Sub-beat velocity"), frame), 3, 0);
     m_metronomeSubBeatVely = new TQSpinBox(frame);
     m_metronomeSubBeatVely->setMinValue(0);
     m_metronomeSubBeatVely->setMaxValue(127);
     connect(m_metronomeSubBeatVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified()));
-    tqlayout->addWidget(m_metronomeSubBeatVely, 3, 1);
+    layout->addWidget(m_metronomeSubBeatVely, 3, 1);
 
     vbox = new TQVBox(hbox);
 
@@ -261,7 +261,7 @@ ManageMetronomeDialog::populate(int deviceIndex)
                 }
             }
 
-            //	    if (used) iname = i18n("%1 [used]").tqarg(iname);
+            //	    if (used) iname = i18n("%1 [used]").arg(iname);
 
             m_metronomeInstrument->insertItem(iname);
 
diff --git a/src/gui/dialogs/MarkerModifyDialog.cpp b/src/gui/dialogs/MarkerModifyDialog.cpp
index b5c8c2c..b3629bd 100644
--- a/src/gui/dialogs/MarkerModifyDialog.cpp
+++ b/src/gui/dialogs/MarkerModifyDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "MarkerModifyDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include "base/Composition.h"
@@ -80,9 +80,9 @@ MarkerModifyDialog::initialise(Composition *composition,
 
     /*!!!
      
-        tqlayout->addWidget(new TQLabel(i18n("Absolute Time:"), frame), 0, 0);
+        layout->addWidget(new TQLabel(i18n("Absolute Time:"), frame), 0, 0);
         m_timeEdit = new TQSpinBox(frame);
-        tqlayout->addWidget(m_timeEdit, 0, 1);
+        layout->addWidget(m_timeEdit, 0, 1);
      
         m_timeEdit->setMinValue(INT_MIN);
         m_timeEdit->setMaxValue(INT_MAX);
@@ -95,15 +95,15 @@ MarkerModifyDialog::initialise(Composition *composition,
 
     TQFrame *frame = new TQFrame(groupBox);
 
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2, 5, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 2, 2, 5, 5);
 
-    tqlayout->addWidget(new TQLabel(i18n("Text:"), frame), 0, 0);
+    layout->addWidget(new TQLabel(i18n("Text:"), frame), 0, 0);
     m_nameEdit = new TQLineEdit(name, frame);
-    tqlayout->addWidget(m_nameEdit, 0, 1);
+    layout->addWidget(m_nameEdit, 0, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Description:"), frame), 1, 0);
+    layout->addWidget(new TQLabel(i18n("Description:"), frame), 1, 0);
     m_desEdit = new TQLineEdit(des, frame);
-    tqlayout->addWidget(m_desEdit, 1, 1);
+    layout->addWidget(m_desEdit, 1, 1);
 
     m_nameEdit->selectAll();
     m_nameEdit->setFocus();
diff --git a/src/gui/dialogs/PitchPickerDialog.cpp b/src/gui/dialogs/PitchPickerDialog.cpp
index ed09662..12e6034 100644
--- a/src/gui/dialogs/PitchPickerDialog.cpp
+++ b/src/gui/dialogs/PitchPickerDialog.cpp
@@ -26,7 +26,7 @@
 #include "PitchPickerDialog.h"
 #include <klocale.h>
 #include <kdialogbase.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqstring.h>
 #include <tqvbox.h>
@@ -43,10 +43,10 @@ PitchPickerDialog::PitchPickerDialog(TQWidget *parent, int initialPitch, TQStrin
 
     TQFrame *frame = new TQFrame(vBox);
 
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 10, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 10, 5);
 
     m_pitch = new PitchChooser(text, frame, initialPitch);
-    tqlayout->addMultiCellWidget(m_pitch, 0, 0, 0, 2, TQt::AlignHCenter);
+    layout->addMultiCellWidget(m_pitch, 0, 0, 0, 2, TQt::AlignHCenter);
 }
 
 PitchPickerDialog::~PitchPickerDialog()
diff --git a/src/gui/dialogs/ShowSequencerStatusDialog.cpp b/src/gui/dialogs/ShowSequencerStatusDialog.cpp
index 373712a..13b419a 100644
--- a/src/gui/dialogs/ShowSequencerStatusDialog.cpp
+++ b/src/gui/dialogs/ShowSequencerStatusDialog.cpp
@@ -31,7 +31,7 @@
 #include <tqdatastream.h>
 #include <tqlabel.h>
 #include <tqstring.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqvbox.h>
 #include <tqwidget.h>
 #include "gui/application/RosegardenApplication.h"
diff --git a/src/gui/dialogs/SimpleEventEditDialog.cpp b/src/gui/dialogs/SimpleEventEditDialog.cpp
index b3009f6..41830be 100644
--- a/src/gui/dialogs/SimpleEventEditDialog.cpp
+++ b/src/gui/dialogs/SimpleEventEditDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "SimpleEventEditDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include "base/BaseProperties.h"
 #include "base/Event.h"
@@ -76,16 +76,16 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
 
     TQFrame *frame = new TQFrame(groupBox);
 
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 7, 3, 5, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 7, 3, 5, 5);
 
-    tqlayout->addWidget(new TQLabel(i18n("Event type:"), frame), 0, 0);
+    layout->addWidget(new TQLabel(i18n("Event type:"), frame), 0, 0);
 
     if (inserting) {
 
         m_typeLabel = 0;
 
         m_typeCombo = new KComboBox(frame);
-        tqlayout->addWidget(m_typeCombo, 0, 1);
+        layout->addWidget(m_typeCombo, 0, 1);
 
         m_typeCombo->insertItem(strtoqstr(Note::EventType));
         m_typeCombo->insertItem(strtoqstr(Controller::EventType));
@@ -111,15 +111,15 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
         m_typeCombo = 0;
 
         m_typeLabel = new TQLabel(frame);
-        tqlayout->addWidget(m_typeLabel, 0, 1);
+        layout->addWidget(m_typeLabel, 0, 1);
     }
 
     m_timeLabel = new TQLabel(i18n("Absolute time:"), frame);
-    tqlayout->addWidget(m_timeLabel, 1, 0);
+    layout->addWidget(m_timeLabel, 1, 0);
     m_timeSpinBox = new TQSpinBox(INT_MIN, INT_MAX, Note(Note::Shortest).getDuration(), frame);
     m_timeEditButton = new TQPushButton("edit", frame);
-    tqlayout->addWidget(m_timeSpinBox, 1, 1);
-    tqlayout->addWidget(m_timeEditButton, 1, 2);
+    layout->addWidget(m_timeSpinBox, 1, 1);
+    layout->addWidget(m_timeEditButton, 1, 2);
 
     connect(m_timeSpinBox, TQT_SIGNAL(valueChanged(int)),
             TQT_SLOT(slotAbsoluteTimeChanged(int)));
@@ -127,11 +127,11 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
             TQT_SLOT(slotEditAbsoluteTime()));
 
     m_durationLabel = new TQLabel(i18n("Duration:"), frame);
-    tqlayout->addWidget(m_durationLabel, 2, 0);
+    layout->addWidget(m_durationLabel, 2, 0);
     m_durationSpinBox = new TQSpinBox(0, INT_MAX, Note(Note::Shortest).getDuration(), frame);
     m_durationEditButton = new TQPushButton("edit", frame);
-    tqlayout->addWidget(m_durationSpinBox, 2, 1);
-    tqlayout->addWidget(m_durationEditButton, 2, 2);
+    layout->addWidget(m_durationSpinBox, 2, 1);
+    layout->addWidget(m_durationEditButton, 2, 2);
 
     connect(m_durationSpinBox, TQT_SIGNAL(valueChanged(int)),
             TQT_SLOT(slotDurationChanged(int)));
@@ -139,11 +139,11 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
             TQT_SLOT(slotEditDuration()));
 
     m_pitchLabel = new TQLabel(i18n("Pitch:"), frame);
-    tqlayout->addWidget(m_pitchLabel, 3, 0);
+    layout->addWidget(m_pitchLabel, 3, 0);
     m_pitchSpinBox = new TQSpinBox(frame);
     m_pitchEditButton = new TQPushButton("edit", frame);
-    tqlayout->addWidget(m_pitchSpinBox, 3, 1);
-    tqlayout->addWidget(m_pitchEditButton, 3, 2);
+    layout->addWidget(m_pitchSpinBox, 3, 1);
+    layout->addWidget(m_pitchEditButton, 3, 2);
 
     connect(m_pitchSpinBox, TQT_SIGNAL(valueChanged(int)),
             TQT_SLOT(slotPitchChanged(int)));
@@ -155,15 +155,15 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
 
     m_controllerLabel = new TQLabel(i18n("Controller name:"), frame);
     m_controllerLabelValue = new TQLabel(i18n("<none>"), frame);
-    m_controllerLabelValue->tqsetAlignment(TQLabel::AlignRight);
+    m_controllerLabelValue->setAlignment(TQLabel::AlignRight);
 
-    tqlayout->addWidget(m_controllerLabel, 4, 0);
-    tqlayout->addWidget(m_controllerLabelValue, 4, 1);
+    layout->addWidget(m_controllerLabel, 4, 0);
+    layout->addWidget(m_controllerLabelValue, 4, 1);
 
     m_velocityLabel = new TQLabel(i18n("Velocity:"), frame);
-    tqlayout->addWidget(m_velocityLabel, 5, 0);
+    layout->addWidget(m_velocityLabel, 5, 0);
     m_velocitySpinBox = new TQSpinBox(frame);
-    tqlayout->addWidget(m_velocitySpinBox, 5, 1);
+    layout->addWidget(m_velocitySpinBox, 5, 1);
 
     connect(m_velocitySpinBox, TQT_SIGNAL(valueChanged(int)),
             TQT_SLOT(slotVelocityChanged(int)));
@@ -172,14 +172,14 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
     m_velocitySpinBox->setMaxValue(MidiMaxValue);
 
     m_metaLabel = new TQLabel(i18n("Meta string:"), frame);
-    tqlayout->addWidget(m_metaLabel, 6, 0);
+    layout->addWidget(m_metaLabel, 6, 0);
     m_metaEdit = new TQLineEdit(frame);
-    tqlayout->addWidget(m_metaEdit, 6, 1);
+    layout->addWidget(m_metaEdit, 6, 1);
 
     m_sysexLoadButton = new TQPushButton(i18n("Load data"), frame);
-    tqlayout->addWidget(m_sysexLoadButton, 6, 2);
+    layout->addWidget(m_sysexLoadButton, 6, 2);
     m_sysexSaveButton = new TQPushButton(i18n("Save data"), frame);
-    tqlayout->addWidget(m_sysexSaveButton, 4, 2);
+    layout->addWidget(m_sysexSaveButton, 4, 2);
 
     connect(m_metaEdit, TQT_SIGNAL(textChanged(const TQString &)),
             TQT_SLOT(slotMetaChanged(const TQString &)));
@@ -193,21 +193,21 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
 
     frame = new TQFrame(m_notationGroupBox);
 
-    tqlayout = new TQGridLayout(frame, 3, 3, 5, 5);
+    layout = new TQGridLayout(frame, 3, 3, 5, 5);
 
     m_lockNotationValues = new TQCheckBox(i18n("Lock to changes in performed values"), frame);
-    tqlayout->addMultiCellWidget(m_lockNotationValues, 0, 0, 0, 2);
+    layout->addMultiCellWidget(m_lockNotationValues, 0, 0, 0, 2);
     m_lockNotationValues->setChecked(true);
 
     connect(m_lockNotationValues, TQT_SIGNAL(released()),
             TQT_SLOT(slotLockNotationChanged()));
 
     m_notationTimeLabel = new TQLabel(i18n("Notation time:"), frame);
-    tqlayout->addWidget(m_notationTimeLabel, 1, 0);
+    layout->addWidget(m_notationTimeLabel, 1, 0);
     m_notationTimeSpinBox = new TQSpinBox(INT_MIN, INT_MAX, Note(Note::Shortest).getDuration(), frame);
     m_notationTimeEditButton = new TQPushButton("edit", frame);
-    tqlayout->addWidget(m_notationTimeSpinBox, 1, 1);
-    tqlayout->addWidget(m_notationTimeEditButton, 1, 2);
+    layout->addWidget(m_notationTimeSpinBox, 1, 1);
+    layout->addWidget(m_notationTimeEditButton, 1, 2);
 
     connect(m_notationTimeSpinBox, TQT_SIGNAL(valueChanged(int)),
             TQT_SLOT(slotNotationAbsoluteTimeChanged(int)));
@@ -215,11 +215,11 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
             TQT_SLOT(slotEditNotationAbsoluteTime()));
 
     m_notationDurationLabel = new TQLabel(i18n("Notation duration:"), frame);
-    tqlayout->addWidget(m_notationDurationLabel, 2, 0);
+    layout->addWidget(m_notationDurationLabel, 2, 0);
     m_notationDurationSpinBox = new TQSpinBox(0, INT_MAX, Note(Note::Shortest).getDuration(), frame);
     m_notationDurationEditButton = new TQPushButton("edit", frame);
-    tqlayout->addWidget(m_notationDurationSpinBox, 2, 1);
-    tqlayout->addWidget(m_notationDurationEditButton, 2, 2);
+    layout->addWidget(m_notationDurationSpinBox, 2, 1);
+    layout->addWidget(m_notationDurationEditButton, 2, 2);
 
     connect(m_notationDurationSpinBox, TQT_SIGNAL(valueChanged(int)),
             TQT_SLOT(slotNotationDurationChanged(int)));
diff --git a/src/gui/dialogs/SplitByPitchDialog.cpp b/src/gui/dialogs/SplitByPitchDialog.cpp
index 2c93253..7788af1 100644
--- a/src/gui/dialogs/SplitByPitchDialog.cpp
+++ b/src/gui/dialogs/SplitByPitchDialog.cpp
@@ -36,7 +36,7 @@
 #include <tqlabel.h>
 #include <tqvbox.h>
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 
 namespace Rosegarden
@@ -49,27 +49,27 @@ SplitByPitchDialog::SplitByPitchDialog(TQWidget *parent) :
 
     TQFrame *frame = new TQFrame(vBox);
 
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 10, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 10, 5);
 
     m_pitch = new PitchChooser(i18n("Starting split pitch"), frame, 60);
-    tqlayout->addMultiCellWidget(m_pitch, 0, 0, 0, 2, TQt::AlignHCenter);
+    layout->addMultiCellWidget(m_pitch, 0, 0, 0, 2, TQt::AlignHCenter);
 
     m_range = new TQCheckBox(i18n("Range up and down to follow music"), frame);
-    tqlayout->addMultiCellWidget(m_range,
+    layout->addMultiCellWidget(m_range,
                                1, 1,  // fromRow, toRow
                                0, 2  // fromCol, toCol
                               );
 
     m_duplicate = new TQCheckBox(i18n("Duplicate non-note events"), frame);
-    tqlayout->addMultiCellWidget(m_duplicate, 2, 2, 0, 2);
+    layout->addMultiCellWidget(m_duplicate, 2, 2, 0, 2);
 
-    tqlayout->addWidget(new TQLabel(i18n("Clef handling:"), frame), 3, 0);
+    layout->addWidget(new TQLabel(i18n("Clef handling:"), frame), 3, 0);
 
     m_clefs = new KComboBox(frame);
     m_clefs->insertItem(i18n("Leave clefs alone"));
     m_clefs->insertItem(i18n("Guess new clefs"));
     m_clefs->insertItem(i18n("Use treble and bass clefs"));
-    tqlayout->addMultiCellWidget(m_clefs, 3, 3, 1, 2);
+    layout->addMultiCellWidget(m_clefs, 3, 3, 1, 2);
 
     m_range->setChecked(true);
     m_duplicate->setChecked(true);
diff --git a/src/gui/dialogs/SplitByRecordingSrcDialog.cpp b/src/gui/dialogs/SplitByRecordingSrcDialog.cpp
index 1609865..89a4586 100644
--- a/src/gui/dialogs/SplitByRecordingSrcDialog.cpp
+++ b/src/gui/dialogs/SplitByRecordingSrcDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "SplitByRecordingSrcDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include "misc/Strings.h"
@@ -52,23 +52,23 @@ SplitByRecordingSrcDialog::SplitByRecordingSrcDialog(TQWidget *parent, Rosegarde
     TQGroupBox *groupBox = new TQGroupBox
                           (1, Qt::Horizontal, i18n("Recording Source"), vBox);
     TQFrame *frame = new TQFrame(groupBox);
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2, 10, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 2, 2, 10, 5);
 
-    tqlayout->addWidget(new TQLabel( i18n("Channel:"), frame ), 0, 0);
+    layout->addWidget(new TQLabel( i18n("Channel:"), frame ), 0, 0);
     m_channel = new KComboBox( frame );
     m_channel->setSizeLimit( 17 );
-    tqlayout->addWidget(m_channel, 0, 1);
+    layout->addWidget(m_channel, 0, 1);
     TQSpacerItem *spacer = new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    tqlayout->addItem( spacer, 0, 2 );
+    layout->addItem( spacer, 0, 2 );
 
     m_channel->insertItem(i18n("any"));
     for (int i = 1; i < 17; ++i) {
         m_channel->insertItem(TQString::number(i));
     }
 
-    tqlayout->addWidget(new TQLabel( i18n("Device:"), frame ), 1, 0);
+    layout->addWidget(new TQLabel( i18n("Device:"), frame ), 1, 0);
     m_device = new KComboBox( frame );
-    tqlayout->addMultiCellWidget( m_device, 1, 1, 1, 2 );
+    layout->addMultiCellWidget( m_device, 1, 1, 1, 2 );
 
     m_deviceIds.clear();
     m_deviceIds.push_back( -1);
diff --git a/src/gui/dialogs/TempoDialog.cpp b/src/gui/dialogs/TempoDialog.cpp
index 92d7165..c2c54a3 100644
--- a/src/gui/dialogs/TempoDialog.cpp
+++ b/src/gui/dialogs/TempoDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "TempoDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include "misc/Debug.h"
@@ -63,18 +63,18 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc,
     TQGroupBox *groupBox = new TQGroupBox(1, Qt::Horizontal, i18n("Tempo"), vbox);
 
     TQFrame *frame = new TQFrame(groupBox);
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 5, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 5, 5);
 
     // Set tempo
-    tqlayout->addWidget(new TQLabel(i18n("New tempo:"), frame), 0, 1);
+    layout->addWidget(new TQLabel(i18n("New tempo:"), frame), 0, 1);
     m_tempoValueSpinBox = new HSpinBox(frame, 0, 100000, 0.0, 1000.0, 5);
-    tqlayout->addWidget(m_tempoValueSpinBox, 0, 2);
+    layout->addWidget(m_tempoValueSpinBox, 0, 2);
 
     connect(m_tempoValueSpinBox, TQT_SIGNAL(valueChanged(const TQString &)),
             TQT_SLOT(slotTempoChanged(const TQString &)));
 
     m_tempoTap= new TQPushButton(i18n("Tap"), frame);
-    tqlayout->addWidget(m_tempoTap, 0, 3);
+    layout->addWidget(m_tempoTap, 0, 3);
     connect(m_tempoTap, TQT_SIGNAL(clicked()), TQT_SLOT(slotTapClicked()));
 
 
@@ -85,13 +85,13 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc,
     //    m_tempoTargetCheckBox = new TQCheckBox(i18n("Ramping to:"), frame);
     m_tempoTargetSpinBox = new HSpinBox(frame, 0, 100000, 0.0, 1000.0, 5);
 
-    //    tqlayout->addMultiCellWidget(m_tempoTargetCheckBox, 1, 1, 0, 1, AlignRight);
-    //    tqlayout->addWidget(m_tempoTargetSpinBox, 1, 2);
+    //    layout->addMultiCellWidget(m_tempoTargetCheckBox, 1, 1, 0, 1, AlignRight);
+    //    layout->addWidget(m_tempoTargetSpinBox, 1, 2);
 
-    tqlayout->addMultiCellWidget(m_tempoConstant, 1, 1, 1, 2);
-    tqlayout->addMultiCellWidget(m_tempoRampToNext, 2, 2, 1, 2);
-    tqlayout->addWidget(m_tempoRampToTarget, 3, 1);
-    tqlayout->addWidget(m_tempoTargetSpinBox, 3, 2);
+    layout->addMultiCellWidget(m_tempoConstant, 1, 1, 1, 2);
+    layout->addMultiCellWidget(m_tempoRampToNext, 2, 2, 1, 2);
+    layout->addWidget(m_tempoRampToTarget, 3, 1);
+    layout->addWidget(m_tempoTargetSpinBox, 3, 2);
 
     //    connect(m_tempoTargetCheckBox, TQT_SIGNAL(clicked()),
     //            TQT_SLOT(slotTargetCheckBoxClicked()));
@@ -105,13 +105,13 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc,
             TQT_SLOT(slotTargetChanged(const TQString &)));
 
     m_tempoBeatLabel = new TQLabel(frame);
-    tqlayout->addWidget(m_tempoBeatLabel, 0, 4);
+    layout->addWidget(m_tempoBeatLabel, 0, 4);
 
     m_tempoBeat = new TQLabel(frame);
-    tqlayout->addWidget(m_tempoBeat, 0, 5);
+    layout->addWidget(m_tempoBeat, 0, 5);
 
     m_tempoBeatsPerMinute = new TQLabel(frame);
-    tqlayout->addWidget(m_tempoBeatsPerMinute, 0, 6);
+    layout->addWidget(m_tempoBeatsPerMinute, 0, 6);
 
     m_timeEditor = 0;
 
@@ -253,17 +253,17 @@ TempoDialog::populateTempo()
     RealTime tempoTime = comp.getElapsedRealTime(m_tempoTime);
     TQString milliSeconds;
     milliSeconds.sprintf("%03d", tempoTime.msec());
-    m_tempoTimeLabel->setText(i18n("%1.%2 s,").tqarg(tempoTime.sec)
-                              .tqarg(milliSeconds));
+    m_tempoTimeLabel->setText(i18n("%1.%2 s,").arg(tempoTime.sec)
+                              .arg(milliSeconds));
 
     int barNo = comp.getBarNumber(m_tempoTime);
     if (comp.getBarStart(barNo) == m_tempoTime) {
         m_tempoBarLabel->setText
-        (i18n("at the start of measure %1.").tqarg(barNo + 1));
+        (i18n("at the start of measure %1.").arg(barNo + 1));
         m_tempoChangeStartOfBar->setEnabled(false);
     } else {
         m_tempoBarLabel->setText(
-            i18n("in the middle of measure %1.").tqarg(barNo + 1));
+            i18n("in the middle of measure %1.").arg(barNo + 1));
         m_tempoChangeStartOfBar->setEnabled(true);
     }
 
@@ -282,8 +282,8 @@ TempoDialog::populateTempo()
             lastms.sprintf("%03d", lastRT.msec());
             int lastBar = comp.getBarNumber(lastTempoTime);
             m_tempoChangeBeforeAt->setText
-            (i18n("        (at %1.%2 s, in measure %3)").tqarg(lastRT.sec)
-             .tqarg(lastms).tqarg(lastBar + 1));
+            (i18n("        (at %1.%2 s, in measure %3)").arg(lastRT.sec)
+             .arg(lastms).arg(lastBar + 1));
             m_tempoChangeBeforeAt->show();
 
             m_tempoChangeBefore->setEnabled(true);
diff --git a/src/gui/dialogs/TimeSignatureDialog.cpp b/src/gui/dialogs/TimeSignatureDialog.cpp
index 7aae2aa..f9de575 100644
--- a/src/gui/dialogs/TimeSignatureDialog.cpp
+++ b/src/gui/dialogs/TimeSignatureDialog.cpp
@@ -92,12 +92,12 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent,
     BigArrowButton *denomDown = new BigArrowButton(denomBox, Qt::LeftArrow);
 
     m_numLabel = new TQLabel
-                 (TQString("%1").tqarg(m_timeSignature.getNumerator()), numBox);
+                 (TQString("%1").arg(m_timeSignature.getNumerator()), numBox);
     m_denomLabel = new TQLabel
-                   (TQString("%1").tqarg(m_timeSignature.getDenominator()), denomBox);
+                   (TQString("%1").arg(m_timeSignature.getDenominator()), denomBox);
 
-    m_numLabel->tqsetAlignment(AlignHCenter | AlignVCenter);
-    m_denomLabel->tqsetAlignment(AlignHCenter | AlignVCenter);
+    m_numLabel->setAlignment(AlignHCenter | AlignVCenter);
+    m_denomLabel->setAlignment(AlignHCenter | AlignVCenter);
 
     m_numLabel->setFont(*timeSigFont);
     m_denomLabel->setFont(*timeSigFont);
@@ -139,11 +139,11 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent,
                 if (atStartOfBar) {
                     scopeText = TQString
                                 (i18n("Insertion point is at start of measure %1."))
-                                .tqarg(barNo + 1);
+                                .arg(barNo + 1);
                 } else {
                     scopeText = TQString
                                 (i18n("Insertion point is in the middle of measure %1."))
-                                .tqarg(barNo + 1);
+                                .arg(barNo + 1);
                 }
             } else {
                 scopeText = TQString
@@ -152,19 +152,19 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent,
 
             new TQLabel(scopeText, groupBox);
             m_asGivenButton = new TQRadioButton
-                              (i18n("Start measure %1 here").tqarg(barNo + 2), groupBox);
+                              (i18n("Start measure %1 here").arg(barNo + 2), groupBox);
 
             if (!atStartOfBar) {
                 m_startOfBarButton = new TQRadioButton
                                      (i18n("Change time from start of measure %1")
-                                      .tqarg(barNo + 1), groupBox);
+                                      .arg(barNo + 1), groupBox);
                 m_startOfBarButton->setChecked(true);
             } else {
                 m_asGivenButton->setChecked(true);
             }
         } else {
             new TQLabel(i18n("Time change will take effect at the start of measure %1.")
-                       .tqarg(barNo + 1), groupBox);
+                       .arg(barNo + 1), groupBox);
         }
     }
 
@@ -231,7 +231,7 @@ TimeSignatureDialog::slotNumDown()
     int n = m_timeSignature.getNumerator();
     if (--n >= 1) {
         m_timeSignature = TimeSignature(n, m_timeSignature.getDenominator());
-        m_numLabel->setText(TQString("%1").tqarg(n));
+        m_numLabel->setText(TQString("%1").arg(n));
     }
     slotUpdateCommonTimeButton();
 }
@@ -242,7 +242,7 @@ TimeSignatureDialog::slotNumUp()
     int n = m_timeSignature.getNumerator();
     if (++n <= 99) {
         m_timeSignature = TimeSignature(n, m_timeSignature.getDenominator());
-        m_numLabel->setText(TQString("%1").tqarg(n));
+        m_numLabel->setText(TQString("%1").arg(n));
     }
     slotUpdateCommonTimeButton();
 }
@@ -253,7 +253,7 @@ TimeSignatureDialog::slotDenomDown()
     int n = m_timeSignature.getDenominator();
     if ((n /= 2) >= 1) {
         m_timeSignature = TimeSignature(m_timeSignature.getNumerator(), n);
-        m_denomLabel->setText(TQString("%1").tqarg(n));
+        m_denomLabel->setText(TQString("%1").arg(n));
     }
     slotUpdateCommonTimeButton();
 }
@@ -264,7 +264,7 @@ TimeSignatureDialog::slotDenomUp()
     int n = m_timeSignature.getDenominator();
     if ((n *= 2) <= 64) {
         m_timeSignature = TimeSignature(m_timeSignature.getNumerator(), n);
-        m_denomLabel->setText(TQString("%1").tqarg(n));
+        m_denomLabel->setText(TQString("%1").arg(n));
     }
     slotUpdateCommonTimeButton();
 }
diff --git a/src/gui/dialogs/TransportDialog.cpp b/src/gui/dialogs/TransportDialog.cpp
index 68c42a7..a63beac 100644
--- a/src/gui/dialogs/TransportDialog.cpp
+++ b/src/gui/dialogs/TransportDialog.cpp
@@ -46,7 +46,7 @@
 #include <tqfont.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
 #include <tqstring.h>
@@ -206,10 +206,10 @@ TransportDialog::TransportDialog(TQWidget *parent,
     pal.setColor(TQColorGroup::Foreground, TQColor(192, 216, 255));
 
     m_transport->TempoDisplay->setPalette(pal);
-    m_transport->TempoDisplay->tqsetAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight));
+    m_transport->TempoDisplay->setAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight));
 
     m_transport->TimeSigDisplay->setPalette(pal);
-    m_transport->TimeSigDisplay->tqsetAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight));
+    m_transport->TimeSigDisplay->setAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight));
 
     TQFont localFont(m_transport->OutDisplay->font() );
     localFont.setFamily( "lucida" );
@@ -344,7 +344,7 @@ TransportDialog::loadPixmaps()
     TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
 
     for (int i = 0; i < 10; i++) {
-        fileName = TQString("%1/transport/led-%2.xpm").tqarg(pixmapDir).tqarg(i);
+        fileName = TQString("%1/transport/led-%2.xpm").arg(pixmapDir).arg(i);
         if (!m_lcdList[i].load(fileName)) {
             std::cerr << "TransportDialog - failed to load pixmap \""
                       << fileName.ascii() << "\"" << std::endl;
@@ -353,7 +353,7 @@ TransportDialog::loadPixmaps()
 
     // Load the "negative" sign pixmap
     //
-    fileName = TQString("%1/transport/led--.xpm").tqarg(pixmapDir);
+    fileName = TQString("%1/transport/led--.xpm").arg(pixmapDir);
     m_lcdNegative.load(fileName);
 
 }
@@ -479,7 +479,7 @@ TransportDialog::displayTime()
 
     case FrameMode:
         m_clearMetronomeTimer->stop();
-        m_transport->TimeDisplayLabel->setText(TQString("%1").tqarg(m_sampleRate));
+        m_transport->TimeDisplayLabel->setText(TQString("%1").arg(m_sampleRate));
         m_transport->TimeDisplayLabel->show();
         break;
     }
@@ -917,7 +917,7 @@ TransportDialog::setMidiInLabel(const MappedEvent *mE)
         MidiPitchLabel mPL(mE->getPitch());
         m_transport->InDisplay->setText
             (mPL.getTQString() +
-             TQString("  %1").tqarg(mE->getVelocity()));
+             TQString("  %1").arg(mE->getVelocity()));
     }
     break;
 
@@ -977,7 +977,7 @@ TransportDialog::setMidiOutLabel(const MappedEvent *mE)
         MidiPitchLabel mPL(mE->getPitch());
         m_transport->OutDisplay->setText
             (mPL.getTQString() +
-             TQString("  %1").tqarg(mE->getVelocity()));
+             TQString("  %1").arg(mE->getVelocity()));
     }
     break;
 
@@ -1133,8 +1133,8 @@ TransportDialog::slotSetBackground(TQColor c)
 
     /* this is a bit more thorough, but too slow and flickery:
      
-    const TQObjectList *tqchildren = m_transport->LCDBoxFrame->tqchildren();
-    TQObjectListIt it(*tqchildren);
+    const TQObjectList *children = m_transport->LCDBoxFrame->children();
+    TQObjectListIt it(*children);
     TQObject *obj;
      
     while ((obj = it.current()) != 0) {
diff --git a/src/gui/dialogs/TriggerSegmentDialog.cpp b/src/gui/dialogs/TriggerSegmentDialog.cpp
index 744d628..4e4c75b 100644
--- a/src/gui/dialogs/TriggerSegmentDialog.cpp
+++ b/src/gui/dialogs/TriggerSegmentDialog.cpp
@@ -41,7 +41,7 @@
 #include <tqstring.h>
 #include <tqvbox.h>
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 
 namespace Rosegarden
@@ -56,27 +56,27 @@ TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *parent,
     TQVBox *vbox = makeVBoxMainWidget();
 
     TQFrame *frame = new TQFrame(vbox);
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 3, 2, 5, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 3, 2, 5, 5);
 
     TQLabel *label = new TQLabel(i18n("Trigger segment: "), frame);
-    tqlayout->addWidget(label, 0, 0);
+    layout->addWidget(label, 0, 0);
 
     m_segment = new KComboBox(frame);
-    tqlayout->addWidget(m_segment, 0, 1);
+    layout->addWidget(m_segment, 0, 1);
 
     int n = 1;
     for (Composition::triggersegmentcontaineriterator i =
                 m_composition->getTriggerSegments().begin();
             i != m_composition->getTriggerSegments().end(); ++i) {
         m_segment->insertItem
-        (TQString("%1. %2").tqarg(n++).tqarg(strtoqstr((*i)->getSegment()->getLabel())));
+        (TQString("%1. %2").arg(n++).arg(strtoqstr((*i)->getSegment()->getLabel())));
     }
 
     label = new TQLabel(i18n("Perform with timing: "), frame);
-    tqlayout->addWidget(label, 1, 0);
+    layout->addWidget(label, 1, 0);
 
     m_adjustTime = new KComboBox(frame);
-    tqlayout->addWidget(m_adjustTime, 1, 1);
+    layout->addWidget(m_adjustTime, 1, 1);
 
     m_adjustTime->insertItem(i18n("As stored"));
     m_adjustTime->insertItem(i18n("Truncate if longer than note"));
@@ -86,7 +86,7 @@ TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *parent,
     m_retune = new TQCheckBox(i18n("Adjust pitch to note"), frame);
     m_retune->setChecked(true);
 
-    tqlayout->addWidget(m_retune, 2, 1);
+    layout->addWidget(m_retune, 2, 1);
 
     setupFromConfig();
 }
diff --git a/src/gui/dialogs/TupletDialog.cpp b/src/gui/dialogs/TupletDialog.cpp
index d9d528b..e4a1e00 100644
--- a/src/gui/dialogs/TupletDialog.cpp
+++ b/src/gui/dialogs/TupletDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "TupletDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include "base/NotationTypes.h"
@@ -120,7 +120,7 @@ TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType,
         new TQLabel(i18n("Selected region:"), timingDisplayGrid);
         new TQLabel("", timingDisplayGrid);
         m_selectionDurationDisplay = new TQLabel("x", timingDisplayGrid);
-        m_selectionDurationDisplay->tqsetAlignment(int(TQLabel::AlignVCenter |
+        m_selectionDurationDisplay->setAlignment(int(TQLabel::AlignVCenter |
                 TQLabel::AlignRight));
     } else {
         m_selectionDurationDisplay = 0;
@@ -129,19 +129,19 @@ TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType,
     new TQLabel(i18n("Group with current timing:"), timingDisplayGrid);
     m_untupledDurationCalculationDisplay = new TQLabel("x", timingDisplayGrid);
     m_untupledDurationDisplay = new TQLabel("x", timingDisplayGrid);
-    m_untupledDurationDisplay->tqsetAlignment(int(TQLabel::AlignVCenter |
+    m_untupledDurationDisplay->setAlignment(int(TQLabel::AlignVCenter |
                                             TQLabel::AlignRight));
 
     new TQLabel(i18n("Group with new timing:"), timingDisplayGrid);
     m_tupledDurationCalculationDisplay = new TQLabel("x", timingDisplayGrid);
     m_tupledDurationDisplay = new TQLabel("x", timingDisplayGrid);
-    m_tupledDurationDisplay->tqsetAlignment(int(TQLabel::AlignVCenter |
+    m_tupledDurationDisplay->setAlignment(int(TQLabel::AlignVCenter |
                                           TQLabel::AlignRight));
 
     new TQLabel(i18n("Gap created by timing change:"), timingDisplayGrid);
     m_newGapDurationCalculationDisplay = new TQLabel("x", timingDisplayGrid);
     m_newGapDurationDisplay = new TQLabel("x", timingDisplayGrid);
-    m_newGapDurationDisplay->tqsetAlignment(int(TQLabel::AlignVCenter |
+    m_newGapDurationDisplay->setAlignment(int(TQLabel::AlignVCenter |
                                           TQLabel::AlignRight));
 
     if (maxDuration > 0) {
@@ -150,7 +150,7 @@ TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType,
         m_unchangedDurationCalculationDisplay = new TQLabel
                                                 ("x", timingDisplayGrid);
         m_unchangedDurationDisplay = new TQLabel("x", timingDisplayGrid);
-        m_unchangedDurationDisplay->tqsetAlignment(int(TQLabel::AlignVCenter |
+        m_unchangedDurationDisplay->setAlignment(int(TQLabel::AlignVCenter |
                 TQLabel::AlignRight));
 
     } else {
@@ -238,7 +238,7 @@ TupletDialog::updateUntupledCombo()
     TQString previousText = m_untupledCombo->currentText();
     if (previousText.toInt() == 0) {
         if (maxValue < 3)
-            previousText = TQString("%1").tqarg(maxValue);
+            previousText = TQString("%1").arg(maxValue);
         else
             previousText = "3";
     }
@@ -247,7 +247,7 @@ TupletDialog::updateUntupledCombo()
     bool setText = false;
 
     for (int i = 1; i <= maxValue; ++i) {
-        TQString text = TQString("%1").tqarg(i);
+        TQString text = TQString("%1").arg(i);
         m_untupledCombo->insertItem(text);
         if (m_hasTimingAlready->isChecked()) {
             if (i == (m_maxDuration * 3) / (Note(getUnitType()).getDuration()*2)) {
@@ -278,7 +278,7 @@ TupletDialog::updateTupledCombo()
     if (previousText.toInt() == 0 ||
             previousText.toInt() > untupled) {
         if (untupled < 2)
-            previousText = TQString("%1").tqarg(untupled);
+            previousText = TQString("%1").arg(untupled);
         else
             previousText = "2";
     }
@@ -286,7 +286,7 @@ TupletDialog::updateTupledCombo()
     m_tupledCombo->clear();
 
     for (int i = 1; i < untupled; ++i) {
-        TQString text = TQString("%1").tqarg(i);
+        TQString text = TQString("%1").arg(i);
         m_tupledCombo->insertItem(text);
         if (m_hasTimingAlready->isChecked()) {
             if (i == m_maxDuration / Note(getUnitType()).getDuration()) {
@@ -310,33 +310,33 @@ TupletDialog::updateTimingDisplays()
     timeT tupledDuration = unitDuration * tupledCount;
 
     if (m_selectionDurationDisplay) {
-        m_selectionDurationDisplay->setText(TQString("%1").tqarg(m_maxDuration));
+        m_selectionDurationDisplay->setText(TQString("%1").arg(m_maxDuration));
     }
 
     m_untupledDurationCalculationDisplay->setText
-    (TQString("  %1 x %2 = ").tqarg(untupledCount).tqarg(unitDuration));
+    (TQString("  %1 x %2 = ").arg(untupledCount).arg(unitDuration));
     m_untupledDurationDisplay->setText
-    (TQString("%1").tqarg(untupledDuration));
+    (TQString("%1").arg(untupledDuration));
 
     m_tupledDurationCalculationDisplay->setText
-    (TQString("  %1 x %2 = ").tqarg(tupledCount).tqarg(unitDuration));
+    (TQString("  %1 x %2 = ").arg(tupledCount).arg(unitDuration));
     m_tupledDurationDisplay->setText
-    (TQString("%1").tqarg(tupledDuration));
+    (TQString("%1").arg(tupledDuration));
 
     m_newGapDurationCalculationDisplay->setText
-    (TQString("  %1 - %2 = ").tqarg(untupledDuration).tqarg(tupledDuration));
+    (TQString("  %1 - %2 = ").arg(untupledDuration).arg(tupledDuration));
     m_newGapDurationDisplay->setText
-    (TQString("%1").tqarg(untupledDuration - tupledDuration));
+    (TQString("%1").arg(untupledDuration - tupledDuration));
 
     if (m_selectionDurationDisplay && m_unchangedDurationDisplay) {
         if (m_maxDuration != untupledDuration) {
             m_unchangedDurationCalculationDisplay->setText
-            (TQString("  %1 - %2 = ").tqarg(m_maxDuration).tqarg(untupledDuration));
+            (TQString("  %1 - %2 = ").arg(m_maxDuration).arg(untupledDuration));
         } else {
             m_unchangedDurationCalculationDisplay->setText("");
         }
         m_unchangedDurationDisplay->setText
-        (TQString("%1").tqarg(m_maxDuration - untupledDuration));
+        (TQString("%1").arg(m_maxDuration - untupledDuration));
     }
 }
 
diff --git a/src/gui/dialogs/UnusedAudioSelectionDialog.cpp b/src/gui/dialogs/UnusedAudioSelectionDialog.cpp
index 9a86252..b15fe07 100644
--- a/src/gui/dialogs/UnusedAudioSelectionDialog.cpp
+++ b/src/gui/dialogs/UnusedAudioSelectionDialog.cpp
@@ -60,8 +60,8 @@ UnusedAudioSelectionDialog::UnusedAudioSelectionDialog(TQWidget *parent,
         TQString fileSize = i18n(" (not found) ");
         TQString fileDate;
         if (info.exists()) {
-            fileSize = TQString(" %1 ").tqarg(info.size());
-            fileDate = TQString(" %1 ").tqarg(info.lastModified().toString());
+            fileSize = TQString(" %1 ").arg(info.size());
+            fileDate = TQString(" %1 ").arg(info.lastModified().toString());
         }
         TQListViewItem *item = new KListViewItem
                               (m_listView, fileName, fileSize, fileDate);
diff --git a/src/gui/dialogs/UseOrnamentDialog.cpp b/src/gui/dialogs/UseOrnamentDialog.cpp
index 2c8fb97..9076803 100644
--- a/src/gui/dialogs/UseOrnamentDialog.cpp
+++ b/src/gui/dialogs/UseOrnamentDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "UseOrnamentDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <kapplication.h>
 
 #include "base/BaseProperties.h"
@@ -63,13 +63,13 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
     TQGroupBox *notationBox = new TQGroupBox(1, Qt::Horizontal, i18n("Notation"), vbox);
 
     TQFrame *frame = new TQFrame(notationBox);
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 1, 5, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 4, 1, 5, 5);
 
     label = new TQLabel(i18n("Display as:  "), frame);
-    tqlayout->addWidget(label, 0, 0);
+    layout->addWidget(label, 0, 0);
 
     m_mark = new KComboBox(frame);
-    tqlayout->addWidget(m_mark, 0, 1);
+    layout->addWidget(m_mark, 0, 1);
 
     m_marks.push_back(Marks::Trill);
     m_marks.push_back(Marks::LongTrill);
@@ -96,35 +96,35 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
     connect(m_mark, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMarkChanged(int)));
 
     m_textLabel = new TQLabel(i18n("   Text:  "), frame);
-    tqlayout->addWidget(m_textLabel, 0, 2);
+    layout->addWidget(m_textLabel, 0, 2);
 
     m_text = new TQLineEdit(frame);
-    tqlayout->addWidget(m_text, 0, 3);
+    layout->addWidget(m_text, 0, 3);
 
     TQGroupBox *performBox = new TQGroupBox(1, Qt::Horizontal, i18n("Performance"), vbox);
 
     frame = new TQFrame(performBox);
-    tqlayout = new TQGridLayout(frame, 3, 2, 5, 5);
+    layout = new TQGridLayout(frame, 3, 2, 5, 5);
 
     label = new TQLabel(i18n("Perform using triggered segment: "), frame);
-    tqlayout->addWidget(label, 0, 0);
+    layout->addWidget(label, 0, 0);
 
     m_ornament = new KComboBox(frame);
-    tqlayout->addWidget(m_ornament, 0, 1);
+    layout->addWidget(m_ornament, 0, 1);
 
     int n = 1;
     for (Composition::triggersegmentcontaineriterator i =
                 m_composition->getTriggerSegments().begin();
             i != m_composition->getTriggerSegments().end(); ++i) {
         m_ornament->insertItem
-        (TQString("%1. %2").tqarg(n++).tqarg(strtoqstr((*i)->getSegment()->getLabel())));
+        (TQString("%1. %2").arg(n++).arg(strtoqstr((*i)->getSegment()->getLabel())));
     }
 
     label = new TQLabel(i18n("Perform with timing: "), frame);
-    tqlayout->addWidget(label, 1, 0);
+    layout->addWidget(label, 1, 0);
 
     m_adjustTime = new KComboBox(frame);
-    tqlayout->addWidget(m_adjustTime, 1, 1);
+    layout->addWidget(m_adjustTime, 1, 1);
 
     m_adjustTime->insertItem(i18n("As stored"));
     m_adjustTime->insertItem(i18n("Truncate if longer than note"));
@@ -134,7 +134,7 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
     m_retune = new TQCheckBox(i18n("Adjust pitch to note"), frame);
     m_retune->setChecked(true);
 
-    tqlayout->addWidget(m_retune, 2, 1);
+    layout->addWidget(m_retune, 2, 1);
 
     setupFromConfig();
 }
diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp
index 91b2b4d..67a233a 100644
--- a/src/gui/editors/eventlist/EventView.cpp
+++ b/src/gui/editors/eventlist/EventView.cpp
@@ -76,7 +76,7 @@
 #include <tqgroupbox.h>
 #include <tqiconset.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistview.h>
 #include <tqpixmap.h>
 #include <tqpoint.h>
@@ -161,40 +161,40 @@ EventView::EventView(RosegardenGUIDoc *doc,
                               (1, Qt::Horizontal, i18n("Triggered Segment Properties"), getCentralWidget());
 
         TQFrame *frame = new TQFrame(groupBox);
-        TQGridLayout *tqlayout = new TQGridLayout(frame, 5, 3, 5, 5);
+        TQGridLayout *layout = new TQGridLayout(frame, 5, 3, 5, 5);
 
-        tqlayout->addWidget(new TQLabel(i18n("Label:  "), frame), 0, 0);
+        layout->addWidget(new TQLabel(i18n("Label:  "), frame), 0, 0);
         TQString label = strtoqstr(segments[0]->getLabel());
         if (label == "")
             label = i18n("<no label>");
         m_triggerName = new TQLabel(label, frame);
-        tqlayout->addWidget(m_triggerName, 0, 1);
+        layout->addWidget(m_triggerName, 0, 1);
         TQPushButton *editButton = new TQPushButton(i18n("edit"), frame);
-        tqlayout->addWidget(editButton, 0, 2);
+        layout->addWidget(editButton, 0, 2);
         connect(editButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotEditTriggerName()));
 
-        tqlayout->addWidget(new TQLabel(i18n("Base pitch:  "), frame), 1, 0);
-        m_triggerPitch = new TQLabel(TQString("%1").tqarg(rec->getBasePitch()), frame);
-        tqlayout->addWidget(m_triggerPitch, 1, 1);
+        layout->addWidget(new TQLabel(i18n("Base pitch:  "), frame), 1, 0);
+        m_triggerPitch = new TQLabel(TQString("%1").arg(rec->getBasePitch()), frame);
+        layout->addWidget(m_triggerPitch, 1, 1);
         editButton = new TQPushButton(i18n("edit"), frame);
-        tqlayout->addWidget(editButton, 1, 2);
+        layout->addWidget(editButton, 1, 2);
         connect(editButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotEditTriggerPitch()));
 
-        tqlayout->addWidget(new TQLabel(i18n("Base velocity:  "), frame), 2, 0);
-        m_triggerVelocity = new TQLabel(TQString("%1").tqarg(rec->getBaseVelocity()), frame);
-        tqlayout->addWidget(m_triggerVelocity, 2, 1);
+        layout->addWidget(new TQLabel(i18n("Base velocity:  "), frame), 2, 0);
+        m_triggerVelocity = new TQLabel(TQString("%1").arg(rec->getBaseVelocity()), frame);
+        layout->addWidget(m_triggerVelocity, 2, 1);
         editButton = new TQPushButton(i18n("edit"), frame);
-        tqlayout->addWidget(editButton, 2, 2);
+        layout->addWidget(editButton, 2, 2);
         connect(editButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotEditTriggerVelocity()));
 
         /*!!! Comment out these two options, which are not yet used
           anywhere else -- intended for use with library ornaments, not
           yet implemented
 
-        tqlayout->addWidget(new TQLabel(i18n("Default timing:  "), frame), 3, 0);
+        layout->addWidget(new TQLabel(i18n("Default timing:  "), frame), 3, 0);
 
         KComboBox *adjust = new KComboBox(frame);
-        tqlayout->addMultiCellWidget(adjust, 3, 3, 1, 2);
+        layout->addMultiCellWidget(adjust, 3, 3, 1, 2);
         adjust->insertItem(i18n("As stored"));
         adjust->insertItem(i18n("Truncate if longer than note"));
         adjust->insertItem(i18n("End at same time as note")); 
@@ -216,7 +216,7 @@ EventView::EventView(RosegardenGUIDoc *doc,
         TQCheckBox *retune = new TQCheckBox(i18n("Adjust pitch to trigger note by default"), frame);
         retune->setChecked(rec->getDefaultRetune());
         connect(retune, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotTriggerRetuneChanged()));
-        tqlayout->addMultiCellWidget(retune, 4, 4, 1, 2);
+        layout->addMultiCellWidget(retune, 4, 4, 1, 2);
 
         */
 
@@ -387,7 +387,7 @@ EventView::applyLayout(int /*staffNo*/)
                 int p = (*it)->get
                         <Int>(BaseProperties::PITCH);
                 pitchStr = TQString("%1 %2  ")
-                           .tqarg(p).tqarg(MidiPitchLabel(p).getTQString());
+                           .arg(p).arg(MidiPitchLabel(p).getTQString());
             } else if ((*it)->isa(Note::EventType)) {
                 pitchStr = "<not set>";
             }
@@ -613,27 +613,27 @@ EventView::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 =
                 getDocument()->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);
     }
 }
 
@@ -649,15 +649,15 @@ EventView::makeDurationString(timeT time,
             getDocument()->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
@@ -665,12 +665,12 @@ EventView::makeDurationString(timeT time,
             RealTime rt =
                 getDocument()->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);
     }
 }
 
@@ -719,7 +719,7 @@ EventView::slotEditTriggerPitch()
     if (dlg->exec() == TQDialog::Accepted) {
         addCommandToHistory(new SetTriggerSegmentBasePitchCommand
                             (&getDocument()->getComposition(), id, dlg->getPitch()));
-        m_triggerPitch->setText(TQString("%1").tqarg(dlg->getPitch()));
+        m_triggerPitch->setText(TQString("%1").arg(dlg->getPitch()));
     }
 }
 
@@ -737,7 +737,7 @@ EventView::slotEditTriggerVelocity()
     if (dlg->exec() == TQDialog::Accepted) {
         addCommandToHistory(new SetTriggerSegmentBaseVelocityCommand
                             (&getDocument()->getComposition(), id, dlg->getVelocity()));
-        m_triggerVelocity->setText(TQString("%1").tqarg(dlg->getVelocity()));
+        m_triggerVelocity->setText(TQString("%1").arg(dlg->getVelocity()));
     }
 }
 
@@ -1575,8 +1575,8 @@ EventView::updateViewCaption()
     if (m_isTriggerSegment) {
 
         setCaption(i18n("%1 - Triggered Segment: %2")
-                   .tqarg(getDocument()->getTitle())
-                   .tqarg(strtoqstr(m_segments[0]->getLabel())));
+                   .arg(getDocument()->getTitle())
+                   .arg(strtoqstr(m_segments[0]->getLabel())));
 
 
     } else if (m_segments.size() == 1) {
@@ -1590,14 +1590,14 @@ EventView::updateViewCaption()
             trackPosition = track->getPosition();
 
         setCaption(i18n("%1 - Segment Track #%2 - Event List")
-                   .tqarg(getDocument()->getTitle())
-                   .tqarg(trackPosition + 1));
+                   .arg(getDocument()->getTitle())
+                   .arg(trackPosition + 1));
 
     } else {
 
         setCaption(i18n("%1 - %2 Segments - Event List")
-                   .tqarg(getDocument()->getTitle())
-                   .tqarg(m_segments.size()));
+                   .arg(getDocument()->getTitle())
+                   .arg(m_segments.size()));
     }
 
 }
diff --git a/src/gui/editors/guitar/ChordMap.cpp b/src/gui/editors/guitar/ChordMap.cpp
index 64ea463..fad1871 100644
--- a/src/gui/editors/guitar/ChordMap.cpp
+++ b/src/gui/editors/guitar/ChordMap.cpp
@@ -26,7 +26,7 @@
 #include "ChordMap.h"
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 namespace Rosegarden
 {
@@ -201,7 +201,7 @@ bool ChordMap::saveDocument(const TQString& filename, bool userChordsOnly, TQStr
     outStream << "</chords>\n";    
     outStream << "</rosegarden-chord-data>\n";
   
-    return outStream.tqdevice()->status() == IO_Ok;
+    return outStream.device()->status() == IO_Ok;
 }
 
 int ChordMap::FILE_FORMAT_VERSION_MAJOR = 1;
diff --git a/src/gui/editors/guitar/ChordXmlHandler.cpp b/src/gui/editors/guitar/ChordXmlHandler.cpp
index d2f71b4..6802485 100644
--- a/src/gui/editors/guitar/ChordXmlHandler.cpp
+++ b/src/gui/editors/guitar/ChordXmlHandler.cpp
@@ -134,9 +134,9 @@ bool
 ChordXmlHandler::error(const TQXmlParseException& exception)
 {
     m_errorString = TQString("%1 at line %2, column %3")
-                    .tqarg(exception.message())
-                    .tqarg(exception.lineNumber())
-                    .tqarg(exception.columnNumber());
+                    .arg(exception.message())
+                    .arg(exception.lineNumber())
+                    .arg(exception.columnNumber());
     return TQXmlDefaultHandler::error( exception );
 }
 
@@ -144,9 +144,9 @@ bool
 ChordXmlHandler::fatalError(const TQXmlParseException& exception)
 {
     m_errorString = TQString("%1 at line %2, column %3")
-                    .tqarg(exception.message())
-                    .tqarg(exception.lineNumber())
-                    .tqarg(exception.columnNumber());
+                    .arg(exception.message())
+                    .arg(exception.lineNumber())
+                    .arg(exception.columnNumber());
     return TQXmlDefaultHandler::fatalError( exception );
 }
 
diff --git a/src/gui/editors/guitar/Fingering.cpp b/src/gui/editors/guitar/Fingering.cpp
index 7e5ecc4..59459e9 100644
--- a/src/gui/editors/guitar/Fingering.cpp
+++ b/src/gui/editors/guitar/Fingering.cpp
@@ -69,24 +69,24 @@ Fingering::getStartFret() const
 bool
 Fingering::hasBarre() const
 {
-    int lastStringtqStatus = m_strings[getNbStrings() - 1];
+    int lastStringStatus = m_strings[getNbStrings() - 1];
     
-    return ((m_strings[0] > OPEN && m_strings[0] == lastStringtqStatus) ||
-            (m_strings[1] > OPEN && m_strings[1] == lastStringtqStatus) ||
-            (m_strings[2] > OPEN && m_strings[2] == lastStringtqStatus));
+    return ((m_strings[0] > OPEN && m_strings[0] == lastStringStatus) ||
+            (m_strings[1] > OPEN && m_strings[1] == lastStringStatus) ||
+            (m_strings[2] > OPEN && m_strings[2] == lastStringStatus));
 }
 
 Fingering::Barre
 Fingering::getBarre() const
 {
-    int lastStringtqStatus = m_strings[getNbStrings() - 1];
+    int lastStringStatus = m_strings[getNbStrings() - 1];
 
     Barre res;
     
-    res.fret = lastStringtqStatus;
+    res.fret = lastStringStatus;
     
     for(unsigned int i = 0; i < 3; ++i) {
-        if (m_strings[i] > OPEN && m_strings[i] == lastStringtqStatus)
+        if (m_strings[i] > OPEN && m_strings[i] == lastStringStatus)
             res.start = i;
             break;
     }
@@ -115,7 +115,7 @@ Fingering::parseFingering(const TQString& ch, TQString& errorString)
 //            NOTATION_DEBUG << "Fingering::parseFingering : '" << t << "' = MUTED\n";  
             fingering[idx] = MUTED;
         } else {
-            errorString = i18n("couldn't parse fingering '%1' in '%2'").tqarg(t).tqarg(ch);            
+            errorString = i18n("couldn't parse fingering '%1' in '%2'").arg(t).arg(ch);            
         }
     }
 
@@ -140,8 +140,8 @@ std::string Fingering::toString() const
 bool operator<(const Fingering& a, const Fingering& b)
 {
     for(unsigned int i = 0; i < Fingering::DEFAULT_NB_STRINGS; ++i) {
-        if (a.getStringtqStatus(i) != b.getStringtqStatus(i)) {
-            return a.getStringtqStatus(i) < b.getStringtqStatus(i);
+        if (a.getStringStatus(i) != b.getStringStatus(i)) {
+            return a.getStringStatus(i) < b.getStringStatus(i);
         }
     }
     return false;
diff --git a/src/gui/editors/guitar/Fingering.h b/src/gui/editors/guitar/Fingering.h
index b413d3b..32693dd 100644
--- a/src/gui/editors/guitar/Fingering.h
+++ b/src/gui/editors/guitar/Fingering.h
@@ -60,8 +60,8 @@ public:
      * returns the fret number on which the string is pressed, or one of MUTED and OPEN  
      * 
      */
-    int  getStringtqStatus(int stringNb) const       { return m_strings[stringNb]; } 
-    void setStringtqStatus(int stringNb, int status) { m_strings[stringNb] = status; } 
+    int  getStringStatus(int stringNb) const       { return m_strings[stringNb]; } 
+    void setStringStatus(int stringNb, int status) { m_strings[stringNb] = status; } 
     unsigned int getStartFret() const;
     unsigned int getNbStrings() const { return m_strings.size(); }
         
diff --git a/src/gui/editors/guitar/FingeringBox.cpp b/src/gui/editors/guitar/FingeringBox.cpp
index 6ca2c39..49058b2 100644
--- a/src/gui/editors/guitar/FingeringBox.cpp
+++ b/src/gui/editors/guitar/FingeringBox.cpp
@@ -219,16 +219,16 @@ FingeringBox::processMouseRelease(unsigned int release_string_num,
                 
                 if(m_press_fret_num == 0) {
                     
-                    int stringtqStatus = m_fingering.getStringtqStatus(m_press_string_num);
+                    int stringStatus = m_fingering.getStringStatus(m_press_string_num);
 
-                    if (stringtqStatus == Guitar::Fingering::OPEN)
+                    if (stringStatus == Guitar::Fingering::OPEN)
                         aVal = Guitar::Fingering::MUTED;
-                    else if (stringtqStatus > Guitar::Fingering::OPEN)
+                    else if (stringStatus > Guitar::Fingering::OPEN)
                         aVal = Guitar::Fingering::OPEN;
 
                 }
                 
-                m_fingering.setStringtqStatus(m_press_string_num, aVal);
+                m_fingering.setStringStatus(m_press_string_num, aVal);
                 
                 update();
             }
diff --git a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
index 8a4fb3e..9658e5d 100644
--- a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
+++ b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstddirs.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 namespace Rosegarden
diff --git a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
index f401cd1..47cdf4c 100644
--- a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
+++ b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
@@ -30,7 +30,7 @@
 
 #include "misc/Debug.h"
 #include <tqlistbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
@@ -416,7 +416,7 @@ GuitarChordSelectorDialog::parseChordFile(const TQString& chordFileName)
     TQFile chordFile(chordFileName);
     bool ok = chordFile.open(IO_ReadOnly);    
     if (!ok)
-        KMessageBox::error(0, i18n("couldn't open file '%1'").tqarg(handler.errorString()));
+        KMessageBox::error(0, i18n("couldn't open file '%1'").arg(handler.errorString()));
 
     TQXmlInputSource source(chordFile);
     TQXmlSimpleReader reader;
@@ -425,7 +425,7 @@ GuitarChordSelectorDialog::parseChordFile(const TQString& chordFileName)
     NOTATION_DEBUG << "GuitarChordSelectorDialog::parseChordFile() parsing " << chordFileName << endl;
     reader.parse(source);
     if (!ok)
-        KMessageBox::error(0, i18n("couldn't parse chord dictionnary : %1").tqarg(handler.errorString()));
+        KMessageBox::error(0, i18n("couldn't parse chord dictionnary : %1").arg(handler.errorString()));
     
 }
 
diff --git a/src/gui/editors/guitar/NoteSymbols.h b/src/gui/editors/guitar/NoteSymbols.h
index fa52a45..383e9c8 100644
--- a/src/gui/editors/guitar/NoteSymbols.h
+++ b/src/gui/editors/guitar/NoteSymbols.h
@@ -29,7 +29,7 @@
 
 #include <utility>
 
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqpainter.h>
 
 namespace Rosegarden
diff --git a/src/gui/editors/matrix/MatrixElement.cpp b/src/gui/editors/matrix/MatrixElement.cpp
index b60b63f..ca6e88d 100644
--- a/src/gui/editors/matrix/MatrixElement.cpp
+++ b/src/gui/editors/matrix/MatrixElement.cpp
@@ -32,7 +32,7 @@
 #include "gui/general/GUIPalette.h"
 #include "QCanvasMatrixDiamond.h"
 #include "QCanvasMatrixRectangle.h"
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcanvas.h>
 #include <tqcolor.h>
 
diff --git a/src/gui/editors/matrix/MatrixElement.h b/src/gui/editors/matrix/MatrixElement.h
index 921297c..f05723b 100644
--- a/src/gui/editors/matrix/MatrixElement.h
+++ b/src/gui/editors/matrix/MatrixElement.h
@@ -27,7 +27,7 @@
 #define _RG_MATRIXELEMENT_H_
 
 #include "base/ViewElement.h"
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcanvas.h>
 #include "QCanvasMatrixRectangle.h"
 
diff --git a/src/gui/editors/matrix/MatrixHLayout.cpp b/src/gui/editors/matrix/MatrixHLayout.cpp
index f4615fa..99b89c2 100644
--- a/src/gui/editors/matrix/MatrixHLayout.cpp
+++ b/src/gui/editors/matrix/MatrixHLayout.cpp
@@ -61,7 +61,7 @@ void MatrixHLayout::scanStaff(Staff &staffBase,
 {
     Profiler profiler("MatrixHLayout::scanStaff", true);
 
-    // The Matrix tqlayout is not currently designed to be able to lay
+    // The Matrix layout is not currently designed to be able to lay
     // out more than one staff, because we have no requirement to show
     // more than one at once in the Matrix view.  To make it work for
     // multiple staffs should be straightforward; we just need to bear
@@ -88,7 +88,7 @@ void MatrixHLayout::scanStaff(Staff &staffBase,
     }
 
     // Do this in two parts: bar lines separately from elements.
-    // (We don't need to do all that stuff notationhtqlayout has to do,
+    // (We don't need to do all that stuff notationhlayout has to do,
     // scanning the notes bar-by-bar; we can just place the bar lines
     // in the theoretically-correct places and do the same with the
     // notes quite independently.)
diff --git a/src/gui/editors/matrix/MatrixHLayout.h b/src/gui/editors/matrix/MatrixHLayout.h
index 291d618..76f1b31 100644
--- a/src/gui/editors/matrix/MatrixHLayout.h
+++ b/src/gui/editors/matrix/MatrixHLayout.h
@@ -62,7 +62,7 @@ public:
                             timeT = 0);
 
     /**
-     * Returns the total length of all elements once tqlayout is done.
+     * Returns the total length of all elements once layout is done.
      * This is the x-coord of the end of the last element on the
      * longest staff
      */
@@ -84,9 +84,9 @@ public:
     virtual double getBarPosition(int barNo) const;
 
     /**
-     * Precomputes tqlayout data for a single staff, updating any
+     * Precomputes layout data for a single staff, updating any
      * internal data stores associated with that staff and updating
-     * any tqlayout-related properties in the events on the staff's
+     * any layout-related properties in the events on the staff's
      * segment.
      */
     virtual void scanStaff(Staff&,
@@ -94,10 +94,10 @@ public:
                            timeT = 0);
 
     /**
-     * Computes any tqlayout data that may depend on the results of
+     * Computes any layout data that may depend on the results of
      * scanning more than one staff.  This may mean doing most of
-     * the tqlayout (likely for horizontal tqlayout) or nothing at all
-     * (likely for vertical tqlayout).
+     * the layout (likely for horizontal layout) or nothing at all
+     * (likely for vertical layout).
      */
     virtual void finishLayout(timeT = 0,
                               timeT = 0);
@@ -118,7 +118,7 @@ protected:
 
     // pair of has-time-sig and time-sig
     typedef std::pair<bool, TimeSignature> TimeSigData;
-    // pair of tqlayout-x and time-signature if there is one
+    // pair of layout-x and time-signature if there is one
     typedef std::pair<double, TimeSigData> BarData;
     typedef FastVector<BarData> BarDataList;
     BarDataList m_barData;
@@ -133,7 +133,7 @@ protected:
  */
 class ZoomableMatrixHLayoutRulerScale : public RulerScale, public HZoomable {
 public:
-    ZoomableMatrixHLayoutRulerScale(MatrixHLayout& tqlayout) : RulerScale(tqlayout.getComposition()), m_referenceHLayout(tqlayout) {};
+    ZoomableMatrixHLayoutRulerScale(MatrixHLayout& layout) : RulerScale(layout.getComposition()), m_referenceHLayout(layout) {};
     
     virtual double getBarPosition(int n)   const { return m_referenceHLayout.getBarPosition(n) * getHScaleFactor(); }
     virtual double getXForTime(timeT time) const { return m_referenceHLayout.getXForTime(time) * getHScaleFactor(); }
diff --git a/src/gui/editors/matrix/MatrixParameterBox.cpp b/src/gui/editors/matrix/MatrixParameterBox.cpp
index 75228c3..ef1deb7 100644
--- a/src/gui/editors/matrix/MatrixParameterBox.cpp
+++ b/src/gui/editors/matrix/MatrixParameterBox.cpp
@@ -34,7 +34,7 @@
 #include <tqfont.h>
 #include <tqfontmetrics.h>
 #include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidget.h>
 
 
diff --git a/src/gui/editors/matrix/MatrixToolBox.cpp b/src/gui/editors/matrix/MatrixToolBox.cpp
index 3254b35..dab9632 100644
--- a/src/gui/editors/matrix/MatrixToolBox.cpp
+++ b/src/gui/editors/matrix/MatrixToolBox.cpp
@@ -73,7 +73,7 @@ EditTool* MatrixToolBox::createTool(const TQString& toolName)
 
     else {
         KMessageBox::error(0, TQString("MatrixToolBox::createTool : unrecognised toolname %1 (%2)")
-                           .tqarg(toolName).tqarg(toolNamelc));
+                           .arg(toolName).arg(toolNamelc));
         return 0;
     }
 
diff --git a/src/gui/editors/matrix/MatrixVLayout.h b/src/gui/editors/matrix/MatrixVLayout.h
index 538e598..a33e0d1 100644
--- a/src/gui/editors/matrix/MatrixVLayout.h
+++ b/src/gui/editors/matrix/MatrixVLayout.h
@@ -58,9 +58,9 @@ public:
                             timeT = 0);
 
     /**
-     * Precomputes tqlayout data for a single staff, updating any
+     * Precomputes layout data for a single staff, updating any
      * internal data stores associated with that staff and updating
-     * any tqlayout-related properties in the events on the staff's
+     * any layout-related properties in the events on the staff's
      * segment.
      */
     virtual void scanStaff(Staff &staff,
@@ -68,10 +68,10 @@ public:
                            timeT = 0);
 
     /**
-     * Computes any tqlayout data that may depend on the results of
+     * Computes any layout data that may depend on the results of
      * scanning more than one staff.  This may mean doing most of
-     * the tqlayout (likely for horizontal tqlayout) or nothing at all
-     * (likely for vertical tqlayout).
+     * the layout (likely for horizontal layout) or nothing at all
+     * (likely for vertical layout).
      */
     virtual void finishLayout(timeT = 0,
                               timeT = 0);
diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp
index 195da46..78a24c4 100644
--- a/src/gui/editors/matrix/MatrixView.cpp
+++ b/src/gui/editors/matrix/MatrixView.cpp
@@ -116,7 +116,7 @@
 #include <tqcanvas.h>
 #include <tqcursor.h>
 #include <tqdialog.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqiconset.h>
 #include <tqlabel.h>
 #include <tqpixmap.h>
@@ -140,10 +140,10 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
                        TQWidget *parent,
                        bool drumMode)
         : EditView(doc, segments, 3, parent, "matrixview"),
-        m_htqlayout(&doc->getComposition()),
-        m_referenceRuler(new ZoomableMatrixHLayoutRulerScale(m_htqlayout)),
-        m_vtqlayout(),
-        m_snapGrid(new SnapGrid(&m_htqlayout)),
+        m_hlayout(&doc->getComposition()),
+        m_referenceRuler(new ZoomableMatrixHLayoutRulerScale(m_hlayout)),
+        m_vlayout(),
+        m_snapGrid(new SnapGrid(&m_hlayout)),
         m_lastEndMarkerTime(0),
         m_hoveredOverAbsoluteTime(0),
         m_hoveredOverNoteName(0),
@@ -205,7 +205,7 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
 	TQString backgroundPixmap = isDrumMode() ? "bg-paper-white.xpm" : "bg-matrix-lines.xpm";
         if (background.load(TQString("%1/misc/%2").
                             arg(pixmapDir, backgroundPixmap))) {
-            tCanvas->tqsetBackgroundPixmap(background);
+            tCanvas->setBackgroundPixmap(background);
         }
     }
 
@@ -430,29 +430,29 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
     (doc, TQT_SIGNAL(pointerPositionChanged(timeT)),
      TQT_TQOBJECT(this), TQT_SLOT(slotSetPointerPosition(timeT)));
 
-    MATRIX_DEBUG << "MatrixView : applying tqlayout\n";
+    MATRIX_DEBUG << "MatrixView : applying layout\n";
 
     bool layoutApplied = applyLayout();
     if (!layoutApplied)
-        KMessageBox::sorry(0, i18n("Couldn't apply piano roll tqlayout"));
+        KMessageBox::sorry(0, i18n("Couldn't apply piano roll layout"));
     else {
         MATRIX_DEBUG << "MatrixView : rendering elements\n";
         for (unsigned int i = 0; i < m_staffs.size(); ++i) {
 
             m_staffs[i]->positionAllElements();
-            m_staffs[i]->getSegment().getRefreshtqStatus
+            m_staffs[i]->getSegment().getRefreshStatus
             (m_segmentsRefreshStatusIds[i]).setNeedsRefresh(false);
         }
     }
 
     StandardRuler *topStandardRuler = new StandardRuler(getDocument(),
-                                &m_htqlayout, int(xorigin), 25,
+                                &m_hlayout, int(xorigin), 25,
                                 false, getCentralWidget());
     topStandardRuler->setSnapGrid(m_snapGrid);
     setTopStandardRuler(topStandardRuler);
 
     StandardRuler *bottomStandardRuler = new StandardRuler(getDocument(),
-                                   &m_htqlayout, 0, 25,
+                                   &m_hlayout, 0, 25,
                                    true, getBottomWidget());
     bottomStandardRuler->setSnapGrid(m_snapGrid);
     setBottomStandardRuler(bottomStandardRuler);
@@ -667,7 +667,7 @@ void MatrixView::setupActions()
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("chord")));
     (new KToggleAction(i18n("C&hord Insert Mode"), icon, Key_H,
-                       TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()),
+                       TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()),
                        actionCollection(), "chord_mode"))->
     setChecked(false);
 
@@ -903,9 +903,9 @@ void MatrixView::setupActions()
             else if (d == crotchetDuration) cut = Key_4;
             else if (d == crotchetDuration * 2) cut = Key_2;
 
-            TQString actionName = TQString("snap_%1").tqarg(int((crotchetDuration * 4) / d));
+            TQString actionName = TQString("snap_%1").arg(int((crotchetDuration * 4) / d));
             if (d == (crotchetDuration * 3) / 2) actionName = "snap_3";
-            new KAction(i18n("Snap to %1").tqarg(label), pixmap, cut, TQT_TQOBJECT(this),
+            new KAction(i18n("Snap to %1").arg(label), pixmap, cut, TQT_TQOBJECT(this),
                         TQT_SLOT(slotSetSnapFromAction()), actionCollection(),
                         actionName.ascii());
         }
@@ -1032,20 +1032,20 @@ bool MatrixView::applyLayout(int staffNo,
 {
     Profiler profiler("MatrixView::applyLayout", true);
 
-    m_htqlayout.reset();
-    m_vtqlayout.reset();
+    m_hlayout.reset();
+    m_vlayout.reset();
 
     for (unsigned int i = 0; i < m_staffs.size(); ++i) {
 
         if (staffNo >= 0 && (int)i != staffNo)
             continue;
 
-        m_htqlayout.scanStaff(*m_staffs[i], startTime, endTime);
-        m_vtqlayout.scanStaff(*m_staffs[i], startTime, endTime);
+        m_hlayout.scanStaff(*m_staffs[i], startTime, endTime);
+        m_vlayout.scanStaff(*m_staffs[i], startTime, endTime);
     }
 
-    m_htqlayout.finishLayout();
-    m_vtqlayout.finishLayout();
+    m_hlayout.finishLayout();
+    m_vlayout.finishLayout();
 
     if (m_staffs[0]->getSegment().getEndMarkerTime() != m_lastEndMarkerTime ||
             m_lastEndMarkerTime == 0 ||
@@ -1099,7 +1099,7 @@ void MatrixView::setViewSize(TQSize s)
 void MatrixView::repaintRulers()
 {
     for (unsigned int i = 0; i != m_propertyViewRulers.size(); i++)
-        m_propertyViewRulers[i].first->tqrepaint();
+        m_propertyViewRulers[i].first->repaint();
 }
 
 void MatrixView::updateView()
@@ -1196,8 +1196,8 @@ void MatrixView::setCurrentSelection(EventSelection* s, bool preview,
                 getStaff(segment)->positionElements(std::min(startA, startB),
                                                     std::max(endA, endB));
             } else {
-                // mark refresh status and then request a tqrepaint
-                segment.getRefreshtqStatus
+                // mark refresh status and then request a repaint
+                segment.getRefreshStatus
                 (m_segmentsRefreshStatusIds
                  [getStaff(segment)->getId()]).
                 push(std::min(startA, startB), std::max(endA, endB));
@@ -1213,14 +1213,14 @@ void MatrixView::setCurrentSelection(EventSelection* s, bool preview,
 
                 getStaff(s->getSegment())->positionElements(startB, endB);
             } else {
-                // mark refresh status and then request a tqrepaint
+                // mark refresh status and then request a repaint
 
-                oldSelection->getSegment().getRefreshtqStatus
+                oldSelection->getSegment().getRefreshStatus
                 (m_segmentsRefreshStatusIds
                  [getStaff(oldSelection->getSegment())->getId()]).
                 push(startA, endA);
 
-                s->getSegment().getRefreshtqStatus
+                s->getSegment().getRefreshStatus
                 (m_segmentsRefreshStatusIds
                  [getStaff(s->getSegment())->getId()]).
                 push(startB, endB);
@@ -1474,13 +1474,13 @@ MatrixView::slotHoveredOverNoteChanged(int evPitch,
         long ms = rt.msec();
 
         TQString msg = i18n("Note: %1 (%2.%3s)")
-                  .tqarg(TQString("%1-%2-%3-%4")
-                       .tqarg(TQString("%1").tqarg(bar + 1).rightJustify(3, '0'))
-                       .tqarg(TQString("%1").tqarg(beat).rightJustify(2, '0'))
-                       .tqarg(TQString("%1").tqarg(fraction).rightJustify(2, '0'))
-                       .tqarg(TQString("%1").tqarg(remainder).rightJustify(2, '0')))
-                  .tqarg(rt.sec)
-                  .tqarg(TQString("%1").tqarg(ms).rightJustify(3, '0'));
+                  .arg(TQString("%1-%2-%3-%4")
+                       .arg(TQString("%1").arg(bar + 1).rightJustify(3, '0'))
+                       .arg(TQString("%1").arg(beat).rightJustify(2, '0'))
+                       .arg(TQString("%1").arg(fraction).rightJustify(2, '0'))
+                       .arg(TQString("%1").arg(remainder).rightJustify(2, '0')))
+                  .arg(rt.sec)
+                  .arg(TQString("%1").arg(ms).rightJustify(3, '0'));
 
         m_hoveredOverAbsoluteTime->setText(msg);
     }
@@ -1488,8 +1488,8 @@ MatrixView::slotHoveredOverNoteChanged(int evPitch,
     m_haveHoveredOverNote = false;
 
     m_hoveredOverNoteName->setText(i18n("%1 (%2)")
-                                   .tqarg(label.getTQString())
-                                   .tqarg(evPitch));
+                                   .arg(label.getTQString())
+                                   .arg(evPitch));
 
     m_pitchRuler->drawHoverNote(evPitch);
 }
@@ -1504,7 +1504,7 @@ MatrixView::slotHoveredOverKeyChanged(unsigned int y)
     if (evPitch != m_previousEvPitch) {
         MidiPitchLabel label(evPitch);
         m_hoveredOverNoteName->setText(TQString("%1 (%2)").
-                                       tqarg(label.getTQString()).tqarg(evPitch));
+                                       arg(label.getTQString()).arg(evPitch));
         m_previousEvPitch = evPitch;
     }
 }
@@ -1529,13 +1529,13 @@ MatrixView::slotHoveredOverAbsoluteTimeChanged(unsigned int time)
     // to support Unicode
 
     TQString message = i18n("Time: %1 (%2.%3s)")
-                      .tqarg(TQString("%1-%2-%3-%4")
-                           .tqarg(TQString("%1").tqarg(bar + 1).rightJustify(3, '0'))
-                           .tqarg(TQString("%1").tqarg(beat).rightJustify(2, '0'))
-                           .tqarg(TQString("%1").tqarg(fraction).rightJustify(2, '0'))
-                           .tqarg(TQString("%1").tqarg(remainder).rightJustify(2, '0')))
-                      .tqarg(rt.sec)
-                      .tqarg(TQString("%1").tqarg(ms).rightJustify(3, '0'));
+                      .arg(TQString("%1-%2-%3-%4")
+                           .arg(TQString("%1").arg(bar + 1).rightJustify(3, '0'))
+                           .arg(TQString("%1").arg(beat).rightJustify(2, '0'))
+                           .arg(TQString("%1").arg(fraction).rightJustify(2, '0'))
+                           .arg(TQString("%1").arg(remainder).rightJustify(2, '0')))
+                      .arg(rt.sec)
+                      .arg(TQString("%1").arg(ms).rightJustify(3, '0'));
 
     m_hoveredOverAbsoluteTime->setText(message);
 }
@@ -1552,7 +1552,7 @@ MatrixView::slotSetPointerPosition(timeT time, bool scroll)
     Composition &comp = getDocument()->getComposition();
     int barNo = comp.getBarNumber(time);
 
-    if (barNo >= m_htqlayout.getLastVisibleBarOnStaff(*m_staffs[0])) {
+    if (barNo >= m_hlayout.getLastVisibleBarOnStaff(*m_staffs[0])) {
 
         Segment &seg = m_staffs[0]->getSegment();
 
@@ -1561,20 +1561,20 @@ MatrixView::slotSetPointerPosition(timeT time, bool scroll)
                 seg.getStartTime() +
                 ((time - seg.getStartTime()) %
                  (seg.getEndMarkerTime() - seg.getStartTime()));
-            m_staffs[0]->setPointerPosition(m_htqlayout, time);
+            m_staffs[0]->setPointerPosition(m_hlayout, time);
         } else {
             m_staffs[0]->hidePointer();
             scroll = false;
         }
-    } else if (barNo < m_htqlayout.getFirstVisibleBarOnStaff(*m_staffs[0])) {
+    } else if (barNo < m_hlayout.getFirstVisibleBarOnStaff(*m_staffs[0])) {
         m_staffs[0]->hidePointer();
         scroll = false;
     } else {
-        m_staffs[0]->setPointerPosition(m_htqlayout, time);
+        m_staffs[0]->setPointerPosition(m_hlayout, time);
     }
 
     if (scroll && !getCanvasView()->isAutoScrolling())
-        getCanvasView()->slotScrollHoriz(static_cast<int>(getXbyWorldMatrix(m_htqlayout.getXForTime(time))));
+        getCanvasView()->slotScrollHoriz(static_cast<int>(getXbyWorldMatrix(m_hlayout.getXForTime(time))));
 
     updateView();
 }
@@ -1585,11 +1585,11 @@ MatrixView::slotSetInsertCursorPosition(timeT time, bool scroll)
     //!!! For now.  Probably unlike slotSetPointerPosition this one
     // should snap to the nearest event or grid line.
 
-    m_staffs[0]->setInsertCursorPosition(m_htqlayout, time);
+    m_staffs[0]->setInsertCursorPosition(m_hlayout, time);
 
     if (scroll && !getCanvasView()->isAutoScrolling()) {
         getCanvasView()->slotScrollHoriz
-            (static_cast<int>(getXbyWorldMatrix(m_htqlayout.getXForTime(time))));
+            (static_cast<int>(getXbyWorldMatrix(m_hlayout.getXForTime(time))));
     }
 
     updateView();
@@ -1830,7 +1830,7 @@ void MatrixView::slotInsertNoteFromAction()
     } catch (...) {
 
         KMessageBox::sorry
-        (this, i18n("Unknown note insert action %1").tqarg(name));
+        (this, i18n("Unknown note insert action %1").arg(name));
         return ;
     }
 
@@ -2052,7 +2052,7 @@ MatrixView::slotSetSnap(timeT t)
     }
 
     for (unsigned int i = 0; i < m_staffs.size(); ++i)
-        m_staffs[i]->sizeStaff(m_htqlayout);
+        m_staffs[i]->sizeStaff(m_hlayout);
 
     m_segments[0]->setSnapGridSize(t);
 
@@ -2161,7 +2161,7 @@ MatrixView::initActionsToolbar()
     
     m_velocityCombo = new KComboBox(actionsToolbar);
     for (int i = 0; i <= 127; ++i) {
-        m_velocityCombo->insertItem(TQString("%1").tqarg(i));
+        m_velocityCombo->insertItem(TQString("%1").arg(i));
     }
     m_velocityCombo->setCurrentItem(100); //!!! associate with segment
 
@@ -2236,8 +2236,8 @@ MatrixView::slotChangeHorizontalZoom(int)
 {
     double zoomValue = m_hZoomSlider->getCurrentSize();
 
-    //     m_zoomLabel->setText(i18n("%1%").tqarg(zoomValue*100.0 * 2)); // GROSS HACK - see in matrixstaff.h - BREAKS MATRIX VIEW, see bug 1000595
-    m_zoomLabel->setText(i18n("%1%").tqarg(zoomValue*100.0));
+    //     m_zoomLabel->setText(i18n("%1%").arg(zoomValue*100.0 * 2)); // GROSS HACK - see in matrixstaff.h - BREAKS MATRIX VIEW, see bug 1000595
+    m_zoomLabel->setText(i18n("%1%").arg(zoomValue*100.0));
 
     MATRIX_DEBUG << "MatrixView::slotChangeHorizontalZoom() : zoom factor = "
     << zoomValue << endl;
@@ -2245,9 +2245,9 @@ MatrixView::slotChangeHorizontalZoom(int)
     m_referenceRuler->setHScaleFactor(zoomValue);
     
     if (m_tempoRuler)
-        m_tempoRuler->tqrepaint();
+        m_tempoRuler->repaint();
     if (m_chordNameRuler)
-        m_chordNameRuler->tqrepaint();
+        m_chordNameRuler->repaint();
 
     // Set zoom matrix
     //
@@ -2266,7 +2266,7 @@ MatrixView::slotChangeHorizontalZoom(int)
 
     for (unsigned int i = 0; i < m_propertyViewRulers.size(); ++i) {
         m_propertyViewRulers[i].first->setHScaleFactor(zoomValue);
-        m_propertyViewRulers[i].first->tqrepaint();
+        m_propertyViewRulers[i].first->repaint();
     }
 
     if (m_topStandardRuler)
@@ -2314,7 +2314,7 @@ MatrixView::slotZoomOut()
 void
 MatrixView::scrollToTime(timeT t)
 {
-    double layoutCoord = m_htqlayout.getXForTime(t);
+    double layoutCoord = m_hlayout.getXForTime(t);
     getCanvasView()->slotScrollHoriz(int(layoutCoord));
 }
 
@@ -2366,7 +2366,7 @@ MatrixView::addPropertyViewRuler(const PropertyName &property)
 
     int height = 20;
 
-    PropertyViewRuler *newRuler = new PropertyViewRuler(&m_htqlayout,
+    PropertyViewRuler *newRuler = new PropertyViewRuler(&m_hlayout,
                                   m_segments[0],
                                   property,
                                   xorigin,
@@ -2409,7 +2409,7 @@ MatrixView::removePropertyViewRuler(unsigned int number)
 RulerScale*
 MatrixView::getHLayout()
 {
-    return &m_htqlayout;
+    return &m_hlayout;
 }
 
 Staff*
@@ -2429,14 +2429,14 @@ timeT
 MatrixView::getInsertionTime()
 {
     MatrixStaff *staff = m_staffs[0];
-    return staff->getInsertCursorTime(m_htqlayout);
+    return staff->getInsertCursorTime(m_hlayout);
 }
 
 void
 MatrixView::slotStepBackward()
 {
     timeT time(getInsertionTime());
-    slotSetInsertCursorPosition(SnapGrid(&m_htqlayout).snapTime
+    slotSetInsertCursorPosition(SnapGrid(&m_hlayout).snapTime
                                 (time - 1,
                                  SnapGrid::SnapLeft));
 }
@@ -2445,7 +2445,7 @@ void
 MatrixView::slotStepForward()
 {
     timeT time(getInsertionTime());
-    slotSetInsertCursorPosition(SnapGrid(&m_htqlayout).snapTime
+    slotSetInsertCursorPosition(SnapGrid(&m_hlayout).snapTime
                                 (time + 1,
                                  SnapGrid::SnapRight));
 }
@@ -2553,7 +2553,7 @@ MatrixView::readjustCanvasSize()
 
         MatrixStaff &staff = *m_staffs[i];
 
-        staff.sizeStaff(m_htqlayout);
+        staff.sizeStaff(m_hlayout);
 
         //         if (staff.getTotalWidth() + staff.getX() > maxWidth) {
         //             maxWidth = staff.getTotalWidth() + staff.getX() + 1;
@@ -2721,23 +2721,23 @@ MatrixView::updateViewCaption()
             trackPosition = track->getPosition();
 
         setCaption(i18n("%1 - Segment Track #%2 - %3")
-                   .tqarg(getDocument()->getTitle())
-                   .tqarg(trackPosition + 1)
-                   .tqarg(view));
+                   .arg(getDocument()->getTitle())
+                   .arg(trackPosition + 1)
+                   .arg(view));
 
     } else if (m_segments.size() == getDocument()->getComposition().getNbSegments()) {
 
         setCaption(i18n("%1 - All Segments - %2")
-                   .tqarg(getDocument()->getTitle())
-                   .tqarg(view));
+                   .arg(getDocument()->getTitle())
+                   .arg(view));
 
     } else {
 
         setCaption(i18n("%1 - 1 Segment - %2",
                         "%1 - %n Segments - %2",
                         m_segments.size())
-                   .tqarg(getDocument()->getTitle())
-                   .tqarg(view));
+                   .arg(getDocument()->getTitle())
+                   .arg(view));
     }
 }
 
@@ -2745,10 +2745,10 @@ int MatrixView::computePostLayoutWidth()
 {
     Segment *segment = m_segments[0];
     Composition *composition = segment->getComposition();
-    int endX = int(m_htqlayout.getXForTime
+    int endX = int(m_hlayout.getXForTime
                    (composition->getBarEndForTime
                     (segment->getEndMarkerTime())));
-    int startX = int(m_htqlayout.getXForTime
+    int startX = int(m_hlayout.getXForTime
                      (composition->getBarStartForTime
                       (segment->getStartTime())));
 
@@ -2928,7 +2928,7 @@ MatrixView::slotToggleStepByStep()
 }
 
 void
-MatrixView::slotUpdateInsertModetqStatus()
+MatrixView::slotUpdateInsertModeStatus()
 {
     TQString message;
     if (isInChordMode()) {
@@ -3044,17 +3044,17 @@ MatrixView::slotPercussionSetChanged(Instrument * newInstr)
     m_pitchRuler = pitchRuler;
     m_pianoView->addChild(m_pitchRuler);
     m_pitchRuler->show();
-    m_pianoView->setFixedWidth(pitchRuler->tqsizeHint().width());
+    m_pianoView->setFixedWidth(pitchRuler->sizeHint().width());
 
     // Update matrix canvas
     readjustCanvasSize();
     bool layoutApplied = applyLayout();
     if (!layoutApplied)
-        KMessageBox::sorry(0, i18n("Couldn't apply piano roll tqlayout"));
+        KMessageBox::sorry(0, i18n("Couldn't apply piano roll layout"));
     else {
         MATRIX_DEBUG << "MatrixView : rendering elements\n";
         m_staffs[0]->positionAllElements();
-        m_staffs[0]->getSegment().getRefreshtqStatus
+        m_staffs[0]->getSegment().getRefreshStatus
         (m_segmentsRefreshStatusIds[0]).setNeedsRefresh(false);
         update();
     }
diff --git a/src/gui/editors/matrix/MatrixView.h b/src/gui/editors/matrix/MatrixView.h
index 6dc6519..45c43fb 100644
--- a/src/gui/editors/matrix/MatrixView.h
+++ b/src/gui/editors/matrix/MatrixView.h
@@ -190,7 +190,7 @@ public:
      * Adjust an X coord by world matrix
      */
     double getXbyWorldMatrix(double value)
-    { return m_canvasView->tqworldMatrix().m11() * value; }
+    { return m_canvasView->worldMatrix().m11() * value; }
         
     double getXbyInverseWorldMatrix(double value)
     { return m_canvasView->inverseWorldMatrix().m11() * value; }
@@ -292,7 +292,7 @@ public slots:
     void slotToggleStepByStep();
 
     /// status stuff
-    void slotUpdateInsertModetqStatus();
+    void slotUpdateInsertModeStatus();
 
     /// transforms
     void slotTransformsQuantize();
@@ -520,7 +520,7 @@ protected:
 
     /**
      * save general Options like all bar positions and status as well
-     * as the tqgeometry and the recent file list to the configuration
+     * as the geometry and the recent file list to the configuration
      * file
      */
     virtual void slotSaveOptions();
@@ -594,13 +594,13 @@ protected:
 
     std::vector<MatrixStaff*> m_staffs;
 
-    MatrixHLayout             m_htqlayout;
-    MatrixVLayout             m_vtqlayout;
+    MatrixHLayout             m_hlayout;
+    MatrixVLayout             m_vlayout;
     SnapGrid     *m_snapGrid;
 
     timeT         m_lastEndMarkerTime;
 
-    // tqStatus bar elements
+    // Status bar elements
     TQLabel* m_hoveredOverAbsoluteTime;
     TQLabel* m_hoveredOverNoteName;
     TQLabel *m_selectionCounter;
diff --git a/src/gui/editors/matrix/PianoKeyboard.cpp b/src/gui/editors/matrix/PianoKeyboard.cpp
index 7ae4a5a..0b8563e 100644
--- a/src/gui/editors/matrix/PianoKeyboard.cpp
+++ b/src/gui/editors/matrix/PianoKeyboard.cpp
@@ -65,13 +65,13 @@ PianoKeyboard::PianoKeyboard(TQWidget *parent, int keys)
     setMouseTracking(true);
 }
 
-TQSize PianoKeyboard::tqsizeHint() const
+TQSize PianoKeyboard::sizeHint() const
 {
     return TQSize(m_keySize.width(),
                  m_keySize.height() * m_nbKeys);
 }
 
-TQSize PianoKeyboard::tqminimumSizeHint() const
+TQSize PianoKeyboard::minimumSizeHint() const
 {
     return m_keySize;
 }
@@ -154,7 +154,7 @@ void PianoKeyboard::paintEvent(TQPaintEvent*)
                        label.getTQString());
     }
 
-    paint.setBrush(tqcolorGroup().foreground());
+    paint.setBrush(colorGroup().foreground());
 
     for (unsigned int i = 0; i < m_blackKeyPos.size(); ++i)
         paint.drawRect(0, m_blackKeyPos[i],
@@ -249,7 +249,7 @@ void PianoKeyboard::mouseMoveEvent(TQMouseEvent* e)
     //
     // RWB (20040220)
     //
-    MatrixView *matrixView = dynamic_cast<MatrixView*>(tqtopLevelWidget());
+    MatrixView *matrixView = dynamic_cast<MatrixView*>(topLevelWidget());
     if (matrixView) {
         MatrixStaff *staff = matrixView->getStaff(0);
 
diff --git a/src/gui/editors/matrix/PianoKeyboard.h b/src/gui/editors/matrix/PianoKeyboard.h
index 7c29c89..3d8b583 100644
--- a/src/gui/editors/matrix/PianoKeyboard.h
+++ b/src/gui/editors/matrix/PianoKeyboard.h
@@ -49,8 +49,8 @@ class PianoKeyboard : public PitchRuler
 public:
     PianoKeyboard(TQWidget *parent, int keys = 88);
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     /* 
      * We want to be able to call this from the matrix view
diff --git a/src/gui/editors/matrix/QCanvasMatrixDiamond.cpp b/src/gui/editors/matrix/QCanvasMatrixDiamond.cpp
index d8d7b06..e44e7d5 100644
--- a/src/gui/editors/matrix/QCanvasMatrixDiamond.cpp
+++ b/src/gui/editors/matrix/QCanvasMatrixDiamond.cpp
@@ -68,7 +68,7 @@ void QCanvasMatrixDiamond::drawShape(TQPainter & p)
 
     TQPointArray pa(4);
     int q = height() / 2 + 2;
-    TQPoint mapPos = p.tqworldMatrix().map(TQPoint(int(x()), int(y())));
+    TQPoint mapPos = p.worldMatrix().map(TQPoint(int(x()), int(y())));
 
     pa[0] = TQPoint(mapPos.x(), mapPos.y() - 3);
     pa[1] = TQPoint(mapPos.x() + q, mapPos.y() - 3 + q);
diff --git a/src/gui/editors/matrix/QCanvasMatrixDiamond.h b/src/gui/editors/matrix/QCanvasMatrixDiamond.h
index 8b736e7..2546961 100644
--- a/src/gui/editors/matrix/QCanvasMatrixDiamond.h
+++ b/src/gui/editors/matrix/QCanvasMatrixDiamond.h
@@ -41,7 +41,7 @@ class MatrixElement;
 
 
 /**
- * A TQCanvas diamond tqshape referencing a MatrixElement
+ * A TQCanvas diamond shape referencing a MatrixElement
  */
 class QCanvasMatrixDiamond : public QCanvasMatrixRectangle
 {
diff --git a/src/gui/editors/notation/FontViewFrame.cpp b/src/gui/editors/notation/FontViewFrame.cpp
index d07ba40..6e24a18 100644
--- a/src/gui/editors/notation/FontViewFrame.cpp
+++ b/src/gui/editors/notation/FontViewFrame.cpp
@@ -97,7 +97,7 @@ FontViewFrame::loadFont()
     FcPatternDestroy(pattern);
 
     if (!match || result != FcResultMatch) {
-        KMessageBox::error(this, i18n("Error: Unable to match font name %1").tqarg(m_fontName));
+        KMessageBox::error(this, i18n("Error: Unable to match font name %1").arg(m_fontName));
         return ;
     }
 
@@ -106,7 +106,7 @@ FontViewFrame::loadFont()
 
     if (TQString((const char *)matchFamily).lower() != m_fontName.lower()) {
         KMessageBox::sorry(this, i18n("Warning: No good match for font name %1 (best is %2)").
-                           tqarg(m_fontName).tqarg(TQString((const char *)matchFamily)));
+                           arg(m_fontName).arg(TQString((const char *)matchFamily)));
         m_fontName = (const char *)matchFamily;
     }
 
@@ -125,7 +125,7 @@ void FontViewFrame::setGlyphs(bool glyphs)
     update();
 }
 
-TQSize FontViewFrame::tqsizeHint() const
+TQSize FontViewFrame::sizeHint() const
 {
     return TQSize(16 * m_fontSize * 3 / 2 + margin() + 2 * frameWidth(),
                  16 * m_fontSize * 3 / 2 + margin() + 2 * frameWidth());
@@ -186,7 +186,7 @@ void FontViewFrame::paintEvent( TQPaintEvent* e )
                     continue;
                 p.setFont(kapp->font());
                 TQFontMetrics afm(kapp->font());
-                TQString s = TQString("%1").tqarg(m_row * 256 + (j - 1) * 16);
+                TQString s = TQString("%1").arg(m_row * 256 + (j - 1) * 16);
                 p.drawText(x - afm.width(s), y, s);
                 p.setPen(TQColor(190, 190, 255));
                 p.drawLine(0, y, width(), y);
@@ -194,7 +194,7 @@ void FontViewFrame::paintEvent( TQPaintEvent* e )
                 continue;
             } else if (j == 0) {
                 p.setFont(kapp->font());
-                TQString s = TQString("%1").tqarg(i - 1);
+                TQString s = TQString("%1").arg(i - 1);
                 p.drawText(x, y, s);
                 p.setPen(TQColor(190, 190, 255));
                 p.drawLine(x, 0, x, height());
diff --git a/src/gui/editors/notation/FontViewFrame.h b/src/gui/editors/notation/FontViewFrame.h
index fbfc95a..1d649c4 100644
--- a/src/gui/editors/notation/FontViewFrame.h
+++ b/src/gui/editors/notation/FontViewFrame.h
@@ -49,7 +49,7 @@ public:
     FontViewFrame(int pixelSize, TQWidget *parent = 0, const char *name = 0);
     virtual ~FontViewFrame();
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
     bool hasRow(int row) const;
 
 public slots:
diff --git a/src/gui/editors/notation/NotationElement.h b/src/gui/editors/notation/NotationElement.h
index 6dfad3d..2bb036f 100644
--- a/src/gui/editors/notation/NotationElement.h
+++ b/src/gui/editors/notation/NotationElement.h
@@ -43,7 +43,7 @@ class Event;
 
 
 /**
- * The Notation H and V tqlayout is performed on a
+ * The Notation H and V layout is performed on a
  * NotationElementList. Once this is done, each NotationElement is
  * affected a TQCanvasItem which is set at these coords.
  *
@@ -82,7 +82,7 @@ public:
      * Sets the X coordinate and width of the space "underneath"
      * this element, i.e. the extents within which a mouse click
      * or some such might be considered to be interested in this
-     * element as opposed to any other.  These are tqlayout coords
+     * element as opposed to any other.  These are layout coords
      */
     void setLayoutAirspace(double x, double width) {
         m_airX = x; m_airWidth = width;
diff --git a/src/gui/editors/notation/NotationGroup.h b/src/gui/editors/notation/NotationGroup.h
index 9906747..c7b1134 100644
--- a/src/gui/editors/notation/NotationGroup.h
+++ b/src/gui/editors/notation/NotationGroup.h
@@ -73,13 +73,13 @@ public:
 
     /**
      * Writes the BEAMED, BEAM_ABOVE, and STEM_UP properties into the
-     * notes in the group, as appropriate.  Does not require tqlayout x
+     * notes in the group, as appropriate.  Does not require layout x
      * coordinates to have been set.
      */
     void applyStemProperties();
 
     /**
-     * Writes beam data into each note in the group.  Notes' tqlayout x
+     * Writes beam data into each note in the group.  Notes' layout x
      * coordinates must already have been set.  Does not require
      * applyStemProperties to have already been called.
      */
@@ -87,7 +87,7 @@ public:
 
     /**
      * Writes tupling line data into each note in the group.  Notes'
-     * tqlayout x coordinates must already have been set.  Does nothing
+     * layout x coordinates must already have been set.  Does nothing
      * if this is not a tupled group.
      */
     void applyTuplingLine(NotationStaff &);
diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp
index e971521..4d891a6 100644
--- a/src/gui/editors/notation/NotationHLayout.cpp
+++ b/src/gui/editors/notation/NotationHLayout.cpp
@@ -1230,15 +1230,15 @@ NotationHLayout::finishLayout(timeT startTime, timeT endTime)
 
         m_timePerProgressIncrement = timeCovered / (100 / m_barData.size());
 
-        tqlayout(i, startTime, endTime);
+        layout(i, startTime, endTime);
         ++staffNo;
     }
 }
 
 void
-NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime)
+NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
 {
-    Profiler profiler("NotationHLayout::tqlayout");
+    Profiler profiler("NotationHLayout::layout");
 
     Staff &staff = *(i->first);
     NotationElementList *notes = staff.getViewElementList();
@@ -1251,7 +1251,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
     //    bool haveSimpleOffset = false;
     //    double simpleOffset = 0;
 
-    NOTATION_DEBUG << "NotationHLayout::tqlayout: full tqlayout " << isFullLayout << ", times " << startTime << "->" << endTime << endl;
+    NOTATION_DEBUG << "NotationHLayout::layout: full layout " << isFullLayout << ", times " << startTime << "->" << endTime << endl;
 
     double x = 0, barX = 0;
     TieMap tieMap;
@@ -1287,7 +1287,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
         NotationElementList::iterator from = bdi->second.basicData.start;
         NotationElementList::iterator to;
 
-        NOTATION_DEBUG << "NotationHLayout::tqlayout(): starting bar " << barNo << ", x = " << barX << ", width = " << bdi->second.sizeData.idealWidth << ", time = " << (from == notes->end() ? -1 : (*from)->getViewAbsoluteTime()) << endl;
+        NOTATION_DEBUG << "NotationHLayout::layout(): starting bar " << barNo << ", x = " << barX << ", width = " << bdi->second.sizeData.idealWidth << ", time = " << (from == notes->end() ? -1 : (*from)->getViewAbsoluteTime()) << endl;
 
         BarDataList::iterator nbdi(bdi);
         if (++nbdi == barList.end()) {
@@ -1307,10 +1307,10 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
 
             double offset = barX - bdi->second.layoutData.x;
 
-            NOTATION_DEBUG << "NotationHLayout::tqlayout(): bar " << barNo << " has needsLayout false and offset of " << offset << endl;
+            NOTATION_DEBUG << "NotationHLayout::layout(): bar " << barNo << " has needsLayout false and offset of " << offset << endl;
 
             if (offset > -0.1 && offset < 0.1) {
-                NOTATION_DEBUG << "NotationHLayout::tqlayout(): no offset, ignoring" << endl;
+                NOTATION_DEBUG << "NotationHLayout::layout(): no offset, ignoring" << endl;
                 continue;
             }
 
@@ -1323,7 +1323,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
                     it != to && it != notes->end(); ++it) {
 
                 NotationElement* nel = static_cast<NotationElement*>(*it);
-                NOTATION_DEBUG << "NotationHLayout::tqlayout(): shifting element's x to " << ((*it)->getLayoutX() + offset) << " (was " << (*it)->getLayoutX() << ")" << endl;
+                NOTATION_DEBUG << "NotationHLayout::layout(): shifting element's x to " << ((*it)->getLayoutX() + offset) << " (was " << (*it)->getLayoutX() << ")" << endl;
                 nel->setLayoutX((*it)->getLayoutX() + offset);
                 double airX, airWidth;
                 nel->getLayoutAirspace(airX, airWidth);
@@ -1342,7 +1342,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
             timeSigToPlace = !bdi->second.basicData.timeSignature.isHidden();
         }
         if (timeSigToPlace) {
-            NOTATION_DEBUG << "NotationHLayout::tqlayout(): there's a time sig in this bar" << endl;
+            NOTATION_DEBUG << "NotationHLayout::layout(): there's a time sig in this bar" << endl;
         }
 
         bool repeatClefAndKey = false;
@@ -1350,7 +1350,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
             repeatClefAndKey = true;
         }
         if (repeatClefAndKey) {
-            NOTATION_DEBUG << "NotationHLayout::tqlayout(): need to repeat clef & key in this bar" << endl;
+            NOTATION_DEBUG << "NotationHLayout::layout(): need to repeat clef & key in this bar" << endl;
         }
 
         double barInset = notationStaff.getBarInset(barNo, repeatClefAndKey);
@@ -1467,7 +1467,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
                 }
             }
 
-            NOTATION_DEBUG << "NotationHLayout::tqlayout(): setting element's x to " << x << " (was " << el->getLayoutX() << ")" << endl;
+            NOTATION_DEBUG << "NotationHLayout::layout(): setting element's x to " << x << " (was " << el->getLayoutX() << ")" << endl;
 
             double displacedX = 0.0;
             long dxRaw = 0;
@@ -1692,7 +1692,7 @@ NotationHLayout::positionChord(Staff &staff,
             barEndsInChord = true;
 
         // #704958 (multiple tuplet spanners created when entering
-        // triplet chord) -- tqlayout() updates the beamed group data
+        // triplet chord) -- layout() updates the beamed group data
         // for non-notes, but we have to do it for notes so as to
         // ensure every note in the chord is accounted for
         sampleGroupElement(staff, clef, key, citr);
diff --git a/src/gui/editors/notation/NotationHLayout.h b/src/gui/editors/notation/NotationHLayout.h
index 07cf25e..878dc17 100644
--- a/src/gui/editors/notation/NotationHLayout.h
+++ b/src/gui/editors/notation/NotationHLayout.h
@@ -56,7 +56,7 @@ class AccidentalTable;
 
 
 /**
- * Horizontal notation tqlayout
+ * Horizontal notation layout
  *
  * computes the X coordinates of notation elements
  */
@@ -77,9 +77,9 @@ public:
     }
 
     /**
-     * Precomputes tqlayout data for a single staff.  The resulting data
+     * Precomputes layout data for a single staff.  The resulting data
      * is stored in the BarDataMap, keyed from the staff reference;
-     * the entire map is then used by reconcileBars() and tqlayout().
+     * the entire map is then used by reconcileBars() and layout().
      * The map should be cleared (by calling reset()) before a full
      * set of staffs is preparsed.
      */
@@ -167,7 +167,7 @@ public:
     static std::vector<int> getAvailableProportions();
 
     /**
-     * Returns the total length of all elements once tqlayout is done
+     * Returns the total length of all elements once layout is done
      * This is the x-coord of the end of the last element on the longest
      * staff, plus the space allocated to that element
      */
@@ -211,7 +211,7 @@ public:
      * Returns the X coord corresponding to the given time value.
      * This RulerScale method works by interpolating between bar lines
      * (the inverse of the way getTimeForX works), and should be used
-     * for any rulers associated with the tqlayout.
+     * for any rulers associated with the layout.
      */
     virtual double getXForTime(timeT time) const;
 
@@ -286,7 +286,7 @@ protected:
         } sizeData;
 
         struct LayoutData
-        {   // slots either assumed, or only known at tqlayout time
+        {   // slots either assumed, or only known at layout time
             bool needsLayout;
             double x;             // coordinate for display of barline
             int timeSigX;
@@ -360,7 +360,7 @@ protected:
     /// Tries to harmonize the bar positions for all the staves (page mode)
     void reconcileBarsPage();
 
-    void tqlayout(BarDataMap::iterator,
+    void layout(BarDataMap::iterator,
                 timeT startTime,
                 timeT endTime);
     
diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp
index 83575c6..1baa33c 100644
--- a/src/gui/editors/notation/NotationStaff.cpp
+++ b/src/gui/editors/notation/NotationStaff.cpp
@@ -379,7 +379,7 @@ NotationStaff::getClosestElementToLayoutX(double x,
         return notes->end();
     }
 
-    NOTATION_DEBUG << "NotationStaff::getClosestElementToLayoutX: found element at tqlayout " << (*result)->getLayoutX() << " - we're at tqlayout " << x << endl;
+    NOTATION_DEBUG << "NotationStaff::getClosestElementToLayoutX: found element at layout " << (*result)->getLayoutX() << " - we're at layout " << x << endl;
 
     PRINT_ELAPSED("NotationStaff::getClosestElementToLayoutX");
 
@@ -449,7 +449,7 @@ NotationStaff::renderElements(NotationElementList::iterator from,
     //    NOTATION_DEBUG << "NotationStaff " << this << "::renderElements()" << endl;
     Profiler profiler("NotationStaff::renderElements");
 
-    emit setOperationName(i18n("Rendering staff %1...").tqarg(getId() + 1));
+    emit setOperationName(i18n("Rendering staff %1...").arg(getId() + 1));
     emit setProgress(0);
 
     throwIfCancelled();
@@ -512,7 +512,7 @@ NotationStaff::renderPrintable(timeT from, timeT to)
 
     Profiler profiler("NotationStaff::renderElements");
 
-    emit setOperationName(i18n("Rendering notes on staff %1...").tqarg(getId() + 1));
+    emit setOperationName(i18n("Rendering notes on staff %1...").arg(getId() + 1));
     emit setProgress(0);
 
     throwIfCancelled();
@@ -580,7 +580,7 @@ NotationStaff::positionElements(timeT from, timeT to)
     if (to < startTime) to = startTime;
     if (to == from) return;
 
-    emit setOperationName(i18n("Positioning staff %1...").tqarg(getId() + 1));
+    emit setOperationName(i18n("Positioning staff %1...").arg(getId() + 1));
     emit setProgress(0);
     throwIfCancelled();
 
diff --git a/src/gui/editors/notation/NotationStaff.h b/src/gui/editors/notation/NotationStaff.h
index bb056c0..f58e77d 100644
--- a/src/gui/editors/notation/NotationStaff.h
+++ b/src/gui/editors/notation/NotationStaff.h
@@ -136,14 +136,14 @@ public:
     
     /**
      * Assign suitable coordinates to the elements on the staff,
-     * based entirely on the tqlayout X and Y coordinates they were
-     * given by the horizontal and vertical tqlayout processes.
+     * based entirely on the layout X and Y coordinates they were
+     * given by the horizontal and vertical layout processes.
      *
      * This is necessary because the sprites that are being positioned
-     * may have been created either after the tqlayout process completed
+     * may have been created either after the layout process completed
      * (by renderElements) or before (by the previous renderElements
      * call, if the sprites are unchanged but have moved) -- so
-     * neither the tqlayout nor renderElements can authoritatively set
+     * neither the layout nor renderElements can authoritatively set
      * their final positions.
      *
      * This method also updates the selected-ness of any elements it
@@ -197,7 +197,7 @@ public:
      * elements).  Pass movedOnly as true to indicate that elements
      * have not changed but only been repositioned, for example as a
      * consequence of a modification on another staff that caused a
-     * retqlayout.
+     * relayout.
      */
     virtual void markChanged(timeT from = 0,
                              timeT to = 0,
@@ -270,7 +270,7 @@ public:
      Accidentals::NoAccidental) const;
 
     /**
-     * Find the NotationElement whose tqlayout x-coord is closest to x,
+     * Find the NotationElement whose layout x-coord is closest to x,
      * without regard to its y-coord.
      *
      * If notesAndRestsOnly is true, will return the closest note
@@ -289,7 +289,7 @@ public:
      int proximityThreshold = 10);
 
     /**
-     * Find the NotationElement "under" the given tqlayout x-coord,
+     * Find the NotationElement "under" the given layout x-coord,
      * without regard to its y-coord.
      *
      * Also returns the clef and key in force at the given coordinates.
@@ -396,7 +396,7 @@ protected:
      * Returns true if the item at the given iterator appears to have
      * moved horizontally without the spacing around it changing.
      * 
-     * In practice, calculates the offset between the intended tqlayout
+     * In practice, calculates the offset between the intended layout
      * and current canvas coordinates of the item at the given
      * iterator, and returns true if this offset is equal to those of
      * all other following iterators at the same time as well as the
@@ -412,7 +412,7 @@ protected:
 
     /**
      * Prepare a painter to draw an object of logical width w at
-     * tqlayout-x coord x, starting at offset dx into the object, by
+     * layout-x coord x, starting at offset dx into the object, by
      * setting the painter's clipping so as to crop the object at the
      * right edge of the row if it would otherwise overrun.  The
      * return value is the amount of the object visible on this row
@@ -473,8 +473,8 @@ protected:
 
     TQPainter *m_printPainter;
 
-    enum BartqStatus { UnRendered = 0, Rendered, Positioned };
-    typedef std::map<int, BartqStatus> BarStatusMap;
+    enum BarStatus { UnRendered = 0, Rendered, Positioned };
+    typedef std::map<int, BarStatus> BarStatusMap;
     BarStatusMap m_status;
     std::pair<int, int> m_lastRenderCheck;
     bool m_ready;
diff --git a/src/gui/editors/notation/NotationStrings.cpp b/src/gui/editors/notation/NotationStrings.cpp
index e4cae98..9bbc6e6 100644
--- a/src/gui/editors/notation/NotationStrings.cpp
+++ b/src/gui/editors/notation/NotationStrings.cpp
@@ -49,26 +49,26 @@ NotationStrings::addDots(TQString s, int dots,
     if (internationalize) {
         if (dots > 1) {
             if (hyphenate)
-                return i18n("%1-dotted-%2").tqarg(dots).tqarg(s);
+                return i18n("%1-dotted-%2").arg(dots).arg(s);
             else
-                return i18n("%1-dotted %2").tqarg(dots).tqarg(s);
+                return i18n("%1-dotted %2").arg(dots).arg(s);
         } else {
             if (hyphenate)
-                return i18n("dotted-%1").tqarg(s);
+                return i18n("dotted-%1").arg(s);
             else
-                return i18n("dotted %1").tqarg(s);
+                return i18n("dotted %1").arg(s);
         }
     } else {
         if (dots > 1) {
             if (hyphenate)
-                return TQString("%1-dotted-%2").tqarg(dots).tqarg(s);
+                return TQString("%1-dotted-%2").arg(dots).arg(s);
             else
-                return TQString("%1-dotted %2").tqarg(dots).tqarg(s);
+                return TQString("%1-dotted %2").arg(dots).arg(s);
         } else {
             if (hyphenate)
-                return TQString("dotted-%1").tqarg(s);
+                return TQString("dotted-%1").arg(s);
             else
-                return TQString("dotted %1").tqarg(s);
+                return TQString("dotted %1").arg(s);
         }
     }
 }
@@ -93,11 +93,11 @@ NotationStrings::getNoteName(Note note, bool plural, bool triplet)
                                          };
 
     if (plural && triplet) {
-        return addDots(i18n("%1 triplets").tqarg(names[type]), dots, false, true); // TODO PLURAL - this is broken because it assumes there's only 1 plural form
+        return addDots(i18n("%1 triplets").arg(names[type]), dots, false, true); // TODO PLURAL - this is broken because it assumes there's only 1 plural form
     } else if (plural) {
         return addDots(pluralnames[type], dots, false, true);
     } else if (triplet) {
-        return addDots(i18n("%1 triplet").tqarg(names[type]), dots, false, true);
+        return addDots(i18n("%1 triplet").arg(names[type]), dots, false, true);
     } else {
         return addDots(names[type], dots, false, true);
     }
@@ -123,11 +123,11 @@ NotationStrings::getAmericanName(Note note, bool plural, bool triplet)
                                          };
 
     if (plural && triplet) {
-        return addDots(TQString("%1 triplets").tqarg(names[type]), dots, false, false);
+        return addDots(TQString("%1 triplets").arg(names[type]), dots, false, false);
     } else if (plural) {
         return addDots(pluralnames[type], dots, false, false);
     } else if (triplet) {
-        return addDots(TQString("%1 triplet").tqarg(names[type]), dots, false, false);
+        return addDots(TQString("%1 triplet").arg(names[type]), dots, false, false);
     } else {
         return addDots(names[type], dots, false, false);
     }
@@ -151,11 +151,11 @@ NotationStrings::getShortNoteName(Note note, bool plural, bool triplet)
                                          };
 
     if (plural && triplet) {
-        return addDots(i18n("%1 triplets").tqarg(names[type]), dots, false, true); // TODO - this is broken because it assumes there's only 1 plural form
+        return addDots(i18n("%1 triplets").arg(names[type]), dots, false, true); // TODO - this is broken because it assumes there's only 1 plural form
     } else if (plural) {
         return addDots(pluralnames[type], dots, false, true);
     } else if (triplet) {
-        return addDots(i18n("%1 triplet").tqarg(names[type]), dots, false, true);
+        return addDots(i18n("%1 triplet").arg(names[type]), dots, false, true);
     } else {
         return addDots(names[type], dots, false, true);
     }
@@ -271,11 +271,11 @@ NotationStrings::makeNoteMenuLabel(timeT duration,
 
         timeT wholeNote = Note(Note::Semibreve).getDuration();
         if ((wholeNote / duration) * duration == wholeNote) {
-            return TQString("1/%1").tqarg(wholeNote / duration);
+            return TQString("1/%1").arg(wholeNote / duration);
         } else if ((duration / wholeNote) * wholeNote == duration) {
-            return TQString("%1/1").tqarg(duration / wholeNote);
+            return TQString("%1/1").arg(duration / wholeNote);
         } else {
-            return i18n("%1 ticks").tqarg(duration);
+            return i18n("%1 ticks").arg(duration);
             plural = false;
         }
 
diff --git a/src/gui/editors/notation/NotationToolBox.cpp b/src/gui/editors/notation/NotationToolBox.cpp
index f2fa642..7632413 100644
--- a/src/gui/editors/notation/NotationToolBox.cpp
+++ b/src/gui/editors/notation/NotationToolBox.cpp
@@ -89,7 +89,7 @@ EditTool* NotationToolBox::createTool(const TQString& toolName)
 
     else {
         KMessageBox::error(0, TQString("NotationToolBox::createTool : unrecognised toolname %1 (%2)")
-                           .tqarg(toolName).tqarg(toolNamelc));
+                           .arg(toolName).arg(toolNamelc));
         return 0;
     }
 
diff --git a/src/gui/editors/notation/NotationVLayout.cpp b/src/gui/editors/notation/NotationVLayout.cpp
index af6a2fe..5afaa4a 100644
--- a/src/gui/editors/notation/NotationVLayout.cpp
+++ b/src/gui/editors/notation/NotationVLayout.cpp
@@ -236,7 +236,7 @@ NotationVLayout::scanStaff(Staff &staffBase, timeT, timeT)
                 if (!(*chord[j])->event()->get
                         <Int>
                         (m_properties.HEIGHT_ON_STAFF, height)) {
-                    std::cerr << TQString("ERROR: Event in chord at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").tqarg((*chord[j])->getViewAbsoluteTime()).ascii() << std::endl;
+                    std::cerr << TQString("ERROR: Event in chord at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").arg((*chord[j])->getViewAbsoluteTime()).ascii() << std::endl;
                     (*chord[j])->event()->dump(std::cerr);
                 }
                 h.push_back(height);
@@ -249,7 +249,7 @@ NotationVLayout::scanStaff(Staff &staffBase, timeT, timeT)
 
             bool hasShifted = chord.hasNoteHeadShifted();
 
-            double y0 = -1E50;          // A very unlikely Y tqlayout value
+            double y0 = -1E50;          // A very unlikely Y layout value
 
             for (unsigned int j = 0; j < chord.size(); ++j) {
 
@@ -269,7 +269,7 @@ NotationVLayout::scanStaff(Staff &staffBase, timeT, timeT)
                 // These calculations and assignments are pretty much final
                 // if the chord is not in a beamed group, but if it is then
                 // they will be reworked by NotationGroup::applyBeam, which
-                // is called from NotationHLayout::tqlayout, which is called
+                // is called from NotationHLayout::layout, which is called
                 // after this.  Any inaccuracies here for beamed groups
                 // should be stamped out there.
 
@@ -342,7 +342,7 @@ NotationVLayout::scanStaff(Staff &staffBase, timeT, timeT)
             // Not optimal, as we can end up scanning the chord
             // multiple times (we'll return to it after scanning the
             // contained note).  [We can't just iterate over all
-            // elements within the chord (as we can in htqlayout)
+            // elements within the chord (as we can in hlayout)
             // because we need them in height order.]
 
             i = chord.getFirstElementNotInChord();
@@ -490,7 +490,7 @@ NotationVLayout::positionSlur(NotationStaff &staff,
             if (!event->get
                     <Int>(m_properties.HEIGHT_ON_STAFF, h)) {
                 KMessageBox::sorry
-                ((TQWidget *)parent(), i18n("Spanned note at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").tqarg((*scooter)->getViewAbsoluteTime()));
+                ((TQWidget *)parent(), i18n("Spanned note at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").arg((*scooter)->getViewAbsoluteTime()));
                 event->dump(std::cerr);
             }
 
diff --git a/src/gui/editors/notation/NotationVLayout.h b/src/gui/editors/notation/NotationVLayout.h
index b69c06c..2e718c7 100644
--- a/src/gui/editors/notation/NotationVLayout.h
+++ b/src/gui/editors/notation/NotationVLayout.h
@@ -52,7 +52,7 @@ class Composition;
 
 
 /**
- * Vertical notation tqlayout
+ * Vertical notation layout
  *
  * computes the Y coordinate of notation elements
  */
@@ -91,9 +91,9 @@ public:
                            timeT = 0);
 
     /**
-     * Do any tqlayout dependent on more than one staff.  As it
-     * happens, we have none, but we do have some tqlayout that
-     * depends on the final results from the horizontal tqlayout
+     * Do any layout dependent on more than one staff.  As it
+     * happens, we have none, but we do have some layout that
+     * depends on the final results from the horizontal layout
      * (for slurs), so we should do that here
      */
     virtual void finishLayout(timeT = 0,
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index bd553ee..be96fdf 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -25,7 +25,7 @@
 
 #include "NotationView.h"
 #include <list>
-#include <tqlayout.h>
+#include <layout.h>
 #include "misc/Debug.h"
 #include <kapplication.h>
 
@@ -194,7 +194,7 @@
 #include <ktempfile.h>
 #include <ktoolbar.h>
 #include <kxmlguiclient.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcanvas.h>
 #include <tqcursor.h>
 #include <tqdialog.h>
@@ -372,9 +372,9 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
         m_pageMode(LinedStaff::LinearMode),
         m_leftGutter(20),
         m_notePixmapFactory(new NotePixmapFactory(m_fontName, m_fontSize)),
-        m_htqlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory,
+        m_hlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory,
                                       m_properties, TQT_TQOBJECT(this))),
-        m_vtqlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory,
+        m_vlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory,
                                       m_properties, TQT_TQOBJECT(this))),
         m_chordNameRuler(0),
         m_tempoRuler(0),
@@ -409,7 +409,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
 
 
     // Initialise the display-related defaults that will be needed
-    // by both the actions and the tqlayout toolbar
+    // by both the actions and the layout toolbar
 
     m_config->setGroup(NotationViewConfigGroup);
 
@@ -435,15 +435,15 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
                   NoteFontFactory::getDefaultSize(m_fontName));
 
     int defaultSpacing = m_config->readNumEntry("spacing", 100);
-    m_htqlayout->setSpacing(defaultSpacing);
+    m_hlayout->setSpacing(defaultSpacing);
 
     int defaultProportion = m_config->readNumEntry("proportion", 60);
-    m_htqlayout->setProportion(defaultProportion);
+    m_hlayout->setProportion(defaultProportion);
 
     delete m_notePixmapFactory;
     m_notePixmapFactory = new NotePixmapFactory(m_fontName, m_fontSize);
-    m_htqlayout->setNotePixmapFactory(m_notePixmapFactory);
-    m_vtqlayout->setNotePixmapFactory(m_notePixmapFactory);
+    m_hlayout->setNotePixmapFactory(m_notePixmapFactory);
+    m_vlayout->setNotePixmapFactory(m_notePixmapFactory);
 
     setupActions();
     //     setupAddControlRulerMenu(); - too early for notation, moved to end of ctor.
@@ -460,19 +460,19 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
     updateViewCaption();
 
     m_chordNameRuler = new ChordNameRuler
-                       (m_htqlayout, doc, segments, m_leftGutter, 20, getCentralWidget());
+                       (m_hlayout, doc, segments, m_leftGutter, 20, getCentralWidget());
     addRuler(m_chordNameRuler);
     if (showProgressive)
         m_chordNameRuler->show();
 
     m_tempoRuler = new TempoRuler
-                   (m_htqlayout, doc, this, m_leftGutter, 24, false, getCentralWidget());
+                   (m_hlayout, doc, this, m_leftGutter, 24, false, getCentralWidget());
     addRuler(m_tempoRuler);
     m_tempoRuler->hide();
     static_cast<TempoRuler *>(m_tempoRuler)->connectSignals();
 
     m_rawNoteRuler = new RawNoteRuler
-                     (m_htqlayout, segments[0], m_leftGutter, 20, getCentralWidget());
+                     (m_hlayout, segments[0], m_leftGutter, 20, getCentralWidget());
     addRuler(m_rawNoteRuler);
     m_rawNoteRuler->show();
 
@@ -484,7 +484,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
     readOptions();
 
 
-    setBottomStandardRuler(new StandardRuler(getDocument(), m_htqlayout, m_leftGutter, 25,
+    setBottomStandardRuler(new StandardRuler(getDocument(), m_hlayout, m_leftGutter, 25,
                                        true, getBottomWidget()));
 
     for (unsigned int i = 0; i < segments.size(); ++i)
@@ -506,7 +506,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
     m_canvasView->setLeftFixedWidget(m_headersGroupView);
 
     // Add a close button just above the track headers.
-    // The grid tqlayout is only here to maintain the button in a
+    // The grid layout is only here to maintain the button in a
     // right place
     m_headersTopFrame = new TQFrame(getCentralWidget());
     TQGridLayout * headersTopGrid
@@ -522,7 +522,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
     TQToolTip::add(hideHeadersButton, i18n("Close track headers"));
     headersTopGrid->setMargin(4);
     setTopStandardRuler(new StandardRuler(getDocument(),
-                                    m_htqlayout, m_leftGutter, 25,
+                                    m_hlayout, m_leftGutter, 25,
                                     false, getCentralWidget()), m_headersTopFrame);
 
     m_topStandardRuler->getLoopRuler()->setBackgroundColor
@@ -544,7 +544,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
 
 
     //
-    // tqlayout
+    // layout
     //
     ProgressDialog* progressDlg = 0;
 
@@ -585,7 +585,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
         setPageMode(mode);
 
         for (unsigned int i = 0; i < m_staffs.size(); ++i) {
-            m_staffs[i]->getSegment().getRefreshtqStatus
+            m_staffs[i]->getSegment().getRefreshStatus
             (m_segmentsRefreshStatusIds[i]).setNeedsRefresh(false);
         }
 
@@ -594,7 +594,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
     } catch (ProgressReporter::Cancelled c)
     {
         // when cancelled, m_ok is false -- checked by calling method
-        NOTATION_DEBUG << "NotationView ctor : tqlayout Cancelled" << endl;
+        NOTATION_DEBUG << "NotationView ctor : layout Cancelled" << endl;
     }
 
     NOTATION_DEBUG << "NotationView ctor : m_ok = " << m_ok << endl;
@@ -754,10 +754,10 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
     slotSetInsertCursorPosition(0);
     slotSetPointerPosition(doc->getComposition().getPosition());
     setCurrentSelection(0, false, true);
-    slotUpdateInsertModetqStatus();
-    m_chordNameRuler->tqrepaint();
-    m_tempoRuler->tqrepaint();
-    m_rawNoteRuler->tqrepaint();
+    slotUpdateInsertModeStatus();
+    m_chordNameRuler->repaint();
+    m_tempoRuler->repaint();
+    m_rawNoteRuler->repaint();
     m_inhibitRefresh = false;
 
     //    slotCheckRendered(0, getCanvasView()->visibleWidth());
@@ -817,9 +817,9 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
         m_pageMode(LinedStaff::LinearMode),
         m_leftGutter(0),
         m_notePixmapFactory(new NotePixmapFactory(m_fontName, m_fontSize)),
-        m_htqlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory,
+        m_hlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory,
                                       m_properties, TQT_TQOBJECT(this))),
-        m_vtqlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory,
+        m_vlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory,
                                       m_properties, TQT_TQOBJECT(this))),
         m_chordNameRuler(0),
         m_tempoRuler(0),
@@ -850,7 +850,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
 
 
     // Initialise the display-related defaults that will be needed
-    // by both the actions and the tqlayout toolbar
+    // by both the actions and the layout toolbar
 
     m_config->setGroup(NotationViewConfigGroup);
 
@@ -871,20 +871,20 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
 
     if (referenceView)
     {
-        m_htqlayout->setSpacing(referenceView->m_htqlayout->getSpacing());
-        m_htqlayout->setProportion(referenceView->m_htqlayout->getProportion());
+        m_hlayout->setSpacing(referenceView->m_hlayout->getSpacing());
+        m_hlayout->setProportion(referenceView->m_hlayout->getProportion());
     } else
     {
         int defaultSpacing = m_config->readNumEntry("spacing", 100);
-        m_htqlayout->setSpacing(defaultSpacing);
+        m_hlayout->setSpacing(defaultSpacing);
         int defaultProportion = m_config->readNumEntry("proportion", 60);
-        m_htqlayout->setProportion(defaultProportion);
+        m_hlayout->setProportion(defaultProportion);
     }
 
     delete m_notePixmapFactory;
     m_notePixmapFactory = new NotePixmapFactory(m_fontName, m_fontSize);
-    m_htqlayout->setNotePixmapFactory(m_notePixmapFactory);
-    m_vtqlayout->setNotePixmapFactory(m_notePixmapFactory);
+    m_hlayout->setNotePixmapFactory(m_notePixmapFactory);
+    m_vlayout->setNotePixmapFactory(m_notePixmapFactory);
 
     setBackgroundMode(PaletteBase);
     m_config->setGroup(NotationViewConfigGroup);
@@ -930,7 +930,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
         setPageMode(LinedStaff::MultiPageMode); // also positions and renders the staffs!
 
         for (unsigned int i = 0; i < m_staffs.size(); ++i) {
-            m_staffs[i]->getSegment().getRefreshtqStatus
+            m_staffs[i]->getSegment().getRefreshStatus
             (m_segmentsRefreshStatusIds[i]).setNeedsRefresh(false);
         }
 
@@ -939,7 +939,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
     } catch (ProgressReporter::Cancelled c)
     {
         // when cancelled, m_ok is false -- checked by calling method
-        NOTATION_DEBUG << "NotationView ctor : tqlayout Cancelled" << endl;
+        NOTATION_DEBUG << "NotationView ctor : layout Cancelled" << endl;
     }
 
     NOTATION_DEBUG << "NotationView ctor : m_ok = " << m_ok << endl;
@@ -1223,7 +1223,7 @@ void NotationView::positionStaffs()
         }
     }
 
-    m_htqlayout->setPageWidth(pageWidth - leftMargin * 2);
+    m_hlayout->setPageWidth(pageWidth - leftMargin * 2);
 
     int topGutter = 0;
 
@@ -1341,7 +1341,7 @@ void NotationView::positionPages()
             haveBackground = true;
         }
         // we're happy to ignore errors from this one:
-        deskBackground.load(TQString("%1/misc/bg-desktop.xpm").tqarg(pixmapDir));
+        deskBackground.load(TQString("%1/misc/bg-desktop.xpm").arg(pixmapDir));
     }
 
     int pageWidth = getPageWidth();
@@ -1365,14 +1365,14 @@ void NotationView::positionPages()
 
     if (m_pageMode != LinedStaff::MultiPageMode) {
         if (haveBackground) {
-            canvas()->tqsetBackgroundPixmap(background);
+            canvas()->setBackgroundPixmap(background);
             getCanvasView()->setBackgroundMode(TQt::FixedPixmap);
             getCanvasView()->setPaletteBackgroundPixmap(background);
             getCanvasView()->setErasePixmap(background);
         }
     } else {
         if (haveBackground) {
-            canvas()->tqsetBackgroundPixmap(deskBackground);
+            canvas()->setBackgroundPixmap(deskBackground);
             getCanvasView()->setBackgroundMode(TQt::FixedPixmap);
             getCanvasView()->setPaletteBackgroundPixmap(background);
             getCanvasView()->setErasePixmap(background);
@@ -1389,7 +1389,7 @@ void NotationView::positionPages()
             int w = pageWidth - leftMargin / 2;
             int h = pageHeight;
 
-            TQString str = TQString("%1").tqarg(page + 1);
+            TQString str = TQString("%1").arg(page + 1);
             TQCanvasText *text = new TQCanvasText(str, pageNumberFont, canvas());
             text->setX(m_leftGutter + pageWidth * page + pageWidth - pageNumberMetrics.width(str) - leftMargin);
             text->setY(y + h - pageNumberMetrics.descent() - topMargin);
@@ -1482,13 +1482,13 @@ void NotationView::readOptions()
     opt = m_config->readBoolEntry("Show Annotations", true);
     m_annotationsVisible = opt;
     getToggleAction("show_annotations")->setChecked(opt);
-    slotUpdateAnnotationstqStatus();
+    slotUpdateAnnotationsStatus();
     //    slotToggleAnnotations();
 
     opt = m_config->readBoolEntry("Show LilyPond Directives", true);
     m_lilyPondDirectivesVisible = opt;
     getToggleAction("show_lilypond_directives")->setChecked(opt);
-    slotUpdateLilyPondDirectivestqStatus();
+    slotUpdateLilyPondDirectivesStatus();
 }
 
 void NotationView::setupActions()
@@ -1549,7 +1549,7 @@ void NotationView::setupActions()
     KActionMenu *spacingActionMenu =
         new KActionMenu(i18n("S&pacing"), TQT_TQOBJECT(this), "stretch_actionmenu");
 
-    int defaultSpacing = m_htqlayout->getSpacing();
+    int defaultSpacing = m_hlayout->getSpacing();
     std::vector<int> spacings = NotationHLayout::getAvailableSpacings();
 
     for (std::vector<int>::iterator i = spacings.begin();
@@ -1557,9 +1557,9 @@ void NotationView::setupActions()
 
         KToggleAction *spacingAction =
             new KToggleAction
-            (TQString("%1%").tqarg(*i), 0, TQT_TQOBJECT(this),
+            (TQString("%1%").arg(*i), 0, TQT_TQOBJECT(this),
              TQT_SLOT(slotChangeSpacingFromAction()),
-             actionCollection(), TQString("spacing_%1").tqarg(*i).ascii());
+             actionCollection(), TQString("spacing_%1").arg(*i).ascii());
 
         spacingAction->setExclusiveGroup("spacing");
         spacingAction->setChecked(*i == defaultSpacing);
@@ -1571,13 +1571,13 @@ void NotationView::setupActions()
     KActionMenu *proportionActionMenu =
         new KActionMenu(i18n("Du&ration Factor"), TQT_TQOBJECT(this), "proportion_actionmenu");
 
-    int defaultProportion = m_htqlayout->getProportion();
+    int defaultProportion = m_hlayout->getProportion();
     std::vector<int> proportions = NotationHLayout::getAvailableProportions();
 
     for (std::vector<int>::iterator i = proportions.begin();
             i != proportions.end(); ++i) {
 
-        TQString name = TQString("%1%").tqarg(*i);
+        TQString name = TQString("%1%").arg(*i);
         if (*i == 0)
             name = i18n("None");
 
@@ -1585,7 +1585,7 @@ void NotationView::setupActions()
             new KToggleAction
             (name, 0, TQT_TQOBJECT(this),
              TQT_SLOT(slotChangeProportionFromAction()),
-             actionCollection(), TQString("proportion_%1").tqarg(*i).ascii());
+             actionCollection(), TQString("proportion_%1").arg(*i).ascii());
 
         proportionAction->setExclusiveGroup("proportion");
         proportionAction->setChecked(*i == defaultProportion);
@@ -1820,7 +1820,7 @@ void NotationView::setupActions()
 
     TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
 
-    TQCanvasPixmap pixmap(pixmapDir + "/toolbar/linear-tqlayout.xpm");
+    TQCanvasPixmap pixmap(pixmapDir + "/toolbar/linear-layout.xpm");
     icon = TQIconSet(pixmap);
     KRadioAction *linearModeAction = new KRadioAction
                                      (i18n("&Linear Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotLinearMode()),
@@ -1910,21 +1910,21 @@ void NotationView::setupActions()
     icon = TQIconSet(NotePixmapFactory::toTQPixmap
                     (NotePixmapFactory::makeToolbarPixmap("triplet")));
     (new KToggleAction(i18n("Trip&let Insert Mode"), icon, Key_G,
-                       TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()),
+                       TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()),
                        actionCollection(), "triplet_mode"))->
         setChecked(false);
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap
                     (NotePixmapFactory::makeToolbarPixmap("chord")));
     (new KToggleAction(i18n("C&hord Insert Mode"), icon, Key_H,
-                       TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()),
+                       TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()),
                        actionCollection(), "chord_mode"))->
         setChecked(false);
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap
                     (NotePixmapFactory::makeToolbarPixmap("group-grace")));
     (new KToggleAction(i18n("Grace Insert Mode"), icon, 0,
-                       TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()),
+                       TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()),
                        actionCollection(), "grace_mode"))->
         setChecked(false);
 /*!!!
@@ -2263,7 +2263,7 @@ void NotationView::setupActions()
     for (int i = 0; i <= 5; ++i) {
         new KAction(slashTitles[i], 0, TQT_TQOBJECT(this),
                     TQT_SLOT(slotAddSlashes()), actionCollection(),
-                    TQString("slashes_%1").tqarg(i).ascii());
+                    TQString("slashes_%1").arg(i).ascii());
     }
 
     new KAction(ClefInsertionCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
@@ -2546,7 +2546,7 @@ NotationView::setupFontSizeMenu(std::string oldFontName)
         for (unsigned int i = 0; i < sizes.size(); ++i) {
             KAction *action =
                 actionCollection()->action
-                (TQString("note_font_size_%1").tqarg(sizes[i]).ascii());
+                (TQString("note_font_size_%1").arg(sizes[i]).ascii());
             m_fontSizeActionMenu->remove
             (action);
 
@@ -2560,7 +2560,7 @@ NotationView::setupFontSizeMenu(std::string oldFontName)
 
     for (unsigned int i = 0; i < sizes.size(); ++i) {
 
-        TQString actionName = TQString("note_font_size_%1").tqarg(sizes[i]);
+        TQString actionName = TQString("note_font_size_%1").arg(sizes[i]);
 
         KToggleAction *sizeAction = dynamic_cast<KToggleAction *>
                                     (actionCollection()->action(actionName.ascii()));
@@ -2611,7 +2611,7 @@ void NotationView::initLayoutToolbar()
 
     if (!layoutToolbar) {
         std::cerr
-        << "NotationView::initLayoutToolbar() : tqlayout toolbar not found"
+        << "NotationView::initLayoutToolbar() : layout toolbar not found"
         << std::endl;
         return ;
     }
@@ -2679,7 +2679,7 @@ void NotationView::initLayoutToolbar()
     //
     // spacing combo
     //
-    int defaultSpacing = m_htqlayout->getSpacing();
+    int defaultSpacing = m_hlayout->getSpacing();
     std::vector<int> spacings = NotationHLayout::getAvailableSpacings();
 
     m_spacingCombo = new KComboBox(layoutToolbar, "spacing combo");
@@ -2786,17 +2786,17 @@ NotationView::setPageMode(LinedStaff::PageMode pageMode)
     int topMargin = 0, leftMargin = 0;
     getPageMargins(leftMargin, topMargin);
 
-    m_htqlayout->setPageMode(pageMode != LinedStaff::LinearMode);
-    m_htqlayout->setPageWidth(pageWidth - leftMargin * 2);
+    m_hlayout->setPageMode(pageMode != LinedStaff::LinearMode);
+    m_hlayout->setPageWidth(pageWidth - leftMargin * 2);
 
-    NOTATION_DEBUG << "NotationView::setPageMode: set tqlayout's page width to "
+    NOTATION_DEBUG << "NotationView::setPageMode: set layout's page width to "
     << (pageWidth - leftMargin * 2) << endl;
 
     positionStaffs();
 
     bool layoutApplied = applyLayout();
     if (!layoutApplied)
-        KMessageBox::sorry(0, "Couldn't apply tqlayout");
+        KMessageBox::sorry(0, "Couldn't apply layout");
     else {
         for (unsigned int i = 0; i < m_staffs.size(); ++i) {
             m_staffs[i]->markChanged();
@@ -2894,7 +2894,7 @@ void
 NotationView::scrollToTime(timeT t)
 {
 
-    double notationViewLayoutCoord = m_htqlayout->getXForTime(t);
+    double notationViewLayoutCoord = m_hlayout->getXForTime(t);
 
     // Doesn't appear to matter which staff we use
     //!!! actually it probably does matter, if they don't have the same extents
@@ -2912,7 +2912,7 @@ NotationView::scrollToTime(timeT t)
 RulerScale*
 NotationView::getHLayout()
 {
-    return m_htqlayout;
+    return m_hlayout;
 }
 
 void
@@ -2948,8 +2948,8 @@ NotationView::paintEvent(TQPaintEvent *e)
     getPageMargins(leftMargin, topMargin);
 
     if (m_pageMode == LinedStaff::ContinuousPageMode) {
-        // retqlayout if the window width changes significantly in continuous page mode
-        int diff = int(getPageWidth() - leftMargin * 2 - m_htqlayout->getPageWidth());
+        // relayout if the window width changes significantly in continuous page mode
+        int diff = int(getPageWidth() - leftMargin * 2 - m_hlayout->getPageWidth());
         if (diff < -10 || diff > 10) {
             setPageMode(m_pageMode);
             refreshSegment(0, 0, 0);
@@ -2990,15 +2990,15 @@ NotationView::paintEvent(TQPaintEvent *e)
         }
     }
 
-    slotSetOperationNameAndtqStatus(i18n("  Ready."));
+    slotSetOperationNameAndStatus(i18n("  Ready."));
 }
 
 bool NotationView::applyLayout(int staffNo, timeT startTime, timeT endTime)
 {
-    slotSetOperationNameAndtqStatus(i18n("Laying out score..."));
+    slotSetOperationNameAndStatus(i18n("Laying out score..."));
     ProgressDialog::processEvents();
 
-    m_htqlayout->setStaffCount(m_staffs.size());
+    m_hlayout->setStaffCount(m_staffs.size());
 
     Profiler profiler("NotationView::applyLayout");
     unsigned int i;
@@ -3008,20 +3008,20 @@ bool NotationView::applyLayout(int staffNo, timeT startTime, timeT endTime)
         if (staffNo >= 0 && (int)i != staffNo)
             continue;
 
-        slotSetOperationNameAndtqStatus(i18n("Laying out staff %1...").tqarg(i + 1));
+        slotSetOperationNameAndStatus(i18n("Laying out staff %1...").arg(i + 1));
         ProgressDialog::processEvents();
 
-        m_htqlayout->resetStaff(*m_staffs[i], startTime, endTime);
-        m_vtqlayout->resetStaff(*m_staffs[i], startTime, endTime);
-        m_htqlayout->scanStaff(*m_staffs[i], startTime, endTime);
-        m_vtqlayout->scanStaff(*m_staffs[i], startTime, endTime);
+        m_hlayout->resetStaff(*m_staffs[i], startTime, endTime);
+        m_vlayout->resetStaff(*m_staffs[i], startTime, endTime);
+        m_hlayout->scanStaff(*m_staffs[i], startTime, endTime);
+        m_vlayout->scanStaff(*m_staffs[i], startTime, endTime);
     }
 
-    slotSetOperationNameAndtqStatus(i18n("Reconciling staffs..."));
+    slotSetOperationNameAndStatus(i18n("Reconciling staffs..."));
     ProgressDialog::processEvents();
 
-    m_htqlayout->finishLayout(startTime, endTime);
-    m_vtqlayout->finishLayout(startTime, endTime);
+    m_hlayout->finishLayout(startTime, endTime);
+    m_vlayout->finishLayout(startTime, endTime);
 
     // find the last finishing staff for future use
 
@@ -3194,8 +3194,8 @@ void NotationView::setCurrentSelection(EventSelection* s, bool preview,
                 getLinedStaff(segment)->positionElements(std::min(startA, startB),
                         std::max(endA, endB));
             } else {
-                // mark refresh status and then request a tqrepaint
-                segment.getRefreshtqStatus
+                // mark refresh status and then request a repaint
+                segment.getRefreshStatus
                 (m_segmentsRefreshStatusIds
                  [getLinedStaff(segment)->getId()]).
                 push(std::min(startA, startB), std::max(endA, endB));
@@ -3211,14 +3211,14 @@ void NotationView::setCurrentSelection(EventSelection* s, bool preview,
 
                 getLinedStaff(s->getSegment())->positionElements(startB, endB);
             } else {
-                // mark refresh status and then request a tqrepaint
+                // mark refresh status and then request a repaint
 
-                oldSelection->getSegment().getRefreshtqStatus
+                oldSelection->getSegment().getRefreshStatus
                 (m_segmentsRefreshStatusIds
                  [getLinedStaff(oldSelection->getSegment())->getId()]).
                 push(startA, endA);
 
-                s->getSegment().getRefreshtqStatus
+                s->getSegment().getRefreshStatus
                 (m_segmentsRefreshStatusIds
                  [getLinedStaff(s->getSegment())->getId()]).
                 push(startB, endB);
@@ -3349,10 +3349,10 @@ void NotationView::setNotePixmapFactory(NotePixmapFactory* f)
 {
     delete m_notePixmapFactory;
     m_notePixmapFactory = f;
-    if (m_htqlayout)
-        m_htqlayout->setNotePixmapFactory(m_notePixmapFactory);
-    if (m_vtqlayout)
-        m_vtqlayout->setNotePixmapFactory(m_notePixmapFactory);
+    if (m_hlayout)
+        m_hlayout->setNotePixmapFactory(m_notePixmapFactory);
+    if (m_vlayout)
+        m_vlayout->setNotePixmapFactory(m_notePixmapFactory);
 }
 
 Segment *
@@ -3469,7 +3469,7 @@ NotationView::getStaffForCanvasCoords(int x, int y) const
         LinedStaff::LinedStaffCoords coords =
             s->getLayoutCoordsForCanvasCoords(x, y);
 
-        timeT t = m_htqlayout->getTimeForX(coords.first);
+        timeT t = m_hlayout->getTimeForX(coords.first);
 	// In order to find the correct starting and ending bar of the segment,
 	// make infinitesimal shifts (+1 and -1) towards its center.
 	timeT t0 = getDocument()->getComposition().getBarStartForTime(m_staffs[m_currentStaff]->getSegment().getStartTime()+1);
@@ -3488,7 +3488,7 @@ NotationView::getStaffForCanvasCoords(int x, int y) const
             LinedStaff::LinedStaffCoords coords =
                 s->getLayoutCoordsForCanvasCoords(x, y);
 
-	    timeT t = m_htqlayout->getTimeForX(coords.first);
+	    timeT t = m_hlayout->getTimeForX(coords.first);
 	    // In order to find the correct starting and ending bar of the segment,
 	    // make infinitesimal shifts (+1 and -1) towards its center.
 	    timeT t0 = getDocument()->getComposition().getBarStartForTime(m_staffs[i]->getSegment().getStartTime()+1);
@@ -3589,8 +3589,8 @@ void NotationView::print(bool previewOnly)
             LinedStaff::LinedStaffCoords cc1 = staff->getLayoutCoordsForCanvasCoords
                                                (pageRect.x() + pageRect.width(), pageRect.y() + pageRect.height());
 
-            timeT t0 = m_htqlayout->getTimeForX(cc0.first);
-            timeT t1 = m_htqlayout->getTimeForX(cc1.first);
+            timeT t0 = m_hlayout->getTimeForX(cc0.first);
+            timeT t1 = m_hlayout->getTimeForX(cc1.first);
 
             m_staffs[i]->setPrintPainter(&printpainter);
             m_staffs[i]->checkRendered(t0, t1);
@@ -3629,8 +3629,8 @@ void NotationView::print(bool previewOnly)
             LinedStaff::LinedStaffCoords cc1 = staff->getLayoutCoordsForCanvasCoords
                                                (pageRect.x() + pageRect.width(), pageRect.y() + pageRect.height());
 
-            timeT t0 = m_htqlayout->getTimeForX(cc0.first);
-            timeT t1 = m_htqlayout->getTimeForX(cc1.first);
+            timeT t0 = m_hlayout->getTimeForX(cc0.first);
+            timeT t1 = m_hlayout->getTimeForX(cc1.first);
 
             m_staffs[i]->renderPrintable(t0, t1);
         }
@@ -3745,7 +3745,7 @@ NotationView::updateThumbnails(bool complete)
             int w = pageWidth - leftMargin / 2;
             int h = pageHeight;
 
-            TQString str = TQString("%1").tqarg(page + 1);
+            TQString str = TQString("%1").arg(page + 1);
 
             thumbPainter.drawRect(x / thumbScale, y / thumbScale,
                                   w / thumbScale, h / thumbScale);
@@ -3809,7 +3809,7 @@ void NotationView::refreshSegment(Segment *segment,
     }
 
     setMenuStates();
-    slotSetOperationNameAndtqStatus(i18n("  Ready."));
+    slotSetOperationNameAndStatus(i18n("  Ready."));
     NOTATION_DEBUG << "*** " << endl;
 }
 
@@ -3876,7 +3876,7 @@ void NotationView::readjustCanvasSize()
     double maxWidth = 0.0;
     int maxHeight = 0;
 
-    slotSetOperationNameAndtqStatus(i18n("Sizing and allocating canvas..."));
+    slotSetOperationNameAndStatus(i18n("Sizing and allocating canvas..."));
     ProgressDialog::processEvents();
 
     int progressTotal = m_staffs.size() + 2;
@@ -3886,7 +3886,7 @@ void NotationView::readjustCanvasSize()
 
         LinedStaff &staff = *m_staffs[i];
 
-        staff.sizeStaff(*m_htqlayout);
+        staff.sizeStaff(*m_hlayout);
         UPDATE_PROGRESS(1);
 
         if (staff.getTotalWidth() + staff.getX() > maxWidth) {
@@ -3944,7 +3944,7 @@ void NotationView::readjustCanvasSize()
         }
     }
 
-    // Give a correct vertical tqalignment to track headers
+    // Give a correct vertical alignment to track headers
     if ((m_pageMode == LinedStaff::LinearMode) && m_showHeadersGroup) {
         m_headersGroupView->setContentsPos(0, getCanvasView()->contentsY());
     }
@@ -4067,7 +4067,7 @@ void NotationView::initActionDataMaps()
             (NotationStrings::getReferenceName(Note(type, 0), false));
 
             TQString shortName(TQString("change_%1%2")
-                              .tqarg(notationOnly ? "notation_" : "").tqarg(refName));
+                              .arg(notationOnly ? "notation_" : "").arg(refName));
             shortName.replace(TQRegExp("-"), "_");
 
             TQString titleName
@@ -4095,7 +4095,7 @@ void NotationView::initActionDataMaps()
 
         Mark mark = marks[i];
         TQString markName(strtoqstr(mark));
-        TQString actionName = TQString("add_%1").tqarg(markName);
+        TQString actionName = TQString("add_%1").arg(markName);
 
         m_markActionDataMap->insert
             (actionName, new MarkActionData
@@ -4110,10 +4110,10 @@ void NotationView::setupProgress(KProgress* bar)
     if (bar) {
         NOTATION_DEBUG << "NotationView::setupProgress(bar)\n";
 
-        connect(m_htqlayout, TQT_SIGNAL(setProgress(int)),
+        connect(m_hlayout, TQT_SIGNAL(setProgress(int)),
                 bar, TQT_SLOT(setValue(int)));
 
-        connect(m_htqlayout, TQT_SIGNAL(incrementProgress(int)),
+        connect(m_hlayout, TQT_SIGNAL(incrementProgress(int)),
                 bar, TQT_SLOT(advance(int)));
 
         connect(this, TQT_SIGNAL(setProgress(int)),
@@ -4142,11 +4142,11 @@ void NotationView::setupProgress(ProgressDialog* dialog)
         setupProgress(dialog->progressBar());
 
         connect(dialog, TQT_SIGNAL(cancelClicked()),
-                m_htqlayout, TQT_SLOT(slotCancel()));
+                m_hlayout, TQT_SLOT(slotCancel()));
 
         for (unsigned int i = 0; i < m_staffs.size(); ++i) {
             connect(m_staffs[i], TQT_SIGNAL(setOperationName(TQString)),
-                    this, TQT_SLOT(slotSetOperationNameAndtqStatus(TQString)));
+                    this, TQT_SLOT(slotSetOperationNameAndStatus(TQString)));
 
             connect(dialog, TQT_SIGNAL(cancelClicked()),
                     m_staffs[i], TQT_SLOT(slotCancel()));
@@ -4159,10 +4159,10 @@ void NotationView::setupProgress(ProgressDialog* dialog)
 
 }
 
-void NotationView::slotSetOperationNameAndtqStatus(TQString name)
+void NotationView::slotSetOperationNameAndStatus(TQString name)
 {
     emit setOperationName(name);
-    statusBar()->changeItem(TQString("  %1").tqarg(name),
+    statusBar()->changeItem(TQString("  %1").arg(name),
                             KTmpStatusMsg::getDefaultId());
 }
 
@@ -4170,7 +4170,7 @@ void NotationView::disconnectProgress()
 {
     NOTATION_DEBUG << "NotationView::disconnectProgress()" << endl;
 
-    m_htqlayout->disconnect();
+    m_hlayout->disconnect();
     disconnect(TQT_SIGNAL(setProgress(int)));
     disconnect(TQT_SIGNAL(incrementProgress(int)));
     disconnect(TQT_SIGNAL(setOperationName(TQString)));
@@ -4203,18 +4203,18 @@ void NotationView::updateViewCaption()
             trackPosition = track->getPosition();
         //	std::cout << std::endl << std::endl << std::endl << "DEBUG TITLE BAR: " << getDocument()->getTitle() << std::endl << std::endl << std::endl;
         setCaption(i18n("%1 - Segment Track #%2 - Notation")
-                   .tqarg(getDocument()->getTitle())
-                   .tqarg(trackPosition + 1));
+                   .arg(getDocument()->getTitle())
+                   .arg(trackPosition + 1));
 
     } else if (m_segments.size() == getDocument()->getComposition().getNbSegments()) {
 
         setCaption(i18n("%1 - All Segments - Notation")
-                   .tqarg(getDocument()->getTitle()));
+                   .arg(getDocument()->getTitle()));
 
     } else {
 
         setCaption(i18n("%1 - Segment - Notation", "%1 - %n Segments - Notation", m_segments.size())
-                   .tqarg(getDocument()->getTitle()));
+                   .arg(getDocument()->getTitle()));
 
     }
 }
@@ -4230,7 +4230,7 @@ NotationView::MarkActionDataMap* NotationView::m_markActionDataMap = 0;
 
 
 void
-NotationView::slotUpdateInsertModetqStatus()
+NotationView::slotUpdateInsertModeStatus()
 {
     TQString tripletMessage = i18n("Triplet");
     TQString chordMessage = i18n("Chord");
@@ -4238,22 +4238,22 @@ NotationView::slotUpdateInsertModetqStatus()
     TQString message;
 
     if (isInTripletMode()) {
-        message = i18n("%1 %2").tqarg(message).tqarg(tripletMessage);
+        message = i18n("%1 %2").arg(message).arg(tripletMessage);
     }
 
     if (isInChordMode()) {
-        message = i18n("%1 %2").tqarg(message).tqarg(chordMessage);
+        message = i18n("%1 %2").arg(message).arg(chordMessage);
     }
 
     if (isInGraceMode()) {
-        message = i18n("%1 %2").tqarg(message).tqarg(graceMessage);
+        message = i18n("%1 %2").arg(message).arg(graceMessage);
     }
 
     m_insertModeLabel->setText(message);
 }
 
 void
-NotationView::slotUpdateAnnotationstqStatus()
+NotationView::slotUpdateAnnotationsStatus()
 {
     if (!areAnnotationsVisible()) {
         for (int i = 0; i < getStaffCount(); ++i) {
@@ -4273,7 +4273,7 @@ NotationView::slotUpdateAnnotationstqStatus()
 }
 
 void
-NotationView::slotUpdateLilyPondDirectivestqStatus()
+NotationView::slotUpdateLilyPondDirectivesStatus()
 {
     if (!areLilyPondDirectivesVisible()) {
         for (int i = 0; i < getStaffCount(); ++i) {
@@ -4317,22 +4317,22 @@ NotationView::slotChangeSpacingFromAction()
 
     } else {
         KMessageBox::sorry
-        (this, i18n("Unknown spacing action %1").tqarg(name));
+        (this, i18n("Unknown spacing action %1").arg(name));
     }
 }
 
 void
 NotationView::slotChangeSpacing(int spacing)
 {
-    if (m_htqlayout->getSpacing() == spacing)
+    if (m_hlayout->getSpacing() == spacing)
         return ;
 
-    m_htqlayout->setSpacing(spacing);
+    m_hlayout->setSpacing(spacing);
 
     //     m_spacingSlider->setSize(spacing);
 
     KToggleAction *action = dynamic_cast<KToggleAction *>
-                            (actionCollection()->action(TQString("spacing_%1").tqarg(spacing).ascii()));
+                            (actionCollection()->action(TQString("spacing_%1").arg(spacing).ascii()));
     if (action)
         action->setChecked(true);
     else {
@@ -4357,7 +4357,7 @@ NotationView::slotChangeSpacing(int spacing)
 void
 NotationView::slotChangeProportionFromIndex(int n)
 {
-    std::vector<int> proportions = m_htqlayout->getAvailableProportions();
+    std::vector<int> proportions = m_hlayout->getAvailableProportions();
     if (n >= (int)proportions.size())
         n = proportions.size() - 1;
     slotChangeProportion(proportions[n]);
@@ -4375,22 +4375,22 @@ NotationView::slotChangeProportionFromAction()
 
     } else {
         KMessageBox::sorry
-        (this, i18n("Unknown proportion action %1").tqarg(name));
+        (this, i18n("Unknown proportion action %1").arg(name));
     }
 }
 
 void
 NotationView::slotChangeProportion(int proportion)
 {
-    if (m_htqlayout->getProportion() == proportion)
+    if (m_hlayout->getProportion() == proportion)
         return ;
 
-    m_htqlayout->setProportion(proportion);
+    m_hlayout->setProportion(proportion);
 
     //    m_proportionSlider->setSize(proportion);
 
     KToggleAction *action = dynamic_cast<KToggleAction *>
-                            (actionCollection()->action(TQString("proportion_%1").tqarg(proportion).ascii()));
+                            (actionCollection()->action(TQString("proportion_%1").arg(proportion).ascii()));
     if (action)
         action->setChecked(true);
     else {
@@ -4422,7 +4422,7 @@ NotationView::slotChangeFontFromAction()
         slotChangeFont(name);
     } else {
         KMessageBox::sorry
-        (this, i18n("Unknown font action %1").tqarg(name));
+        (this, i18n("Unknown font action %1").arg(name));
     }
 }
 
@@ -4440,11 +4440,11 @@ NotationView::slotChangeFontSizeFromAction()
             slotChangeFont(m_fontName, size);
         else {
             KMessageBox::sorry
-            (this, i18n("Unknown font size %1").tqarg(name));
+            (this, i18n("Unknown font size %1").arg(name));
         }
     } else {
         KMessageBox::sorry
-        (this, i18n("Unknown font size action %1").tqarg(name));
+        (this, i18n("Unknown font size action %1").arg(name));
     }
 }
 
@@ -4581,7 +4581,7 @@ NotationView::slotChangeFont(std::string newName, int newSize)
         int topMargin = 0, leftMargin = 0;
         getPageMargins(leftMargin, topMargin);
 
-        m_htqlayout->setPageWidth(pageWidth - leftMargin * 2);
+        m_hlayout->setPageWidth(pageWidth - leftMargin * 2);
     }
 
     for (unsigned int i = 0; i < m_staffs.size(); ++i) {
@@ -4594,7 +4594,7 @@ NotationView::slotChangeFont(std::string newName, int newSize)
 
     bool layoutApplied = applyLayout();
     if (!layoutApplied)
-        KMessageBox::sorry(0, "Couldn't apply tqlayout");
+        KMessageBox::sorry(0, "Couldn't apply layout");
     else {
         for (unsigned int i = 0; i < m_staffs.size(); ++i) {
             m_staffs[i]->markChanged();
@@ -5357,7 +5357,7 @@ void NotationView::slotAddIndication(std::string type, TQString desc)
         setSingleSelectedEvent(m_currentEventSelection->getSegment(),
                                command->getLastInsertedEvent());
     } else {
-        KMessageBox::sorry(this, i18n("Can't add overlapping %1 indications").tqarg(desc)); // TODO PLURAL - how many 'indications' ?
+        KMessageBox::sorry(this, i18n("Can't add overlapping %1 indications").arg(desc)); // TODO PLURAL - how many 'indications' ?
         delete command;
     }
 }
@@ -5568,7 +5568,7 @@ void NotationView::slotSetStyleFromAction()
     if (name.left(6) == "style_") {
         name = name.right(name.length() - 6);
 
-        KTmpStatusMsg msg(i18n("Changing to %1 style...").tqarg(name),
+        KTmpStatusMsg msg(i18n("Changing to %1 style...").arg(name),
                           this);
 
         addCommandToHistory(new ChangeStyleCommand
@@ -5576,7 +5576,7 @@ void NotationView::slotSetStyleFromAction()
                              *m_currentEventSelection));
     } else {
         KMessageBox::sorry
-            (this, i18n("Unknown style action %1").tqarg(name));
+            (this, i18n("Unknown style action %1").arg(name));
     }
 }
 
@@ -5608,7 +5608,7 @@ void NotationView::slotInsertNoteFromAction()
     } catch (...) {
 
         KMessageBox::sorry
-            (this, i18n("Unknown note insert action %1").tqarg(name));
+            (this, i18n("Unknown note insert action %1").arg(name));
         return ;
     }
 
@@ -6027,9 +6027,9 @@ NotationView::slotMakeOrnament()
     TQString name;
     int barNo = segment.getComposition()->getBarNumber(absTime);
     if (track) {
-        name = TQString(i18n("Ornament track %1 bar %2").tqarg(track->getPosition() + 1).tqarg(barNo + 1));
+        name = TQString(i18n("Ornament track %1 bar %2").arg(track->getPosition() + 1).arg(barNo + 1));
     } else {
-        name = TQString(i18n("Ornament bar %1").tqarg(barNo + 1));
+        name = TQString(i18n("Ornament bar %1").arg(barNo + 1));
     }
 
     MakeOrnamentDialog dialog(this, name, basePitch);
@@ -6438,22 +6438,22 @@ NotationView::slotSetPointerPosition(timeT time, bool scroll)
 
     for (unsigned int i = 0; i < m_staffs.size(); ++i) {
 
-        double layoutX = m_htqlayout->getXForTimeByEvent(time);
+        double layoutX = m_hlayout->getXForTimeByEvent(time);
         Segment &seg = m_staffs[i]->getSegment();
 
         bool good = true;
 
-        if (barNo >= m_htqlayout->getLastVisibleBarOnStaff(*m_staffs[i])) {
+        if (barNo >= m_hlayout->getLastVisibleBarOnStaff(*m_staffs[i])) {
             if (seg.isRepeating() && time < seg.getRepeatEndTime()) {
                 timeT mappedTime =
                     seg.getStartTime() +
                     ((time - seg.getStartTime()) %
                      (seg.getEndMarkerTime() - seg.getStartTime()));
-                layoutX = m_htqlayout->getXForTimeByEvent(mappedTime);
+                layoutX = m_hlayout->getXForTimeByEvent(mappedTime);
             } else {
                 good = false;
             }
-        } else if (barNo < m_htqlayout->getFirstVisibleBarOnStaff(*m_staffs[i])) {
+        } else if (barNo < m_hlayout->getFirstVisibleBarOnStaff(*m_staffs[i])) {
             good = false;
         }
 
@@ -6536,7 +6536,7 @@ NotationView::slotSetCurrentStaff(int staffNo)
 
         m_chordNameRuler->setCurrentSegment(segment);
         m_rawNoteRuler->setCurrentSegment(segment);
-        m_rawNoteRuler->tqrepaint();
+        m_rawNoteRuler->repaint();
         setControlRulersCurrentSegment();
 
         updateView();
@@ -6750,7 +6750,7 @@ NotationView::doDeferredCursorMove()
         t == segment.getEndTime() ||
         t == segment.getBarStartForTime(t)) {
 
-        staff->setInsertCursorPosition(*m_htqlayout, t);
+        staff->setInsertCursorPosition(*m_hlayout, t);
 
         if (type == CursorMoveAndMakeVisible) {
             double cx;
@@ -6976,21 +6976,21 @@ void NotationView::slotMultiPageMode()
 
 void NotationView::slotToggleChordsRuler()
 {
-    if (m_htqlayout->isPageMode())
+    if (m_hlayout->isPageMode())
         return ;
     toggleWidget(m_chordNameRuler, "show_chords_ruler");
 }
 
 void NotationView::slotToggleRawNoteRuler()
 {
-    if (m_htqlayout->isPageMode())
+    if (m_hlayout->isPageMode())
         return ;
     toggleWidget(m_rawNoteRuler, "show_raw_note_ruler");
 }
 
 void NotationView::slotToggleTempoRuler()
 {
-    if (m_htqlayout->isPageMode())
+    if (m_hlayout->isPageMode())
         return ;
     toggleWidget(m_tempoRuler, "show_tempo_ruler");
 }
@@ -6998,7 +6998,7 @@ void NotationView::slotToggleTempoRuler()
 void NotationView::slotToggleAnnotations()
 {
     m_annotationsVisible = !m_annotationsVisible;
-    slotUpdateAnnotationstqStatus();
+    slotUpdateAnnotationsStatus();
     //!!! use refresh mechanism
     refreshSegment(0, 0, 0);
 }
@@ -7006,7 +7006,7 @@ void NotationView::slotToggleAnnotations()
 void NotationView::slotToggleLilyPondDirectives()
 {
     m_lilyPondDirectivesVisible = !m_lilyPondDirectivesVisible;
-    slotUpdateLilyPondDirectivestqStatus();
+    slotUpdateLilyPondDirectivesStatus();
     //!!! use refresh mechanism
     refreshSegment(0, 0, 0);
 }
@@ -7116,7 +7116,7 @@ void NotationView::slotNonNotationItemPressed(TQMouseEvent *e, TQCanvasItem *it)
     } else if (dynamic_cast<TQCanvasTimeSigSprite *>(it)) {
 
         double layoutX = (dynamic_cast<TQCanvasTimeSigSprite *>(it))->getLayoutX();
-        emit editTimeSignature(m_htqlayout->getTimeForX(layoutX));
+        emit editTimeSignature(m_hlayout->getTimeForX(layoutX));
     }
 }
 
@@ -7194,17 +7194,17 @@ NotationView::slotHoveredOverAbsoluteTimeChanged(unsigned int time)
 
     //    TQString message;
     //    TQString format("%ld (%ld.%03lds)");
-    //    format = i18n("Time: %1").tqarg(format);
+    //    format = i18n("Time: %1").arg(format);
     //    message.sprintf(format, t, rt.sec, ms);
 
     TQString message = i18n("Time: %1 (%2.%3s)")
-        .tqarg(TQString("%1-%2-%3-%4")
-             .tqarg(TQString("%1").tqarg(bar + 1).rightJustify(3, '0'))
-             .tqarg(TQString("%1").tqarg(beat).rightJustify(2, '0'))
-             .tqarg(TQString("%1").tqarg(fraction).rightJustify(2, '0'))
-             .tqarg(TQString("%1").tqarg(remainder).rightJustify(2, '0')))
-        .tqarg(rt.sec)
-        .tqarg(TQString("%1").tqarg(ms).rightJustify(3, '0'));
+        .arg(TQString("%1-%2-%3-%4")
+             .arg(TQString("%1").arg(bar + 1).rightJustify(3, '0'))
+             .arg(TQString("%1").arg(beat).rightJustify(2, '0'))
+             .arg(TQString("%1").arg(fraction).rightJustify(2, '0'))
+             .arg(TQString("%1").arg(remainder).rightJustify(2, '0')))
+        .arg(rt.sec)
+        .arg(TQString("%1").arg(ms).rightJustify(3, '0'));
 
     m_hoveredOverAbsoluteTime->setText(message);
 }
@@ -7396,8 +7396,8 @@ NotationView::slotCheckRendered(double cx0, double cx1)
         LinedStaff::LinedStaffCoords cc1 = staff->getLayoutCoordsForCanvasCoords
             (cx1, staff->getTotalHeight() + staff->getY());
 
-        timeT t0 = m_htqlayout->getTimeForX(cc0.first);
-        timeT t1 = m_htqlayout->getTimeForX(cc1.first);
+        timeT t0 = m_hlayout->getTimeForX(cc0.first);
+        timeT t1 = m_hlayout->getTimeForX(cc1.first);
 
         if (dynamic_cast<NotationStaff *>(staff)->checkRendered(t0, t1)) {
             something = true; //!!!
diff --git a/src/gui/editors/notation/NotationView.h b/src/gui/editors/notation/NotationView.h
index 461d299..ac8f58c 100644
--- a/src/gui/editors/notation/NotationView.h
+++ b/src/gui/editors/notation/NotationView.h
@@ -274,13 +274,13 @@ public:
     /// Sound the given note
     void playNote(Segment &segment, int pitch, int velocity = -1);
 
-    /// Switches between page- and linear- tqlayout modes
+    /// Switches between page- and linear- layout modes
     void setPageMode(LinedStaff::PageMode mode);
 
-    /// Returns the page width according to the tqlayout mode (page/linear)
+    /// Returns the page width according to the layout mode (page/linear)
     int getPageWidth();
 
-    /// Returns the page height according to the tqlayout mode (page/linear)
+    /// Returns the page height according to the layout mode (page/linear)
     int getPageHeight();
 
     /// Returns the margins within the page (zero if not in MultiPageMode)
@@ -310,7 +310,7 @@ public:
 
     /**
      * Render segments on printing painter.  This uses the current
-     * font size and tqlayout, rather than the optimal ones for the
+     * font size and layout, rather than the optimal ones for the
      * printer configuration (notation editing is not quite WYSIWYG,
      * and we may be in a non-page mode).
      * 
@@ -446,7 +446,7 @@ public slots:
     void slotToggleGroupToolBar();
 
     /**
-     * toggles the tqlayout toolbar
+     * toggles the layout toolbar
      */
     void slotToggleLayoutToolBar();
 
@@ -494,9 +494,9 @@ public slots:
     void slotToggleStepByStep();
 
     /// status stuff
-    void slotUpdateInsertModetqStatus();
-    void slotUpdateAnnotationstqStatus();
-    void slotUpdateLilyPondDirectivestqStatus();
+    void slotUpdateInsertModeStatus();
+    void slotUpdateAnnotationsStatus();
+    void slotUpdateLilyPondDirectivesStatus();
 
     /// edit menu
     void slotPreviewSelection();
@@ -773,22 +773,22 @@ public slots:
     /// Changes to the next font size down
     void slotZoomOut();
 
-    /// Changes the htqlayout spacing of the staffs on the view
+    /// Changes the hlayout spacing of the staffs on the view
     void slotChangeSpacing(int newSpacing);
 
-    /// Changes the htqlayout spacing of the staffs on the view
+    /// Changes the hlayout spacing of the staffs on the view
     void slotChangeSpacingFromStringValue(const TQString&);
 
-    /// Changes the htqlayout spacing of the staffs on the view
+    /// Changes the hlayout spacing of the staffs on the view
     void slotChangeSpacingFromAction();
 
-    /// Changes the htqlayout proportion of the staffs on the view
+    /// Changes the hlayout proportion of the staffs on the view
     void slotChangeProportion(int newProportion);
 
-    /// Changes the htqlayout proportion of the staffs on the view
+    /// Changes the hlayout proportion of the staffs on the view
     void slotChangeProportionFromIndex(int newProportionIndex);
 
-    /// Changes the htqlayout proportion of the staffs on the view
+    /// Changes the hlayout proportion of the staffs on the view
     void slotChangeProportionFromAction();
 
     /// Note-on received asynchronously -- consider step-by-step editing
@@ -812,7 +812,7 @@ public slots:
     /// Do some background rendering work.
     void slotRenderSomething();
 
-    void slotSetOperationNameAndtqStatus(TQString);
+    void slotSetOperationNameAndStatus(TQString);
 
     // Update notation view based on track/staff name change
     void slotUpdateStaffName();
@@ -876,7 +876,7 @@ protected:
 protected slots:
     /**
      * save general Options like all bar positions and status as well
-     * as the tqgeometry and the recent file list to the configuration
+     * as the geometry and the recent file list to the configuration
      * file
      */
     virtual void slotSaveOptions();
@@ -912,13 +912,13 @@ protected:
     virtual void initStatusBar();
 
     /**
-     * Place the staffs at the correct x & y coordinates (before tqlayout)
+     * Place the staffs at the correct x & y coordinates (before layout)
      */
     void positionStaffs();
 
     /**
      * Place the page pixmaps (if any) at the correct x & y
-     * coordinates (after tqlayout)
+     * coordinates (after layout)
      */
     void positionPages();
 
@@ -929,7 +929,7 @@ protected:
     void updateThumbnails(bool complete);
 
     /**
-     * setup the tqlayout/font toolbar
+     * setup the layout/font toolbar
      */
     void initLayoutToolbar();
 
@@ -940,15 +940,15 @@ protected:
      */
     void toggleNamedToolBar(const TQString& toolBarName, bool* force = 0);
 
-    /// Calls all the relevant preparse and tqlayout methods
+    /// Calls all the relevant preparse and layout methods
     virtual bool applyLayout(int staffNo = -1,
                              timeT startTime = 0,
                              timeT endTime = 0);
 
     /**
-     * Readjust the size of the canvas after a tqlayout
+     * Readjust the size of the canvas after a layout
      *
-     * Checks the total width computed by the horizontal tqlayout
+     * Checks the total width computed by the horizontal layout
      *
      * @see NotationHLayout#getTotalWidth()
      */
@@ -1074,8 +1074,8 @@ protected:
 
     NotePixmapFactory *m_notePixmapFactory;
     
-    NotationHLayout* m_htqlayout;
-    NotationVLayout* m_vtqlayout;
+    NotationHLayout* m_hlayout;
+    NotationVLayout* m_vlayout;
 
     ChordNameRuler *m_chordNameRuler;
     TQWidget *m_tempoRuler;
diff --git a/src/gui/editors/notation/NoteFont.cpp b/src/gui/editors/notation/NoteFont.cpp
index 18f82f7..5f84e7a 100644
--- a/src/gui/editors/notation/NoteFont.cpp
+++ b/src/gui/editors/notation/NoteFont.cpp
@@ -66,7 +66,7 @@ NoteFont::NoteFont(std::string fontName, int size) :
 
     if (size > 0) {
         if (sizes.find(size) == sizes.end()) {
-            throw BadNoteFont(qstrtostr(TQString("Font \"%1\" not available in size %2").tqarg(strtoqstr(fontName)).tqarg(size)));
+            throw BadNoteFont(qstrtostr(TQString("Font \"%1\" not available in size %2").arg(strtoqstr(fontName)).arg(size)));
         } else {
             m_size = size;
         }
@@ -86,8 +86,8 @@ NoteFont::NoteFont(std::string fontName, int size) :
     // Locate our font's pixmap map in the font map, create if necessary
 
     std::string fontKey = qstrtostr(TQString("__%1__%2__")
-                                    .tqarg(strtoqstr(m_fontMap.getName()))
-                                    .tqarg(m_size));
+                                    .arg(strtoqstr(m_fontMap.getName()))
+                                    .arg(m_size));
 
     FontPixmapMap::iterator i = m_fontPixmapMap->find(fontKey);
     if (i == m_fontPixmapMap->end()) {
@@ -444,13 +444,13 @@ NoteFont::getShadedPixmap(CharName baseCharName, TQPixmap &pixmap,
 CharName
 NoteFont::getNameWithColour(CharName base, int hue) const
 {
-    return qstrtostr(TQString("%1__%2").tqarg(hue).tqarg(strtoqstr(base)));
+    return qstrtostr(TQString("%1__%2").arg(hue).arg(strtoqstr(base)));
 }
 
 CharName
 NoteFont::getNameShaded(CharName base) const
 {
-    return qstrtostr(TQString("shaded__%1").tqarg(strtoqstr(base)));
+    return qstrtostr(TQString("shaded__%1").arg(strtoqstr(base)));
 }
 
 bool
diff --git a/src/gui/editors/notation/NoteFontMap.cpp b/src/gui/editors/notation/NoteFontMap.cpp
index 47fc9f5..f82a263 100644
--- a/src/gui/editors/notation/NoteFontMap.cpp
+++ b/src/gui/editors/notation/NoteFontMap.cpp
@@ -57,8 +57,8 @@ NoteFontMap::NoteFontMap(std::string name) :
     TQString mapFileName;
 
     TQString mapFileMixedName = TQString("%1/mappings/%2.xml")
-                               .tqarg(m_fontDirectory)
-                               .tqarg(strtoqstr(name));
+                               .arg(m_fontDirectory)
+                               .arg(strtoqstr(name));
 
     TQFileInfo mapFileMixedInfo(mapFileMixedName);
 
@@ -67,8 +67,8 @@ NoteFontMap::NoteFontMap(std::string name) :
         TQString lowerName = strtoqstr(name).lower();
         lowerName.replace(TQRegExp(" "), "_");
         TQString mapFileLowerName = TQString("%1/mappings/%2.xml")
-                                   .tqarg(m_fontDirectory)
-                                   .tqarg(lowerName);
+                                   .arg(m_fontDirectory)
+                                   .arg(lowerName);
 
         TQFileInfo mapFileLowerInfo(mapFileLowerName);
 
@@ -76,11 +76,11 @@ NoteFontMap::NoteFontMap(std::string name) :
             if (mapFileLowerName != mapFileMixedName) {
                 throw MappingFileReadFailed
                 (qstrtostr(i18n("Can't open font mapping file %1 or %2").
-                           tqarg(mapFileMixedName).tqarg(mapFileLowerName)));
+                           arg(mapFileMixedName).arg(mapFileLowerName)));
             } else {
                 throw MappingFileReadFailed
                 (qstrtostr(i18n("Can't open font mapping file %1").
-                           tqarg(mapFileMixedName)));
+                           arg(mapFileMixedName)));
             }
         } else {
             mapFileName = mapFileLowerName;
@@ -595,7 +595,7 @@ NoteFontMap::startElement(const TQString &, const TQString &,
                 m_systemFontNames[n] = name;
                 delete font;
             } else {
-                std::cerr << TQString("Warning: Unable to load font \"%1\"").tqarg(name).ascii() << std::endl;
+                std::cerr << TQString("Warning: Unable to load font \"%1\"").arg(name).ascii() << std::endl;
                 m_ok = false;
             }
 
@@ -615,7 +615,7 @@ NoteFontMap::startElement(const TQString &, const TQString &,
             }
             if (!have) {
                 std::cerr << TQString("Warning: Unable to load any of the fonts in \"%1\"").
-                tqarg(names).ascii() << std::endl;
+                arg(names).ascii() << std::endl;
                 m_ok = false;
             }
 
@@ -657,10 +657,10 @@ bool
 NoteFontMap::error(const TQXmlParseException& exception)
 {
     m_errorString = TQString("%1 at line %2, column %3: %4")
-                    .tqarg(exception.message())
-                    .tqarg(exception.lineNumber())
-                    .tqarg(exception.columnNumber())
-                    .tqarg(m_errorString);
+                    .arg(exception.message())
+                    .arg(exception.lineNumber())
+                    .arg(exception.columnNumber())
+                    .arg(m_errorString);
     return TQXmlDefaultHandler::error(exception);
 }
 
@@ -668,10 +668,10 @@ bool
 NoteFontMap::fatalError(const TQXmlParseException& exception)
 {
     m_errorString = TQString("%1 at line %2, column %3: %4")
-                    .tqarg(exception.message())
-                    .tqarg(exception.lineNumber())
-                    .tqarg(exception.columnNumber())
-                    .tqarg(m_errorString);
+                    .arg(exception.message())
+                    .arg(exception.lineNumber())
+                    .arg(exception.columnNumber())
+                    .arg(m_errorString);
     return TQXmlDefaultHandler::fatalError(exception);
 }
 
@@ -705,20 +705,20 @@ bool
 NoteFontMap::checkFile(int size, std::string &src) const
 {
     TQString pixmapFileMixedName = TQString("%1/%2/%3/%4.xpm")
-                                  .tqarg(m_fontDirectory)
-                                  .tqarg(strtoqstr(m_srcDirectory))
-                                  .tqarg(size)
-                                  .tqarg(strtoqstr(src));
+                                  .arg(m_fontDirectory)
+                                  .arg(strtoqstr(m_srcDirectory))
+                                  .arg(size)
+                                  .arg(strtoqstr(src));
 
     TQFileInfo pixmapFileMixedInfo(pixmapFileMixedName);
 
     if (!pixmapFileMixedInfo.isReadable()) {
 
         TQString pixmapFileLowerName = TQString("%1/%2/%3/%4.xpm")
-                                      .tqarg(m_fontDirectory)
-                                      .tqarg(strtoqstr(m_srcDirectory).lower())
-                                      .tqarg(size)
-                                      .tqarg(strtoqstr(src));
+                                      .arg(m_fontDirectory)
+                                      .arg(strtoqstr(m_srcDirectory).lower())
+                                      .arg(size)
+                                      .arg(strtoqstr(src));
 
         TQFileInfo pixmapFileLowerInfo(pixmapFileLowerName);
 
diff --git a/src/gui/editors/notation/NoteFontViewer.cpp b/src/gui/editors/notation/NoteFontViewer.cpp
index d485244..d3dc2a3 100644
--- a/src/gui/editors/notation/NoteFontViewer.cpp
+++ b/src/gui/editors/notation/NoteFontViewer.cpp
@@ -50,7 +50,7 @@ NoteFontViewer::slotViewChanged(int i)
 
     for (int r = 0; r < 256; ++r) {
         if (m_frame->hasRow(r)) {
-            m_rows->insertItem(TQString("%1").tqarg(r));
+            m_rows->insertItem(TQString("%1").arg(r));
             if (firstRow < 0)
                 firstRow = r;
         }
@@ -84,7 +84,7 @@ NoteFontViewer::slotFontChanged(const TQString &s)
 NoteFontViewer::NoteFontViewer(TQWidget *parent, TQString noteFontName,
                                TQStringList fontNames, int pixelSize) :
         KDialogBase(parent, 0, true,
-                    i18n("Note Font Viewer: %1").tqarg(noteFontName), Close)
+                    i18n("Note Font Viewer: %1").arg(noteFontName), Close)
 {
     TQVBox *box = makeVBoxMainWidget();
     KToolBar* controls = new KToolBar(box);
diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp
index 2ff4969..9103d4e 100644
--- a/src/gui/editors/notation/NotePixmapFactory.cpp
+++ b/src/gui/editors/notation/NotePixmapFactory.cpp
@@ -1880,7 +1880,7 @@ NotePixmapFactory::makeClefPixmap(const Clef &clef)
     else if (adjustedOctave < 8)
         adjustedOctave++;
 
-    TQString text = TQString("%1").tqarg(adjustedOctave);
+    TQString text = TQString("%1").arg(adjustedOctave);
     TQRect rect = m_clefOttavaFontMetrics.boundingRect(text);
 
     createPixmapAndMask(plain.getWidth(),
@@ -2228,7 +2228,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
             else if (adjustedOctave < 8)
                 adjustedOctave++;
 
-            TQString text = TQString("%1").tqarg(adjustedOctave);
+            TQString text = TQString("%1").arg(adjustedOctave);
             TQRect rect = m_clefOttavaFontMetrics.boundingRect(text);
 
             m_p->painter().setPen(colour);
diff --git a/src/gui/editors/notation/NotePixmapFactory.h b/src/gui/editors/notation/NotePixmapFactory.h
index 9bf32b1..2b502f1 100644
--- a/src/gui/editors/notation/NotePixmapFactory.h
+++ b/src/gui/editors/notation/NotePixmapFactory.h
@@ -140,7 +140,7 @@ public:
     TQCanvasPixmap* makeTrackHeaderPixmap(int width, int height,
                                             TrackHeader *header);
 
-    // Bounding box and other tqgeometry methods:
+    // Bounding box and other geometry methods:
 
     int getNoteBodyWidth (Note::Type =
                           Note::Crotchet) const;
diff --git a/src/gui/editors/notation/NotePixmapPainter.h b/src/gui/editors/notation/NotePixmapPainter.h
index 9b56052..ff8edae 100644
--- a/src/gui/editors/notation/NotePixmapPainter.h
+++ b/src/gui/editors/notation/NotePixmapPainter.h
@@ -61,13 +61,13 @@ public:
 
 	if (mask) {
 	    m_useMask = true;
-	    m_maskPainter.tqbegin(mask, unclipped);
+	    m_maskPainter.begin(mask, unclipped);
 	} else {
 	    m_useMask = false;
 	}
 
 	m_painter = &m_myPainter;
-	return m_painter->tqbegin(device, unclipped);
+	return m_painter->begin(device, unclipped);
     }
 
     bool end() {
@@ -105,19 +105,19 @@ public:
 
     void drawPolygon(const TQPointArray &a, bool winding = false,
 		     int index = 0, int n = -1) {
-	m_painter->tqdrawPolygon(a, winding, index, n);
-	if (m_useMask) m_maskPainter.tqdrawPolygon(a, winding, index, n);
+	m_painter->drawPolygon(a, winding, index, n);
+	if (m_useMask) m_maskPainter.drawPolygon(a, winding, index, n);
     }
 
     void drawPolyline(const TQPointArray &a, int index = 0, int n = -1) {
-	m_painter->tqdrawPolyline(a, index, n);
-	if (m_useMask) m_maskPainter.tqdrawPolyline(a, index, n);
+	m_painter->drawPolyline(a, index, n);
+	if (m_useMask) m_maskPainter.drawPolyline(a, index, n);
     }
 
     void drawPixmap(int x, int y, const TQPixmap &pm,
 		    int sx = 0, int sy = 0, int sw = -1, int sh = -1) {
-	m_painter->tqdrawPixmap(x, y, pm, sx, sy, sw, sh);
-	if (m_useMask) m_maskPainter.tqdrawPixmap(x, y, *(pm.mask()), sx, sy, sw, sh);
+	m_painter->drawPixmap(x, y, pm, sx, sy, sw, sh);
+	if (m_useMask) m_maskPainter.drawPixmap(x, y, *(pm.mask()), sx, sy, sw, sh);
     }
 
     void drawText(int x, int y, const TQString &string) {
diff --git a/src/gui/editors/notation/NoteStyle.cpp b/src/gui/editors/notation/NoteStyle.cpp
index 00ce956..1e316fd 100644
--- a/src/gui/editors/notation/NoteStyle.cpp
+++ b/src/gui/editors/notation/NoteStyle.cpp
@@ -70,12 +70,12 @@ NoteStyle::getShape(Note::Type type)
         if (m_baseStyle)
             return m_baseStyle->getShape(type);
         std::cerr
-        << "WARNING: NoteStyle::getShape: No tqshape defined for note type "
+        << "WARNING: NoteStyle::getShape: No shape defined for note type "
         << type << ", defaulting to AngledOval" << std::endl;
         return AngledOval;
     }
 
-    return i->second.tqshape;
+    return i->second.shape;
 }
 
 bool
@@ -183,57 +183,57 @@ NoteStyle::getNoteHeadCharName(Note::Type type)
     CharName name = NoteCharacterNames::UNKNOWN;
     bool inverted = false;
 
-    if (desc.tqshape == AngledOval) {
+    if (desc.shape == AngledOval) {
 
         name = desc.filled ? NoteCharacterNames::NOTEHEAD_BLACK
                : NoteCharacterNames::VOID_NOTEHEAD;
 
-    } else if (desc.tqshape == LevelOval) {
+    } else if (desc.shape == LevelOval) {
 
         if (desc.filled) {
             std::cerr << "WARNING: NoteStyle::getNoteHeadCharName: No filled level oval head" << std::endl;
         }
         name = NoteCharacterNames::WHOLE_NOTE;
 
-    } else if (desc.tqshape == Breve) {
+    } else if (desc.shape == Breve) {
 
         if (desc.filled) {
             std::cerr << "WARNING: NoteStyle::getNoteHeadCharName: No filled breve head" << std::endl;
         }
         name = NoteCharacterNames::BREVE;
 
-    } else if (desc.tqshape == Cross) {
+    } else if (desc.shape == Cross) {
 
         name = desc.filled ? NoteCharacterNames::X_NOTEHEAD
                : NoteCharacterNames::CIRCLE_X_NOTEHEAD;
 
-    } else if (desc.tqshape == TriangleUp) {
+    } else if (desc.shape == TriangleUp) {
 
         name = desc.filled ? NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_BLACK
                : NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_WHITE;
 
-    } else if (desc.tqshape == TriangleDown) {
+    } else if (desc.shape == TriangleDown) {
 
         name = desc.filled ? NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_BLACK
                : NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_WHITE;
         inverted = true;
 
-    } else if (desc.tqshape == Diamond) {
+    } else if (desc.shape == Diamond) {
 
         name = desc.filled ? NoteCharacterNames::SEMIBREVIS_BLACK
                : NoteCharacterNames::SEMIBREVIS_WHITE;
 
-    } else if (desc.tqshape == Rectangle) {
+    } else if (desc.shape == Rectangle) {
 
         name = desc.filled ? NoteCharacterNames::STQUARE_NOTEHEAD_BLACK
                : NoteCharacterNames::STQUARE_NOTEHEAD_WHITE;
 
-    } else if (desc.tqshape == Number) {
+    } else if (desc.shape == Number) {
 
         std::cerr << "WARNING: NoteStyle::getNoteHeadCharName: Number not yet implemented" << std::endl;
         name = NoteCharacterNames::UNKNOWN; //!!!
 
-    } else if (desc.tqshape == CustomCharName) {
+    } else if (desc.shape == CustomCharName) {
 
         name = desc.charName;
 
@@ -433,10 +433,10 @@ NoteStyle::checkDescription(Note::Type note)
 }
 
 void
-NoteStyle::setShape(Note::Type note, NoteHeadShape tqshape)
+NoteStyle::setShape(Note::Type note, NoteHeadShape shape)
 {
     checkDescription(note);
-    m_notes[note].tqshape = tqshape;
+    m_notes[note].shape = shape;
 }
 
 void
diff --git a/src/gui/editors/notation/NoteStyle.h b/src/gui/editors/notation/NoteStyle.h
index 4431c16..3959e01 100644
--- a/src/gui/editors/notation/NoteStyle.h
+++ b/src/gui/editors/notation/NoteStyle.h
@@ -99,8 +99,8 @@ public:
 
 protected:
     struct NoteDescription {
-        NoteHeadShape tqshape; // if CustomCharName, use charName
-        CharName charName; // only used if tqshape == CustomCharName
+        NoteHeadShape shape; // if CustomCharName, use charName
+        CharName charName; // only used if shape == CustomCharName
         bool filled;
         bool stem;
         int flags;
@@ -109,14 +109,14 @@ protected:
         VFixPoint vfix;
 
         NoteDescription() :
-            tqshape(AngledOval), charName(NoteCharacterNames::UNKNOWN),
+            shape(AngledOval), charName(NoteCharacterNames::UNKNOWN),
             filled(true), stem(true), flags(0), slashes(0),
             hfix(Normal), vfix(Middle) { }
 
-        NoteDescription(NoteHeadShape _tqshape, CharName _charName,
+        NoteDescription(NoteHeadShape _shape, CharName _charName,
                         bool _filled, bool _stem, int _flags, int _slashes,
                         HFixPoint _hfix, VFixPoint _vfix) :
-            tqshape(_tqshape), charName(_charName),
+            shape(_shape), charName(_charName),
             filled(_filled), stem(_stem), flags(_flags), slashes(_slashes),
             hfix(_hfix), vfix(_vfix) { }
     };
diff --git a/src/gui/editors/notation/NoteStyleFactory.cpp b/src/gui/editors/notation/NoteStyleFactory.cpp
index d5e0815..4303cc6 100644
--- a/src/gui/editors/notation/NoteStyleFactory.cpp
+++ b/src/gui/editors/notation/NoteStyleFactory.cpp
@@ -63,7 +63,7 @@ NoteStyleFactory::getAvailableStyleNames()
 
     for (TQStringList::Iterator i = files.begin(); i != files.end(); ++i) {
         if ((*i).length() > 4 && (*i).right(4) == ".xml") {
-            TQFileInfo fileInfo(TQString("%1/%2").tqarg(styleDir).tqarg(*i));
+            TQFileInfo fileInfo(TQString("%1/%2").arg(styleDir).arg(*i));
             if (fileInfo.exists() && fileInfo.isReadable()) {
                 std::string styleName = qstrtostr((*i).left((*i).length() - 4));
                 if (styleName == DefaultStyle)
diff --git a/src/gui/editors/notation/NoteStyleFileReader.cpp b/src/gui/editors/notation/NoteStyleFileReader.cpp
index b8619c9..10e5f13 100644
--- a/src/gui/editors/notation/NoteStyleFileReader.cpp
+++ b/src/gui/editors/notation/NoteStyleFileReader.cpp
@@ -48,13 +48,13 @@ NoteStyleFileReader::NoteStyleFileReader(std::string name) :
 	KGlobal::dirs()->findResource("appdata", "styles/");
 
     TQString styleFileName =
-	TQString("%1/%2.xml").tqarg(styleDirectory).tqarg(strtoqstr(name));
+	TQString("%1/%2.xml").arg(styleDirectory).arg(strtoqstr(name));
 
     TQFileInfo fileInfo(styleFileName);
 
     if (!fileInfo.isReadable()) {
         throw StyleFileReadFailed
-	    (qstrtostr(i18n("Can't open style file %1").tqarg(styleFileName)));
+	    (qstrtostr(i18n("Can't open style file %1").arg(styleFileName)));
     }
 
     TQFile styleFile(styleFileName);
@@ -98,7 +98,7 @@ NoteStyleFileReader::startElement(const TQString &, const TQString &,
 	    if (!setFromAttributes(type, attributes)) return false;
 
 	} catch (NotationStrings::MalformedNoteName n) {
-	    m_errorString = i18n("Unrecognised note name %1").tqarg(s);
+	    m_errorString = i18n("Unrecognised note name %1").arg(s);
 	    return false;
 	}
 
@@ -125,7 +125,7 @@ NoteStyleFileReader::setFromAttributes(Note::Type type,
     TQString s;
     bool haveShape = false;
 
-    s = attributes.value("tqshape");
+    s = attributes.value("shape");
     if (!s.isNull()) {
 	m_style->setShape(type, qstrtostr(s.lower()));
 	haveShape = true;
@@ -134,7 +134,7 @@ NoteStyleFileReader::setFromAttributes(Note::Type type,
     s = attributes.value("charname");
     if (!s.isNull()) {
 	if (haveShape) {
-	    m_errorString = i18n("global and note elements may have tqshape "
+	    m_errorString = i18n("global and note elements may have shape "
 				 "or charname attribute, but not both");
 	    return false;
 	}
diff --git a/src/gui/editors/notation/TrackHeader.cpp b/src/gui/editors/notation/TrackHeader.cpp
index fa19ca5..83dca88 100644
--- a/src/gui/editors/notation/TrackHeader.cpp
+++ b/src/gui/editors/notation/TrackHeader.cpp
@@ -65,7 +65,7 @@ namespace Rosegarden
 {
 
 
-// tqStatus bits
+// Status bits
 const int TrackHeader::SEGMENT_HERE                = 1 << 0;
 const int TrackHeader::SUPERIMPOSED_SEGMENTS       = 1 << 1;
 const int TrackHeader::INCONSISTENT_CLEFS          = 1 << 2;
@@ -111,12 +111,12 @@ TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos
     int trackPos = comp->getTrackPositionById(m_track);
 
     TQString toolTipText = TQString(i18n("Track %1 : \"%2\"")
-                            .tqarg(trackPos + 1)
-                            .tqarg(strtoqstr(track->getLabel())));
+                            .arg(trackPos + 1)
+                            .arg(strtoqstr(track->getLabel())));
 
     TQString preset = track->getPresetLabel().c_str();
     if (preset != TQString(""))
-        toolTipText += TQString(i18n("\nNotate for: %1").tqarg(preset));
+        toolTipText += TQString(i18n("\nNotate for: %1").arg(preset));
 
     TQString notationSize = i18n("normal");
     switch (track->getStaffSize()) {
@@ -154,8 +154,8 @@ TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos
     }
 
     toolTipText += TQString(i18n("\nSize: %1,  Bracket: %2 "))
-                            .tqarg(notationSize)
-                            .tqarg(bracketText);
+                            .arg(notationSize)
+                            .arg(bracketText);
 
     // Sort segments by position on the track
     SortedSegments segments;
@@ -181,17 +181,17 @@ TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos
             TQString transposeName;
             transposeValueToName(transpose, transposeName);
             toolTipText += TQString(i18n("\nbars [%1-%2] in %3 (tr=%4) : \"%5\""))
-                                    .tqarg(barStart)
-                                    .tqarg(barEnd)
-                                    .tqarg(transposeName)
-                                    .tqarg(transpose)
-                                    .tqarg(strtoqstr((*i)->getLabel()));
+                                    .arg(barStart)
+                                    .arg(barEnd)
+                                    .arg(transposeName)
+                                    .arg(transpose)
+                                    .arg(strtoqstr((*i)->getLabel()));
         } else {
             toolTipText += TQString(i18n("\nbars [%1-%2] (tr=%3) : \"%4\""))
-                                    .tqarg(barStart)
-                                    .tqarg(barEnd)
-                                    .tqarg(transpose)
-                                    .tqarg(strtoqstr((*i)->getLabel()));
+                                    .arg(barStart)
+                                    .arg(barEnd)
+                                    .arg(transpose)
+                                    .arg(strtoqstr((*i)->getLabel()));
         }
     }
 
@@ -350,9 +350,9 @@ TrackHeader::lookAtStaff(double x, int maxWidth)
     transposeValueToName(m_transpose, noteName);
 
     m_upperText = TQString(i18n("%1: %2")
-                                .tqarg(trackPos + 1)
-                                .tqarg(strtoqstr(track->getLabel())));
-    if (m_transpose) m_transposeText = i18n(" in %1").tqarg(noteName);
+                                .arg(trackPos + 1)
+                                .arg(strtoqstr(track->getLabel())));
+    if (m_transpose) m_transposeText = i18n(" in %1").arg(noteName);
     else             m_transposeText = TQString("");
 
     NotePixmapFactory * npf = m_notationView->getNotePixmapFactory();
diff --git a/src/gui/editors/notation/TrackHeader.h b/src/gui/editors/notation/TrackHeader.h
index 3f7029e..85ee067 100644
--- a/src/gui/editors/notation/TrackHeader.h
+++ b/src/gui/editors/notation/TrackHeader.h
@@ -169,7 +169,7 @@ private :
     void transposeValueToName(int transpose, TQString &transposeName);
 
 
-    // tqStatus bits
+    // Status bits
     static const int SEGMENT_HERE;
     static const int SUPERIMPOSED_SEGMENTS;
     static const int INCONSISTENT_CLEFS;
diff --git a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
index 7299a9f..553af2b 100644
--- a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
@@ -24,7 +24,7 @@
 
 
 #include "AudioInstrumentParameterPanel.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <kapplication.h>
 
 #include <klocale.h>
@@ -48,7 +48,7 @@
 #include <tqcolor.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
 #include <tqstring.h>
diff --git a/src/gui/editors/parameters/InstrumentParameterBox.cpp b/src/gui/editors/parameters/InstrumentParameterBox.cpp
index b618bed..30c2f46 100644
--- a/src/gui/editors/parameters/InstrumentParameterBox.cpp
+++ b/src/gui/editors/parameters/InstrumentParameterBox.cpp
@@ -24,7 +24,7 @@
 
 
 #include "InstrumentParameterBox.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include "misc/Debug.h"
@@ -122,8 +122,8 @@ InstrumentParameterBox::InstrumentParameterBox(RosegardenGUIDoc *doc,
 
     // Layout the groups left to right.
 
-    TQBoxLayout* tqlayout = new TQVBoxLayout(this);
-    tqlayout->addWidget(m_widgetStack);
+    TQBoxLayout* layout = new TQVBoxLayout(this);
+    layout->addWidget(m_widgetStack);
 
 }
 
diff --git a/src/gui/editors/parameters/InstrumentParameterPanel.cpp b/src/gui/editors/parameters/InstrumentParameterPanel.cpp
index 9cca26d..ba91b17 100644
--- a/src/gui/editors/parameters/InstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/InstrumentParameterPanel.cpp
@@ -48,7 +48,7 @@ InstrumentParameterPanel::InstrumentParameterPanel(RosegardenGUIDoc *doc,
     int width25 = metrics.width("1234567890123456789012345");
 
     m_instrumentLabel->setFixedWidth(width25);
-    m_instrumentLabel->tqsetAlignment(TQt::AlignCenter);
+    m_instrumentLabel->setAlignment(TQt::AlignCenter);
 }
 
 void
diff --git a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
index ceb2e26..9387798 100644
--- a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
@@ -24,7 +24,7 @@
 
 
 #include "MIDIInstrumentParameterPanel.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include "sound/Midi.h"
 #include <klocale.h>
@@ -98,7 +98,7 @@ MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc
     m_variationValue->setMinimumWidth(width22);
 
     m_connectionLabel->setFixedWidth(width25);
-    m_connectionLabel->tqsetAlignment(TQt::AlignCenter);
+    m_connectionLabel->setAlignment(TQt::AlignCenter);
 
     // Configure the empty final row to accomodate any extra vertical space.
 
@@ -131,7 +131,7 @@ MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc
     // Populate channel lists
     //
     for (int i = 0; i < 16; i++) {
-        m_channelValue->insertItem(TQString("%1").tqarg(i + 1));
+        m_channelValue->insertItem(TQString("%1").arg(i + 1));
     }
 
     m_channelValue->setSizeLimit(16);
@@ -212,13 +212,13 @@ MIDIInstrumentParameterPanel::setupForInstrument(Instrument *instrument)
     //
     TQString connection(strtoqstr(md->getConnection()));
     if (connection == "") {
-        m_connectionLabel->setText(i18n("[ %1 ]").tqarg(i18n("No connection")));
+        m_connectionLabel->setText(i18n("[ %1 ]").arg(i18n("No connection")));
     } else {
 
         // remove trailing "(duplex)", "(read only)", "(write only)" etc
         connection.replace(TQRegExp("\\s*\\([^)0-9]+\\)\\s*$"), "");
 
-        TQString text = i18n("[ %1 ]").tqarg(connection);
+        TQString text = i18n("[ %1 ]").arg(connection);
         /*TQString origText(text);
 
         TQFontMetrics metrics(m_connectionLabel->fontMetrics());
@@ -361,7 +361,7 @@ MIDIInstrumentParameterPanel::setupControllers(MidiDevice *md)
                     redraw = 0;
             }
             if (redraw == 2) {
-                rotary->tqrepaint();
+                rotary->repaint();
             }
 
             // Update the controller name that is associated with
@@ -641,8 +641,8 @@ MIDIInstrumentParameterPanel::populateProgramList()
         std::string programName = programs[i].getName();
         if (programName != "") {
             m_programValue->insertItem(TQString("%1. %2")
-                                       .tqarg(programs[i].getProgram() + 1)
-                                       .tqarg(strtoqstr(programName)));
+                                       .arg(programs[i].getProgram() + 1)
+                                       .arg(strtoqstr(programName)));
             if (m_selectedInstrument->getProgram() == programs[i]) {
                 currentProgram = m_programs.size();
             }
@@ -763,8 +763,8 @@ MIDIInstrumentParameterPanel::populateVariationList()
             					 strtoqstr(programName));
             */
             m_variationValue->insertItem(TQString("%1. %2")
-                                         .tqarg(variations[i] + 1)
-                                         .tqarg(strtoqstr(programName)));
+                                         .arg(variations[i] + 1)
+                                         .arg(strtoqstr(programName)));
             if (m_selectedInstrument->getProgram() == program) {
                 currentVariation = m_variations.size();
             }
@@ -787,7 +787,7 @@ MIDIInstrumentParameterPanel::populateVariationList()
         }
 
     } else {
-        //!!! seem to have problems here -- the grid tqlayout doesn't
+        //!!! seem to have problems here -- the grid layout doesn't
         //like us adding stuff in the middle so if we go from 1
         //visible row (say program) to 2 (program + variation) the
         //second one overlaps the control knobs
diff --git a/src/gui/editors/parameters/RosegardenParameterArea.cpp b/src/gui/editors/parameters/RosegardenParameterArea.cpp
index 5e13652..8a7fcd3 100644
--- a/src/gui/editors/parameters/RosegardenParameterArea.cpp
+++ b/src/gui/editors/parameters/RosegardenParameterArea.cpp
@@ -35,7 +35,7 @@
 #include <tqscrollview.h>
 #include <tqstring.h>
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvgroupbox.h>
 #include <tqwidget.h>
 #include <tqwidgetstack.h>
@@ -86,15 +86,15 @@ void RosegardenParameterArea::addRosegardenParameterBox(
     m_parameterBoxes.push_back(b);
 
     m_scrollView->setMinimumWidth(std::max(m_scrollView->minimumWidth(),
-                                           b->tqsizeHint().width()) + 8);
+                                           b->sizeHint().width()) + 8);
 
     // Create a titled group box for the parameter box, parented by the
-    // classic tqlayout widget, so that it can be used to provide a title
+    // classic layout widget, so that it can be used to provide a title
     // and outline, in classic mode. Add this container to an array that
     // parallels the above array of parameter boxes.
 
     TQVGroupBox *box = new TQVGroupBox(b->getLongLabel(), m_classic);
-    box->tqlayout()->setMargin( 4 ); // about half the default value
+    box->layout()->setMargin( 4 ); // about half the default value
     TQFont f;
     f.setBold( true );
     box->setFont( f );
diff --git a/src/gui/editors/parameters/RosegardenParameterArea.h b/src/gui/editors/parameters/RosegardenParameterArea.h
index 7fd8989..95eae45 100644
--- a/src/gui/editors/parameters/RosegardenParameterArea.h
+++ b/src/gui/editors/parameters/RosegardenParameterArea.h
@@ -72,13 +72,13 @@ public:
         TAB_BOX_STYLE   // A horizontal list of tabs, displaying one box at a time.
     };
 
-    // Redisplay the widgets with a different tqlayout style.
+    // Redisplay the widgets with a different layout style.
 
     void setArrangement(Arrangement style);
 
 protected:
 private:
-    Arrangement m_style;                // The current tqlayout style.
+    Arrangement m_style;                // The current layout style.
 
     // The list of parameter box widgets that are being displayed by this
     // widget.
diff --git a/src/gui/editors/parameters/RosegardenParameterBox.h b/src/gui/editors/parameters/RosegardenParameterBox.h
index 459aeab..df21d92 100644
--- a/src/gui/editors/parameters/RosegardenParameterBox.h
+++ b/src/gui/editors/parameters/RosegardenParameterBox.h
@@ -43,7 +43,7 @@ namespace Rosegarden
 
 /**
  * A flat TQFrame, in which a group of parameters can be laid out.
- * Virtual method functions are defined for for requesting a tqlayout
+ * Virtual method functions are defined for for requesting a layout
  * style, and returning the single-word to use for labelling the
  * box.
  */
@@ -72,11 +72,11 @@ public:
 protected:
     void init();
 
-    // List the tqlayout styles that may be requested via a call to setStyle().
+    // List the layout styles that may be requested via a call to setStyle().
 
     enum LayoutMode {
-        LANDSCAPE_MODE,  // Optimize the tqlayout for a tall and narrow parent.
-        PORTRAIT_MODE    // Optimize the tqlayout for a short and wide parent.
+        LANDSCAPE_MODE,  // Optimize the layout for a tall and narrow parent.
+        PORTRAIT_MODE    // Optimize the layout for a short and wide parent.
     };
 
     void setLayoutMode(LayoutMode mode);
@@ -84,7 +84,7 @@ protected:
     TQFont m_font;
     TQString m_shortLabel;    // The string that containers can use for labelling and identification
     TQString m_longLabel;    // The full title
-    LayoutMode m_mode;  // The current tqlayout mode.
+    LayoutMode m_mode;  // The current layout mode.
 };
 
 
diff --git a/src/gui/editors/parameters/SegmentParameterBox.cpp b/src/gui/editors/parameters/SegmentParameterBox.cpp
index 34f3976..299369a 100644
--- a/src/gui/editors/parameters/SegmentParameterBox.cpp
+++ b/src/gui/editors/parameters/SegmentParameterBox.cpp
@@ -24,7 +24,7 @@
 
 
 #include "SegmentParameterBox.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <kapplication.h>
 
 #include <klocale.h>
@@ -333,7 +333,7 @@ SegmentParameterBox::initBox()
     // populate the transpose combo
     //
     for (int i = -m_transposeRange; i < m_transposeRange + 1; i++) {
-        m_transposeValue->insertItem(noMap, TQString("%1").tqarg(i));
+        m_transposeValue->insertItem(noMap, TQString("%1").arg(i));
         if (i == 0)
             m_transposeValue->setCurrentItem(m_transposeValue->count() - 1);
     }
@@ -363,7 +363,7 @@ SegmentParameterBox::initBox()
     for (int i = 0; i < 10; i++) {
         int rtd = (i < 5 ? ((i + 1) * 10) : ((i - 3) * 50));
         m_realTimeDelays.push_back(rtd);
-        m_delayValue->insertItem(i18n("%1 ms").tqarg(rtd));
+        m_delayValue->insertItem(i18n("%1 ms").arg(rtd));
     }
 
     // set delay blank initially
@@ -666,7 +666,7 @@ SegmentParameterBox::populateBoxFromSegments()
         // 2nd arg of "true" means "add if necessary"
     case All:
         m_transposeValue->
-        setCurrentItem(TQString("%1").tqarg(transposeLevel), true);
+        setCurrentItem(TQString("%1").arg(transposeLevel), true);
         break;
 
     case Some:
@@ -694,7 +694,7 @@ SegmentParameterBox::populateBoxFromSegments()
 
         } else if (delayLevel < 0) {
 
-            m_delayValue->setCurrentItem(i18n("%1 ms").tqarg( -delayLevel),
+            m_delayValue->setCurrentItem(i18n("%1 ms").arg( -delayLevel),
                                          true);
         }
 
@@ -1019,8 +1019,8 @@ SegmentParameterBox::updateHighLow()
     //!!! FIXME this code is broken, and needs to be fixed after the fashion of
     //the TPB, but I'm not bothering with that at this time, because they are
     //going to be hidden for 1.3 anyway
-//    m_highButton->setText(TQString("&High:   %1%2").tqarg(highest.getNoteName(key)).tqarg(highest.getOctave(base)));
-//    m_lowButton->setText(TQString("&Low:   %1%2").tqarg(lowest.getNoteName(key)).tqarg(lowest.getOctave(base)));
+//    m_highButton->setText(TQString("&High:   %1%2").arg(highest.getNoteName(key)).arg(highest.getOctave(base)));
+//    m_lowButton->setText(TQString("&Low:   %1%2").arg(lowest.getNoteName(key)).arg(lowest.getOctave(base)));
 }
 
 void
diff --git a/src/gui/editors/parameters/TrackParameterBox.cpp b/src/gui/editors/parameters/TrackParameterBox.cpp
index 94b1137..167017d 100644
--- a/src/gui/editors/parameters/TrackParameterBox.cpp
+++ b/src/gui/editors/parameters/TrackParameterBox.cpp
@@ -28,7 +28,7 @@
 
 
 #include "TrackParameterBox.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <kapplication.h>
 
 #include <klocale.h>
@@ -128,7 +128,7 @@ TrackParameterBox::TrackParameterBox( RosegardenGUIDoc *doc,
     // track label
     //
     m_trackLabel = new KSqueezedTextLabel(i18n("<untitled>"), this);
-    m_trackLabel->tqsetAlignment(TQt::AlignCenter);
+    m_trackLabel->setAlignment(TQt::AlignCenter);
     //mainLayout->addMultiCellWidget(m_trackLabel, 0, 0, 0, 5, AlignCenter);
     mainLayout->addWidget(m_trackLabel, 0, 0);
 
@@ -311,7 +311,7 @@ TrackParameterBox::TrackParameterBox( RosegardenGUIDoc *doc,
 
     int transposeRange = 48;
     for (int i = -transposeRange; i < transposeRange + 1; i++) {
-        m_defTranspose->insertItem(TQString("%1").tqarg(i));
+        m_defTranspose->insertItem(TQString("%1").arg(i));
         if (i == 0)
             m_defTranspose->setCurrentItem(m_defTranspose->count() - 1);
     }
@@ -468,7 +468,7 @@ TrackParameterBox::populatePlaybackDeviceList()
                         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;
                     }
@@ -601,10 +601,10 @@ TrackParameterBox::updateHighLow()
     bool useSharps = true;
     bool includeOctave = true;
 
-//    m_highButton->setText(i18n("High: %1").tqarg(highest.getAsString(useSharps, includeOctave, base)));
-//    m_lowButton->setText(i18n("Low: %1").tqarg(lowest.getAsString(useSharps, includeOctave, base)));
-    m_highButton->setText(TQString("%1").tqarg(highest.getAsString(useSharps, includeOctave, base).c_str()));
-    m_lowButton->setText(TQString("%1").tqarg(lowest.getAsString(useSharps, includeOctave, base).c_str()));
+//    m_highButton->setText(i18n("High: %1").arg(highest.getAsString(useSharps, includeOctave, base)));
+//    m_lowButton->setText(i18n("Low: %1").arg(lowest.getAsString(useSharps, includeOctave, base)));
+    m_highButton->setText(TQString("%1").arg(highest.getAsString(useSharps, includeOctave, base).c_str()));
+    m_lowButton->setText(TQString("%1").arg(lowest.getAsString(useSharps, includeOctave, base).c_str()));
 
     m_presetLbl->setEnabled(false);
 }
@@ -624,7 +624,7 @@ TrackParameterBox::slotUpdateControls(int /*dummy*/)
         return ;
 
     m_defClef->setCurrentItem(trk->getClef());
-    m_defTranspose->setCurrentItem(TQString("%1").tqarg(trk->getTranspose()), true);
+    m_defTranspose->setCurrentItem(TQString("%1").arg(trk->getTranspose()), true);
     m_defColor->setCurrentItem(trk->getColor());
     m_highestPlayable = trk->getHighestPlayable();
     m_lowestPlayable = trk->getLowestPlayable();
@@ -663,7 +663,7 @@ TrackParameterBox::slotSelectedTrackNameChanged()
     else
         m_trackName.truncate(20);
     int trackNum = trk->getPosition() + 1;
-    m_trackLabel->setText(i18n("[ Track %1 - %2 ]").tqarg(trackNum).tqarg(m_trackName));
+    m_trackLabel->setText(i18n("[ Track %1 - %2 ]").arg(trackNum).arg(m_trackName));
 }
 
 void
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;
     }
 
diff --git a/src/gui/editors/tempo/TempoView.cpp b/src/gui/editors/tempo/TempoView.cpp
index 7629632..ff3b1ec 100644
--- a/src/gui/editors/tempo/TempoView.cpp
+++ b/src/gui/editors/tempo/TempoView.cpp
@@ -58,7 +58,7 @@
 #include <tqptrlist.h>
 #include <tqsize.h>
 #include <tqstring.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcanvas.h>
 #include <kstatusbar.h>
 
@@ -218,7 +218,7 @@ TempoView::applyLayout(int /*staffNo*/)
             new TempoListItem(comp, TempoListItem::TimeSignature,
                               sig.first, i, m_list, timeString,
                               i18n("Time Signature   "),
-                              TQString("%1/%2   ").tqarg(sig.second.getNumerator()).
+                              TQString("%1/%2   ").arg(sig.second.getNumerator()).
                               arg(sig.second.getDenominator()),
                               properties);
         }
@@ -243,7 +243,7 @@ TempoView::applyLayout(int /*staffNo*/)
             if (sig.getBeatDuration() ==
                     Note(Note::Crotchet).getDuration()) {
                 desc = i18n("%1.%2%3").
-                       tqarg(qpmUnits).tqarg(qpmTenths).tqarg(qpmHundredths);
+                       arg(qpmUnits).arg(qpmTenths).arg(qpmHundredths);
             } else {
                 float bpm = (qpm *
                              Note(Note::Crotchet).getDuration()) /
@@ -253,8 +253,8 @@ TempoView::applyLayout(int /*staffNo*/)
                 int bpmHundredths = int((bpm - bpmUnits - bpmTenths / 10.0) * 100 + 0.001);
 
                 desc = i18n("%1.%2%3 qpm (%4.%5%6 bpm)   ").
-                       tqarg(qpmUnits).tqarg(qpmTenths).tqarg(qpmHundredths).
-                       tqarg(bpmUnits).tqarg(bpmTenths).tqarg(bpmHundredths);
+                       arg(qpmUnits).arg(qpmTenths).arg(qpmHundredths).
+                       arg(bpmUnits).arg(bpmTenths).arg(bpmHundredths);
             }
 
             TQString timeString = makeTimeString(tempo.first, timeMode);
@@ -354,27 +354,27 @@ TempoView::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 =
                 getDocument()->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);
     }
 }
 
@@ -832,7 +832,7 @@ void
 TempoView::updateViewCaption()
 {
     setCaption(i18n("%1 - Tempo and Time Signature Editor")
-               .tqarg(getDocument()->getTitle()));
+               .arg(getDocument()->getTitle()));
 }
 
 }
diff --git a/src/gui/general/BaseTool.h b/src/gui/general/BaseTool.h
index 2c1eab1..fa3027b 100644
--- a/src/gui/general/BaseTool.h
+++ b/src/gui/general/BaseTool.h
@@ -58,7 +58,7 @@ public:
     /**
      * Is called by the parent View (EditView or SegmentCanvas) when
      * the tool is set as current.
-     * Add any setup here (e.g. setting the mouse cursor tqshape)
+     * Add any setup here (e.g. setting the mouse cursor shape)
      */
     virtual void ready();
 
diff --git a/src/gui/general/CanvasItemGC.h b/src/gui/general/CanvasItemGC.h
index 50bd21f..681e021 100644
--- a/src/gui/general/CanvasItemGC.h
+++ b/src/gui/general/CanvasItemGC.h
@@ -52,10 +52,10 @@ namespace Rosegarden
  *
  * However, if the SegmentItem deletes its repeat rectangle, then when
  * the SegmentCanvas destruction occurs, the SegmentCanvas dtor will
- * get a list of all its tqchildren (TQCanvas::allItems()), containing
+ * get a list of all its children (TQCanvas::allItems()), containing
  * both SegmentItems and their repeat rectangles. Deleting a
  * SegmentItem will delete its repeat rectangle, which will still be
- * present in the all tqchildren list which the SegmentCanvas dtor is
+ * present in the all children list which the SegmentCanvas dtor is
  * iterating over.
  * 
  * So a solution is simply to push to-be-deleted repeat rectangles on
diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp
index f1f5dbf..0e66133 100644
--- a/src/gui/general/EditView.cpp
+++ b/src/gui/general/EditView.cpp
@@ -24,7 +24,7 @@
 
 
 #include "EditView.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include "base/BaseProperties.h"
 #include <klocale.h>
@@ -138,7 +138,7 @@ EditView::EditView(RosegardenGUIDoc *doc,
     connect(m_controlRulers, TQT_SIGNAL(closeRequest(TQWidget*)),
             this, TQT_SLOT(slotRemoveControlRuler(TQWidget*)));
 
-    (dynamic_cast<TQBoxLayout*>(m_bottomBox->tqlayout()))->setDirection(TQBoxLayout::BottomToTop);
+    (dynamic_cast<TQBoxLayout*>(m_bottomBox->layout()))->setDirection(TQBoxLayout::BottomToTop);
 
     // m_rulerBoxFiller is a white label used to keep m_rulerBox exactly
     // above the scrolling part of the view (and never above the
@@ -154,7 +154,7 @@ EditView::EditView(RosegardenGUIDoc *doc,
     m_grid->addLayout(gl, RULERS_ROW, m_mainCol);
 
     m_grid->addMultiCellLayout(m_controlBox, CONTROLS_ROW, CONTROLS_ROW, 0, 1);
-    m_controlBox->tqsetAlignment(AlignRight);
+    m_controlBox->setAlignment(AlignRight);
     //     m_grid->addWidget(m_controlRulers, CONTROLRULER_ROW, 2);
 
     m_controlRulers->hide();
@@ -169,7 +169,7 @@ EditView::~EditView()
 
 void EditView::updateBottomWidgetGeometry()
 {
-    getBottomWidget()->tqlayout()->tqinvalidate();
+    getBottomWidget()->layout()->invalidate();
     getBottomWidget()->updateGeometry();
     getCanvasView()->updateBottomWidgetGeometry();
 }
@@ -891,9 +891,9 @@ EditView::setupAddControlRulerMenu()
                 TQString hexValue;
                 hexValue.sprintf("(0x%x)", it->getControllerValue());
 
-                itemStr = i18n("%1 Controller %2 %3").tqarg(strtoqstr(it->getName()))
-                          .tqarg(it->getControllerValue())
-                          .tqarg(hexValue);
+                itemStr = i18n("%1 Controller %2 %3").arg(strtoqstr(it->getName()))
+                          .arg(it->getControllerValue())
+                          .arg(hexValue);
 
             } else if (it->getType() == PitchBend::EventType)
                 itemStr = i18n("Pitch Bend");
@@ -1114,10 +1114,10 @@ EditView::createInsertPitchActionMenu()
 
                 insertPitchAction =
                     new KAction
-                    (flat.tqarg(notePitchNames[i]),
+                    (flat.arg(notePitchNames[i]),
                      CTRL + SHIFT + notePitchKeys[octave][i],
                      TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
-                     TQString("insert_%1_flat%2").tqarg(i).tqarg(octaveSuffix).ascii());
+                     TQString("insert_%1_flat%2").arg(i).arg(octaveSuffix).ascii());
 
                 menu->insert(insertPitchAction);
             }
@@ -1127,7 +1127,7 @@ EditView::createInsertPitchActionMenu()
                 (notePitchNames[i],
                  notePitchKeys[octave][i],
                  TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
-                 TQString("insert_%1%2").tqarg(i).tqarg(octaveSuffix).ascii());
+                 TQString("insert_%1%2").arg(i).arg(octaveSuffix).ascii());
 
             menu->insert(insertPitchAction);
 
@@ -1137,10 +1137,10 @@ EditView::createInsertPitchActionMenu()
 
                 insertPitchAction =
                     new KAction
-                    (sharp.tqarg(notePitchNames[i]),
+                    (sharp.arg(notePitchNames[i]),
                      SHIFT + notePitchKeys[octave][i],
                      TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
-                     TQString("insert_%1_sharp%2").tqarg(i).tqarg(octaveSuffix).ascii());
+                     TQString("insert_%1_sharp%2").arg(i).arg(octaveSuffix).ascii());
 
                 menu->insert(insertPitchAction);
             }
diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp
index dda2c76..4318646 100644
--- a/src/gui/general/EditViewBase.cpp
+++ b/src/gui/general/EditViewBase.cpp
@@ -24,7 +24,7 @@
 
 
 #include "EditViewBase.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <kapplication.h>
 
 #include <klocale.h>
@@ -311,7 +311,7 @@ EditViewBase::makeViewLocalPropertyPrefix()
 void EditViewBase::paintEvent(TQPaintEvent* e)
 {
     // It is possible for this function to be called re-entrantly,
-    // because a re-tqlayout procedure may deliberately ask the event
+    // because a re-layout procedure may deliberately ask the event
     // loop to process some more events so as to keep the GUI looking
     // responsive.  If that happens, we remember the events that came
     // in in the middle of one paintEvent call and process their union
@@ -362,7 +362,7 @@ void EditViewBase::paintEvent(TQPaintEvent* e)
     //
     // If we have more than one segment modified, we need to update
     // them all at once with the same time range, otherwise we can run
-    // into problems when the tqlayout of one depends on the others.  So
+    // into problems when the layout of one depends on the others.  So
     // we use updateStart/End to calculate a bounding range for all
     // modifications.
 
@@ -374,12 +374,12 @@ void EditViewBase::paintEvent(TQPaintEvent* e)
 
         Segment* segment = m_segments[i];
         unsigned int refreshStatusId = m_segmentsRefreshStatusIds[i];
-        SegmentRefreshtqStatus &refreshtqStatus =
-            segment->getRefreshtqStatus(refreshStatusId);
+        SegmentRefreshStatus &refreshStatus =
+            segment->getRefreshStatus(refreshStatusId);
 
-        if (refreshtqStatus.needsRefresh() && isCompositionModified()) {
+        if (refreshStatus.needsRefresh() && isCompositionModified()) {
 
-            // if composition is also modified, retqlayout everything
+            // if composition is also modified, relayout everything
             refreshSegment(0);
             segmentsToUpdate = 0;
             break;
@@ -392,10 +392,10 @@ void EditViewBase::paintEvent(TQPaintEvent* e)
             m_timeSigNotifier->reset();
             break;
 
-        } else if (refreshtqStatus.needsRefresh()) {
+        } else if (refreshStatus.needsRefresh()) {
 
-            timeT startTime = refreshtqStatus.from(),
-                              endTime = refreshtqStatus.to();
+            timeT startTime = refreshStatus.from(),
+                              endTime = refreshStatus.to();
 
             if (segmentsToUpdate == 0 || startTime < updateStart) {
                 updateStart = startTime;
@@ -406,7 +406,7 @@ void EditViewBase::paintEvent(TQPaintEvent* e)
             singleSegment = segment;
             ++segmentsToUpdate;
 
-            refreshtqStatus.setNeedsRefresh(false);
+            refreshStatus.setNeedsRefresh(false);
             m_needUpdate = true;
         }
     }
@@ -518,13 +518,13 @@ void EditViewBase::initSegmentRefreshStatusIds()
 
 bool EditViewBase::isCompositionModified()
 {
-    return getDocument()->getComposition().getRefreshtqStatus
+    return getDocument()->getComposition().getRefreshStatus
            (m_compositionRefreshStatusId).needsRefresh();
 }
 
 void EditViewBase::setCompositionModified(bool c)
 {
-    getDocument()->getComposition().getRefreshtqStatus
+    getDocument()->getComposition().getRefreshStatus
     (m_compositionRefreshStatusId).setNeedsRefresh(c);
 }
 
diff --git a/src/gui/general/EditViewBase.h b/src/gui/general/EditViewBase.h
index aaf6dbe..ef70384 100644
--- a/src/gui/general/EditViewBase.h
+++ b/src/gui/general/EditViewBase.h
@@ -311,7 +311,7 @@ protected:
 protected slots:
     /**
      * save general Options like all bar positions and status as well
-     * as the tqgeometry and the recent file list to the configuration
+     * as the geometry and the recent file list to the configuration
      * file
      */
     virtual void slotSaveOptions();
diff --git a/src/gui/general/LinedStaff.cpp b/src/gui/general/LinedStaff.cpp
index ffaa28c..9156efe 100644
--- a/src/gui/general/LinedStaff.cpp
+++ b/src/gui/general/LinedStaff.cpp
@@ -572,7 +572,7 @@ LinedStaff::getCanvasXForLeftOfRow(int row) const
 }
 
 void
-LinedStaff::sizeStaff(HorizontalLayoutEngine &tqlayout)
+LinedStaff::sizeStaff(HorizontalLayoutEngine &layout)
 {
     Profiler profiler("LinedStaff::sizeStaff", true);
 
@@ -582,19 +582,19 @@ LinedStaff::sizeStaff(HorizontalLayoutEngine &tqlayout)
 
     //    RG_DEBUG << "LinedStaff::sizeStaff" << endl;
 
-    int lastBar = tqlayout.getLastVisibleBarOnStaff(*this);
+    int lastBar = layout.getLastVisibleBarOnStaff(*this);
 
     double xleft = 0, xright = 0;
     bool haveXLeft = false;
 
-    xright = tqlayout.getBarPosition(lastBar) - 1;
+    xright = layout.getBarPosition(lastBar) - 1;
 
     TimeSignature currentTimeSignature;
 
-    for (int barNo = tqlayout.getFirstVisibleBarOnStaff(*this);
+    for (int barNo = layout.getFirstVisibleBarOnStaff(*this);
             barNo <= lastBar; ++barNo) {
 
-        double x = tqlayout.getBarPosition(barNo);
+        double x = layout.getBarPosition(barNo);
 
         if (!haveXLeft) {
             xleft = x;
@@ -603,7 +603,7 @@ LinedStaff::sizeStaff(HorizontalLayoutEngine &tqlayout)
 
         double timeSigX = 0;
         TimeSignature timeSig;
-        bool isNew = tqlayout.getTimeSignaturePosition(*this, barNo, timeSig, timeSigX);
+        bool isNew = layout.getTimeSignaturePosition(*this, barNo, timeSig, timeSigX);
 
         if (isNew && barNo < lastBar) {
             currentTimeSignature = timeSig;
@@ -619,8 +619,8 @@ LinedStaff::sizeStaff(HorizontalLayoutEngine &tqlayout)
 
         insertBar(x,
                   ((barNo == lastBar) ? 0 :
-                   (tqlayout.getBarPosition(barNo + 1) - x)),
-                  tqlayout.isBarCorrectOnStaff(*this, barNo - 1),
+                   (layout.getBarPosition(barNo + 1) - x)),
+                  layout.isBarCorrectOnStaff(*this, barNo - 1),
                   currentTimeSignature,
                   barNo,
                   showBarNo);
@@ -745,7 +745,7 @@ LinedStaff::insertBar(double layoutX, double width, bool isCorrect,
     else
         line->show();
 
-    // The bar lines have to be in order of tqlayout-x (there's no
+    // The bar lines have to be in order of layout-x (there's no
     // such interesting stipulation for beat or connecting lines)
     BarLineList::iterator insertPoint = lower_bound
                                         (m_barLines.begin(), m_barLines.end(), line, compareBars);
@@ -782,7 +782,7 @@ LinedStaff::insertBar(double layoutX, double width, bool isCorrect,
         TQFont font;
         font.setPixelSize(m_resolution * 3 / 2);
         TQFontMetrics metrics(font);
-        TQString text = TQString("%1").tqarg(barNo + 1);
+        TQString text = TQString("%1").arg(barNo + 1);
 
         TQCanvasItem *barNoText = new TQCanvasText(text, font, m_canvas);
         barNoText->setX(x);
@@ -1110,10 +1110,10 @@ LinedStaff::getLayoutXOfInsertCursor() const
 }
 
 timeT
-LinedStaff::getInsertCursorTime(HorizontalLayoutEngine &tqlayout) const
+LinedStaff::getInsertCursorTime(HorizontalLayoutEngine &layout) const
 {
     if (m_insertCursorTimeValid) return m_insertCursorTime;
-    return tqlayout.getTimeForX(getLayoutXOfInsertCursor());
+    return layout.getTimeForX(getLayoutXOfInsertCursor());
 }
 
 void
@@ -1141,10 +1141,10 @@ LinedStaff::setPointerPosition(double canvasX, int canvasY)
 }
 
 void
-LinedStaff::setPointerPosition(HorizontalLayoutEngine &tqlayout,
+LinedStaff::setPointerPosition(HorizontalLayoutEngine &layout,
                                timeT time)
 {
-    setPointerPosition(tqlayout.getXForTime(time));
+    setPointerPosition(layout.getXForTime(time));
 }
 
 void
@@ -1176,10 +1176,10 @@ LinedStaff::setInsertCursorPosition(double canvasX, int canvasY)
 }
 
 void
-LinedStaff::setInsertCursorPosition(HorizontalLayoutEngine &tqlayout,
+LinedStaff::setInsertCursorPosition(HorizontalLayoutEngine &layout,
                                     timeT time)
 {
-    double x = tqlayout.getXForTime(time);
+    double x = layout.getXForTime(time);
     LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(x, 0);
     setInsertCursorPosition(coords.first, coords.second);
     m_insertCursorTime = time;
diff --git a/src/gui/general/LinedStaff.h b/src/gui/general/LinedStaff.h
index 3dff372..0ebdf5f 100644
--- a/src/gui/general/LinedStaff.h
+++ b/src/gui/general/LinedStaff.h
@@ -87,7 +87,7 @@ public:
 protected:
     /**
      * Create a new LinedStaff for the given Segment, with a
-     * linear tqlayout.
+     * linear layout.
      * 
      * \a id is an arbitrary id for the staff in its view,
      *    not used within the LinedStaff implementation but
@@ -104,7 +104,7 @@ protected:
 
     /**
      * Create a new LinedStaff for the given Segment, with a
-     * page tqlayout.
+     * page layout.
      * 
      * \a id is an arbitrary id for the staff in its view,
      *    not used within the LinedStaff implementation but
@@ -117,7 +117,7 @@ protected:
      *    staff line should be
      *
      * \a pageWidth is the width of a page, to determine
-     *    when to break lines for page tqlayout
+     *    when to break lines for page layout
      *
      * \a rowsPerPage is the number of rows to a page, or zero
      *    for a single continuous page
@@ -131,7 +131,7 @@ protected:
 
     /**
      * Create a new LinedStaff for the given Segment, with
-     * either page or linear tqlayout.
+     * either page or linear layout.
      */
     LinedStaff(TQCanvas *, Segment *, SnapGrid *,
                int id, int resolution, int lineThickness, PageMode pageMode,
@@ -304,14 +304,14 @@ public:
     virtual int getTitleHeight() const;
     
     /**
-     * Returns the width of the entire staff after tqlayout.  Call
+     * Returns the width of the entire staff after layout.  Call
      * this only after you've done the full sizeStaff/positionElements
      * procedure.
      */
     virtual double getTotalWidth() const;
 
     /**
-     * Returns the height of the entire staff after tqlayout.  Call
+     * Returns the height of the entire staff after layout.  Call
      * this only after you've done the full sizeStaff/positionElements
      * procedure.  If there are multiple rows, this will be the
      * height of all rows, including any space between rows that
@@ -383,26 +383,26 @@ public:
     virtual void setCurrent(bool current);
 
     /**
-     * Move the playback pointer to the tqlayout-X coordinate
+     * Move the playback pointer to the layout-X coordinate
      * corresponding to the given time, and show it.
      */
     virtual void setPointerPosition
     (HorizontalLayoutEngine&, timeT);
 
     /**
-     * Move the playback pointer to the tqlayout-X coordinate
+     * Move the playback pointer to the layout-X coordinate
      * corresponding to the given canvas coordinates, and show it.
      */
     virtual void setPointerPosition(double x, int y);
 
     /**
-     * Move the playback pointer to the given tqlayout-X
+     * Move the playback pointer to the given layout-X
      * coordinate, and show it.
      */
     virtual void setPointerPosition(double x);
 
     /**
-     * Returns the tqlayout-X coordinate corresponding to the current
+     * Returns the layout-X coordinate corresponding to the current
      * position of the playback pointer.
      */
     virtual double getLayoutXOfPointer() const;
@@ -419,19 +419,19 @@ public:
     virtual void hidePointer();
 
     /**
-     * Move the insertion cursor to the tqlayout-X coordinate
+     * Move the insertion cursor to the layout-X coordinate
      * corresponding to the given time, and show it.
      */
     virtual void setInsertCursorPosition(HorizontalLayoutEngine&, timeT);
 
     /**
-     * Move the insertion cursor to the tqlayout-X coordinate
+     * Move the insertion cursor to the layout-X coordinate
      * corresponding to the given canvas coordinates, and show it.
      */
     virtual void setInsertCursorPosition(double x, int y);
 
     /**
-     * Returns the tqlayout-X coordinate corresponding to the current
+     * Returns the layout-X coordinate corresponding to the current
      * position of the insertion cursor.  Returns -1 if this staff
      * is not current or there is some other problem.
      */
@@ -454,8 +454,8 @@ public:
     virtual void hideInsertCursor();
 
     /**
-     * Query the given horizontal tqlayout object (which is assumed to
-     * have just completed its tqlayout procedure) to determine the
+     * Query the given horizontal layout object (which is assumed to
+     * have just completed its layout procedure) to determine the
      * required extents of the staff and the positions of the bars,
      * and create the bars and staff lines accordingly.  It may be
      * called either before or after renderElements and/or
@@ -464,7 +464,7 @@ public:
      * No bars or staff lines will appear unless this method has
      * been called.
      */
-    virtual void sizeStaff(HorizontalLayoutEngine& tqlayout);
+    virtual void sizeStaff(HorizontalLayoutEngine& layout);
 
     /**
      * Generate or re-generate sprites for all the elements between
@@ -486,9 +486,9 @@ public:
 
     /**
      * Assign suitable coordinates to the elements on the staff
-     * between the start and end times, based entirely on the tqlayout
+     * between the start and end times, based entirely on the layout
      * X and Y coordinates they were given by the horizontal and
-     * vertical tqlayout processes.
+     * vertical layout processes.
      *
      * The implementation is free to render any elements it
      * chooses in this method as well.
@@ -519,7 +519,7 @@ public:
      * Also return the clef and key in force at these coordinates.
      *
      * The default implementation should suit for subclasses that only
-     * show a single element per tqlayout X coordinate.
+     * show a single element per layout X coordinate.
      */
     virtual ViewElementList::iterator getClosestElementToCanvasCoords
     (double x, int y, 
@@ -533,7 +533,7 @@ public:
 
     /**
      * Return an iterator pointing to the nearest view element to the
-     * given tqlayout x-coordinate.
+     * given layout x-coordinate.
      * 
      * If notesAndRestsOnly is true, do not return any view element
      * other than a note or rest.
@@ -564,7 +564,7 @@ public:
      *
      *
      * The default implementation should suit for subclasses that only
-     * show a single element per tqlayout X coordinate.
+     * show a single element per layout X coordinate.
      */
     virtual ViewElementList::iterator getElementUnderCanvasCoords
     (double x, int y, Event *&clef, Event *&key) {
@@ -627,10 +627,10 @@ public:
 
 protected:
     // Methods that the subclass may (indeed, should) use to convert
-    // between the tqlayout coordinates of elements and their canvas
+    // between the layout coordinates of elements and their canvas
     // coordinates.  These are deliberately not virtual.
 
-    // Note that even linear-tqlayout staffs have multiple rows; their
+    // Note that even linear-layout staffs have multiple rows; their
     // rows all have the same y coordinate but increasing x
     // coordinates, instead of the other way around.  (The only reason
     // for this is that it seems to be more efficient from the TQCanvas
@@ -682,7 +682,7 @@ protected:
     // signatures, override the deleteTimeSignatures and
     // insertTimeSignature methods.  For repeated clefs and keys at
     // the start of each row, override deleteRepeatedClefsAndKeys
-    // and insertRepeatedClefAndKey, but note that your tqlayout class
+    // and insertRepeatedClefAndKey, but note that your layout class
     // will need to allot the space for them separately.
 
     virtual void resizeStaffLines();
@@ -737,7 +737,7 @@ protected:
     ItemMatrix m_staffLines;
     ItemList m_staffConnectingLines;
 
-    typedef std::pair<double, TQCanvasItem *> LineRec; // tqlayout-x, line
+    typedef std::pair<double, TQCanvasItem *> LineRec; // layout-x, line
     typedef FastVector<LineRec> LineRecList;
     typedef FastVector<BarLine *> BarLineList;//!!! should be multiset I reckon
     static bool compareBars(const BarLine *, const BarLine *);
diff --git a/src/gui/general/MidiPitchLabel.cpp b/src/gui/general/MidiPitchLabel.cpp
index a103234..51742c3 100644
--- a/src/gui/general/MidiPitchLabel.cpp
+++ b/src/gui/general/MidiPitchLabel.cpp
@@ -55,7 +55,7 @@ MidiPitchLabel::MidiPitchLabel(int pitch)
         int baseOctave = config->readNumEntry("midipitchoctave", -2);
 
         int octave = (int)(((float)pitch) / 12.0) + baseOctave;
-        m_midiNote = notes[pitch % 12].tqarg(octave);
+        m_midiNote = notes[pitch % 12].arg(octave);
     }
 }
 
diff --git a/src/gui/general/PresetGroup.cpp b/src/gui/general/PresetGroup.cpp
index cb8efca..2c39256 100644
--- a/src/gui/general/PresetGroup.cpp
+++ b/src/gui/general/PresetGroup.cpp
@@ -70,7 +70,7 @@ PresetGroup::PresetGroup() :
     TQString language = KGlobal::locale()->language();
 
     TQString presetFileName = TQString("%1/presets-%2.xml")
-                             .tqarg(m_presetDirectory).tqarg(language);
+                             .arg(m_presetDirectory).arg(language);
 
     if (!TQFileInfo(presetFileName).isReadable()) {
 
@@ -78,14 +78,14 @@ PresetGroup::PresetGroup() :
 
         language.replace(TQRegExp("_.*$"), "");
         presetFileName = TQString("%1/presets-%2.xml")
-                         .tqarg(m_presetDirectory).tqarg(language);
+                         .arg(m_presetDirectory).arg(language);
 
         if (!TQFileInfo(presetFileName).isReadable()) {
 
             RG_DEBUG << "Failed to open " << presetFileName << endl;
 
             presetFileName = TQString("%1/presets.xml")
-                             .tqarg(m_presetDirectory);
+                             .arg(m_presetDirectory);
 
             if (!TQFileInfo(presetFileName).isReadable()) {
 
@@ -247,10 +247,10 @@ PresetGroup::error(const TQXmlParseException& exception)
     RG_DEBUG << "PresetGroup::error(): jubilation and glee, we have an error, whee!" << endl;
 
     m_errorString = TQString("%1 at line %2, column %3: %4")
-                    .tqarg(exception.message())
-                    .tqarg(exception.lineNumber())
-                    .tqarg(exception.columnNumber())
-                    .tqarg(m_errorString);
+                    .arg(exception.message())
+                    .arg(exception.lineNumber())
+                    .arg(exception.columnNumber())
+                    .arg(m_errorString);
     return TQXmlDefaultHandler::error(exception);
 }
 
@@ -259,10 +259,10 @@ PresetGroup::fatalError(const TQXmlParseException& exception)
 {
     RG_DEBUG << "PresetGroup::fatalError(): double your jubilation, and triple your glee, a fatal error doth it be!" << endl;
     m_errorString = TQString("%1 at line %2, column %3: %4")
-                    .tqarg(exception.message())
-                    .tqarg(exception.lineNumber())
-                    .tqarg(exception.columnNumber())
-                    .tqarg(m_errorString);
+                    .arg(exception.message())
+                    .arg(exception.lineNumber())
+                    .arg(exception.columnNumber())
+                    .arg(m_errorString);
     return TQXmlDefaultHandler::fatalError(exception);
 }
 
diff --git a/src/gui/general/PresetHandlerDialog.cpp b/src/gui/general/PresetHandlerDialog.cpp
index 9d9c897..b97d581 100644
--- a/src/gui/general/PresetHandlerDialog.cpp
+++ b/src/gui/general/PresetHandlerDialog.cpp
@@ -27,7 +27,7 @@
 
 
 #include "PresetHandlerDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <kapplication.h>
 
 #include <klocale.h>
@@ -81,7 +81,7 @@ PresetHandlerDialog::initDialog()
 
     TQFrame *frame = new TQFrame(vBox);
 
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 6, 5, 10, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 6, 5, 10, 5);
 
     TQLabel *title = new TQLabel(i18n("Select preset track parameters for:"), frame);
     if (m_fromNotation) title->setText(i18n("Create appropriate notation for:"));
@@ -114,14 +114,14 @@ PresetHandlerDialog::initDialog()
         onlyNewSegments->setChecked(true);
     }
     
-    tqlayout->addMultiCellWidget(title, 0, 0, 0, 1, AlignLeft);
-    tqlayout->addWidget(catlabel, 1, 0, AlignRight);
-    tqlayout->addWidget(m_categoryCombo, 1, 1);
-    tqlayout->addWidget(inslabel, 2, 0, AlignRight);
-    tqlayout->addWidget(m_instrumentCombo, 2, 1);
-    tqlayout->addWidget(plylabel, 3, 0, AlignRight);
-    tqlayout->addWidget(m_playerCombo, 3, 1);
-    tqlayout->addMultiCellWidget(scopeBox, 4, 4, 0, 1, AlignLeft);
+    layout->addMultiCellWidget(title, 0, 0, 0, 1, AlignLeft);
+    layout->addWidget(catlabel, 1, 0, AlignRight);
+    layout->addWidget(m_categoryCombo, 1, 1);
+    layout->addWidget(inslabel, 2, 0, AlignRight);
+    layout->addWidget(m_instrumentCombo, 2, 1);
+    layout->addWidget(plylabel, 3, 0, AlignRight);
+    layout->addWidget(m_playerCombo, 3, 1);
+    layout->addMultiCellWidget(scopeBox, 4, 4, 0, 1, AlignLeft);
 
     populateCategoryCombo();
     // try to set to same category used previously
diff --git a/src/gui/general/RosegardenCanvasView.cpp b/src/gui/general/RosegardenCanvasView.cpp
index a806e8a..4893147 100644
--- a/src/gui/general/RosegardenCanvasView.cpp
+++ b/src/gui/general/RosegardenCanvasView.cpp
@@ -84,10 +84,10 @@ void RosegardenCanvasView::setBottomFixedWidget(TQWidget* w)
 {
     m_bottomWidget = w;
     if (m_bottomWidget) {
-        int lww = m_leftWidget ? m_leftWidget->tqsizeHint().width() : 0;
+        int lww = m_leftWidget ? m_leftWidget->sizeHint().width() : 0;
         m_bottomWidget->reparent(this, 0, TQPoint(0, 0));
-        m_bottomWidget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
-        setMargins(lww, 0, 0, m_bottomWidget->tqsizeHint().height());
+        m_bottomWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
+        setMargins(lww, 0, 0, m_bottomWidget->sizeHint().height());
     }
 }
 
@@ -399,7 +399,7 @@ void RosegardenCanvasView::updateBottomWidgetGeometry()
     if (!m_bottomWidget)
         return ;
 
-    int bottomWidgetHeight = m_bottomWidget->tqsizeHint().height();
+    int bottomWidgetHeight = m_bottomWidget->sizeHint().height();
 
     int leftWidgetWidth = 0;
     if (m_leftWidget && m_leftWidget->isVisible()) {
@@ -447,10 +447,10 @@ void RosegardenCanvasView::setLeftFixedWidget(TQWidget* w)
 {
     m_leftWidget = w;
     if (m_leftWidget) {
-        int bwh = m_bottomWidget ? m_bottomWidget->tqsizeHint().height() : 0;
+        int bwh = m_bottomWidget ? m_bottomWidget->sizeHint().height() : 0;
         m_leftWidget->reparent(this, 0, TQPoint(0, 0));
-        m_leftWidget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred));
-        setMargins(m_leftWidget->tqsizeHint().width(), 0, 0, bwh);
+        m_leftWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred));
+        setMargins(m_leftWidget->sizeHint().width(), 0, 0, bwh);
     }
 }
 
@@ -467,7 +467,7 @@ void RosegardenCanvasView::updateLeftWidgetGeometry()
     m_leftWidget->setFixedWidth(leftWidgetWidth);
 
     int bottomWidgetHeight = m_bottomWidget ? 
-                                m_bottomWidget->tqsizeHint().height() : 0;
+                                m_bottomWidget->sizeHint().height() : 0;
 
     setMargins(leftWidgetWidth, 0, 0, bottomWidgetHeight);
 
diff --git a/src/gui/general/RosegardenScrollView.cpp b/src/gui/general/RosegardenScrollView.cpp
index 815ab6b..c3184da 100644
--- a/src/gui/general/RosegardenScrollView.cpp
+++ b/src/gui/general/RosegardenScrollView.cpp
@@ -75,8 +75,8 @@ void RosegardenScrollView::setBottomFixedWidget(TQWidget* w)
     m_bottomWidget = w;
     if (m_bottomWidget) {
         m_bottomWidget->reparent(this, 0, TQPoint(0, 0));
-        m_bottomWidget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
-        setMargins(0, 0, 0, m_bottomWidget->tqsizeHint().height());
+        m_bottomWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
+        setMargins(0, 0, 0, m_bottomWidget->sizeHint().height());
     }
 }
 
@@ -376,7 +376,7 @@ void RosegardenScrollView::updateBottomWidgetGeometry()
     if (!m_bottomWidget)
         return ;
 
-    int bottomWidgetHeight = m_bottomWidget->tqsizeHint().height();
+    int bottomWidgetHeight = m_bottomWidget->sizeHint().height();
 
     setMargins(0, 0, 0, bottomWidgetHeight);
     TQRect r = frameRect();
diff --git a/src/gui/kdeext/KLedButton.cpp b/src/gui/kdeext/KLedButton.cpp
index 3e2f460..bc67cd7 100644
--- a/src/gui/kdeext/KLedButton.cpp
+++ b/src/gui/kdeext/KLedButton.cpp
@@ -41,8 +41,8 @@ KLedButton::KLedButton(const TQColor &col, TQWidget *parent, const char *name)
 {}
 
 KLedButton::KLedButton(const TQColor& col, KLed::State st, KLed::Look look,
-                       KLed::Shape tqshape, TQWidget *parent, const char *name)
-        : KLed( col, st, look, tqshape, parent, name )
+                       KLed::Shape shape, TQWidget *parent, const char *name)
+        : KLed( col, st, look, shape, parent, name )
 {}
 
 KLedButton::~KLedButton()
diff --git a/src/gui/kdeext/KLedButton.h b/src/gui/kdeext/KLedButton.h
index 197f96b..d3fa1fb 100644
--- a/src/gui/kdeext/KLedButton.h
+++ b/src/gui/kdeext/KLedButton.h
@@ -52,7 +52,7 @@ class KLedButton : public KLed  {
   TQ_OBJECT
   public: 
    KLedButton(const TQColor &col=TQt::green, TQWidget *parent=0, const char *name=0);
-   KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape tqshape,
+   KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape shape,
               TQWidget *parent=0, const char *name=0);
    ~KLedButton();       
 
diff --git a/src/gui/kdeext/KStartupLogo.cpp b/src/gui/kdeext/KStartupLogo.cpp
index f368d96..d1b4870 100644
--- a/src/gui/kdeext/KStartupLogo.cpp
+++ b/src/gui/kdeext/KStartupLogo.cpp
@@ -92,7 +92,7 @@ void KStartupLogo::paintEvent(TQPaintEvent*)
     //TQString version(VERSION);
     //int sepIdx = version.find("-");
     TQString versionLabel(VERSION);
-    //TQString("R%1 v%2").tqarg(version.left(sepIdx)).tqarg(version.mid(sepIdx + 1));
+    //TQString("R%1 v%2").arg(version.left(sepIdx)).arg(version.mid(sepIdx + 1));
     int versionWidth = metrics.width(versionLabel);
 
     paint.drawText(m_pixmap.width() - versionWidth - 18,
diff --git a/src/gui/kdeext/KTmpStatusMsg.cpp b/src/gui/kdeext/KTmpStatusMsg.cpp
index 8977c74..620d7c5 100644
--- a/src/gui/kdeext/KTmpStatusMsg.cpp
+++ b/src/gui/kdeext/KTmpStatusMsg.cpp
@@ -33,7 +33,7 @@ KTmpStatusMsg::KTmpStatusMsg(const TQString& msg, KMainWindow* window, int id)
         : m_mainWindow(window),
         m_id(id)
 {
-    m_mainWindow->statusBar()->changeItem(TQString("  %1").tqarg(msg), m_id);
+    m_mainWindow->statusBar()->changeItem(TQString("  %1").arg(msg), m_id);
     Rosegarden::rgapp->refreshGUI(50);
 }
 
diff --git a/src/gui/kdeext/QCanvasGroupableItem.cpp b/src/gui/kdeext/QCanvasGroupableItem.cpp
index 818004b..3160606 100644
--- a/src/gui/kdeext/QCanvasGroupableItem.cpp
+++ b/src/gui/kdeext/QCanvasGroupableItem.cpp
@@ -131,7 +131,7 @@ TQCanvasItemGroup::setVisible(bool yes)
 {
     TQCanvasItemList::Iterator i;
     for (i = m_items.begin(); i != m_items.end(); ++i)
-        (*i)->tqsetVisible(yes);
+        (*i)->setVisible(yes);
 }
 
 void
@@ -141,7 +141,7 @@ TQCanvasItemGroup::setSelected(bool yes)
 
     TQCanvasItemList::Iterator i;
     for (i = m_items.begin(); i != m_items.end(); ++i)
-        (*i)->tqsetVisible(yes);
+        (*i)->setVisible(yes);
 }
 
 void
diff --git a/src/gui/kdeext/QCanvasGroupableItem.h b/src/gui/kdeext/QCanvasGroupableItem.h
index b7d4fbb..d237524 100644
--- a/src/gui/kdeext/QCanvasGroupableItem.h
+++ b/src/gui/kdeext/QCanvasGroupableItem.h
@@ -27,7 +27,7 @@
 class TQCanvasItemGroup;
 
 /**
- * This class is meant to be inherited by TQCanvasItem tqchildren to make
+ * This class is meant to be inherited by TQCanvasItem children to make
  * them groupable.
  *
  * On destruction, the item will remove itself from the group it's
diff --git a/src/gui/kdeext/RGLed.cpp b/src/gui/kdeext/RGLed.cpp
index fbadb95..a928ee5 100644
--- a/src/gui/kdeext/RGLed.cpp
+++ b/src/gui/kdeext/RGLed.cpp
@@ -59,7 +59,7 @@
  *
  * Revision 1.19  2001/08/08 14:35:12  hausmann
  * - removed empty KActionCollection::childEvent
- * - added tqsizeHint() and tqminimumSizeHint() methods to KLed, as advised by
+ * - added sizeHint() and minimumSizeHint() methods to KLed, as advised by
  *   Rik in the comment in kled.h
  * - removed unused mousePressEvent, mouseMoveEvent and mouseReleaseEvent
  *   handlers from KPassDlg
@@ -160,7 +160,7 @@ KLed::KLed(TQWidget *parent, const char *name)
         : TQWidget( parent, name),
         led_state(On),
         led_look(Raised),
-        led_tqshape(Circular)
+        led_shape(Circular)
 {
     TQColor col(green);
     d = new KLed::KLedPrivate;
@@ -177,7 +177,7 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name)
         : TQWidget( parent, name),
         led_state(On),
         led_look(Raised),
-        led_tqshape(Circular)
+        led_shape(Circular)
 {
     d = new KLed::KLedPrivate;
     d->dark_factor = 300;
@@ -190,11 +190,11 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name)
 }
 
 KLed::KLed(const TQColor& col, KLed::State state,
-           KLed::Look look, KLed::Shape tqshape, TQWidget *parent, const char *name )
+           KLed::Look look, KLed::Shape shape, TQWidget *parent, const char *name )
         : TQWidget(parent, name),
         led_state(state),
         led_look(look),
-        led_tqshape(tqshape)
+        led_shape(shape)
 {
     d = new KLed::KLedPrivate;
     d->dark_factor = 300;
@@ -202,7 +202,7 @@ KLed::KLed(const TQColor& col, KLed::State state,
     d->off_map = 0;
     d->on_map = 0;
 
-    //setShape(tqshape);
+    //setShape(shape);
     setColor(col);
 }
 
@@ -223,7 +223,7 @@ KLed::paintEvent(TQPaintEvent *)
     t.start();
     for (int i = 0; i < rounds; i++) {
 #endif
-        switch (led_tqshape) {
+        switch (led_shape) {
         case Rectangular:
             switch (led_look) {
             case Sunken :
@@ -298,7 +298,7 @@ KLed::paintFlat() // paint a ROUND FLAT led lamp
     brush.setColor( color );
 
     pen.setWidth( 1 );
-    color = tqcolorGroup().dark();
+    color = colorGroup().dark();
     pen.setColor( color );			// Set the pen accordingly
 
     paint.setPen( pen );			// Select pen for drawing
@@ -386,7 +386,7 @@ KLed::paintRound() // paint a ROUND RAISED led lamp
     // avoid that the border can be erased by the bright spot of the LED
 
     pen.setWidth( 1 );
-    color = tqcolorGroup().dark();
+    color = colorGroup().dark();
     pen.setColor( color );			// Set the pen accordingly
     paint.setPen( pen );			// Select pen for drawing
     brush.setStyle( Qt::NoBrush );		// Switch off the brush
@@ -509,11 +509,11 @@ KLed::paintSunken() // paint a ROUND SUNKEN led lamp
     brush.setStyle( Qt::NoBrush );              // Switch off the brush
     paint.setBrush( brush );                        // This avoids filling of the ellipse
 
-    // Set the initial color value to tqcolorGroup().light() (bright) and start
+    // Set the initial color value to colorGroup().light() (bright) and start
     // drawing the shadow border at 45� (45*16 = 720).
 
     int angle = -720;
-    color = tqcolorGroup().light();
+    color = colorGroup().light();
 
     for ( int arc = 120; arc < 2880; arc += 240 )
     {
@@ -612,9 +612,9 @@ KLed::state() const
 }
 
 KLed::Shape
-KLed::tqshape() const
+KLed::shape() const
 {
-    return led_tqshape;
+    return led_shape;
 }
 
 TQColor
@@ -649,8 +649,8 @@ KLed::toggleState()
 void
 KLed::setShape(KLed::Shape s)
 {
-    if (led_tqshape != s) {
-        led_tqshape = s;
+    if (led_shape != s) {
+        led_shape = s;
         update();
     }
 }
@@ -713,13 +713,13 @@ KLed::off()
 }
 
 TQSize
-KLed::tqsizeHint() const
+KLed::sizeHint() const
 {
     return TQSize(16, 16);
 }
 
 TQSize
-KLed::tqminimumSizeHint() const
+KLed::minimumSizeHint() const
 {
     return TQSize(16, 16 );
 }
diff --git a/src/gui/kdeext/klearlook.cpp b/src/gui/kdeext/klearlook.cpp
index 51e2909..b1a55a4 100644
--- a/src/gui/kdeext/klearlook.cpp
+++ b/src/gui/kdeext/klearlook.cpp
@@ -39,7 +39,7 @@ DEALINGS IN THE SOFTWARE.
 #include <tqmenubar.h>
 #include <tqapplication.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqframe.h>
 #include <tqpushbutton.h>
 #include <tqdrawutil.h>
@@ -47,7 +47,7 @@ DEALINGS IN THE SOFTWARE.
 #include <tqtabbar.h>
 #include <tqtabwidget.h>
 #include <tqguardedptr.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqlistview.h>
 #include <tqbitmap.h>
@@ -511,11 +511,11 @@ hoverSect( TQTC_NO_SECT ) {
 #endif
 
     if ( PROFILE_RAISED != pmProfile )
-        shadeColors( tqApp->tqpalette().active().highlight(), menuPbar );
+        shadeColors( tqApp->palette().active().highlight(), menuPbar );
     else
-        shadeGradient( tqApp->tqpalette().active().highlight(), menuPbar );
-    shadeColors( tqApp->tqpalette().active().background(), gray );
-    shadeColors( tqApp->tqpalette().active().button(), button );
+        shadeGradient( tqApp->palette().active().highlight(), menuPbar );
+    shadeColors( tqApp->palette().active().background(), gray );
+    shadeColors( tqApp->palette().active().button(), button );
 }
 
 void KlearlookStyle::polish( TQApplication *app ) {
@@ -549,18 +549,18 @@ void KlearlookStyle::polish( TQPalette &pal ) {
         newContrast = true;
     }
 
-    if ( newContrast || gray[ NUM_SHADES ] != tqApp->tqpalette().active().background() )
-        shadeColors( tqApp->tqpalette().active().background(), gray );
+    if ( newContrast || gray[ NUM_SHADES ] != tqApp->palette().active().background() )
+        shadeColors( tqApp->palette().active().background(), gray );
 
-    if ( newContrast || button[ NUM_SHADES ] != tqApp->tqpalette().active().button() )
-        shadeColors( tqApp->tqpalette().active().button(), button );
+    if ( newContrast || button[ NUM_SHADES ] != tqApp->palette().active().button() )
+        shadeColors( tqApp->palette().active().button(), button );
 
     if ( PROFILE_RAISED == pmProfile ) {
-        if ( newContrast || menuPbar[ NUM_SHADES ] != tqApp->tqpalette().active().highlight() )
-            shadeColors( tqApp->tqpalette().active().highlight(), menuPbar );
+        if ( newContrast || menuPbar[ NUM_SHADES ] != tqApp->palette().active().highlight() )
+            shadeColors( tqApp->palette().active().highlight(), menuPbar );
     } else
-        if ( tqApp->tqpalette().active().highlight() != menuPbar[ GRADIENT_BASE ] )
-            shadeGradient( tqApp->tqpalette().active().highlight(), menuPbar );
+        if ( tqApp->palette().active().highlight() != menuPbar[ GRADIENT_BASE ] )
+            shadeGradient( tqApp->palette().active().highlight(), menuPbar );
 
     const TQColorGroup &actGroup = pal.active(),
                                   &inactGroup = pal.inactive();
@@ -690,12 +690,12 @@ bool KlearlookStyle::eventFilter( TQObject *object, TQEvent *event ) {
             if ( toolbar )
                 horiz_grad = toolbar->orientation() == TQt::Vertical;
 
-            drawBevelGradient( parent->tqcolorGroup().background(), true, 1, &TQPainter( widget ),
+            drawBevelGradient( parent->colorGroup().background(), true, 1, &TQPainter( widget ),
                                TQRect( x_offset, y_offset, pr.width(), pr.height() ),
                                horiz_grad, SHADE_BAR_LIGHT, SHADE_BAR_DARK );
 #else
 
-            TQPainter( widget ).fillRect( widget->rect(), parent->tqcolorGroup().background() );
+            TQPainter( widget ).fillRect( widget->rect(), parent->colorGroup().background() );
 #endif
 
             return false;   // Now draw the contents
@@ -707,10 +707,10 @@ bool KlearlookStyle::eventFilter( TQObject *object, TQEvent *event ) {
             TQPainter painter( frame );
             if ( TQFrame::VLine == frame->frameShape() )
                 tqdrawPrimitive( PE_DockWindowSeparator, &painter,
-                    frame->rect(), frame->tqcolorGroup(), Style_Horizontal );
+                    frame->rect(), frame->colorGroup(), Style_Horizontal );
             else if ( TQFrame::HLine == frame->frameShape() )
                 tqdrawPrimitive( PE_DockWindowSeparator, &painter,
-                    frame->rect(), frame->tqcolorGroup() );
+                    frame->rect(), frame->colorGroup() );
             else
                 return false;
             return true; // been drawn!
@@ -722,7 +722,7 @@ bool KlearlookStyle::eventFilter( TQObject *object, TQEvent *event ) {
                 hoverWidget = ( TQWidget * ) object;
                 if ( hoverWidget && hoverWidget->isEnabled() ) {
                     if ( redrawHoverWidget() ) {
-                        hoverWidget->tqrepaint( false );
+                        hoverWidget->repaint( false );
                         if ( APP_KICKER == themedApp )
                             hover = HOVER_NONE;
                     }
@@ -736,13 +736,13 @@ bool KlearlookStyle::eventFilter( TQObject *object, TQEvent *event ) {
                 oldCursor.setX( -1 );
                 oldCursor.setY( -1 );
                 hoverWidget = NULL;
-                ( ( TQWidget * ) object ) ->tqrepaint( false );
+                ( ( TQWidget * ) object ) ->repaint( false );
             }
             break;
         case TQEvent::MouseMove:
             if ( hoverWidget && object->isWidgetType() ) {
                 if ( redrawHoverWidget() ) {
-                    hoverWidget->tqrepaint( false );
+                    hoverWidget->repaint( false );
                     if ( APP_KICKER == themedApp )
                         hover = HOVER_NONE;
                 }
@@ -1475,7 +1475,7 @@ void KlearlookStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, cons
                     int x = r.x(), y = r.y(), w = r.width(), h = r.height(), marg = lv->itemMargin();
 
                     p->setPen( TQPen( flags & Style_Enabled ? cg.text()
-                                     : lv->tqpalette().color( TQPalette::Disabled, TQColorGroup::Text ) ) );
+                                     : lv->palette().color( TQPalette::Disabled, TQColorGroup::Text ) ) );
 
                     if ( flags & Style_Selected && !lv->rootIsDecorated() &&
                          !( ( item->parent() && 1 == item->parent() ->rtti() &&
@@ -1500,7 +1500,7 @@ void KlearlookStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, cons
                     TQListView * lv = item->listView();
 
                     p->setPen( TQPen( flags & Style_Enabled ? cg.text()
-                                     : lv->tqpalette().color( TQPalette::Disabled, TQColorGroup::Text ), 2 ) );
+                                     : lv->palette().color( TQPalette::Disabled, TQColorGroup::Text ), 2 ) );
                     if ( flags & Style_Selected ) {
                         flags -= Style_Selected;
                         if ( !lv->rootIsDecorated() &&
@@ -2196,7 +2196,7 @@ void KlearlookStyle::drawKStylePrimitive( KStylePrimitive kpe, TQPainter *p, con
     }
 }
 
-void KlearlookStyle::tqdrawControl(
+void KlearlookStyle::drawControl(
     ControlElement control,
     TQPainter *p,
     const TQWidget *widget,
@@ -2225,7 +2225,7 @@ void KlearlookStyle::tqdrawControl(
                     fr( r );
                     int offset = rounded ? 2 : 0;
 
-                    switch ( tb->tqshape() ) {
+                    switch ( tb->shape() ) {
                         case TQTabBar::TriangularAbove:
                         case TQTabBar::RoundedAbove:
                             if ( flags & Style_Selected ) {
@@ -2375,12 +2375,12 @@ void KlearlookStyle::tqdrawControl(
                                 p->fillRect( fr, flags & Style_Selected ? cg.background() : gray[ 2 ] );
                             break;
                         default:
-                            KStyle::tqdrawControl( control, p, widget, r, cg, flags, data );
+                            KStyle::drawControl( control, p, widget, r, cg, flags, data );
                     }
                 } else {
                     TQRect br( r );
 
-                    switch ( tb->tqshape() ) {
+                    switch ( tb->shape() ) {
                         case TQTabBar::TriangularAbove:
                         case TQTabBar::RoundedAbove:
                             if ( flags & Style_Selected ) {
@@ -2465,11 +2465,11 @@ void KlearlookStyle::tqdrawControl(
                 TQRect tr = r;
 
                 if ( t->identifier() == tb->currentTab() ) {
-                    if ( TQTabBar::RoundedAbove == tb->tqshape() || TQTabBar::TriangularAbove == tb->tqshape() )
-                        tr.setBottom( tr.bottom() - tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, tb ) );
+                    if ( TQTabBar::RoundedAbove == tb->shape() || TQTabBar::TriangularAbove == tb->shape() )
+                        tr.setBottom( tr.bottom() - pixelMetric( TQStyle::PM_TabBarTabShiftVertical, tb ) );
                 } else
-                    if ( TQTabBar::RoundedBelow == tb->tqshape() || TQTabBar::TriangularBelow == tb->tqshape() )
-                        tr.setTop( tr.top() + tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, tb ) );
+                    if ( TQTabBar::RoundedBelow == tb->shape() || TQTabBar::TriangularBelow == tb->shape() )
+                        tr.setTop( tr.top() + pixelMetric( TQStyle::PM_TabBarTabShiftVertical, tb ) );
 
                 drawItem( p, tr, AlignCenter | ShowPrefix, cg, flags & Style_Enabled, 0, t->text() );
 
@@ -2489,15 +2489,15 @@ void KlearlookStyle::tqdrawControl(
 
                 // Shift button contents if pushed.
                 if ( active ) {
-                    x += tqpixelMetric( PM_ButtonShiftHorizontal, widget );
-                    y += tqpixelMetric( PM_ButtonShiftVertical, widget );
+                    x += pixelMetric( PM_ButtonShiftHorizontal, widget );
+                    y += pixelMetric( PM_ButtonShiftVertical, widget );
                     flags |= Style_Sunken;
                 }
 
                 // Does the button have a popup menu?
                 if ( button->isMenuButton() ) {
-                    int dx = tqpixelMetric( PM_MenuButtonIndicator, widget ),
-                        margin = tqpixelMetric( PM_ButtonMargin, widget );
+                    int dx = pixelMetric( PM_MenuButtonIndicator, widget ),
+                        margin = pixelMetric( PM_ButtonMargin, widget );
 
                     if ( button->iconSet() && !button->iconSet() ->isNull() &&
                        ( dx + button->iconSet() ->pixmap ( TQIconSet::Small, TQIconSet::Normal,
@@ -2505,7 +2505,7 @@ void KlearlookStyle::tqdrawControl(
                         cornArrow = true; //To little room. Draw the arrow in the corner, don't adjust the widget
                     else {
                         tqdrawPrimitive( PE_ArrowDown,
-                            p, tqvisualRect( TQRect(
+                            p, visualRect( TQRect(
                                 ( x + w ) - ( dx + margin ), y, dx,
                                 h ), r ), cg, flags, data );
                                 
@@ -2547,7 +2547,7 @@ void KlearlookStyle::tqdrawControl(
                     }
 
                     if ( cornArrow )   //Draw over the icon
-                        tqdrawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect( x + w - 6, x + h - 6, 7, 7 ), r ),
+                        tqdrawPrimitive( PE_ArrowDown, p, visualRect( TQRect( x + w - 6, x + h - 6, 7, 7 ), r ),
                                        cg, flags, data );
 
                     if ( xo && iw ) {
@@ -2566,16 +2566,16 @@ void KlearlookStyle::tqdrawControl(
                 for ( i = 0; i < j; i++ )
                     drawItem( p, TQRect( x + i, y, w, h ),
                               AlignCenter | ShowPrefix,
-                              button->tqcolorGroup(),
+                              button->colorGroup(),
                               button->isEnabled(),
                               button->pixmap(),
                               button->text(), -1,
-                              &button->tqcolorGroup().buttonText() );
+                              &button->colorGroup().buttonText() );
 
                 //Draw a focus rect if the button has focus
                 if ( flags & Style_HasFocus )
                     tqdrawPrimitive( PE_FocusRect, p,
-                        TQStyle::tqvisualRect( subRect( SR_PushButtonFocusRect, widget ), widget ), cg, flags );
+                        TQStyle::visualRect( subRect( SR_PushButtonFocusRect, widget ), widget ), cg, flags );
                         
                 break;
             }
@@ -2636,10 +2636,10 @@ void KlearlookStyle::tqdrawControl(
                 bool reverse = TQApplication::reverseLayout();
 
                 if ( reverse ) {
-                    cr = tqvisualRect( cr, r );
-                    sr = tqvisualRect( sr, r );
-                    tr = tqvisualRect( tr, r );
-                    ir = tqvisualRect( ir, r );
+                    cr = visualRect( cr, r );
+                    sr = visualRect( sr, r );
+                    tr = visualRect( tr, r );
+                    ir = visualRect( ir, r );
                 }
 
                 if ( mi->iconSet() && menuIcons ) {
@@ -2647,7 +2647,7 @@ void KlearlookStyle::tqdrawControl(
                     TQIconSet::Mode mode = flags & Style_Active
                             ? ( mi->isEnabled() ? TQIconSet::Active : TQIconSet::Disabled )
                             : ( mi->isEnabled() ? TQIconSet::Normal : TQIconSet::Disabled );
-                    cr = tqvisualRect( TQRect( x, y, maxpmw, h ), r );
+                    cr = visualRect( TQRect( x, y, maxpmw, h ), r );
 
                     // Do we have an icon and are checked at the same time?
                     // Then draw a "pressed" background behind the icon
@@ -2879,7 +2879,7 @@ void KlearlookStyle::tqdrawControl(
         case CE_PushButton: {
                 const TQPushButton *button = static_cast<const TQPushButton *>( widget );
                 TQRect br( r );
-                int dbi = tqpixelMetric( PM_ButtonDefaultIndicator, widget );
+                int dbi = pixelMetric( PM_ButtonDefaultIndicator, widget );
 
                 if ( rounded && isFormWidget( widget ) )
                     formMode = true;
@@ -2914,24 +2914,24 @@ void KlearlookStyle::tqdrawControl(
                         !isFormWidget( widget ) ) {
                     TQRect cr( checkbox->rect() );
                     TQRegion r( TQRect( cr.x(), cr.y(),
-                        tqvisualRect( subRect( SR_CheckBoxFocusRect, widget ), widget ).width() +
-                                    tqpixelMetric( PM_IndicatorWidth ) + 4, cr.height() ) );
+                        visualRect( subRect( SR_CheckBoxFocusRect, widget ), widget ).width() +
+                                    pixelMetric( PM_IndicatorWidth ) + 4, cr.height() ) );
 
-                    r -= tqvisualRect( subRect( SR_CheckBoxIndicator, widget ), widget );
+                    r -= visualRect( subRect( SR_CheckBoxIndicator, widget ), widget );
                     p->setClipRegion( r );
                     p->fillRect( checkbox->rect(), cg.background().light( TQTC_HIGHLIGHT_FACTOR ) );
                     p->setClipping( false );
                 }
-                int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
+                int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
 
-                drawItem( p, r, tqalignment | AlignVCenter | ShowPrefix, cg,
+                drawItem( p, r, alignment | AlignVCenter | ShowPrefix, cg,
                     flags & Style_Enabled, checkbox->pixmap(), checkbox->text() );
 
                 if ( checkbox->hasFocus() )
                     tqdrawPrimitive( PE_FocusRect, p,
-                        tqvisualRect( subRect( SR_CheckBoxFocusRect, widget ), widget ), cg, flags );
+                        visualRect( subRect( SR_CheckBoxFocusRect, widget ), widget ), cg, flags );
             } else
-                KStyle::tqdrawControl( control, p, widget, r, cg, flags, data );
+                KStyle::drawControl( control, p, widget, r, cg, flags, data );
             break;
         case CE_RadioButton:
             formMode = isFormWidget( widget );
@@ -2947,31 +2947,31 @@ void KlearlookStyle::tqdrawControl(
                         !isFormWidget( widget ) ) {
                     TQRect rb( radiobutton->rect() );
                     TQRegion r( TQRect( rb.x(), rb.y(),
-                                      tqvisualRect( subRect( SR_RadioButtonFocusRect, widget ), widget ).width() +
-                                      tqpixelMetric( PM_ExclusiveIndicatorWidth ) + 4, rb.height() ) );
+                                      visualRect( subRect( SR_RadioButtonFocusRect, widget ), widget ).width() +
+                                      pixelMetric( PM_ExclusiveIndicatorWidth ) + 4, rb.height() ) );
 
-                    r -= tqvisualRect( subRect( SR_RadioButtonIndicator, widget ), widget );
+                    r -= visualRect( subRect( SR_RadioButtonIndicator, widget ), widget );
                     p->setClipRegion( r );
                     p->fillRect( radiobutton->rect(), cg.background().light( TQTC_HIGHLIGHT_FACTOR ) );
                     p->setClipping( false );
                 }
 
-                int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
+                int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
 
-                drawItem( p, r, tqalignment | AlignVCenter | ShowPrefix, cg,
+                drawItem( p, r, alignment | AlignVCenter | ShowPrefix, cg,
                     flags & Style_Enabled, radiobutton->pixmap(), radiobutton->text() );
 
                 if ( radiobutton->hasFocus() )
                     tqdrawPrimitive( PE_FocusRect, p,
-                        tqvisualRect( subRect( SR_RadioButtonFocusRect, widget ), widget ), cg, flags );
+                        visualRect( subRect( SR_RadioButtonFocusRect, widget ), widget ), cg, flags );
                 break;
             }
         default:
-            KStyle::tqdrawControl( control, p, widget, r, cg, flags, data );
+            KStyle::drawControl( control, p, widget, r, cg, flags, data );
     }
 }
 
-void KlearlookStyle::tqdrawControlMask( ControlElement control, TQPainter *p, const TQWidget *widget, const TQRect &r,
+void KlearlookStyle::drawControlMask( ControlElement control, TQPainter *p, const TQWidget *widget, const TQRect &r,
                                       const TQStyleOption &data ) const {
     switch ( control ) {
         case CE_PushButton:
@@ -2991,19 +2991,19 @@ void KlearlookStyle::tqdrawControlMask( ControlElement control, TQPainter *p, co
                 p->fillRect( r, color1 );
             break;
         default:
-            KStyle::tqdrawControlMask( control, p, widget, r, data );
+            KStyle::drawControlMask( control, p, widget, r, data );
     }
 }
 
-void KlearlookStyle::tqdrawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r,
+void KlearlookStyle::drawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r,
         const TQStyleOption &data ) const {
     switch ( control ) {
         case CC_ToolButton:
         case CC_ComboBox:
-            tqdrawControlMask( CE_PushButton, p, widget, r, data );
+            drawControlMask( CE_PushButton, p, widget, r, data );
             break;
         default:
-            KStyle::tqdrawComplexControlMask( control, p, widget, r, data );
+            KStyle::drawComplexControlMask( control, p, widget, r, data );
     }
 }
 
@@ -3019,7 +3019,7 @@ TQRect KlearlookStyle::subRect( SubRect subrect, const TQWidget *widget ) const
 
                 //            if(button->isDefault() || button->autoDefault())
                 //            {
-                dbw1 = tqpixelMetric( PM_ButtonDefaultIndicator, widget );
+                dbw1 = pixelMetric( PM_ButtonDefaultIndicator, widget );
                 dbw2 = dbw1 * 2;
                 //            }
 
@@ -3030,20 +3030,20 @@ TQRect KlearlookStyle::subRect( SubRect subrect, const TQWidget *widget ) const
                 break;
             }
         case SR_CheckBoxIndicator: {
-                int h = tqpixelMetric( PM_IndicatorHeight );
+                int h = pixelMetric( PM_IndicatorHeight );
 
                 rect.setRect( ( widget->rect().height() - h ) >> 1,
                               ( widget->rect().height() - h ) >> 1,
-                              tqpixelMetric( PM_IndicatorWidth ),
+                              pixelMetric( PM_IndicatorWidth ),
                               h );
                 break;
             }
         case SR_RadioButtonIndicator: {
-                int h = tqpixelMetric( PM_ExclusiveIndicatorHeight );
+                int h = pixelMetric( PM_ExclusiveIndicatorHeight );
 
                 rect.setRect( ( widget->rect().height() - h ) >> 1,
                               ( widget->rect().height() - h ) >> 1,
-                              tqpixelMetric( PM_ExclusiveIndicatorWidth ), h );
+                              pixelMetric( PM_ExclusiveIndicatorWidth ), h );
                 break;
             }
         case SR_ProgressBarContents:
@@ -3059,7 +3059,7 @@ TQRect KlearlookStyle::subRect( SubRect subrect, const TQWidget *widget ) const
     return rect;
 }
 
-void KlearlookStyle::tqdrawComplexControl(
+void KlearlookStyle::drawComplexControl(
         ComplexControl control,
         TQPainter *p,
         const TQWidget *widget,
@@ -3173,13 +3173,13 @@ void KlearlookStyle::tqdrawComplexControl(
         case CC_ComboBox: {
                 const TQComboBox *combobox = ( const TQComboBox * ) widget;
                 
-                TQRect frame( TQStyle::tqvisualRect( querySubControlMetrics( CC_ComboBox,
+                TQRect frame( TQStyle::visualRect( querySubControlMetrics( CC_ComboBox,
                              widget,SC_ComboBoxFrame,data ),widget ) ),
                              
-                      arrow( TQStyle::tqvisualRect( querySubControlMetrics( CC_ComboBox,
+                      arrow( TQStyle::visualRect( querySubControlMetrics( CC_ComboBox,
                              widget,SC_ComboBoxArrow,data),widget)),
                              
-                      field( TQStyle::tqvisualRect( querySubControlMetrics(CC_ComboBox,
+                      field( TQStyle::visualRect( querySubControlMetrics(CC_ComboBox,
                              widget,SC_ComboBoxEditField,data),widget));
                              
                 const TQColor *use = buttonColors( cg );
@@ -3211,7 +3211,7 @@ void KlearlookStyle::tqdrawComplexControl(
 
                 if ( controls & SC_ComboBoxEditField && field.isValid() ) {
                     if ( ( flags & Style_HasFocus ) && ( ! combobox->editable() ) ) {
-                        TQRect fr = TQStyle::tqvisualRect( subRect( SR_ComboBoxFocusRect, widget ), widget );
+                        TQRect fr = TQStyle::visualRect( subRect( SR_ComboBoxFocusRect, widget ), widget );
 
                         fr.addCoords( 0, 0, -2, 0 );
                         tqdrawPrimitive( PE_FocusRect,
@@ -3236,7 +3236,7 @@ void KlearlookStyle::tqdrawComplexControl(
                     qDrawShadePanel(
                         p, r, TQColorGroup( gray[ 5 ], gray[ NUM_SHADES ], gray[ 0 ],
                         gray[ 5 ], gray[ 2 ], cg.text(), gray[ NUM_SHADES ] ),
-                        true, tqpixelMetric( PM_SpinBoxFrameWidth )
+                        true, pixelMetric( PM_SpinBoxFrameWidth )
                         );
 
                 if ( ( controls & SC_SpinWidgetUp ) && up.isValid() ) {
@@ -3342,13 +3342,13 @@ void KlearlookStyle::tqdrawComplexControl(
                 if ( ( controls & SC_SliderHandle ) && handle.isValid() )
                     drawSliderHandle( p, handle, cg, flags );
                 if ( controls & SC_SliderTickmarks )
-                    TQCommonStyle::tqdrawComplexControl(
+                    TQCommonStyle::drawComplexControl(
                         control, p, widget, r, cg, flags, SC_SliderTickmarks, active, data
                     );
                 break;
             }
         default:
-            KStyle::tqdrawComplexControl( control, p, widget, r, cg, flags, controls, active, data );
+            KStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, data );
     }
 }
 
@@ -3359,7 +3359,7 @@ TQRect KlearlookStyle::querySubControlMetrics( TQ_ComplexControl control, const
                 if ( !widget )
                     return TQRect();
 
-                int fw = tqpixelMetric( PM_SpinBoxFrameWidth, 0 );
+                int fw = pixelMetric( PM_SpinBoxFrameWidth, 0 );
                 TQSize bs;
 
                 bs.setHeight( widget->height() >> 1 );
@@ -3395,7 +3395,7 @@ TQRect KlearlookStyle::querySubControlMetrics( TQ_ComplexControl control, const
     }
 }
 
-int KlearlookStyle::tqpixelMetric( PixelMetric metric, const TQWidget *widget ) const {
+int KlearlookStyle::pixelMetric( PixelMetric metric, const TQWidget *widget ) const {
     switch ( metric ) {
         case PM_MenuButtonIndicator:
             return 7;
@@ -3408,7 +3408,7 @@ int KlearlookStyle::tqpixelMetric( PixelMetric metric, const TQWidget *widget )
         case PM_TabBarTabShiftVertical: {
                 const TQTabBar *tb = ::tqqt_cast<const TQTabBar *>( widget );
 
-                return TQTabBar::RoundedAbove == tb->tqshape() || TQTabBar::TriangularAbove == tb->tqshape()
+                return TQTabBar::RoundedAbove == tb->shape() || TQTabBar::TriangularAbove == tb->shape()
                        ? 1
                        : -1;
             }
@@ -3417,8 +3417,8 @@ int KlearlookStyle::tqpixelMetric( PixelMetric metric, const TQWidget *widget )
 
         case PM_TabBarTabVSpace: {
                 const TQTabBar * tb = ( const TQTabBar * ) widget;
-                if ( tb->tqshape() == TQTabBar::RoundedAbove ||
-                        tb->tqshape() == TQTabBar::RoundedBelow )
+                if ( tb->shape() == TQTabBar::RoundedAbove ||
+                        tb->shape() == TQTabBar::RoundedBelow )
                     return 12;
                 else
                     return 4;
@@ -3467,7 +3467,7 @@ int KlearlookStyle::tqpixelMetric( PixelMetric metric, const TQWidget *widget )
         case PM_MaximumDragDistance:
             return -1;
         default:
-            return KStyle::tqpixelMetric( metric, widget );
+            return KStyle::pixelMetric( metric, widget );
     }
 }
 
@@ -3496,8 +3496,8 @@ TQSize KlearlookStyle::tqsizeFromContents( ContentsType t,
                 bool checkable = popup->isCheckable();
 
                 if ( mi->custom() ) {
-                    w = mi->custom() ->tqsizeHint().width();
-                    h = mi->custom() ->tqsizeHint().height();
+                    w = mi->custom() ->sizeHint().width();
+                    h = mi->custom() ->sizeHint().height();
                     if ( !mi->custom() ->fullSpan() )
                         h += 4;
                 } else if ( mi->widget() ) {
@@ -3546,8 +3546,8 @@ TQSize KlearlookStyle::tqsizeFromContents( ContentsType t,
         case CT_PushButton: {
                 const TQPushButton* btn = static_cast<const TQPushButton*>( widget );
 
-                int w = s.width() + 2 * tqpixelMetric( PM_ButtonMargin, widget );
-                int h = s.height() + 2 * tqpixelMetric( PM_ButtonMargin, widget );
+                int w = s.width() + 2 * pixelMetric( PM_ButtonMargin, widget );
+                int h = s.height() + 2 * pixelMetric( PM_ButtonMargin, widget );
                 if ( btn->text().isEmpty() && s.width() < 32 )
                     return TQSize( w, h );
                 // return button size
@@ -3571,7 +3571,7 @@ TQSize KlearlookStyle::tqsizeFromContents( ContentsType t,
 
 
 
-int KlearlookStyle::tqstyleHint( StyleHint stylehint, const TQWidget *widget, const TQStyleOption &option, TQStyleHintReturn *returnData ) const {
+int KlearlookStyle::styleHint( StyleHint stylehint, const TQWidget *widget, const TQStyleOption &option, TQStyleHintReturn *returnData ) const {
     switch ( stylehint ) {
         case SH_EtchDisabledText:
         case SH_Slider_SnapToValue:
@@ -3593,7 +3593,7 @@ int KlearlookStyle::tqstyleHint( StyleHint stylehint, const TQWidget *widget, co
         case SH_PopupMenu_AllowActiveAndDisabled:
             return 0;
         default:
-            return KStyle::tqstyleHint( stylehint, widget, option, returnData );
+            return KStyle::styleHint( stylehint, widget, option, returnData );
     }
 }
 
@@ -3895,8 +3895,8 @@ bool KlearlookStyle::redrawHoverWidget() {
 
     if ( rb ) {
         TQRect rect( widgetZero.x(), widgetZero.y(),
-            tqvisualRect( subRect( SR_RadioButtonFocusRect, rb ), rb ).width() +
-            tqpixelMetric( PM_ExclusiveIndicatorWidth ) + 4, hoverWidget->height() );
+            visualRect( subRect( SR_RadioButtonFocusRect, rb ), rb ).width() +
+            pixelMetric( PM_ExclusiveIndicatorWidth ) + 4, hoverWidget->height() );
 
         hover = rect.contains( cursor ) ? HOVER_RADIO : HOVER_NONE;
         return ( HOVER_NONE != hover && !rect.contains( oldCursor ) ) ||
@@ -3906,8 +3906,8 @@ bool KlearlookStyle::redrawHoverWidget() {
 
         if ( cb ) {
             TQRect rect( widgetZero.x(), widgetZero.y(),
-                tqvisualRect( subRect( SR_CheckBoxFocusRect, cb ), cb ).width() +
-                        tqpixelMetric( PM_IndicatorWidth ) + 4, hoverWidget->height() );
+                visualRect( subRect( SR_CheckBoxFocusRect, cb ), cb ).width() +
+                        pixelMetric( PM_IndicatorWidth ) + 4, hoverWidget->height() );
 
             hover = rect.contains( cursor ) ? HOVER_CHECK : HOVER_NONE;
             return ( HOVER_NONE != hover && !rect.contains( oldCursor ) ) ||
diff --git a/src/gui/kdeext/klearlook.h b/src/gui/kdeext/klearlook.h
index 59480b2..b4c6c6f 100644
--- a/src/gui/kdeext/klearlook.h
+++ b/src/gui/kdeext/klearlook.h
@@ -260,23 +260,23 @@ class KlearlookStyle : public KStyle {
                                 const TQStyleOption & = TQStyleOption::Default ) const;
         void drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p, const TQWidget* widget, const TQRect &r,
                                   const TQColorGroup &cg, SFlags flags, const TQStyleOption &opt ) const;
-        void tqdrawControl( ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &,
+        void drawControl( ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &,
                           SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default ) const;
-        void tqdrawControlMask( ControlElement, TQPainter *, const TQWidget *, const TQRect &,
+        void drawControlMask( ControlElement, TQPainter *, const TQWidget *, const TQRect &,
                               const TQStyleOption & = TQStyleOption::Default ) const;
-        void tqdrawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r,
+        void drawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r,
                                      const TQStyleOption &data ) const;
         TQRect subRect( SubRect, const TQWidget * ) const;
-        void tqdrawComplexControl( ComplexControl, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &,
+        void drawComplexControl( ComplexControl, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &,
                                  SFlags = Style_Default, SCFlags = SC_All, SCFlags = SC_None,
                                  const TQStyleOption & = TQStyleOption::Default ) const;
         TQRect querySubControlMetrics( TQ_ComplexControl, const TQWidget *, SubControl,
                                       const TQStyleOption & = TQStyleOption::Default ) const;
-        int tqpixelMetric( PixelMetric, const TQWidget *widget = 0 ) const;
+        int pixelMetric( PixelMetric, const TQWidget *widget = 0 ) const;
         int kPixelMetric( KStylePixelMetric kpm, const TQWidget *widget ) const;
         TQSize tqsizeFromContents( ContentsType, const TQWidget *, const TQSize &,
                                 const TQStyleOption & = TQStyleOption::Default ) const;
-        int tqstyleHint( StyleHint, const TQWidget *widget = 0, const TQStyleOption & = TQStyleOption::Default,
+        int styleHint( StyleHint, const TQWidget *widget = 0, const TQStyleOption & = TQStyleOption::Default,
                        TQStyleHintReturn *returnData = 0 ) const;
 
     protected:
diff --git a/src/gui/rulers/ChordNameRuler.cpp b/src/gui/rulers/ChordNameRuler.cpp
index ca366e2..26a5145 100644
--- a/src/gui/rulers/ChordNameRuler.cpp
+++ b/src/gui/rulers/ChordNameRuler.cpp
@@ -182,15 +182,15 @@ ChordNameRuler::slotScrollHoriz(int x)
 
     if (dx > 0) { // moving right, so the existing stuff moves left
         bitBlt(this, 0, 0, this, dx, 0, w - dx, h);
-        tqrepaint(w - dx, 0, dx, h);
+        repaint(w - dx, 0, dx, h);
     } else {      // moving left, so the existing stuff moves right
         bitBlt(this, -dx, 0, this, 0, 0, w + dx, h);
-        tqrepaint(0, 0, -dx, h);
+        repaint(0, 0, -dx, h);
     }
 }
 
 TQSize
-ChordNameRuler::tqsizeHint() const
+ChordNameRuler::sizeHint() const
 {
     double width =
         m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) +
@@ -204,7 +204,7 @@ ChordNameRuler::tqsizeHint() const
 }
 
 TQSize
-ChordNameRuler::tqminimumSizeHint() const
+ChordNameRuler::minimumSizeHint() const
 {
     double firstBarWidth = m_rulerScale->getBarWidth(0);
     TQSize res = TQSize(int(firstBarWidth), m_height);
@@ -231,8 +231,8 @@ ChordNameRuler::recalculate(timeT from, timeT to)
 
     } else if (m_regetSegmentsOnChange) {
 
-        RefreshtqStatus &rs =
-            m_composition->getRefreshtqStatus(m_compositionRefreshStatusId);
+        RefreshStatus &rs =
+            m_composition->getRefreshStatus(m_compositionRefreshStatusId);
 
         if (rs.needsRefresh()) {
             rs.setNeedsRefresh(false);
@@ -304,15 +304,15 @@ ChordNameRuler::recalculate(timeT from, timeT to)
     if (m_segments.empty())
         return ;
 
-    SegmentRefreshtqStatus overalltqStatus;
-    overalltqStatus.setNeedsRefresh(false);
+    SegmentRefreshStatus overallStatus;
+    overallStatus.setNeedsRefresh(false);
 
     for (SegmentRefreshMap::iterator i = m_segments.begin();
             i != m_segments.end(); ++i) {
-        SegmentRefreshtqStatus &status =
-            i->first->getRefreshtqStatus(i->second);
+        SegmentRefreshStatus &status =
+            i->first->getRefreshStatus(i->second);
         if (status.needsRefresh()) {
-            overalltqStatus.push(status.from(), status.to());
+            overallStatus.push(status.from(), status.to());
         }
     }
 
@@ -326,17 +326,17 @@ ChordNameRuler::recalculate(timeT from, timeT to)
         if (from == to) {
             NOTATION_DEBUG << "ChordNameRuler::recalculate: from==to, recalculating all" << endl;
             level = RecalcWhole;
-        } else if (overalltqStatus.from() == overalltqStatus.to()) {
+        } else if (overallStatus.from() == overallStatus.to()) {
             NOTATION_DEBUG << "ChordNameRuler::recalculate: overallStatus.from==overallStatus.to, ignoring" << endl;
             level = RecalcNone;
-        } else if (overalltqStatus.from() >= from && overalltqStatus.to() <= to) {
-            NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overalltqStatus.from() << "->" << overalltqStatus.to() << ", I show " << from << "->" << to << ", recalculating visible area" << endl;
+        } else if (overallStatus.from() >= from && overallStatus.to() <= to) {
+            NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" << overallStatus.to() << ", I show " << from << "->" << to << ", recalculating visible area" << endl;
             level = RecalcVisible;
-        } else if (overalltqStatus.from() >= to || overalltqStatus.to() <= from) {
-            NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overalltqStatus.from() << "->" << overalltqStatus.to() << ", I show " << from << "->" << to << ", ignoring" << endl;
+        } else if (overallStatus.from() >= to || overallStatus.to() <= from) {
+            NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" << overallStatus.to() << ", I show " << from << "->" << to << ", ignoring" << endl;
             level = RecalcNone;
         } else {
-            NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overalltqStatus.from() << "->" << overalltqStatus.to() << ", I show " << from << "->" << to << ", recalculating whole" << endl;
+            NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" << overallStatus.to() << ", I show " << from << "->" << to << ", recalculating whole" << endl;
             level = RecalcWhole;
         }
     }
@@ -346,7 +346,7 @@ ChordNameRuler::recalculate(timeT from, timeT to)
 
     for (SegmentRefreshMap::iterator i = m_segments.begin();
             i != m_segments.end(); ++i) {
-        i->first->getRefreshtqStatus(i->second).setNeedsRefresh(false);
+        i->first->getRefreshStatus(i->second).setNeedsRefresh(false);
     }
 
     if (!m_currentSegment) { //!!! arbitrary, must do better
diff --git a/src/gui/rulers/ChordNameRuler.h b/src/gui/rulers/ChordNameRuler.h
index 54efd7c..9177c50 100644
--- a/src/gui/rulers/ChordNameRuler.h
+++ b/src/gui/rulers/ChordNameRuler.h
@@ -98,8 +98,8 @@ public:
     // may have one of these (to avoid using percussion tracks in chords):
     void setStudio(Studio *studio);
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     void setMinimumWidth(int width) { m_width = width; }
 
diff --git a/src/gui/rulers/ControlItem.h b/src/gui/rulers/ControlItem.h
index 2aea4b8..d3075b7 100644
--- a/src/gui/rulers/ControlItem.h
+++ b/src/gui/rulers/ControlItem.h
@@ -54,7 +54,7 @@ public:
 
     virtual void setSelected(bool yes);
 
-    /// recompute height according to represented value prior to a canvas tqrepaint
+    /// recompute height according to represented value prior to a canvas repaint
     virtual void updateFromValue();
 
     /// update value according to height after a user edit
diff --git a/src/gui/rulers/ControlRuler.cpp b/src/gui/rulers/ControlRuler.cpp
index 94c66e8..e9db070 100644
--- a/src/gui/rulers/ControlRuler.cpp
+++ b/src/gui/rulers/ControlRuler.cpp
@@ -86,7 +86,7 @@ ControlRuler::ControlRuler(Segment *segment,
 
     m_selectionRect->setPen(TQt::red);
 
-    setFixedHeight(tqsizeHint().height());
+    setFixedHeight(sizeHint().height());
 
     connect(this, TQT_SIGNAL(stateChange(const TQString&, bool)),
             m_parentEditView, TQT_SLOT(slotStateChanged(const TQString&, bool)));
@@ -113,7 +113,7 @@ void ControlRuler::slotUpdate()
     canvas()->setAllChanged(); // TODO: be a bit more subtle, call setChanged(<time area>)
 
     canvas()->update();
-    tqrepaint();
+    repaint();
 }
 
 void ControlRuler::slotUpdateElementsHPos()
@@ -308,7 +308,7 @@ void ControlRuler::contentsMouseMoveEvent(TQMouseEvent* e)
 
     // Borrowed from Rotary - compute total position within window
     //
-    TQPoint totalPos = mapTo(tqtopLevelWidget(), TQPoint(0, 0));
+    TQPoint totalPos = mapTo(topLevelWidget(), TQPoint(0, 0));
 
     int scrollX = dynamic_cast<EditView*>(m_parentEditView)->getRawCanvasView()->
                   horizontalScrollBar()->value();
@@ -335,7 +335,7 @@ void ControlRuler::contentsMouseMoveEvent(TQMouseEvent* e)
             // set value to highest in selection
             if (item->getValue() >= value) {
                 value = item->getValue();
-                m_numberFloat->setText(TQString("%1").tqarg(value));
+                m_numberFloat->setText(TQString("%1").arg(value));
             }
         }
     }
@@ -393,7 +393,7 @@ void ControlRuler::createMenu()
 {
     RG_DEBUG << "ControlRuler::createMenu()\n";
 
-    KMainWindow* parentMainWindow = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
+    KMainWindow* parentMainWindow = dynamic_cast<KMainWindow*>(topLevelWidget());
 
     if (parentMainWindow && parentMainWindow->factory()) {
         m_menu = static_cast<TQPopupMenu*>(parentMainWindow->factory()->container(m_menuName, parentMainWindow));
diff --git a/src/gui/rulers/ControllerEventsRuler.cpp b/src/gui/rulers/ControllerEventsRuler.cpp
index a6a7d2f..fef6e15 100644
--- a/src/gui/rulers/ControllerEventsRuler.cpp
+++ b/src/gui/rulers/ControllerEventsRuler.cpp
@@ -191,9 +191,9 @@ TQString ControllerEventsRuler::getName()
             TQString hexValue;
             hexValue.sprintf("0x%x", m_controller->getControllerValue());
 
-            name = TQString("%1 (%2 / %3)").tqarg(strtoqstr(m_controller->getName()))
-                   .tqarg(int(m_controller->getControllerValue()))
-                   .tqarg(hexValue);
+            name = TQString("%1 (%2 / %3)").arg(strtoqstr(m_controller->getName()))
+                   .arg(int(m_controller->getControllerValue()))
+                   .arg(hexValue);
         } else if (m_controller->getType() == PitchBend::EventType) {
             name = i18n("Pitch Bend");
         }
@@ -395,7 +395,7 @@ void ControllerEventsRuler::contentsMouseReleaseEvent(TQMouseEvent *e)
         << ", endValue = " << endValue
         << endl;
 
-        tqdrawControlLine(startTime, endTime, startValue, endValue);
+        drawControlLine(startTime, endTime, startValue, endValue);
 
         m_controlLineShowing = false;
         m_controlLine->hide();
@@ -445,7 +445,7 @@ void ControllerEventsRuler::layoutItem(ControlItem* item)
 }
 
 void
-ControllerEventsRuler::tqdrawControlLine(timeT startTime,
+ControllerEventsRuler::drawControlLine(timeT startTime,
                                        timeT endTime,
                                        int startValue,
                                        int endValue)
diff --git a/src/gui/rulers/ControllerEventsRuler.h b/src/gui/rulers/ControllerEventsRuler.h
index fc1d1f6..9f077fc 100644
--- a/src/gui/rulers/ControllerEventsRuler.h
+++ b/src/gui/rulers/ControllerEventsRuler.h
@@ -96,7 +96,7 @@ protected:
 
     virtual void layoutItem(ControlItem*);
 
-    void tqdrawControlLine(timeT startTime,
+    void drawControlLine(timeT startTime,
                          timeT endTime,
                          int startValue,
                          int endValue);
diff --git a/src/gui/rulers/LoopRuler.cpp b/src/gui/rulers/LoopRuler.cpp
index 885d7fc..b8b45fe 100644
--- a/src/gui/rulers/LoopRuler.cpp
+++ b/src/gui/rulers/LoopRuler.cpp
@@ -103,7 +103,7 @@ void LoopRuler::scrollHoriz(int x)
 {
     if (getHScaleFactor() != 1.0) {
         m_currentXOffset = static_cast<int>( -x / getHScaleFactor());
-        tqrepaint();
+        repaint();
         return;
     }
 
@@ -118,14 +118,14 @@ void LoopRuler::scrollHoriz(int x)
 
     if (dx > 0) { // moving right, so the existing stuff moves left
         bitBlt(this, 0, 0, this, dx, 0, w - dx, h);
-        tqrepaint(w - dx, 0, dx, h);
+        repaint(w - dx, 0, dx, h);
     } else {      // moving left, so the existing stuff moves right
         bitBlt(this, -dx, 0, this, 0, 0, w + dx, h);
-        tqrepaint(0, 0, -dx, h);
+        repaint(0, 0, -dx, h);
     }
 }
 
-TQSize LoopRuler::tqsizeHint() const
+TQSize LoopRuler::sizeHint() const
 {
     double width =
         m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) +
@@ -137,7 +137,7 @@ TQSize LoopRuler::tqsizeHint() const
     return res;
 }
 
-TQSize LoopRuler::tqminimumSizeHint() const
+TQSize LoopRuler::minimumSizeHint() const
 {
     double firstBarWidth = m_rulerScale->getBarWidth(0) + m_xorigin;
 
@@ -156,7 +156,7 @@ void LoopRuler::paintEvent(TQPaintEvent* e)
     paint.setClipRegion(e->region());
     paint.setClipRect(e->rect().normalize());
 
-    paint.setBrush(tqcolorGroup().foreground());
+    paint.setBrush(colorGroup().foreground());
     drawBarSections(&paint);
     drawLoopMarker(&paint);
     
@@ -352,7 +352,7 @@ void LoopRuler::slotSetLoopMarker(timeT startLoop,
     m_endLoop = endLoop;
 
     TQPainter paint(this);
-    paint.setBrush(tqcolorGroup().foreground());
+    paint.setBrush(colorGroup().foreground());
     drawBarSections(&paint);
     drawLoopMarker(&paint);
 
diff --git a/src/gui/rulers/LoopRuler.h b/src/gui/rulers/LoopRuler.h
index 1d1fb19..f745cd0 100644
--- a/src/gui/rulers/LoopRuler.h
+++ b/src/gui/rulers/LoopRuler.h
@@ -69,8 +69,8 @@ public:
 
     void setSnapGrid(SnapGrid *grid);
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     void scrollHoriz(int x);
 
diff --git a/src/gui/rulers/MarkerRuler.cpp b/src/gui/rulers/MarkerRuler.cpp
index 749dfef..938bfe5 100644
--- a/src/gui/rulers/MarkerRuler.cpp
+++ b/src/gui/rulers/MarkerRuler.cpp
@@ -36,7 +36,7 @@
 #include "commands/edit/ModifyMarkerCommand.h"
 #include "document/MultiViewCommandHistory.h"
 #include <kxmlguifactory.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcursor.h>
 #include <tqfont.h>
 #include <tqfontmetrics.h>
@@ -156,11 +156,11 @@ void
 MarkerRuler::scrollHoriz(int x)
 {
     m_currentXOffset = static_cast<int>( -x / getHScaleFactor());
-    tqrepaint();
+    repaint();
 }
 
 TQSize 
-MarkerRuler::tqsizeHint() const
+MarkerRuler::sizeHint() const
 {
     int lastBar =
         m_rulerScale->getLastVisibleBar();
@@ -172,7 +172,7 @@ MarkerRuler::tqsizeHint() const
 }
 
 TQSize 
-MarkerRuler::tqminimumSizeHint() const
+MarkerRuler::minimumSizeHint() const
 {
     double firstBarWidth = m_rulerScale->getBarWidth(0) + m_xorigin;
 
@@ -366,7 +366,7 @@ MarkerRuler::paintEvent(TQPaintEvent*)
             painter.setWorldXForm(false);
 
             if (i >= 0)
-                painter.drawText(textDrawPoint, TQString("%1").tqarg(i + 1));
+                painter.drawText(textDrawPoint, TQString("%1").arg(i + 1));
 
             painter.setWorldXForm(enableXForm);
         } else {
diff --git a/src/gui/rulers/MarkerRuler.h b/src/gui/rulers/MarkerRuler.h
index 748108c..9d160d8 100644
--- a/src/gui/rulers/MarkerRuler.h
+++ b/src/gui/rulers/MarkerRuler.h
@@ -63,8 +63,8 @@ public:
 
     virtual ~MarkerRuler();
     
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     void scrollHoriz(int x);
 
diff --git a/src/gui/rulers/PercussionPitchRuler.cpp b/src/gui/rulers/PercussionPitchRuler.cpp
index 16b9558..ec2b00f 100644
--- a/src/gui/rulers/PercussionPitchRuler.cpp
+++ b/src/gui/rulers/PercussionPitchRuler.cpp
@@ -63,13 +63,13 @@ PercussionPitchRuler::PercussionPitchRuler(TQWidget *parent,
     setMouseTracking(true);
 }
 
-TQSize PercussionPitchRuler::tqsizeHint() const
+TQSize PercussionPitchRuler::sizeHint() const
 {
     return TQSize(m_width,
                  (m_lineSpacing + 1) * m_mapping->getPitchExtent());
 }
 
-TQSize PercussionPitchRuler::tqminimumSizeHint() const
+TQSize PercussionPitchRuler::minimumSizeHint() const
 {
     return TQSize(m_width, m_lineSpacing + 1);
 }
@@ -159,7 +159,7 @@ void PercussionPitchRuler::mouseMoveEvent(TQMouseEvent* e)
 {
     // ugh
 
-    MatrixView *matrixView = dynamic_cast<MatrixView*>(tqtopLevelWidget());
+    MatrixView *matrixView = dynamic_cast<MatrixView*>(topLevelWidget());
     if (matrixView) {
         MatrixStaff *staff = matrixView->getStaff(0);
         if (staff) {
diff --git a/src/gui/rulers/PercussionPitchRuler.h b/src/gui/rulers/PercussionPitchRuler.h
index 0bb05db..1e63b92 100644
--- a/src/gui/rulers/PercussionPitchRuler.h
+++ b/src/gui/rulers/PercussionPitchRuler.h
@@ -53,8 +53,8 @@ public:
                          const MidiKeyMapping *mapping,
                          int lineSpacing);
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     void drawHoverNote(int evPitch);
 
diff --git a/src/gui/rulers/PitchRuler.cpp b/src/gui/rulers/PitchRuler.cpp
index 117fb87..7817bb8 100644
--- a/src/gui/rulers/PitchRuler.cpp
+++ b/src/gui/rulers/PitchRuler.cpp
@@ -40,15 +40,15 @@ PitchRuler(TQWidget *parent) :
 }
 
 TQSize
-PitchRuler::tqsizeHint() const
+PitchRuler::sizeHint() const
 {
-    return TQWidget::tqsizeHint();
+    return TQWidget::sizeHint();
 }
 
 TQSize
-PitchRuler::tqminimumSizeHint() const
+PitchRuler::minimumSizeHint() const
 {
-    return TQWidget::tqminimumSizeHint();
+    return TQWidget::minimumSizeHint();
 }
 
 }
diff --git a/src/gui/rulers/PitchRuler.h b/src/gui/rulers/PitchRuler.h
index 9e6bd19..715f1d4 100644
--- a/src/gui/rulers/PitchRuler.h
+++ b/src/gui/rulers/PitchRuler.h
@@ -44,8 +44,8 @@ class PitchRuler : public TQWidget
 public:
     PitchRuler(TQWidget *parent);
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     virtual void drawHoverNote(int evPitch) = 0;
 
diff --git a/src/gui/rulers/PropertyBox.cpp b/src/gui/rulers/PropertyBox.cpp
index 06880c1..f98300d 100644
--- a/src/gui/rulers/PropertyBox.cpp
+++ b/src/gui/rulers/PropertyBox.cpp
@@ -47,13 +47,13 @@ PropertyBox::PropertyBox(TQString label,
 {}
 
 TQSize
-PropertyBox::tqsizeHint() const
+PropertyBox::sizeHint() const
 {
     return TQSize(m_width, m_height);
 }
 
 TQSize
-PropertyBox::tqminimumSizeHint() const
+PropertyBox::minimumSizeHint() const
 {
     return TQSize(m_width, m_height);
 }
diff --git a/src/gui/rulers/PropertyBox.h b/src/gui/rulers/PropertyBox.h
index 9df80aa..b5aba14 100644
--- a/src/gui/rulers/PropertyBox.h
+++ b/src/gui/rulers/PropertyBox.h
@@ -56,8 +56,8 @@ public:
                TQWidget *parent=0,
                const char *name = 0);
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
 protected:
     virtual void paintEvent(TQPaintEvent *);
diff --git a/src/gui/rulers/PropertyViewRuler.cpp b/src/gui/rulers/PropertyViewRuler.cpp
index 8998049..2a39713 100644
--- a/src/gui/rulers/PropertyViewRuler.cpp
+++ b/src/gui/rulers/PropertyViewRuler.cpp
@@ -69,7 +69,7 @@ PropertyViewRuler::PropertyViewRuler(RulerScale *rulerScale,
 
     setBackgroundColor(GUIPalette::getColour(GUIPalette::SegmentCanvas));
 
-    TQString tip = i18n("%1 controller").tqarg(strtoqstr(property));
+    TQString tip = i18n("%1 controller").arg(strtoqstr(property));
     TQToolTip::add
         (this, tip);
 }
@@ -94,15 +94,15 @@ PropertyViewRuler::slotScrollHoriz(int x)
 
     if (dx > 0) { // moving right, so the existing stuff moves left
         bitBlt(this, 0, 0, this, dx, 0, w - dx, h);
-        tqrepaint(w - dx, 0, dx, h);
+        repaint(w - dx, 0, dx, h);
     } else {      // moving left, so the existing stuff moves right
         bitBlt(this, -dx, 0, this, 0, 0, w + dx, h);
-        tqrepaint(0, 0, -dx, h);
+        repaint(0, 0, -dx, h);
     }
 }
 
 TQSize
-PropertyViewRuler::tqsizeHint() const
+PropertyViewRuler::sizeHint() const
 {
     double width =
         m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) +
@@ -115,7 +115,7 @@ PropertyViewRuler::tqsizeHint() const
 }
 
 TQSize
-PropertyViewRuler::tqminimumSizeHint() const
+PropertyViewRuler::minimumSizeHint() const
 {
     double firstBarWidth = m_rulerScale->getBarWidth(0) + m_xorigin;
     TQSize res = TQSize(int(firstBarWidth), m_height);
diff --git a/src/gui/rulers/PropertyViewRuler.h b/src/gui/rulers/PropertyViewRuler.h
index ff275ed..f5740fd 100644
--- a/src/gui/rulers/PropertyViewRuler.h
+++ b/src/gui/rulers/PropertyViewRuler.h
@@ -64,8 +64,8 @@ public:
 
     ~PropertyViewRuler();
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     void setMinimumWidth(int width) { m_width = width; }
 
diff --git a/src/gui/rulers/RawNoteRuler.cpp b/src/gui/rulers/RawNoteRuler.cpp
index 75ddc37..30029bc 100644
--- a/src/gui/rulers/RawNoteRuler.cpp
+++ b/src/gui/rulers/RawNoteRuler.cpp
@@ -86,15 +86,15 @@ RawNoteRuler::slotScrollHoriz(int x)
 
     if (dx > 0) { // moving right, so the existing stuff moves left
         bitBlt(this, 0, 0, this, dx, 0, w - dx, h);
-        tqrepaint(w - dx, 0, dx, h);
+        repaint(w - dx, 0, dx, h);
     } else {      // moving left, so the existing stuff moves right
         bitBlt(this, -dx, 0, this, 0, 0, w + dx, h);
-        tqrepaint(0, 0, -dx, h);
+        repaint(0, 0, -dx, h);
     }
 }
 
 TQSize
-RawNoteRuler::tqsizeHint() const
+RawNoteRuler::sizeHint() const
 {
     double width =
         m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) +
@@ -107,7 +107,7 @@ RawNoteRuler::tqsizeHint() const
 }
 
 TQSize
-RawNoteRuler::tqminimumSizeHint() const
+RawNoteRuler::minimumSizeHint() const
 {
     double firstBarWidth = m_rulerScale->getBarWidth(0) + m_xorigin;
     TQSize res = TQSize(int(firstBarWidth), m_height);
@@ -182,7 +182,7 @@ RawNoteRuler::addChildren(Segment *s,
         else
             rightmost = j;
 
-        node->tqchildren.push_back(subnode);
+        node->children.push_back(subnode);
         j = s->findTime(jex.second);
     }
 
@@ -263,8 +263,8 @@ RawNoteRuler::dumpSubtree(EventTreeNode *node, int depth)
     else {
         std::cerr << "no-pitch]" << std::endl;
     }
-    for (EventTreeNode::NodeList::iterator i = node->tqchildren.begin();
-            i != node->tqchildren.end(); ++i) {
+    for (EventTreeNode::NodeList::iterator i = node->children.begin();
+            i != node->children.end(); ++i) {
         dumpSubtree(*i, depth + 1);
     }
 #endif
@@ -292,14 +292,14 @@ RawNoteRuler::dumpForest(EventTreeNode::NodeList *forest)
 int
 RawNoteRuler::EventTreeNode::getDepth()
 {
-    int subtqchildrenDepth = 0;
-    for (NodeList::iterator i = tqchildren.begin();
-            i != tqchildren.end(); ++i) {
+    int subchildrenDepth = 0;
+    for (NodeList::iterator i = children.begin();
+            i != children.end(); ++i) {
         int subchildDepth = (*i)->getDepth();
-        if (subchildDepth > subtqchildrenDepth)
-            subtqchildrenDepth = subchildDepth;
+        if (subchildDepth > subchildrenDepth)
+            subchildrenDepth = subchildDepth;
     }
-    return subtqchildrenDepth + 1;
+    return subchildrenDepth + 1;
 }
 
 int
@@ -312,8 +312,8 @@ RawNoteRuler::EventTreeNode::getChildrenAboveOrBelow(bool below, int p)
 
     int max = 0;
 
-    for (NodeList::iterator i = tqchildren.begin();
-            i != tqchildren.end(); ++i) {
+    for (NodeList::iterator i = children.begin();
+            i != children.end(); ++i) {
         int forThisChild = (*i)->getChildrenAboveOrBelow(below, pitch);
         long thisChildPitch = pitch;
         (*(*i)->node)->get
@@ -339,7 +339,7 @@ RawNoteRuler::drawNode(TQPainter &paint, DefaultVelocityColour &vc,
 
     int below = node->getChildrenAboveOrBelow(true);
 
-    NOTATION_DEBUG << "RawNoteRuler::drawNode: tqchildren above: "
+    NOTATION_DEBUG << "RawNoteRuler::drawNode: children above: "
     << above << ", below: " << below << endl;
 #endif
 
@@ -414,8 +414,8 @@ RawNoteRuler::drawNode(TQPainter &paint, DefaultVelocityColour &vc,
     paint.drawLine(ui0, iy + 1, ui0, iy + ih - 1);
     paint.drawLine(ui1 - 1, iy + 1, ui1 - 1, iy + ih - 1);
 
-    for (EventTreeNode::NodeList::iterator i = node->tqchildren.begin();
-            i != node->tqchildren.end(); ++i) {
+    for (EventTreeNode::NodeList::iterator i = node->children.begin();
+            i != node->children.end(); ++i) {
 
         long nodePitch = myPitch;
         (*(*i)->node)->get
@@ -451,9 +451,9 @@ RawNoteRuler::paintEvent(TQPaintEvent* e)
             trackPosition = track->getPosition();
 
 	TQToolTip::add(this,i18n("Track #%1, Segment \"%2\" (runtime id %3)")
-		           .tqarg(trackPosition + 1)
-		           .tqarg(m_segment->getLabel().c_str())
-		           .tqarg(m_segment->getRuntimeId()));
+		           .arg(trackPosition + 1)
+		           .arg(m_segment->getLabel().c_str())
+		           .arg(m_segment->getRuntimeId()));
     }
 
     //    START_TIMING;
diff --git a/src/gui/rulers/RawNoteRuler.h b/src/gui/rulers/RawNoteRuler.h
index 7690ad1..6878785 100644
--- a/src/gui/rulers/RawNoteRuler.h
+++ b/src/gui/rulers/RawNoteRuler.h
@@ -71,8 +71,8 @@ public:
         m_segment = segment;
     }
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     void setMinimumWidth(int width) { m_width = width; }
 
@@ -97,8 +97,8 @@ private:
         
         EventTreeNode(Segment::iterator n) : node(n) { }
         ~EventTreeNode() {
-            for (NodeList::iterator i = tqchildren.begin();
-                 i != tqchildren.end(); ++i) {
+            for (NodeList::iterator i = children.begin();
+                 i != children.end(); ++i) {
                 delete *i;
             }
         }
@@ -107,7 +107,7 @@ private:
         int getChildrenAboveOrBelow(bool below = false, int pitch = -1);
         
         Segment::iterator node;
-        NodeList tqchildren;
+        NodeList children;
     };
 
     std::pair<timeT, timeT> getExtents(Segment::iterator);
diff --git a/src/gui/rulers/TempoRuler.cpp b/src/gui/rulers/TempoRuler.cpp
index 8aba08b..30d6108 100644
--- a/src/gui/rulers/TempoRuler.cpp
+++ b/src/gui/rulers/TempoRuler.cpp
@@ -231,10 +231,10 @@ TempoRuler::slotScrollHoriz(int x)
 
     if (dx > 0) { // moving right, so the existing stuff moves left
         bitBlt(this, 0, 0, this, dx, 0, w - dx, h);
-        tqrepaint(w - dx, 0, dx, h);
+        repaint(w - dx, 0, dx, h);
     } else {      // moving left, so the existing stuff moves right
         bitBlt(this, -dx, 0, this, 0, 0, w + dx, h);
-        tqrepaint(0, 0, -dx, h);
+        repaint(0, 0, -dx, h);
     }
 }
 
@@ -555,20 +555,20 @@ TempoRuler::showTextFloat(tempoT tempo, tempoT target,
 
             // blargh -- duplicated with TempoView::makeTimeString
             timeText = 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);
 
             timeText = TQString("%1\n%2")
-                       .tqarg(timeText)
-                       //		.tqarg(rt.toString().c_str());
-                       .tqarg(rt.toText(true).c_str());
+                       .arg(timeText)
+                       //		.arg(rt.toString().c_str());
+                       .arg(rt.toText(true).c_str());
         }
 
         TimeSignature sig =
@@ -586,14 +586,14 @@ TempoRuler::showTextFloat(tempoT tempo, tempoT target,
             int b00 = int(bpm * 100 + 0.0001) % 10;
 
             tempoText = i18n("%1.%2%3 (%4.%5%6 bpm)")
-                        .tqarg(qi).tqarg(q0).tqarg(q00)
-                        .tqarg(bi).tqarg(b0).tqarg(b00);
+                        .arg(qi).arg(q0).arg(q00)
+                        .arg(bi).arg(b0).arg(b00);
             haveSet = true;
         }
     }
 
     if (!haveSet) {
-        tempoText = i18n("%1.%2%3 bpm").tqarg(qi).tqarg(q0).tqarg(q00);
+        tempoText = i18n("%1.%2%3 bpm").arg(qi).arg(q0).arg(q00);
     }
 
     if (target > 0 && target != tempo) {
@@ -601,11 +601,11 @@ TempoRuler::showTextFloat(tempoT tempo, tempoT target,
         int tqi = int(tq + 0.0001);
         int tq0 = int(tq * 10 + 0.0001) % 10;
         int tq00 = int(tq * 100 + 0.0001) % 10;
-        tempoText = i18n("%1 - %2.%3%4").tqarg(tempoText).tqarg(tqi).tqarg(tq0).tqarg(tq00);
+        tempoText = i18n("%1 - %2.%3%4").arg(tempoText).arg(tqi).arg(tq0).arg(tq00);
     }
 
     if (showTime && time >= 0) {
-        m_textFloat->setText(TQString("%1\n%2").tqarg(timeText).tqarg(tempoText));
+        m_textFloat->setText(TQString("%1\n%2").arg(timeText).arg(tempoText));
     } else {
         m_textFloat->setText(tempoText);
     }
@@ -630,7 +630,7 @@ TempoRuler::showTextFloat(tempoT tempo, tempoT target,
 }
 
 TQSize
-TempoRuler::tqsizeHint() const
+TempoRuler::sizeHint() const
 {
     double width =
         m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) +
@@ -643,7 +643,7 @@ TempoRuler::tqsizeHint() const
 }
 
 TQSize
-TempoRuler::tqminimumSizeHint() const
+TempoRuler::minimumSizeHint() const
 {
     double firstBarWidth = m_rulerScale->getBarWidth(0) + m_xorigin;
     TQSize res = TQSize(int(firstBarWidth), m_height);
@@ -917,8 +917,8 @@ TempoRuler::paintEvent(TQPaintEvent* e)
                 m_composition->getTimeSignatureAt(time);
 
             TQString str = TQString("%1/%2")
-                          .tqarg(sig.getNumerator())
-                          .tqarg(sig.getDenominator());
+                          .arg(sig.getNumerator())
+                          .arg(sig.getDenominator());
 
             paint.setFont(m_boldFont);
             paint.drawText(static_cast<int>(x) + 2, m_height - 2, str);
@@ -930,7 +930,7 @@ TempoRuler::paintEvent(TQPaintEvent* e)
             long bpm = long(tempo);
             //	    long frac = long(tempo * 100 + 0.001) - 100 * bpm;
 
-            TQString tempoString = TQString("%1").tqarg(bpm);
+            TQString tempoString = TQString("%1").arg(bpm);
 
             if (tempo == prevTempo) {
                 if (m_small)
diff --git a/src/gui/rulers/TempoRuler.h b/src/gui/rulers/TempoRuler.h
index 8327b13..afe1614 100644
--- a/src/gui/rulers/TempoRuler.h
+++ b/src/gui/rulers/TempoRuler.h
@@ -82,8 +82,8 @@ public:
 
     ~TempoRuler();
     
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     void setMinimumWidth(int width) { m_width = width; }
 
diff --git a/src/gui/rulers/TextRuler.cpp b/src/gui/rulers/TextRuler.cpp
index a170b7a..0e1eda4 100644
--- a/src/gui/rulers/TextRuler.cpp
+++ b/src/gui/rulers/TextRuler.cpp
@@ -84,15 +84,15 @@ TextRuler::slotScrollHoriz(int x)
 
     if (dx > 0) { // moving right, so the existing stuff moves left
         bitBlt(this, 0, 0, this, dx, 0, w - dx, h);
-        tqrepaint(w - dx, 0, dx, h);
+        repaint(w - dx, 0, dx, h);
     } else {      // moving left, so the existing stuff moves right
         bitBlt(this, -dx, 0, this, 0, 0, w + dx, h);
-        tqrepaint(0, 0, -dx, h);
+        repaint(0, 0, -dx, h);
     }
 }
 
 TQSize
-TextRuler::tqsizeHint() const
+TextRuler::sizeHint() const
 {
     double width =
         m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) +
@@ -104,7 +104,7 @@ TextRuler::tqsizeHint() const
 }
 
 TQSize
-TextRuler::tqminimumSizeHint() const
+TextRuler::minimumSizeHint() const
 {
     double firstBarWidth = m_rulerScale->getBarWidth(0);
     TQSize res = TQSize(int(firstBarWidth), m_height);
diff --git a/src/gui/rulers/TextRuler.h b/src/gui/rulers/TextRuler.h
index 057b384..9edbe20 100644
--- a/src/gui/rulers/TextRuler.h
+++ b/src/gui/rulers/TextRuler.h
@@ -82,8 +82,8 @@ public:
 
     ~TextRuler();
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     void setMinimumWidth(int width) { m_width = width; }
 
diff --git a/src/gui/seqmanager/CompositionMmapper.cpp b/src/gui/seqmanager/CompositionMmapper.cpp
index 778b655..869e68c 100644
--- a/src/gui/seqmanager/CompositionMmapper.cpp
+++ b/src/gui/seqmanager/CompositionMmapper.cpp
@@ -147,8 +147,8 @@ TQString CompositionMmapper::makeFileName(Segment* segment)
     TQStringList tmpDirs = KGlobal::dirs()->resourceDirs("tmp");
 
     return TQString("%1/segment_%2")
-           .tqarg(tmpDirs.last())
-           .tqarg((uintptr_t)segment, 0, 16);
+           .arg(tmpDirs.last())
+           .arg((uintptr_t)segment, 0, 16);
 }
 
 TQString CompositionMmapper::getSegmentFileName(Segment* s)
diff --git a/src/gui/seqmanager/ControlBlockMmapper.cpp b/src/gui/seqmanager/ControlBlockMmapper.cpp
index cfe24be..6e4560d 100644
--- a/src/gui/seqmanager/ControlBlockMmapper.cpp
+++ b/src/gui/seqmanager/ControlBlockMmapper.cpp
@@ -76,7 +76,7 @@ ControlBlockMmapper::ControlBlockMmapper(RosegardenGUIDoc* doc)
                              MAP_SHARED, m_fd, 0);
 
     if (m_mmappedBuffer == (void*) - 1) {
-        SETQMAN_DEBUG << TQString("mmap failed : (%1) %2\n").tqarg(errno).tqarg(strerror(errno));
+        SETQMAN_DEBUG << TQString("mmap failed : (%1) %2\n").arg(errno).arg(strerror(errno));
         throw Exception("mmap failed");
     }
 
diff --git a/src/gui/seqmanager/SegmentMmapper.cpp b/src/gui/seqmanager/SegmentMmapper.cpp
index 9cb8ef0..63f79b3 100644
--- a/src/gui/seqmanager/SegmentMmapper.cpp
+++ b/src/gui/seqmanager/SegmentMmapper.cpp
@@ -234,7 +234,7 @@ void SegmentMmapper::remap(size_t newsize)
 #endif
 
         if (m_mmappedRegion == (void*) - 1) {
-            SETQMAN_DEBUG << TQString("mremap failed : (%1) %2\n").tqarg(errno).tqarg(strerror(errno));
+            SETQMAN_DEBUG << TQString("mremap failed : (%1) %2\n").arg(errno).arg(strerror(errno));
             throw Exception("mremap failed");
         }
 
@@ -253,7 +253,7 @@ void SegmentMmapper::doMmap()
     m_mmappedEventBuffer = (MappedEvent *)((size_t *)m_mmappedRegion + 1);
 
     if (m_mmappedRegion == (void*) - 1) {
-        SETQMAN_DEBUG << TQString("mmap failed : (%1) %2\n").tqarg(errno).tqarg(strerror(errno));
+        SETQMAN_DEBUG << TQString("mmap failed : (%1) %2\n").arg(errno).arg(strerror(errno));
         throw Exception("mmap failed");
     }
 
diff --git a/src/gui/seqmanager/SequenceManager.cpp b/src/gui/seqmanager/SequenceManager.cpp
index 02a37d9..b05a3d4 100644
--- a/src/gui/seqmanager/SequenceManager.cpp
+++ b/src/gui/seqmanager/SequenceManager.cpp
@@ -90,8 +90,8 @@ SequenceManager::SequenceManager(RosegardenGUIDoc *doc,
             m_metronomeMmapper(SegmentMmapperFactory::makeMetronome(m_doc)),
             m_tempoSegmentMmapper(SegmentMmapperFactory::makeTempo(m_doc)),
             m_timeSigSegmentMmapper(SegmentMmapperFactory::makeTimeSig(m_doc)),
-            m_transporttqStatus(STOPPED),
-            m_soundDrivertqStatus(NO_DRIVER),
+            m_transportStatus(STOPPED),
+            m_soundDriverStatus(NO_DRIVER),
             m_transport(transport),
             m_lastRewoundAt(clock()),
             m_countdownDialog(0),
@@ -133,7 +133,7 @@ SequenceManager::SequenceManager(RosegardenGUIDoc *doc,
     m_doc->getComposition().addObserver(this);
 
     // The owner of this sequence manager will need to call
-    // checkSoundDrivertqStatus on it to set up its status appropriately
+    // checkSoundDriverStatus on it to set up its status appropriately
     // immediately after construction; we used to do it from here but
     // we're not well placed to handle reporting to the user if it
     // throws an exception (and we don't want to leave the object half
@@ -228,9 +228,9 @@ void SequenceManager::setDocument(RosegardenGUIDoc* doc)
 }
 
 void
-SequenceManager::setTransporttqStatus(const TransporttqStatus &status)
+SequenceManager::setTransportStatus(const TransportStatus &status)
 {
-    m_transporttqStatus = status;
+    m_transportStatus = status;
 }
 
 void
@@ -256,14 +256,14 @@ SequenceManager::play()
 
     // If already playing or recording then stop
     //
-    if (m_transporttqStatus == PLAYING ||
-            m_transporttqStatus == RECORDING ) {
+    if (m_transportStatus == PLAYING ||
+            m_transportStatus == RECORDING ) {
         stopping();
         return true;
     }
 
     // This check may throw an exception
-    checkSoundDrivertqStatus(false);
+    checkSoundDriverStatus(false);
 
     // Align Instrument lists and send initial program changes
     //
@@ -369,7 +369,7 @@ SequenceManager::play()
     // Send Play to the Sequencer
     if (!rgapp->sequencerCall("play(long int, long int, long int, long int, long int, long int, long int, long int, long int, long int, long int)",
                               replyType, replyData, data)) {
-        m_transporttqStatus = STOPPED;
+        m_transportStatus = STOPPED;
         return false;
     }
 
@@ -380,9 +380,9 @@ SequenceManager::play()
 
     if (result) {
         // completed successfully
-        m_transporttqStatus = STARTING_TO_PLAY;
+        m_transportStatus = STARTING_TO_PLAY;
     } else {
-        m_transporttqStatus = STOPPED;
+        m_transportStatus = STOPPED;
         std::cerr << "ERROR: SequenceManager::play(): Failed to start playback!" << std::endl;
     }
 
@@ -400,7 +400,7 @@ SequenceManager::stopping()
     // Do this here rather than in stop() to avoid any potential
     // race condition (we use setPointerPosition() during stop()).
     //
-    if (m_transporttqStatus == STOPPED) {
+    if (m_transportStatus == STOPPED) {
         /*!!!
                 if (m_doc->getComposition().isLooping())
                     m_doc->slotSetPointerPosition(m_doc->getComposition().getLoopStart());
@@ -414,8 +414,8 @@ SequenceManager::stopping()
 
     // Disarm recording and drop back to STOPPED
     //
-    if (m_transporttqStatus == RECORDING_ARMED) {
-        m_transporttqStatus = STOPPED;
+    if (m_transportStatus == RECORDING_ARMED) {
+        m_transportStatus = STOPPED;
         m_transport->RecordButton()->setOn(false);
         m_transport->MetronomeButton()->
         setOn(m_doc->getComposition().usePlayMetronome());
@@ -436,7 +436,7 @@ SequenceManager::stop()
 {
     // Toggle off the buttons - first record
     //
-    if (m_transporttqStatus == RECORDING) {
+    if (m_transportStatus == RECORDING) {
         m_transport->RecordButton()->setOn(false);
         m_transport->MetronomeButton()->
         setOn(m_doc->getComposition().usePlayMetronome());
@@ -477,12 +477,12 @@ SequenceManager::stop()
     // restore
     TQApplication::restoreOverrideCursor();
 
-    TransporttqStatus status = m_transporttqStatus;
+    TransportStatus status = m_transportStatus;
 
     // set new transport status first, so that if we're stopping
     // recording we don't risk the record segment being restored by a
     // timer while the document is busy trying to do away with it
-    m_transporttqStatus = STOPPED;
+    m_transportStatus = STOPPED;
 
     // if we're recording MIDI or Audio then tidy up the recording Segment
     if (status == RECORDING) {
@@ -515,7 +515,7 @@ SequenceManager::rewind()
     std::pair<timeT, timeT> barRange =
         composition.getBarRangeForTime(position - 1);
 
-    if (m_transporttqStatus == PLAYING) {
+    if (m_transportStatus == PLAYING) {
 
         // if we're playing and we had a rewind request less than 200ms
         // ago and we're some way into the bar but less than half way
@@ -563,10 +563,10 @@ SequenceManager::fastforward()
 }
 
 void
-SequenceManager::notifySequencertqStatus(TransporttqStatus status)
+SequenceManager::notifySequencerStatus(TransportStatus status)
 {
     // for the moment we don't do anything fancy
-    m_transporttqStatus = status;
+    m_transportStatus = status;
 
 }
 
@@ -611,7 +611,7 @@ SequenceManager::record(bool toggled)
         Instrument *instr = studio.getInstrumentById(instrId);
 
         if (instr && instr->getType() == Instrument::Audio) {
-            if (!m_doc || !(m_soundDrivertqStatus & AUDIO_OK)) {
+            if (!m_doc || !(m_soundDriverStatus & AUDIO_OK)) {
                 m_transport->RecordButton()->setOn(false);
                 throw(Exception("Audio subsystem is not available - can't record audio"));
             }
@@ -623,9 +623,9 @@ SequenceManager::record(bool toggled)
 
     if (toggled) { // preparing record or punch-in record
 
-        if (m_transporttqStatus == RECORDING_ARMED) {
+        if (m_transportStatus == RECORDING_ARMED) {
             SETQMAN_DEBUG << "SequenceManager::record - unarming record\n";
-            m_transporttqStatus = STOPPED;
+            m_transportStatus = STOPPED;
 
             // Toggle the buttons
             m_transport->MetronomeButton()->setOn(comp.usePlayMetronome());
@@ -634,9 +634,9 @@ SequenceManager::record(bool toggled)
             return ;
         }
 
-        if (m_transporttqStatus == STOPPED) {
+        if (m_transportStatus == STOPPED) {
             SETQMAN_DEBUG << "SequenceManager::record - armed record\n";
-            m_transporttqStatus = RECORDING_ARMED;
+            m_transportStatus = RECORDING_ARMED;
 
             // Toggle the buttons
             m_transport->MetronomeButton()->setOn(comp.useRecordMetronome());
@@ -645,7 +645,7 @@ SequenceManager::record(bool toggled)
             return ;
         }
 
-        if (m_transporttqStatus == RECORDING) {
+        if (m_transportStatus == RECORDING) {
             SETQMAN_DEBUG << "SequenceManager::record - stop recording and keep playing\n";
 
             TQByteArray data;
@@ -659,7 +659,7 @@ SequenceManager::record(bool toggled)
                 // if we're stopping recording we don't risk the
                 // record segment being restored by a timer while the
                 // document is busy trying to do away with it
-                m_transporttqStatus = STOPPED;
+                m_transportStatus = STOPPED;
 
                 m_doc->stopRecordingMidi();
                 m_doc->stopRecordingAudio();
@@ -667,7 +667,7 @@ SequenceManager::record(bool toggled)
             }
 
             // #1797873 - as above
-            m_transporttqStatus = PLAYING;
+            m_transportStatus = PLAYING;
 
             m_doc->stopRecordingMidi();
             m_doc->stopRecordingAudio();
@@ -675,7 +675,7 @@ SequenceManager::record(bool toggled)
             return ;
         }
 
-        if (m_transporttqStatus == PLAYING) {
+        if (m_transportStatus == PLAYING) {
             SETQMAN_DEBUG << "SequenceManager::record - punch in recording\n";
             punchIn = true;
             goto punchin;
@@ -720,7 +720,7 @@ punchin:
         }
 
         // may throw an exception
-        checkSoundDrivertqStatus(false);
+        checkSoundDriverStatus(false);
 
         // toggle the Metronome button if it's in use
         m_transport->MetronomeButton()->setOn(comp.useRecordMetronome());
@@ -738,7 +738,7 @@ punchin:
         if (comp.isLooping())
             m_doc->slotSetPointerPosition(comp.getLoopStart());
         else {
-            if (m_transporttqStatus != RECORDING_ARMED && punchIn == false) {
+            if (m_transportStatus != RECORDING_ARMED && punchIn == false) {
                 int startBar = comp.getBarNumber(comp.getPosition());
                 startBar -= config->readUnsignedNumEntry("countinbars", 0);
                 m_doc->slotSetPointerPosition(comp.getBarRange(startBar).first);
@@ -853,7 +853,7 @@ punchin:
         if (!rgapp->sequencerCall("record(long int, long int, long int, long int, long int, long int, long int, long int, long int, long int, long int, long int)",
                                   replyType, replyData, data)) {
             // failed
-            m_transporttqStatus = STOPPED;
+            m_transportStatus = STOPPED;
             return ;
         }
 
@@ -865,7 +865,7 @@ punchin:
         if (result) {
 
             // completed successfully
-            m_transporttqStatus = STARTING_TO_RECORD;
+            m_transportStatus = STARTING_TO_RECORD;
 
             // Create the countdown timer dialog to show recording time
             // remaining.  (Note (dmm) this has changed, and it now reports
@@ -900,7 +900,7 @@ punchin:
         } else {
             // Stop immediately - turn off buttons in parent
             //
-            m_transporttqStatus = STOPPED;
+            m_transportStatus = STOPPED;
 
             if (haveAudioInstrument) {
                 throw(Exception("Couldn't start recording audio.\nPlease set a valid file path in the Document Properties\n(Composition menu -> Edit Document Properties -> Audio)."));
@@ -990,8 +990,8 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC,
                 restoreRecordSubscriptions();
             }
 
-            if (m_transporttqStatus == PLAYING ||
-                m_transporttqStatus == RECORDING) {
+            if (m_transportStatus == PLAYING ||
+                m_transportStatus == RECORDING) {
                 if ((*i)->getType() == MappedEvent::SystemFailure) {
 
                     SETQMAN_DEBUG << "Failure of some sort..." << endl;
@@ -1201,8 +1201,8 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC,
     // out any incoming external controller events
 
     for (i = mC.begin(); i != mC.end(); ++i ) {
-        if (m_transporttqStatus == STOPPED ||
-            m_transporttqStatus == RECORDING_ARMED) {
+        if (m_transportStatus == STOPPED ||
+            m_transportStatus == RECORDING_ARMED) {
             if ((*i)->getType() == MappedEvent::MidiNote) {
                 if ((*i)->getVelocity() == 0) {
                     emit insertableNoteOffReceived((*i)->getPitch(), (*i)->getVelocity());
@@ -1269,7 +1269,7 @@ SequenceManager::setLoop(const timeT &lhs, const timeT &rhs)
 }
 
 void
-SequenceManager::checkSoundDrivertqStatus(bool warnUser)
+SequenceManager::checkSoundDriverStatus(bool warnUser)
 {
     TQByteArray data;
     TQCString replyType;
@@ -1281,25 +1281,25 @@ SequenceManager::checkSoundDrivertqStatus(bool warnUser)
     if (! rgapp->sequencerCall("getSoundDriverStatus(TQString)",
                                replyType, replyData, data)) {
 
-        m_soundDrivertqStatus = NO_DRIVER;
+        m_soundDriverStatus = NO_DRIVER;
 
     } else {
 
         TQDataStream streamIn(replyData, IO_ReadOnly);
         unsigned int result;
         streamIn >> result;
-        m_soundDrivertqStatus = result;
+        m_soundDriverStatus = result;
     }
 
-    SETQMAN_DEBUG << "Sound driver status is: " << m_soundDrivertqStatus << endl;
+    SETQMAN_DEBUG << "Sound driver status is: " << m_soundDriverStatus << endl;
 
     if (!warnUser) return;
 
 #ifdef HAVE_LIBJACK
-    if ((m_soundDrivertqStatus & (AUDIO_OK | MIDI_OK | VERSION_OK)) ==
+    if ((m_soundDriverStatus & (AUDIO_OK | MIDI_OK | VERSION_OK)) ==
         (AUDIO_OK | MIDI_OK | VERSION_OK)) return;
 #else
-    if ((m_soundDrivertqStatus & (MIDI_OK | VERSION_OK)) ==
+    if ((m_soundDriverStatus & (MIDI_OK | VERSION_OK)) ==
         (MIDI_OK | VERSION_OK)) return;
 #endif
 
@@ -1308,24 +1308,24 @@ SequenceManager::checkSoundDrivertqStatus(bool warnUser)
 
     TQString text = "";
 
-    if (m_soundDrivertqStatus == NO_DRIVER) {
+    if (m_soundDriverStatus == NO_DRIVER) {
         text = i18n("<p>Both MIDI and Audio subsystems have failed to initialize.</p><p>You may continue without the sequencer, but we suggest closing Rosegarden, running \"alsaconf\" as root, and starting Rosegarden again.  If you wish to run with no sequencer by design, then use \"rosegarden --nosequencer\" to avoid seeing this error in the future.</p>");
-    } else if (!(m_soundDrivertqStatus & MIDI_OK)) {
+    } else if (!(m_soundDriverStatus & MIDI_OK)) {
         text = i18n("<p>The MIDI subsystem has failed to initialize.</p><p>You may continue without the sequencer, but we suggest closing Rosegarden, running \"modprobe snd-seq-midi\" as root, and starting Rosegarden again.  If you wish to run with no sequencer by design, then use \"rosegarden --nosequencer\" to avoid seeing this error in the future.</p>");
-    } else if (!(m_soundDrivertqStatus & VERSION_OK)) {
+    } else if (!(m_soundDriverStatus & VERSION_OK)) {
         text = i18n("<p>The Rosegarden sequencer module version does not match the GUI module version.</p><p>You have probably mixed up files from two different versions of Rosegarden.  Please check your installation.</p>");
     }
 
     if (text != "") {
         RosegardenGUIApp::self()->awaitDialogClearance();
         KMessageBox::error(RosegardenGUIApp::self(),
-                           i18n("<h3>Sequencer startup failed</h3>%1").tqarg(text));
+                           i18n("<h3>Sequencer startup failed</h3>%1").arg(text));
         CurrentProgressDialog::thaw();
         return;
     }
 
 #ifdef HAVE_LIBJACK
-    if (!(m_soundDrivertqStatus & AUDIO_OK)) {
+    if (!(m_soundDriverStatus & AUDIO_OK)) {
         RosegardenGUIApp::self()->awaitDialogClearance();
         KMessageBox::information(RosegardenGUIApp::self(), i18n("<h3>Failed to connect to JACK audio server.</h3><p>Rosegarden could not connect to the JACK audio server.  This probably means the JACK server is not running.</p><p>If you want to be able to play or record audio files or use plugins, you should exit Rosegarden and start the JACK server before running Rosegarden again.</p>"),
                                  i18n("Failed to connect to JACK"),
@@ -1675,7 +1675,7 @@ bool SequenceManager::event(TQEvent *e)
         SETQMAN_DEBUG << "SequenceManager::event() with user event\n";
         if (m_updateRequested) {
             SETQMAN_DEBUG << "SequenceManager::event(): update requested\n";
-            checkRefreshtqStatus();
+            checkRefreshStatus();
             m_updateRequested = false;
         }
         return true;
@@ -1693,7 +1693,7 @@ void SequenceManager::update()
     TQApplication::postEvent(this, e);
 }
 
-void SequenceManager::checkRefreshtqStatus()
+void SequenceManager::checkRefreshStatus()
 {
     SETQMAN_DEBUG << "SequenceManager::checkRefreshStatus()\n";
 
@@ -1716,10 +1716,10 @@ void SequenceManager::checkRefreshtqStatus()
             newTriggerMap[s] = m_triggerSegments[s];
         }
 
-        if (s->getRefreshtqStatus(newTriggerMap[s]).needsRefresh()) {
+        if (s->getRefreshStatus(newTriggerMap[s]).needsRefresh()) {
             TriggerSegmentRec::SegmentRuntimeIdSet &thisSet = (*i)->getReferences();
             ridset.insert(thisSet.begin(), thisSet.end());
-            s->getRefreshtqStatus(newTriggerMap[s]).setNeedsRefresh(false);
+            s->getRefreshStatus(newTriggerMap[s]).setNeedsRefresh(false);
         }
     }
 
@@ -1747,10 +1747,10 @@ void SequenceManager::checkRefreshtqStatus()
     // then the ones which are still there
     for (SegmentRefreshMap::iterator i = m_segments.begin();
             i != m_segments.end(); ++i) {
-        if (i->first->getRefreshtqStatus(i->second).needsRefresh() ||
+        if (i->first->getRefreshStatus(i->second).needsRefresh() ||
                 ridset.find(i->first->getRuntimeId()) != ridset.end()) {
             segmentModified(i->first);
-            i->first->getRefreshtqStatus(i->second).setNeedsRefresh(false);
+            i->first->getRefreshStatus(i->second).setNeedsRefresh(false);
         }
     }
 
@@ -1770,7 +1770,7 @@ void SequenceManager::segmentModified(Segment* s)
     SETQMAN_DEBUG << "SequenceManager::segmentModified() : size changed = "
     << sizeChanged << endl;
 
-    if ((m_transporttqStatus == PLAYING) && sizeChanged) {
+    if ((m_transportStatus == PLAYING) && sizeChanged) {
         TQByteArray data;
         TQDataStream streamOut(data, IO_WriteOnly);
 
@@ -1815,7 +1815,7 @@ void SequenceManager::segmentEventsTimingChanged(const Composition*, Segment * s
 {
     SETQMAN_DEBUG << "SequenceManager::segmentEventsTimingChanged(" << s << ", " << t << ")\n";
     segmentModified(s);
-    if (s && s->getType() == Segment::Audio && m_transporttqStatus == PLAYING) {
+    if (s && s->getType() == Segment::Audio && m_transportStatus == PLAYING) {
         TQByteArray data;
         rgapp->sequencerSend("remapTracks()", data);
     }
@@ -1831,7 +1831,7 @@ void SequenceManager::segmentTrackChanged(const Composition*, Segment *s, TrackI
 {
     SETQMAN_DEBUG << "SequenceManager::segmentTrackChanged(" << s << ", " << id << ")\n";
     segmentModified(s);
-    if (s && s->getType() == Segment::Audio && m_transporttqStatus == PLAYING) {
+    if (s && s->getType() == Segment::Audio && m_transportStatus == PLAYING) {
         TQByteArray data;
         rgapp->sequencerSend("remapTracks()", data);
     }
@@ -1849,7 +1849,7 @@ void SequenceManager::processAddedSegment(Segment* s)
 
     m_compositionMmapper->segmentAdded(s);
 
-    if (m_transporttqStatus == PLAYING) {
+    if (m_transportStatus == PLAYING) {
 
         TQByteArray data;
         TQDataStream streamOut(data, IO_WriteOnly);
@@ -1857,7 +1857,7 @@ void SequenceManager::processAddedSegment(Segment* s)
         streamOut << m_compositionMmapper->getSegmentFileName(s);
 
         if (!rgapp->sequencerSend("addSegment(TQString)", data)) {
-            m_transporttqStatus = STOPPED;
+            m_transportStatus = STOPPED;
         }
     }
 
@@ -1874,7 +1874,7 @@ void SequenceManager::processRemovedSegment(Segment* s)
     TQString filename = m_compositionMmapper->getSegmentFileName(s);
     m_compositionMmapper->segmentDeleted(s);
 
-    if (m_transporttqStatus == PLAYING) {
+    if (m_transportStatus == PLAYING) {
 
         TQByteArray data;
         TQDataStream streamOut(data, IO_WriteOnly);
@@ -1883,7 +1883,7 @@ void SequenceManager::processRemovedSegment(Segment* s)
 
         if (!rgapp->sequencerSend("deleteSegment(TQString)", data)) {
             // failed
-            m_transporttqStatus = STOPPED;
+            m_transportStatus = STOPPED;
         }
     }
 
@@ -1907,7 +1907,7 @@ void SequenceManager::trackChanged(const Composition *, Track* t)
     SETQMAN_DEBUG << "SequenceManager::trackChanged(" << t << ", " << (t ? t->getPosition() : -1) << ")\n";
     m_controlBlockMmapper->updateTrackData(t);
 
-    if (m_transporttqStatus == PLAYING) {
+    if (m_transportStatus == PLAYING) {
         TQByteArray data;
         rgapp->sequencerSend("remapTracks()", data);
     }
@@ -1933,7 +1933,7 @@ void SequenceManager::metronomeChanged(InstrumentId id,
         resetMetronomeMmapper();
 
     m_controlBlockMmapper->updateMetronomeData(id);
-    if (m_transporttqStatus == PLAYING) {
+    if (m_transportStatus == PLAYING) {
         m_controlBlockMmapper->updateMetronomeForPlayback();
     } else {
         m_controlBlockMmapper->updateMetronomeForRecord();
@@ -1957,7 +1957,7 @@ void SequenceManager::metronomeChanged(const Composition *)
     m_controlBlockMmapper->updateMetronomeData
     (m_metronomeMmapper->getMetronomeInstrument());
 
-    if (m_transporttqStatus == PLAYING) {
+    if (m_transportStatus == PLAYING) {
         m_controlBlockMmapper->updateMetronomeForPlayback();
     } else {
         m_controlBlockMmapper->updateMetronomeForRecord();
@@ -1973,7 +1973,7 @@ void SequenceManager::filtersChanged(MidiFilter thruFilter,
 void SequenceManager::soloChanged(const Composition *, bool solo, TrackId selectedTrack)
 {
     if (m_controlBlockMmapper->updateSoloData(solo, selectedTrack)) {
-        if (m_transporttqStatus == PLAYING) {
+        if (m_transportStatus == PLAYING) {
             TQByteArray data;
             rgapp->sequencerSend("remapTracks()", data);
         }
@@ -1999,7 +1999,7 @@ void SequenceManager::tempoChanged(const Composition *c)
 
     if (c->isLooping())
         setLoop(c->getLoopStart(), c->getLoopEnd());
-    else if (m_transporttqStatus == PLAYING) {
+    else if (m_transportStatus == PLAYING) {
         // If the tempo changes during playback, reset the pointer
         // position because the sequencer keeps track of position in
         // real time and we want to maintain the same position in
diff --git a/src/gui/seqmanager/SequenceManager.h b/src/gui/seqmanager/SequenceManager.h
index c723e79..8fdf848 100644
--- a/src/gui/seqmanager/SequenceManager.h
+++ b/src/gui/seqmanager/SequenceManager.h
@@ -102,7 +102,7 @@ public:
     void fastForwardToEnd();
 
     void setLoop(const timeT &lhs, const timeT &rhs);
-    void notifySequencertqStatus(TransporttqStatus status);
+    void notifySequencerStatus(TransportStatus status);
     void sendSequencerJump(const RealTime &time);
 
     // Events coming in
@@ -112,7 +112,7 @@ public:
     // Before playing and recording.  If warnUser is true, show the
     // user a warning dialog if there is a problem with the setup.
     //
-    void checkSoundDrivertqStatus(bool warnUser);
+    void checkSoundDriverStatus(bool warnUser);
 
     /**
      * Send program changes and align Instrument lists before playback
@@ -126,8 +126,8 @@ public:
     void preparePlayback(bool forceProgramChanges = false);
 
     /// Check and set sequencer status
-    void setTransporttqStatus(const TransporttqStatus &status);
-    TransporttqStatus getTransporttqStatus() const { return m_transporttqStatus; }
+    void setTransportStatus(const TransportStatus &status);
+    TransportStatus getTransportStatus() const { return m_transportStatus; }
 
     /**
      * Suspend the sequencer to allow for a safe DCOP call() i.e. one
@@ -140,7 +140,7 @@ public:
     void sendAudioLevel(MappedEvent *mE);
 
     /// Find what has been initialised and what hasn't
-    unsigned int getSoundDrivertqStatus() { return m_soundDrivertqStatus; }
+    unsigned int getSoundDriverStatus() { return m_soundDriverStatus; }
 
     /// Reset MIDI controllers
     void resetControllers();
@@ -247,7 +247,7 @@ protected:
     void resetMetronomeMmapper();
     void resetTempoSegmentMmapper();
     void resetTimeSigSegmentMmapper();
-    void checkRefreshtqStatus();
+    void checkRefreshStatus();
     void sendMIDIRecordingDevice(const TQString recordDeviceStr);
     void restoreRecordSubscriptions();
     bool shouldWarnForImpreciseTimer();
@@ -267,8 +267,8 @@ protected:
     bool m_metronomeNeedsRefresh;
 
     // statuses
-    TransporttqStatus            m_transporttqStatus;
-    unsigned int               m_soundDrivertqStatus;
+    TransportStatus            m_transportStatus;
+    unsigned int               m_soundDriverStatus;
 
     // pointer to the transport dialog
     TransportDialog *m_transport;
diff --git a/src/gui/seqmanager/SequencerMapper.cpp b/src/gui/seqmanager/SequencerMapper.cpp
index b39d7ef..eec66a0 100644
--- a/src/gui/seqmanager/SequencerMapper.cpp
+++ b/src/gui/seqmanager/SequencerMapper.cpp
@@ -83,7 +83,7 @@ SequencerMapper::map()
     if (m_mmappedBuffer == (void*) - 1) {
 
         RG_DEBUG << TQString("mmap failed : (%1) %2\n").
-        tqarg(errno).tqarg(strerror(errno));
+        arg(errno).arg(strerror(errno));
 
         throw Exception("mmap failed");
     }
diff --git a/src/gui/studio/AudioMixerWindow.cpp b/src/gui/studio/AudioMixerWindow.cpp
index 6dced2b..cb0ab64 100644
--- a/src/gui/studio/AudioMixerWindow.cpp
+++ b/src/gui/studio/AudioMixerWindow.cpp
@@ -24,7 +24,7 @@
 
 
 #include "AudioMixerWindow.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <kapplication.h>
 
 #include "AudioPlugin.h"
@@ -68,7 +68,7 @@
 #include <tqiconset.h>
 #include <tqlabel.h>
 #include <tqobject.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
 #include <tqstring.h>
@@ -184,7 +184,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
             new KRadioAction(i18n("1 Input", "%n Inputs", i),
                              0, TQT_TQOBJECT(this),
                              TQT_SLOT(slotSetInputCountFromAction()), actionCollection(),
-                             TQString("inputs_%1").tqarg(i).ascii());
+                             TQString("inputs_%1").arg(i).ascii());
         action->setExclusiveGroup("inputs");
         if (i == int(m_studio->getRecordIns().size()))
             action->setChecked(true);
@@ -203,7 +203,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
                  (i18n("1 Submaster", "%n Submasters", i),
                   0, TQT_TQOBJECT(this),
                   TQT_SLOT(slotSetSubmasterCountFromAction()), actionCollection(),
-                  TQString("submasters_%1").tqarg(i).ascii());
+                  TQString("submasters_%1").arg(i).ascii());
         action->setExclusiveGroup("submasters");
         if (i == int(m_studio->getBusses().size()) - 1)
             action->setChecked(true);
@@ -268,8 +268,8 @@ AudioMixerWindow::populate()
     BussList busses = m_studio->getBusses();
 
     TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
-    m_monoPixmap.load(TQString("%1/misc/mono.xpm").tqarg(pixmapDir));
-    m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").tqarg(pixmapDir));
+    m_monoPixmap.load(TQString("%1/misc/mono.xpm").arg(pixmapDir));
+    m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").arg(pixmapDir));
 
     // Total cols: is 2 for each fader, submaster or master, plus 1
     // for each spacer.
@@ -397,11 +397,11 @@ AudioMixerWindow::populate()
         TQLabel *idLabel;
         TQString idString;
         if ((*i)->getType() == Instrument::Audio) {
-            idString = i18n("Audio %1").tqarg((*i)->getId() -
+            idString = i18n("Audio %1").arg((*i)->getId() -
                                             AudioInstrumentBase + 1);
             idLabel = new TQLabel(idString, m_mainBox, "audioIdLabel");
         } else {
-            idString = i18n("Synth %1").tqarg((*i)->getId() -
+            idString = i18n("Synth %1").arg((*i)->getId() -
                                             SoftSynthInstrumentBase + 1);
             idLabel = new TQLabel(idString, m_mainBox, "synthIdLabel");
         }
@@ -525,7 +525,7 @@ AudioMixerWindow::populate()
                     this, TQT_SLOT(slotSelectPlugin()));
         }
 
-        TQLabel *idLabel = new TQLabel(i18n("Sub %1").tqarg(count), m_mainBox, "subMaster");
+        TQLabel *idLabel = new TQLabel(i18n("Sub %1").arg(count), m_mainBox, "subMaster");
         idLabel->setFont(boldFont);
 
         //	mainLayout->addWidget(idLabel, 2, col, TQt::AlignCenter);
@@ -1322,7 +1322,7 @@ AudioMixerWindow::updateMonitorMeters(SequencerMapper *mapper)
     // only show monitor levels when quiescent or when recording (as
     // record levels)
     if (m_document->getSequenceManager() &&
-            m_document->getSequenceManager()->getTransporttqStatus() == PLAYING) {
+            m_document->getSequenceManager()->getTransportStatus() == PLAYING) {
         return ;
     }
 
@@ -1714,7 +1714,7 @@ AudioMixerWindow::slotToggleUnassignedFaders()
 void
 AudioMixerWindow::toggleNamedWidgets(bool show, const char* const name)
 {
-    TQLayoutIterator it = m_mainBox->tqlayout()->iterator();
+    TQLayoutIterator it = m_mainBox->layout()->iterator();
     TQLayoutItem *child;
     while ( (child = it.current()) != 0 ) {
         TQWidget * widget = child->widget();
diff --git a/src/gui/studio/AudioPluginOSCGUIManager.cpp b/src/gui/studio/AudioPluginOSCGUIManager.cpp
index 01ade9c..13da726 100644
--- a/src/gui/studio/AudioPluginOSCGUIManager.cpp
+++ b/src/gui/studio/AudioPluginOSCGUIManager.cpp
@@ -345,18 +345,18 @@ AudioPluginOSCGUIManager::getOSCUrl(InstrumentId instrument, int position,
         baseUrl += '/';
 
     TQString url = TQString("%1%2/%3/%4/%5/%6")
-                  .tqarg(baseUrl)
-                  .tqarg("plugin")
-                  .tqarg(type)
-                  .tqarg(instrument);
+                  .arg(baseUrl)
+                  .arg("plugin")
+                  .arg(type)
+                  .arg(instrument);
 
     if (position == int(Instrument::SYNTH_PLUGIN_POSITION)) {
-        url = url.tqarg("synth");
+        url = url.arg("synth");
     } else {
-        url = url.tqarg(position);
+        url = url.arg(position);
     }
 
-    url = url.tqarg(label);
+    url = url.arg(label);
 
     return url;
 }
@@ -444,10 +444,10 @@ AudioPluginOSCGUIManager::getFriendlyName(InstrumentId instrument, int position,
         return i18n("Rosegarden Plugin");
     else {
         if (position == int(Instrument::SYNTH_PLUGIN_POSITION)) {
-            return i18n("Rosegarden: %1").tqarg(strtoqstr(container->getPresentationName()));
+            return i18n("Rosegarden: %1").arg(strtoqstr(container->getPresentationName()));
         } else {
-            return i18n("Rosegarden: %1: %2").tqarg(strtoqstr(container->getPresentationName()))
-                   .tqarg(i18n("Plugin slot %1").tqarg(position));
+            return i18n("Rosegarden: %1: %2").arg(strtoqstr(container->getPresentationName()))
+                   .arg(i18n("Plugin slot %1").arg(position));
         }
     }
 }
diff --git a/src/gui/studio/BankEditorDialog.cpp b/src/gui/studio/BankEditorDialog.cpp
index 518260d..096dfb9 100644
--- a/src/gui/studio/BankEditorDialog.cpp
+++ b/src/gui/studio/BankEditorDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "BankEditorDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <kapplication.h>
 
 #include <klocale.h>
@@ -100,20 +100,20 @@ BankEditorDialog::BankEditorDialog(TQWidget *parent,
 
     TQFrame* btnBox = new TQFrame(mainFrame);
 
-    btnBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+    btnBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
 
-    TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10);
+    TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 4, 10);
 
     m_closeButton = new TQPushButton(btnBox);
     m_applyButton = new TQPushButton(i18n("Apply"), btnBox);
     m_resetButton = new TQPushButton(i18n("Reset"), btnBox);
 
-    tqlayout->addStretch(10);
-    tqlayout->addWidget(m_applyButton);
-    tqlayout->addWidget(m_resetButton);
-    tqlayout->addSpacing(15);
-    tqlayout->addWidget(m_closeButton);
-    tqlayout->addSpacing(5);
+    layout->addStretch(10);
+    layout->addWidget(m_applyButton);
+    layout->addWidget(m_resetButton);
+    layout->addSpacing(15);
+    layout->addWidget(m_closeButton);
+    layout->addSpacing(5);
 
     connect(m_applyButton, TQT_SIGNAL(clicked()),
             this, TQT_SLOT(slotApply()));
@@ -206,8 +206,8 @@ BankEditorDialog::BankEditorDialog(TQWidget *parent,
     vboxLayout->addWidget(m_keyMappingEditor);
     m_keyMappingEditor->hide();
 
-    m_programEditor->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred));
-    m_keyMappingEditor->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred));
+    m_programEditor->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred));
+    m_keyMappingEditor->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred));
 
     m_optionBox = new TQVGroupBox(i18n("Options"), vbox);
     vboxLayout->addWidget(m_optionBox);
@@ -593,7 +593,7 @@ BankEditorDialog::updateDeviceItem(MidiDeviceListViewItem* deviceItem)
 
     // delete banks which are no longer present
     //
-    std::vector<TQListViewItem*> tqchildrenToDelete;
+    std::vector<TQListViewItem*> childrenToDelete;
 
     TQListViewItem* child = deviceItem->firstChild();
 
@@ -603,7 +603,7 @@ BankEditorDialog::updateDeviceItem(MidiDeviceListViewItem* deviceItem)
             dynamic_cast<MidiBankListViewItem *>(child);
         if (bankItem) {
             if (bankItem->getBank() >= int(banks.size()))
-                tqchildrenToDelete.push_back(child);
+                childrenToDelete.push_back(child);
             else { // update the banks MSB/LSB which might have changed
                 bankItem->setPercussion(banks[bankItem->getBank()].isPercussion());
                 bankItem->setMSB(banks[bankItem->getBank()].getMSB());
@@ -615,15 +615,15 @@ BankEditorDialog::updateDeviceItem(MidiDeviceListViewItem* deviceItem)
             dynamic_cast<MidiKeyMapListViewItem *>(child);
         if (keyItem) {
             if (!midiDevice->getKeyMappingByName(qstrtostr(keyItem->getName()))) {
-                tqchildrenToDelete.push_back(child);
+                childrenToDelete.push_back(child);
             }
         }
 
         child = child->nextSibling();
     }
 
-    for (unsigned int i = 0; i < tqchildrenToDelete.size(); ++i)
-        delete tqchildrenToDelete[i];
+    for (unsigned int i = 0; i < childrenToDelete.size(); ++i)
+        delete childrenToDelete[i];
 }
 
 bool
@@ -1045,7 +1045,7 @@ BankEditorDialog::slotAddKeyMapping()
             if (n == 1)
                 name = i18n("<new mapping>");
             else
-                name = i18n("<new mapping %1>").tqarg(n);
+                name = i18n("<new mapping %1>").arg(n);
         }
 
         MidiKeyMapping newKeyMapping(qstrtostr(name));
diff --git a/src/gui/studio/DeviceEditorDialog.cpp b/src/gui/studio/DeviceEditorDialog.cpp
index 79f0fbc..dc80ff6 100644
--- a/src/gui/studio/DeviceEditorDialog.cpp
+++ b/src/gui/studio/DeviceEditorDialog.cpp
@@ -145,7 +145,7 @@ DeviceEditorDialog::populate()
         MidiDevice *md = static_cast<MidiDevice *>(*it);
 
         // if you change this string ("Device %1"), change test in slotApply
-        TQString deviceName = i18n("Device %1").tqarg(md->getId() + 1);
+        TQString deviceName = i18n("Device %1").arg(md->getId() + 1);
         TQString deviceLabel = strtoqstr(md->getName());
         TQString connectionName = strtoqstr(md->getConnection());
 
diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp
index 6f5cbb4..8cc6499 100644
--- a/src/gui/studio/DeviceManagerDialog.cpp
+++ b/src/gui/studio/DeviceManagerDialog.cpp
@@ -62,7 +62,7 @@
 #include <tqframe.h>
 #include <tqgrid.h>
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqsizepolicy.h>
 #include <tqstring.h>
@@ -110,7 +110,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
         m_playTable->setSelectionMode(TQTable::SingleRow);
 
         TQFrame *frame = new TQFrame(groupBox);
-        TQVBoxLayout *vtqlayout = new TQVBoxLayout(frame);
+        TQVBoxLayout *vlayout = new TQVBoxLayout(frame);
         TQGrid *buttons = new TQGrid(2, Qt::Horizontal, frame);
         TQPushButton *addButton = new TQPushButton(i18n("New"), buttons);
         m_deletePlayButton = new TQPushButton(i18n("Delete"), buttons);
@@ -118,8 +118,8 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
         m_exportButton = new TQPushButton(i18n("Export..."), buttons);
         m_banksButton = new TQPushButton(i18n("Banks..."), buttons);
         m_controllersButton = new TQPushButton(i18n("Control Events..."), buttons);
-        vtqlayout->addWidget(buttons);
-        vtqlayout->addStretch(10);
+        vlayout->addWidget(buttons);
+        vlayout->addStretch(10);
 
         TQToolTip::add
             (addButton,
@@ -169,12 +169,12 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
         m_recordTable->setSelectionMode(TQTable::SingleRow);
 
         frame = new TQFrame(groupBox);
-        vtqlayout = new TQVBoxLayout(frame);
+        vlayout = new TQVBoxLayout(frame);
         buttons = new TQGrid(2, Qt::Horizontal, frame);
         addButton = new TQPushButton(i18n("New"), buttons);
         m_deleteRecordButton = new TQPushButton(i18n("Delete"), buttons);
-        vtqlayout->addWidget(buttons);
-        vtqlayout->addStretch(10);
+        vlayout->addWidget(buttons);
+        vlayout->addStretch(10);
 
         TQToolTip::add
             (addButton,
@@ -204,15 +204,15 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
 
         TQFrame* btnBox = new TQFrame(mainBox);
 
-        btnBox->tqsetSizePolicy(
+        btnBox->setSizePolicy(
             TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
 
         TQPushButton *closeButton = new TQPushButton(i18n("Close"), btnBox);
 
-        TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 0, 10);
-        tqlayout->addStretch(10);
-        tqlayout->addWidget(closeButton);
-        tqlayout->addSpacing(5);
+        TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 0, 10);
+        layout->addStretch(10);
+        layout->addWidget(closeButton);
+        layout->addSpacing(5);
 
         KAction* close = KStdAction::close(TQT_TQOBJECT(this),
                                            TQT_SLOT(slotClose()),
@@ -326,7 +326,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
 
             m_playTable->insertRows(deviceCount, 1);
 
-            TQString deviceName = i18n("%1").tqarg(deviceCount + 1);
+            TQString deviceName = i18n("%1").arg(deviceCount + 1);
             TQString connectionName = strtoqstr((*it)->getConnection());
 
             m_playTable->setText(deviceCount, PLAY_NAME_COL,
@@ -360,7 +360,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
 
             m_recordTable->insertRows(deviceCount, 1);
 
-            TQString deviceName = i18n("%1").tqarg(deviceCount + 1);
+            TQString deviceName = i18n("%1").arg(deviceCount + 1);
             TQString connectionName = strtoqstr((*it)->getConnection());
 
             m_recordTable->setText(deviceCount, RECORD_NAME_COL,
diff --git a/src/gui/studio/MidiKeyMappingEditor.cpp b/src/gui/studio/MidiKeyMappingEditor.cpp
index 0a607ad..f3db67b 100644
--- a/src/gui/studio/MidiKeyMappingEditor.cpp
+++ b/src/gui/studio/MidiKeyMappingEditor.cpp
@@ -37,7 +37,7 @@
 #include <kcompletion.h>
 #include <klineedit.h>
 #include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqobject.h>
 #include <tqobjectlist.h>
diff --git a/src/gui/studio/MidiMixerVUMeter.cpp b/src/gui/studio/MidiMixerVUMeter.cpp
index db4ff13..b882dec 100644
--- a/src/gui/studio/MidiMixerVUMeter.cpp
+++ b/src/gui/studio/MidiMixerVUMeter.cpp
@@ -39,7 +39,7 @@ MidiMixerVUMeter::MidiMixerVUMeter(TQWidget *parent,
                                    const char *name):
         VUMeter(parent, type, false, false, width, height, VUMeter::Vertical, name)
 {
-    tqsetAlignment(AlignCenter);
+    setAlignment(AlignCenter);
 }
 
 void
diff --git a/src/gui/studio/MidiMixerWindow.cpp b/src/gui/studio/MidiMixerWindow.cpp
index 04de306..89e6d32 100644
--- a/src/gui/studio/MidiMixerWindow.cpp
+++ b/src/gui/studio/MidiMixerWindow.cpp
@@ -24,7 +24,7 @@
 
 
 #include "MidiMixerWindow.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include "sound/Midi.h"
 #include <klocale.h>
@@ -178,7 +178,7 @@ MidiMixerWindow::setupTabs()
             //
             //TQLabel *label = new TQLabel(TQString("%1 %2").
             //arg(strtoqstr(dev->getName()))
-            //.tqarg(i18n("MIDI Mixer")), m_tabFrame);
+            //.arg(i18n("MIDI Mixer")), m_tabFrame);
 
             TQLabel *label = new TQLabel("", m_tabFrame);
             mainLayout->addMultiCellWidget(label, 0, 0, 0, 16, TQt::AlignCenter);
@@ -306,8 +306,8 @@ MidiMixerWindow::setupTabs()
                 faderCount++;
             }
 
-            TQString name = TQString("%1 (%2)").tqarg(strtoqstr(dev->getName()))
-                           .tqarg(deviceCount++);
+            TQString name = TQString("%1 (%2)").arg(strtoqstr(dev->getName()))
+                           .arg(deviceCount++);
 
             addTab(m_tabFrame, name);
         }
diff --git a/src/gui/studio/MidiProgramsEditor.cpp b/src/gui/studio/MidiProgramsEditor.cpp
index 4186130..6049758 100644
--- a/src/gui/studio/MidiProgramsEditor.cpp
+++ b/src/gui/studio/MidiProgramsEditor.cpp
@@ -43,7 +43,7 @@
 #include <tqfile.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqobjectlist.h>
 #include <tqpixmap.h>
 #include <tqpoint.h>
@@ -251,7 +251,7 @@ MidiProgramsEditor::populate(TQListViewItem* item)
                     getEntryButton(i)->setPixmap(keyPixmap);
                     TQToolTip::add
                         (getEntryButton(i),
-                                i18n("Key Mapping: %1").tqarg(
+                                i18n("Key Mapping: %1").arg(
                                     strtoqstr(m_device->getKeyMappingForProgram(*it)->getName())));
                 }
 
@@ -538,7 +538,7 @@ MidiProgramsEditor::slotEntryMenuItemSelected(int i)
             btn->setPixmap(TQPixmap(file));
         }
         TQToolTip::add
-            (btn, i18n("Key Mapping: %1").tqarg(strtoqstr(newMapping)));
+            (btn, i18n("Key Mapping: %1").arg(strtoqstr(newMapping)));
     }
     btn->setEnabled(haveKeyMappings);
 }
diff --git a/src/gui/studio/NameSetEditor.cpp b/src/gui/studio/NameSetEditor.cpp
index d7917bf..ecf8f18 100644
--- a/src/gui/studio/NameSetEditor.cpp
+++ b/src/gui/studio/NameSetEditor.cpp
@@ -33,7 +33,7 @@
 #include <tqgroupbox.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqstring.h>
 #include <tqtabwidget.h>
@@ -99,7 +99,7 @@ NameSetEditor::NameSetEditor(BankEditorDialog* bankEditor,
 
             for (unsigned int row = 0; row < 128 / (tabs*cols); ++row) {
                 numBox = new TQHBox(v);
-                TQString numberText = TQString("%1").tqarg(labelId + 1);
+                TQString numberText = TQString("%1").arg(labelId + 1);
 
                 if (tab == 0 && col == 0 && row == 0) {
                     // Initial label; button to adjust whether labels start at 0 or 1
@@ -111,7 +111,7 @@ NameSetEditor::NameSetEditor(BankEditorDialog* bankEditor,
                 } else {
                     TQLabel *label = new TQLabel(numberText, numBox);
                     label->setFixedWidth(40);
-                    label->tqsetAlignment(AlignCenter);
+                    label->setAlignment(AlignCenter);
                     m_labels.push_back(label);
                 }
 
@@ -178,11 +178,11 @@ NameSetEditor::slotToggleInitialLabel()
     else
         index = 0;
 
-    m_initialLabel->setText(TQString("%1").tqarg(index++));
+    m_initialLabel->setText(TQString("%1").arg(index++));
     for (std::vector<TQLabel*>::iterator it( m_labels.begin() );
             it != m_labels.end();
             ++it) {
-        (*it)->setText(TQString("%1").tqarg(index++));
+        (*it)->setText(TQString("%1").arg(index++));
     }
 }
 
diff --git a/src/gui/studio/SynthPluginManagerDialog.cpp b/src/gui/studio/SynthPluginManagerDialog.cpp
index 25ac584..17497b9 100644
--- a/src/gui/studio/SynthPluginManagerDialog.cpp
+++ b/src/gui/studio/SynthPluginManagerDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "SynthPluginManagerDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include "misc/Debug.h"
@@ -105,7 +105,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
 
             //	pluginLayout->addWidget(new TQLabel(instrument->getPresentationName().c_str(),
             //					   pluginFrame), i, 0);
-            pluginLayout->addWidget(new TQLabel(TQString("%1").tqarg(i + 1),
+            pluginLayout->addWidget(new TQLabel(TQString("%1").arg(i + 1),
                                                pluginFrame), i, 0);
 
             AudioPluginInstance *plugin = instrument->getPlugin
@@ -161,15 +161,15 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
 
         TQFrame* btnBox = new TQFrame(mainBox);
 
-        btnBox->tqsetSizePolicy(
+        btnBox->setSizePolicy(
             TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
 
         TQPushButton *closeButton = new TQPushButton(i18n("Close"), btnBox);
 
-        TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 0, 10);
-        tqlayout->addStretch(10);
-        tqlayout->addWidget(closeButton);
-        tqlayout->addSpacing(5);
+        TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 0, 10);
+        layout->addStretch(10);
+        layout->addWidget(closeButton);
+        layout->addSpacing(5);
 
         KAction* close = KStdAction::close(TQT_TQOBJECT(this),
                                            TQT_SLOT(slotClose()),
diff --git a/src/gui/ui/RosegardenTransport.ui b/src/gui/ui/RosegardenTransport.ui
index 8c5b467..d2c7ba2 100644
--- a/src/gui/ui/RosegardenTransport.ui
+++ b/src/gui/ui/RosegardenTransport.ui
@@ -2968,7 +2968,7 @@
                 <property name="text">
                     <string>/16</string>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>AlignVCenter|AlignRight</set>
                 </property>
                 <property name="hAlign" stdset="0">
@@ -3530,7 +3530,7 @@
                 <property name="text">
                     <string>END</string>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>AlignVCenter|AlignRight</set>
                 </property>
                 <property name="hAlign" stdset="0">
@@ -3807,7 +3807,7 @@
                 <property name="text">
                     <string>BAR</string>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>AlignVCenter|AlignRight</set>
                 </property>
                 <property name="hAlign" stdset="0">
diff --git a/src/gui/widgets/AudioFaderBox.cpp b/src/gui/widgets/AudioFaderBox.cpp
index 4c8e76c..7a1161f 100644
--- a/src/gui/widgets/AudioFaderBox.cpp
+++ b/src/gui/widgets/AudioFaderBox.cpp
@@ -24,7 +24,7 @@
 
 
 #include "AudioFaderBox.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <kstddirs.h>
@@ -116,8 +116,8 @@ AudioFaderBox::AudioFaderBox(TQWidget *parent,
     m_fader->setOutlineColour(GUIPalette::getColour(GUIPalette::PlaybackFaderOutline));
 
     TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
-    m_monoPixmap.load(TQString("%1/misc/mono.xpm").tqarg(pixmapDir));
-    m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").tqarg(pixmapDir));
+    m_monoPixmap.load(TQString("%1/misc/mono.xpm").arg(pixmapDir));
+    m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").arg(pixmapDir));
 
     m_pan = new Rotary(this, -100.0, 100.0, 1.0, 5.0, 0.0, 22,
                        Rotary::NoTicks, false, true);
diff --git a/src/gui/widgets/AudioRouteMenu.cpp b/src/gui/widgets/AudioRouteMenu.cpp
index a2f6985..89cd416 100644
--- a/src/gui/widgets/AudioRouteMenu.cpp
+++ b/src/gui/widgets/AudioRouteMenu.cpp
@@ -231,24 +231,24 @@ AudioRouteMenu::getEntryText(int entry)
 
             if (stereo) {
                 if (entry < recordIns) {
-                    return i18n("In %1").tqarg(entry + 1);
+                    return i18n("In %1").arg(entry + 1);
                 } else if (entry == recordIns) {
                     return i18n("Master");
                 } else {
-                    return i18n("Sub %1").tqarg(entry - recordIns);
+                    return i18n("Sub %1").arg(entry - recordIns);
                 }
             } else {
                 int channel = entry % 2;
                 entry /= 2;
                 if (entry < recordIns) {
                     return (channel ? i18n("In %1 R") :
-                            i18n("In %1 L")).tqarg(entry + 1);
+                            i18n("In %1 L")).arg(entry + 1);
                 } else if (entry == recordIns) {
                     return (channel ? i18n("Master R") :
                             i18n("Master L"));
                 } else {
                     return (channel ? i18n("Sub %1 R") :
-                            i18n("Sub %1 L")).tqarg(entry - recordIns);
+                            i18n("Sub %1 L")).arg(entry - recordIns);
                 }
             }
             break;
@@ -258,7 +258,7 @@ AudioRouteMenu::getEntryText(int entry)
         if (entry == 0)
             return i18n("Master");
         else
-            return i18n("Sub %1").tqarg(entry);
+            return i18n("Sub %1").arg(entry);
     }
 
     return TQString();
diff --git a/src/gui/widgets/AudioVUMeter.cpp b/src/gui/widgets/AudioVUMeter.cpp
index aacb7c2..6327e2e 100644
--- a/src/gui/widgets/AudioVUMeter.cpp
+++ b/src/gui/widgets/AudioVUMeter.cpp
@@ -76,11 +76,11 @@ void
 AudioVUMeter::paintEvent(TQPaintEvent *e)
 {
     TQPainter paint(this);
-    paint.setPen(tqcolorGroup().mid());
+    paint.setPen(colorGroup().mid());
     paint.drawRect(0, 0, width(), height());
 
-    paint.setPen(tqcolorGroup().background());
-    paint.setBrush(tqcolorGroup().background());
+    paint.setPen(colorGroup().background());
+    paint.setBrush(colorGroup().background());
     paint.drawRect(1, 1, width() - 2, m_yoff / 2 - 1);
     paint.drawRect(1, 1, m_xoff / 2 - 1, height() - 2);
     paint.drawRect(width() - m_xoff / 2 - 1, 1, m_xoff / 2, height() - 2);
diff --git a/src/gui/widgets/BigArrowButton.h b/src/gui/widgets/BigArrowButton.h
index eb364e1..7adfb9b 100644
--- a/src/gui/widgets/BigArrowButton.h
+++ b/src/gui/widgets/BigArrowButton.h
@@ -37,7 +37,7 @@ public:
         KArrowButton(parent, arrow, name) { }
     virtual ~BigArrowButton() { } 
 
-    virtual TQSize tqsizeHint() const {
+    virtual TQSize sizeHint() const {
         return TQSize(20, 20);
     }
 };
diff --git a/src/gui/widgets/CollapsingFrame.cpp b/src/gui/widgets/CollapsingFrame.cpp
index 56c530b..78404e1 100644
--- a/src/gui/widgets/CollapsingFrame.cpp
+++ b/src/gui/widgets/CollapsingFrame.cpp
@@ -30,7 +30,7 @@
 #include <kglobal.h>
 #include <tqfont.h>
 #include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqstring.h>
 #include <tqtoolbutton.h>
@@ -47,7 +47,7 @@ CollapsingFrame::CollapsingFrame(TQString label, TQWidget *parent, const char *n
         m_fill(false),
         m_collapsed(false)
 {
-    m_tqlayout = new TQGridLayout(this, 3, 3, 0, 0);
+    m_layout = new TQGridLayout(this, 3, 3, 0, 0);
 
     m_toggleButton = new TQToolButton(this);
     m_toggleButton->setTextLabel(label);
@@ -66,7 +66,7 @@ CollapsingFrame::CollapsingFrame(TQString label, TQWidget *parent, const char *n
 
     connect(m_toggleButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggle()));
 
-    m_tqlayout->addMultiCellWidget(m_toggleButton, 0, 0, 0, 2);
+    m_layout->addMultiCellWidget(m_toggleButton, 0, 0, 0, 2);
 }
 
 CollapsingFrame::~CollapsingFrame()
@@ -96,9 +96,9 @@ CollapsingFrame::setWidget(TQWidget *widget)
     assert(!m_widget);
     m_widget = widget;
     if (m_fill) {
-        m_tqlayout->addMultiCellWidget(widget, 1, 1, 0, 2);
+        m_layout->addMultiCellWidget(widget, 1, 1, 0, 2);
     } else {
-        m_tqlayout->addWidget(widget, 1, 1);
+        m_layout->addWidget(widget, 1, 1);
     }
 
     bool expanded = true;
diff --git a/src/gui/widgets/CollapsingFrame.h b/src/gui/widgets/CollapsingFrame.h
index 6ae6feb..8e3bdc0 100644
--- a/src/gui/widgets/CollapsingFrame.h
+++ b/src/gui/widgets/CollapsingFrame.h
@@ -62,7 +62,7 @@ public slots:
     void toggle();
 
 protected:
-    TQGridLayout *m_tqlayout;
+    TQGridLayout *m_layout;
     TQToolButton *m_toggleButton;
     TQWidget *m_widget;
     bool m_fill;
diff --git a/src/gui/widgets/DiatonicPitchChooser.cpp b/src/gui/widgets/DiatonicPitchChooser.cpp
index c1a800a..539a8fb 100644
--- a/src/gui/widgets/DiatonicPitchChooser.cpp
+++ b/src/gui/widgets/DiatonicPitchChooser.cpp
@@ -87,7 +87,7 @@ DiatonicPitchChooser::DiatonicPitchChooser(TQString title,
     m_accidental->insertItem(i18n("double sharp"));
     m_accidental->setCurrentItem(2); // default: natural
 
-    m_pitchLabel = new TQLabel(TQString("%1").tqarg(getPitch()), hbox);
+    m_pitchLabel = new TQLabel(TQString("%1").arg(getPitch()), hbox);
     
     m_pitchLabel->setMinimumWidth(40);
 
@@ -157,7 +157,7 @@ DiatonicPitchChooser::slotSetPitch(int pitch)
     
     m_accidental->setCurrentItem(pitchChange + 2);
 
-    m_pitchLabel->setText(TQString("%1").tqarg(pitch));
+    m_pitchLabel->setText(TQString("%1").arg(pitch));
     
     update();
 }
@@ -199,7 +199,7 @@ DiatonicPitchChooser::setLabelsIfNeeded()
     //{
        m_pitchDragLabel->slotSetPitch(getPitch(), m_octave->currentItem(), m_step->currentItem());
     //}
-    m_pitchLabel->setText(TQString("%1").tqarg(getPitch()));
+    m_pitchLabel->setText(TQString("%1").arg(getPitch()));
 }
 
 void
@@ -217,7 +217,7 @@ DiatonicPitchChooser::slotSetNote(int pitch, int octave, int step)
     m_accidental->setCurrentItem(pitchOffset + 2);
 
     //MidiPitchLabel pl(p);
-    m_pitchLabel->setText(TQString("%1").tqarg(pitch));
+    m_pitchLabel->setText(TQString("%1").arg(pitch));
     update();
 }
 
diff --git a/src/gui/widgets/Fader.cpp b/src/gui/widgets/Fader.cpp
index 022f0ca..46bb75e 100644
--- a/src/gui/widgets/Fader.cpp
+++ b/src/gui/widgets/Fader.cpp
@@ -73,7 +73,7 @@ Fader::Fader(AudioLevel::FaderType type,
         m_sliderMax = width() - m_sliderMin;
     }
 
-    m_outlineColour = tqcolorGroup().mid();
+    m_outlineColour = colorGroup().mid();
 
     calculateGroovePixmap();
     setFader(0.0);
@@ -110,7 +110,7 @@ Fader::Fader(int min, int max, int deflt,
         m_sliderMax = width() - m_sliderMin;
     }
 
-    m_outlineColour = tqcolorGroup().mid();
+    m_outlineColour = colorGroup().mid();
 
     calculateGroovePixmap();
     setFader(deflt);
@@ -141,7 +141,7 @@ Fader::Fader(int min, int max, int deflt,
         m_sliderMax = width() - m_sliderMin;
     }
 
-    m_outlineColour = tqcolorGroup().mid();
+    m_outlineColour = colorGroup().mid();
 
     calculateGroovePixmap();
     setFader(deflt);
@@ -397,17 +397,17 @@ Fader::showFloatText()
     TQString text;
 
     if (m_integral) {
-        text = TQString("%1").tqarg(int(m_value));
+        text = TQString("%1").arg(int(m_value));
     } else if (m_value == AudioLevel::DB_FLOOR) {
         text = "Off";
     } else {
         float v = fabs(m_value);
         text = TQString("%1%2.%3%4%5 dB")
-               .tqarg(m_value < 0 ? '-' : '+')
-               .tqarg(int(v))
-               .tqarg(int(v * 10) % 10)
-               .tqarg(int(v * 100) % 10)
-               .tqarg(int(v * 1000) % 10);
+               .arg(m_value < 0 ? '-' : '+')
+               .arg(int(v))
+               .arg(int(v * 10) % 10)
+               .arg(int(v * 100) % 10)
+               .arg(int(v * 1000) % 10);
     }
 
     m_float->setText(text);
@@ -447,9 +447,9 @@ Fader::calculateGroovePixmap()
 
     delete map;
     map = new TQPixmap(width(), height());
-    map->fill(tqcolorGroup().background());
+    map->fill(colorGroup().background());
     TQPainter paint(map);
-    paint.setBrush(tqcolorGroup().background());
+    paint.setBrush(colorGroup().background());
 
     if (m_vertical) {
 
@@ -464,9 +464,9 @@ Fader::calculateGroovePixmap()
                 if (position >= 0 &&
                         position < m_sliderMax - m_sliderMin) {
                     if (dB == 0)
-                        paint.setPen(tqcolorGroup().dark());
+                        paint.setPen(colorGroup().dark());
                     else
-                        paint.setPen(tqcolorGroup().midlight());
+                        paint.setPen(colorGroup().midlight());
                     paint.drawLine(1, (m_sliderMax - position),
                                    width() - 2, (m_sliderMax - position));
                 }
@@ -477,8 +477,8 @@ Fader::calculateGroovePixmap()
             }
         }
 
-        paint.setPen(tqcolorGroup().dark());
-        paint.setBrush(tqcolorGroup().mid());
+        paint.setPen(colorGroup().dark());
+        paint.setBrush(colorGroup().mid());
         paint.drawRect(width() / 2 - 3, height() - m_sliderMax,
                        6, m_sliderMax - m_sliderMin);
         paint.end();
@@ -511,48 +511,48 @@ Fader::calculateButtonPixmap()
             buttonWidth = width() - 2;
 
         map = new TQPixmap(buttonWidth, buttonHeight);
-        map->fill(tqcolorGroup().background());
+        map->fill(colorGroup().background());
 
         int x = 0;
         int y = 0;
 
         TQPainter paint(map);
 
-        paint.setPen(tqcolorGroup().light());
+        paint.setPen(colorGroup().light());
         paint.drawLine(x + 1, y, x + buttonWidth - 2, y);
         paint.drawLine(x, y + 1, x, y + buttonHeight - 2);
 
-        paint.setPen(tqcolorGroup().midlight());
+        paint.setPen(colorGroup().midlight());
         paint.drawLine(x + 1, y + 1, x + buttonWidth - 2, y + 1);
         paint.drawLine(x + 1, y + 1, x + 1, y + buttonHeight - 2);
 
-        paint.setPen(tqcolorGroup().mid());
+        paint.setPen(colorGroup().mid());
         paint.drawLine(x + 2, y + buttonHeight - 2, x + buttonWidth - 2,
                        y + buttonHeight - 2);
         paint.drawLine(x + buttonWidth - 2, y + 2, x + buttonWidth - 2,
                        y + buttonHeight - 2);
 
-        paint.setPen(tqcolorGroup().dark());
+        paint.setPen(colorGroup().dark());
         paint.drawLine(x + 1, y + buttonHeight - 1, x + buttonWidth - 2,
                        y + buttonHeight - 1);
         paint.drawLine(x + buttonWidth - 1, y + 1, x + buttonWidth - 1,
                        y + buttonHeight - 2);
 
-        paint.setPen(tqcolorGroup().shadow());
+        paint.setPen(colorGroup().shadow());
         paint.drawLine(x + 1, y + buttonHeight / 2, x + buttonWidth - 2,
                        y + buttonHeight / 2);
 
-        paint.setPen(tqcolorGroup().mid());
+        paint.setPen(colorGroup().mid());
         paint.drawLine(x + 1, y + buttonHeight / 2 - 1, x + buttonWidth - 2,
                        y + buttonHeight / 2 - 1);
         paint.drawPoint(x, y + buttonHeight / 2);
 
-        paint.setPen(tqcolorGroup().light());
+        paint.setPen(colorGroup().light());
         paint.drawLine(x + 1, y + buttonHeight / 2 + 1, x + buttonWidth - 2,
                        y + buttonHeight / 2 + 1);
 
-        paint.setPen(tqcolorGroup().button());
-        paint.setBrush(tqcolorGroup().button());
+        paint.setPen(colorGroup().button());
+        paint.setBrush(colorGroup().button());
         paint.drawRect(x + 2, y + 2, buttonWidth - 4, buttonHeight / 2 - 4);
         paint.drawRect(x + 2, y + buttonHeight / 2 + 2,
                        buttonWidth - 4, buttonHeight / 2 - 4);
diff --git a/src/gui/widgets/PitchDragLabel.cpp b/src/gui/widgets/PitchDragLabel.cpp
index b43c15f..507ec1b 100644
--- a/src/gui/widgets/PitchDragLabel.cpp
+++ b/src/gui/widgets/PitchDragLabel.cpp
@@ -202,7 +202,7 @@ PitchDragLabel::paintEvent(TQPaintEvent *)
 }
 
 TQSize
-PitchDragLabel::tqsizeHint() const
+PitchDragLabel::sizeHint() const
 {
     return TQSize(150, 135);
 }
diff --git a/src/gui/widgets/PitchDragLabel.h b/src/gui/widgets/PitchDragLabel.h
index 6f11b17..3bb0868 100644
--- a/src/gui/widgets/PitchDragLabel.h
+++ b/src/gui/widgets/PitchDragLabel.h
@@ -53,7 +53,7 @@ public:
 
     int getPitch() const { return m_pitch; }
 
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
 
 signals:
     void pitchDragged(int);
diff --git a/src/gui/widgets/PluginControl.cpp b/src/gui/widgets/PluginControl.cpp
index 0c998f3..59c6880 100644
--- a/src/gui/widgets/PluginControl.cpp
+++ b/src/gui/widgets/PluginControl.cpp
@@ -33,7 +33,7 @@
 #include <tqfont.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqobject.h>
 #include <tqstring.h>
 #include <tqwidget.h>
@@ -44,7 +44,7 @@ namespace Rosegarden
 {
 
 PluginControl::PluginControl(TQWidget *parent,
-                             TQGridLayout *tqlayout,
+                             TQGridLayout *layout,
                              ControlType type,
                              PluginPort *port,
                              AudioPluginManager *aPM,
@@ -53,7 +53,7 @@ PluginControl::PluginControl(TQWidget *parent,
                              bool showBounds,
                              bool hidden):
         TQObject(parent),
-        m_tqlayout(tqlayout),
+        m_layout(layout),
         m_type(type),
         m_port(port),
         m_pluginManager(aPM),
@@ -63,7 +63,7 @@ PluginControl::PluginControl(TQWidget *parent,
     plainFont.setPointSize((plainFont.pointSize() * 9 ) / 10);
 
     TQLabel *controlTitle =
-        new TQLabel(TQString("%1    ").tqarg(strtoqstr(port->getName())), parent);
+        new TQLabel(TQString("%1    ").arg(strtoqstr(port->getName())), parent);
     controlTitle->setFont(plainFont);
 
     if (type == Rotary) {
@@ -121,9 +121,9 @@ PluginControl::PluginControl(TQWidget *parent,
         TQLabel *low;
         if (port->getDisplayHint() &
             (PluginPort::Integer | PluginPort::Toggled)) {
-            low = new TQLabel(TQString("%1").tqarg(int(displayLower)), parent);
+            low = new TQLabel(TQString("%1").arg(int(displayLower)), parent);
         } else {
-            low = new TQLabel(TQString("%1").tqarg(displayLower), parent);
+            low = new TQLabel(TQString("%1").arg(displayLower), parent);
         }
         low->setFont(plainFont);
 
@@ -154,9 +154,9 @@ PluginControl::PluginControl(TQWidget *parent,
         TQLabel *upp;
         if (port->getDisplayHint() &
             (PluginPort::Integer | PluginPort::Toggled)) {
-            upp = new TQLabel(TQString("%1").tqarg(int(displayUpper)), parent);
+            upp = new TQLabel(TQString("%1").arg(int(displayUpper)), parent);
         } else {
-            upp = new TQLabel(TQString("%1").tqarg(displayUpper), parent);
+            upp = new TQLabel(TQString("%1").arg(displayUpper), parent);
         }
         upp->setFont(plainFont);
 
@@ -165,8 +165,8 @@ PluginControl::PluginControl(TQWidget *parent,
         if (!hidden) {
             controlTitle->show();
             item = new TQWidgetItem(controlTitle);
-            item->tqsetAlignment(TQt::AlignRight | TQt::AlignBottom);
-            m_tqlayout->addItem(item);
+            item->setAlignment(TQt::AlignRight | TQt::AlignBottom);
+            m_layout->addItem(item);
         } else {
             controlTitle->hide();
         }
@@ -174,8 +174,8 @@ PluginControl::PluginControl(TQWidget *parent,
         if (showBounds && !hidden) {
             low->show();
             item = new TQWidgetItem(low);
-            item->tqsetAlignment(TQt::AlignRight | TQt::AlignBottom);
-            m_tqlayout->addItem(item);
+            item->setAlignment(TQt::AlignRight | TQt::AlignBottom);
+            m_layout->addItem(item);
         } else {
             low->hide();
         }
@@ -183,8 +183,8 @@ PluginControl::PluginControl(TQWidget *parent,
         if (!hidden) {
             m_dial->show();
             item = new TQWidgetItem(m_dial);
-            item->tqsetAlignment(TQt::AlignCenter);
-            m_tqlayout->addItem(item);
+            item->setAlignment(TQt::AlignCenter);
+            m_layout->addItem(item);
         } else {
             m_dial->hide();
         }
@@ -192,8 +192,8 @@ PluginControl::PluginControl(TQWidget *parent,
         if (showBounds && !hidden) {
             upp->show();
             item = new TQWidgetItem(upp);
-            item->tqsetAlignment(TQt::AlignLeft | TQt::AlignBottom);
-            m_tqlayout->addItem(item);
+            item->setAlignment(TQt::AlignLeft | TQt::AlignBottom);
+            m_layout->addItem(item);
         } else {
             upp->hide();
         }
diff --git a/src/gui/widgets/PluginControl.h b/src/gui/widgets/PluginControl.h
index de90836..09eb928 100644
--- a/src/gui/widgets/PluginControl.h
+++ b/src/gui/widgets/PluginControl.h
@@ -57,7 +57,7 @@ public:
     } ControlType;
 
     PluginControl(TQWidget *parent,
-                  TQGridLayout *tqlayout,
+                  TQGridLayout *layout,
                   ControlType type,
                   PluginPort *port,
                   AudioPluginManager *pluginManager,
@@ -84,7 +84,7 @@ protected:
 
     //--------------- Data members ---------------------------------
 
-    TQGridLayout         *m_tqlayout;
+    TQGridLayout         *m_layout;
 
     ControlType          m_type;
     PluginPort          *m_port;
diff --git a/src/gui/widgets/ProgressDialog.cpp b/src/gui/widgets/ProgressDialog.cpp
index e8ff6ee..7cef518 100644
--- a/src/gui/widgets/ProgressDialog.cpp
+++ b/src/gui/widgets/ProgressDialog.cpp
@@ -130,8 +130,8 @@ ProgressDialog::slotSetOperationName(TQString name)
     setLabel(name);
     // Little trick stolen from TQProgressDialog
     // increase resize only, never shrink
-    int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() );
-    int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() );
+    int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() );
+    int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() );
     resize( w, h );
 }
 
@@ -199,7 +199,7 @@ void ProgressDialog::processEvents()
     //    RG_DEBUG << "ProgressDialog::processEvents: modalVisible is "
     //	     << m_modalVisible << endl;
     if (m_modalVisible) {
-        kapp->tqprocessEvents(50);
+        kapp->processEvents(50);
     } else {
         rgapp->refreshGUI(50);
     }
diff --git a/src/gui/widgets/QuantizeParameters.cpp b/src/gui/widgets/QuantizeParameters.cpp
index a85e3b6..84591cb 100644
--- a/src/gui/widgets/QuantizeParameters.cpp
+++ b/src/gui/widgets/QuantizeParameters.cpp
@@ -24,7 +24,7 @@
 
 
 #include "QuantizeParameters.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <kapplication.h>
 
 #include <klocale.h>
@@ -71,7 +71,7 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
     int zero = 0;
     if (!preamble.isNull()) {
         TQLabel *label = new TQLabel(preamble, this);
-        label->tqsetAlignment(TQt::WordBreak);
+        label->setAlignment(TQt::WordBreak);
         m_mainLayout->addMultiCellWidget(label, 0, 0, 0, 1);
         zero = 1;
     }
@@ -82,18 +82,18 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
     m_mainLayout->addWidget(quantizerBox, zero, 0);
     TQFrame *typeFrame = new TQFrame(quantizerBox);
 
-    TQGridLayout *tqlayout = new TQGridLayout(typeFrame, 2, 2, 5, 3);
-    tqlayout->addWidget(new TQLabel(i18n("Quantizer type:"), typeFrame), 0, 0);
+    TQGridLayout *layout = new TQGridLayout(typeFrame, 2, 2, 5, 3);
+    layout->addWidget(new TQLabel(i18n("Quantizer type:"), typeFrame), 0, 0);
     m_typeCombo = new KComboBox(typeFrame);
     m_typeCombo->insertItem(i18n("Grid quantizer"));
     m_typeCombo->insertItem(i18n("Legato quantizer"));
     m_typeCombo->insertItem(i18n("Heuristic notation quantizer"));
-    tqlayout->addWidget(m_typeCombo, 0, 1);
+    layout->addWidget(m_typeCombo, 0, 1);
 
     m_notationTarget = new TQCheckBox
                        (i18n("Quantize for notation only (leave performance unchanged)"),
                         typeFrame);
-    tqlayout->addMultiCellWidget(m_notationTarget, 1, 1, 0, 1);
+    layout->addMultiCellWidget(m_notationTarget, 1, 1, 0, 1);
     if (!showNotationOption)
         m_notationTarget->hide();
 
@@ -104,14 +104,14 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
                     (1, Qt::Horizontal, i18n("Notation parameters"), parameterBox);
     TQFrame *notationFrame = new TQFrame(m_notationBox);
 
-    tqlayout = new TQGridLayout(notationFrame, 4, 2, 5, 3);
+    layout = new TQGridLayout(notationFrame, 4, 2, 5, 3);
 
-    tqlayout->addWidget(new TQLabel(i18n("Base grid unit:"), notationFrame),
+    layout->addWidget(new TQLabel(i18n("Base grid unit:"), notationFrame),
                       1, 0);
     m_notationUnitCombo = new KComboBox(notationFrame);
-    tqlayout->addWidget(m_notationUnitCombo, 1, 1);
+    layout->addWidget(m_notationUnitCombo, 1, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Complexity:"),
+    layout->addWidget(new TQLabel(i18n("Complexity:"),
                                  notationFrame), 0, 0);
 
     m_simplicityCombo = new KComboBox(notationFrame);
@@ -120,9 +120,9 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
     m_simplicityCombo->insertItem(i18n("Normal"));
     m_simplicityCombo->insertItem(i18n("Low"));
     m_simplicityCombo->insertItem(i18n("Very low"));
-    tqlayout->addWidget(m_simplicityCombo, 0, 1);
+    layout->addWidget(m_simplicityCombo, 0, 1);
 
-    tqlayout->addWidget(new TQLabel(i18n("Tuplet level:"),
+    layout->addWidget(new TQLabel(i18n("Tuplet level:"),
                                  notationFrame), 2, 0);
     m_maxTuplet = new KComboBox(notationFrame);
     m_maxTuplet->insertItem(i18n("None"));
@@ -136,34 +136,34 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
         m_maxTuplet->insertItem(i18n("8-Tuplet"));
     */
     m_maxTuplet->insertItem(i18n("Any"));
-    tqlayout->addWidget(m_maxTuplet, 2, 1);
+    layout->addWidget(m_maxTuplet, 2, 1);
 
     m_counterpoint = new TQCheckBox(i18n("Permit counterpoint"), notationFrame);
-    tqlayout->addMultiCellWidget(m_counterpoint, 3, 3, 0, 1);
+    layout->addMultiCellWidget(m_counterpoint, 3, 3, 0, 1);
 
     m_gridBox = new TQGroupBox
                 (1, Qt::Horizontal, i18n("Grid parameters"), parameterBox);
     TQFrame *gridFrame = new TQFrame(m_gridBox);
 
-    tqlayout = new TQGridLayout(gridFrame, 4, 2, 5, 3);
+    layout = new TQGridLayout(gridFrame, 4, 2, 5, 3);
 
-    tqlayout->addWidget(new TQLabel(i18n("Base grid unit:"), gridFrame), 0, 0);
+    layout->addWidget(new TQLabel(i18n("Base grid unit:"), gridFrame), 0, 0);
     m_gridUnitCombo = new KComboBox(gridFrame);
-    tqlayout->addWidget(m_gridUnitCombo, 0, 1);
+    layout->addWidget(m_gridUnitCombo, 0, 1);
 
     m_swingLabel = new TQLabel(i18n("Swing:"), gridFrame);
-    tqlayout->addWidget(m_swingLabel, 1, 0);
+    layout->addWidget(m_swingLabel, 1, 0);
     m_swingCombo = new KComboBox(gridFrame);
-    tqlayout->addWidget(m_swingCombo, 1, 1);
+    layout->addWidget(m_swingCombo, 1, 1);
 
     m_iterativeLabel = new TQLabel(i18n("Iterative amount:"), gridFrame);
-    tqlayout->addWidget(m_iterativeLabel, 2, 0);
+    layout->addWidget(m_iterativeLabel, 2, 0);
     m_iterativeCombo = new KComboBox(gridFrame);
-    tqlayout->addWidget(m_iterativeCombo, 2, 1);
+    layout->addWidget(m_iterativeCombo, 2, 1);
 
     m_durationCheckBox = new TQCheckBox
                          (i18n("Quantize durations as well as start times"), gridFrame);
-    tqlayout->addMultiCellWidget(m_durationCheckBox, 3, 3, 0, 1);
+    layout->addMultiCellWidget(m_durationCheckBox, 3, 3, 0, 1);
 
     m_postProcessingBox = new TQGroupBox
                           (1, Qt::Horizontal, i18n("After quantization"), this);
@@ -188,17 +188,17 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
 
     TQFrame *postFrame = new TQFrame(m_postProcessingBox);
 
-    tqlayout = new TQGridLayout(postFrame, 4, 1, 5, 3);
+    layout = new TQGridLayout(postFrame, 4, 1, 5, 3);
     m_rebeam = new TQCheckBox(i18n("Re-beam"), postFrame);
     m_articulate = new TQCheckBox
                    (i18n("Add articulations (staccato, tenuto, slurs)"), postFrame);
     m_makeViable = new TQCheckBox(i18n("Tie notes at barlines etc"), postFrame);
     m_deCounterpoint = new TQCheckBox(i18n("Split-and-tie overlapping chords"), postFrame);
 
-    tqlayout->addWidget(m_rebeam, 0, 0);
-    tqlayout->addWidget(m_articulate, 1, 0);
-    tqlayout->addWidget(m_makeViable, 2, 0);
-    tqlayout->addWidget(m_deCounterpoint, 3, 0);
+    layout->addWidget(m_rebeam, 0, 0);
+    layout->addWidget(m_articulate, 1, 0);
+    layout->addWidget(m_makeViable, 2, 0);
+    layout->addWidget(m_deCounterpoint, 3, 0);
 
     TQPixmap noMap = NotePixmapFactory::toTQPixmap
                     (NotePixmapFactory::makeToolbarPixmap("menu-no-note"));
@@ -286,8 +286,8 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
             m_gridUnitCombo->insertItem(pmap, label);
             m_notationUnitCombo->insertItem(pmap, label);
         } else {
-            m_gridUnitCombo->insertItem(noMap, TQString("%1").tqarg(time));
-            m_notationUnitCombo->insertItem(noMap, TQString("%1").tqarg(time));
+            m_gridUnitCombo->insertItem(noMap, TQString("%1").arg(time));
+            m_notationUnitCombo->insertItem(noMap, TQString("%1").arg(time));
         }
 
         if (m_standardQuantizations[i] == defaultUnit) {
@@ -298,14 +298,14 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
     }
 
     for (int i = -100; i <= 200; i += 10) {
-        m_swingCombo->insertItem(i == 0 ? i18n("None") : TQString("%1%").tqarg(i));
+        m_swingCombo->insertItem(i == 0 ? i18n("None") : TQString("%1%").arg(i));
         if (i == defaultSwing)
             m_swingCombo->setCurrentItem(m_swingCombo->count() - 1);
     }
 
     for (int i = 10; i <= 100; i += 10) {
         m_iterativeCombo->insertItem(i == 100 ? i18n("Full quantize") :
-                                     TQString("%1%").tqarg(i));
+                                     TQString("%1%").arg(i));
         if (i == defaultIterate)
             m_iterativeCombo->setCurrentItem(m_iterativeCombo->count() - 1);
     }
diff --git a/src/gui/widgets/Rotary.cpp b/src/gui/widgets/Rotary.cpp
index c700e54..2173a26 100644
--- a/src/gui/widgets/Rotary.cpp
+++ b/src/gui/widgets/Rotary.cpp
@@ -31,12 +31,12 @@
 #include "TextFloat.h"
 #include <kapplication.h>
 #include <klocale.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcolor.h>
 #include <tqdialog.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpen.h>
 #include <tqpixmap.h>
 #include <tqpoint.h>
@@ -133,7 +133,7 @@ void
 Rotary::setKnobColour(const TQColor &colour)
 {
     m_knobColour = colour;
-    tqrepaint();
+    repaint();
 }
 
 void
@@ -223,7 +223,7 @@ Rotary::paintEvent(TQPaintEvent *)
 
     paint.setBrush(TQBrush::NoBrush);
 
-    pen.setColor(tqcolorGroup().dark());
+    pen.setColor(colorGroup().dark());
     pen.setWidth(scale);
     paint.setPen(pen);
 
@@ -253,7 +253,7 @@ Rotary::paintEvent(TQPaintEvent *)
     paint.setPen(pen);
 
     int shadowAngle = -720;
-    c = tqcolorGroup().dark();
+    c = colorGroup().dark();
     for (int arc = 120; arc < 2880; arc += 240) {
         pen.setColor(c);
         paint.setPen(pen);
@@ -263,7 +263,7 @@ Rotary::paintEvent(TQPaintEvent *)
     }
 
     shadowAngle = 2160;
-    c = tqcolorGroup().dark();
+    c = colorGroup().dark();
     for (int arc = 120; arc < 2880; arc += 240) {
         pen.setColor(c);
         paint.setPen(pen);
@@ -289,7 +289,7 @@ Rotary::paintEvent(TQPaintEvent *)
     double y = hyp + len * cos(angle);
 
     pen.setWidth(scale * 2);
-    pen.setColor(tqcolorGroup().dark());
+    pen.setColor(colorGroup().dark());
     paint.setPen(pen);
 
     paint.drawLine(int(x0), int(y0), int(x), int(y));
@@ -391,16 +391,16 @@ Rotary::mousePressEvent(TQMouseEvent *e)
         emit valueChanged(m_snapPosition);
     }
 
-    TQPoint totalPos = mapTo(tqtopLevelWidget(), TQPoint(0, 0));
+    TQPoint totalPos = mapTo(topLevelWidget(), TQPoint(0, 0));
 
     if (!_float)
         _float = new TextFloat(this);
     _float->reparent(this);
     _float->move(totalPos + TQPoint(width() + 2, -height() / 2));
     if (m_logarithmic) {
-        _float->setText(TQString("%1").tqarg(powf(10, m_position)));
+        _float->setText(TQString("%1").arg(powf(10, m_position)));
     } else {
-        _float->setText(TQString("%1").tqarg(m_position));
+        _float->setText(TQString("%1").arg(m_position));
     }        
     _float->show();
 
@@ -498,9 +498,9 @@ Rotary::mouseMoveEvent(TQMouseEvent *e)
 
         // draw on the float text
         if (m_logarithmic) {
-            _float->setText(TQString("%1").tqarg(powf(10, m_snapPosition)));
+            _float->setText(TQString("%1").arg(powf(10, m_snapPosition)));
         } else {
-            _float->setText(TQString("%1").tqarg(m_snapPosition));
+            _float->setText(TQString("%1").arg(m_snapPosition));
         }
     }
 }
@@ -527,15 +527,15 @@ Rotary::wheelEvent(TQWheelEvent *e)
 
     // draw on the float text
     if (m_logarithmic) {
-        _float->setText(TQString("%1").tqarg(powf(10, m_snapPosition)));
+        _float->setText(TQString("%1").arg(powf(10, m_snapPosition)));
     } else {
-        _float->setText(TQString("%1").tqarg(m_snapPosition));
+        _float->setText(TQString("%1").arg(m_snapPosition));
     }
 
     // Reposition - we need to sum the relative positions up to the
     // topLevel or dialog to please move(). Move just top/right of the rotary
     //
-    TQPoint totalPos = mapTo(tqtopLevelWidget(), TQPoint(0, 0));
+    TQPoint totalPos = mapTo(topLevelWidget(), TQPoint(0, 0));
     _float->reparent(this);
     _float->move(totalPos + TQPoint(width() + 2, -height() / 2));
     _float->show();
diff --git a/src/gui/widgets/ScrollBox.cpp b/src/gui/widgets/ScrollBox.cpp
index 66ecc21..7deb0e0 100644
--- a/src/gui/widgets/ScrollBox.cpp
+++ b/src/gui/widgets/ScrollBox.cpp
@@ -123,31 +123,31 @@ void ScrollBox::setPageSize(const TQSize& s)
         setFixedWidth(width);
     }
 
-    tqrepaint();
+    repaint();
 }
 
 void ScrollBox::setViewSize(const TQSize& s)
 {
     m_viewsize = s;
-    tqrepaint();
+    repaint();
 }
 
 void ScrollBox::setViewPos(const TQPoint& pos)
 {
     m_viewpos = pos;
-    tqrepaint();
+    repaint();
 }
 
 void ScrollBox::setViewX(int x)
 {
     m_viewpos = TQPoint(x, m_viewpos.y());
-    tqrepaint();
+    repaint();
 }
 
 void ScrollBox::setViewY(int y)
 {
     m_viewpos = TQPoint(m_viewpos.x(), y);
-    tqrepaint();
+    repaint();
 }
 
 void ScrollBox::setThumbnail(TQPixmap img)
diff --git a/src/gui/widgets/TextFloat.cpp b/src/gui/widgets/TextFloat.cpp
index d3cc9d5..f5221d5 100644
--- a/src/gui/widgets/TextFloat.cpp
+++ b/src/gui/widgets/TextFloat.cpp
@@ -29,7 +29,7 @@
 #include "gui/general/GUIPalette.h"
 #include <tqfontmetrics.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpoint.h>
 #include <tqrect.h>
 #include <tqstring.h>
@@ -106,7 +106,7 @@ void
 TextFloat::setText(const TQString &text)
 {
     m_text = text;
-    tqrepaint();
+    repaint();
 }
 
 }
diff --git a/src/gui/widgets/TimeWidget.cpp b/src/gui/widgets/TimeWidget.cpp
index 82877f8..d1aedb2 100644
--- a/src/gui/widgets/TimeWidget.cpp
+++ b/src/gui/widgets/TimeWidget.cpp
@@ -24,7 +24,7 @@
 
 
 #include "TimeWidget.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include "misc/Debug.h"
@@ -93,14 +93,14 @@ TimeWidget::init(bool editable)
     editable = true;
 
     TQFrame *frame = new TQFrame(this);
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 7, 3, 5, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 7, 3, 5, 5);
     TQLabel *label = 0;
 
     if (m_isDuration) {
 
         label = new TQLabel(i18n("Note:"), frame);
-        label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
-        tqlayout->addWidget(label, 0, 0);
+        label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
+        layout->addWidget(label, 0, 0);
 
         if (editable) {
             m_note = new TQComboBox(frame);
@@ -133,7 +133,7 @@ TimeWidget::init(bool editable)
             }
             connect(m_note, TQT_SIGNAL(activated(int)),
                     this, TQT_SLOT(slotNoteChanged(int)));
-            tqlayout->addMultiCellWidget(m_note, 0, 0, 1, 3);
+            layout->addMultiCellWidget(m_note, 0, 0, 1, 3);
 
         } else {
 
@@ -145,12 +145,12 @@ TimeWidget::init(bool editable)
                 label = i18n("<inexact>");
             TQLineEdit *le = new TQLineEdit(label, frame);
             le->setReadOnly(true);
-            tqlayout->addMultiCellWidget(le, 0, 0, 1, 3);
+            layout->addMultiCellWidget(le, 0, 0, 1, 3);
         }
 
         label = new TQLabel(i18n("Units:"), frame);
-        label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
-        tqlayout->addWidget(label, 0, 4);
+        label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
+        layout->addWidget(label, 0, 4);
 
         if (editable) {
             m_timeT = new TQSpinBox(frame);
@@ -158,12 +158,12 @@ TimeWidget::init(bool editable)
             (Note(Note::Shortest).getDuration());
             connect(m_timeT, TQT_SIGNAL(valueChanged(int)),
                     this, TQT_SLOT(slotTimeTChanged(int)));
-            tqlayout->addWidget(m_timeT, 0, 5);
+            layout->addWidget(m_timeT, 0, 5);
         } else {
             m_timeT = 0;
-            TQLineEdit *le = new TQLineEdit(TQString("%1").tqarg(m_time), frame);
+            TQLineEdit *le = new TQLineEdit(TQString("%1").arg(m_time), frame);
             le->setReadOnly(true);
-            tqlayout->addWidget(le, 0, 5);
+            layout->addWidget(le, 0, 5);
         }
 
     } else {
@@ -171,8 +171,8 @@ TimeWidget::init(bool editable)
         m_note = 0;
 
         label = new TQLabel(i18n("Time:"), frame);
-        label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
-        tqlayout->addWidget(label, 0, 0);
+        label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
+        layout->addWidget(label, 0, 0);
 
         if (editable) {
             m_timeT = new TQSpinBox(frame);
@@ -180,19 +180,19 @@ TimeWidget::init(bool editable)
             (Note(Note::Shortest).getDuration());
             connect(m_timeT, TQT_SIGNAL(valueChanged(int)),
                     this, TQT_SLOT(slotTimeTChanged(int)));
-            tqlayout->addWidget(m_timeT, 0, 1);
-            tqlayout->addWidget(new TQLabel(i18n("units"), frame), 0, 2);
+            layout->addWidget(m_timeT, 0, 1);
+            layout->addWidget(new TQLabel(i18n("units"), frame), 0, 2);
         } else {
             m_timeT = 0;
-            TQLineEdit *le = new TQLineEdit(TQString("%1").tqarg(m_time), frame);
+            TQLineEdit *le = new TQLineEdit(TQString("%1").arg(m_time), frame);
             le->setReadOnly(true);
-            tqlayout->addWidget(le, 0, 2);
+            layout->addWidget(le, 0, 2);
         }
     }
 
     label = new TQLabel(m_isDuration ? i18n("Measures:") : i18n("Measure:"), frame);
-    label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
-    tqlayout->addWidget(label, 1, 0);
+    label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    layout->addWidget(label, 1, 0);
 
     if (editable) {
         m_barLabel = 0;
@@ -201,17 +201,17 @@ TimeWidget::init(bool editable)
             m_bar->setMinValue(0);
         connect(m_bar, TQT_SIGNAL(valueChanged(int)),
                 this, TQT_SLOT(slotBarBeatOrFractionChanged(int)));
-        tqlayout->addWidget(m_bar, 1, 1);
+        layout->addWidget(m_bar, 1, 1);
     } else {
         m_bar = 0;
         m_barLabel = new TQLineEdit(frame);
         m_barLabel->setReadOnly(true);
-        tqlayout->addWidget(m_barLabel, 1, 1);
+        layout->addWidget(m_barLabel, 1, 1);
     }
 
     label = new TQLabel(m_isDuration ? i18n("beats:") : i18n("beat:"), frame);
-    label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
-    tqlayout->addWidget(label, 1, 2);
+    label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    layout->addWidget(label, 1, 2);
 
     if (editable) {
         m_beatLabel = 0;
@@ -219,20 +219,20 @@ TimeWidget::init(bool editable)
         m_beat->setMinValue(1);
         connect(m_beat, TQT_SIGNAL(valueChanged(int)),
                 this, TQT_SLOT(slotBarBeatOrFractionChanged(int)));
-        tqlayout->addWidget(m_beat, 1, 3);
+        layout->addWidget(m_beat, 1, 3);
     } else {
         m_beat = 0;
         m_beatLabel = new TQLineEdit(frame);
         m_beatLabel->setReadOnly(true);
-        tqlayout->addWidget(m_beatLabel, 1, 3);
+        layout->addWidget(m_beatLabel, 1, 3);
     }
 
-    label = new TQLabel(i18n("%1:").tqarg(NotationStrings::getShortNoteName
+    label = new TQLabel(i18n("%1:").arg(NotationStrings::getShortNoteName
                                        (Note
                                         (Note::Shortest), true)),
                        frame);
-    label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
-    tqlayout->addWidget(label, 1, 4);
+    label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    layout->addWidget(label, 1, 4);
 
     if (editable) {
         m_fractionLabel = 0;
@@ -240,20 +240,20 @@ TimeWidget::init(bool editable)
         m_fraction->setMinValue(1);
         connect(m_fraction, TQT_SIGNAL(valueChanged(int)),
                 this, TQT_SLOT(slotBarBeatOrFractionChanged(int)));
-        tqlayout->addWidget(m_fraction, 1, 5);
+        layout->addWidget(m_fraction, 1, 5);
     } else {
         m_fraction = 0;
         m_fractionLabel = new TQLineEdit(frame);
         m_fractionLabel->setReadOnly(true);
-        tqlayout->addWidget(m_fractionLabel, 1, 5);
+        layout->addWidget(m_fractionLabel, 1, 5);
     }
 
     m_timeSig = new TQLabel(frame);
-    tqlayout->addWidget(m_timeSig, 1, 6);
+    layout->addWidget(m_timeSig, 1, 6);
 
     label = new TQLabel(i18n("Seconds:"), frame);
-    label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
-    tqlayout->addWidget(label, 2, 0);
+    label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    layout->addWidget(label, 2, 0);
 
     if (editable) {
         m_secLabel = 0;
@@ -262,17 +262,17 @@ TimeWidget::init(bool editable)
             m_sec->setMinValue(0);
         connect(m_sec, TQT_SIGNAL(valueChanged(int)),
                 this, TQT_SLOT(slotSecOrMSecChanged(int)));
-        tqlayout->addWidget(m_sec, 2, 1);
+        layout->addWidget(m_sec, 2, 1);
     } else {
         m_sec = 0;
         m_secLabel = new TQLineEdit(frame);
         m_secLabel->setReadOnly(true);
-        tqlayout->addWidget(m_secLabel, 2, 1);
+        layout->addWidget(m_secLabel, 2, 1);
     }
 
     label = new TQLabel(i18n("msec:"), frame);
-    label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
-    tqlayout->addWidget(label, 2, 2);
+    label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    layout->addWidget(label, 2, 2);
 
     if (editable) {
         m_msecLabel = 0;
@@ -281,17 +281,17 @@ TimeWidget::init(bool editable)
         m_msec->setLineStep(10);
         connect(m_msec, TQT_SIGNAL(valueChanged(int)),
                 this, TQT_SLOT(slotSecOrMSecChanged(int)));
-        tqlayout->addWidget(m_msec, 2, 3);
+        layout->addWidget(m_msec, 2, 3);
     } else {
         m_msec = 0;
         m_msecLabel = new TQLineEdit(frame);
         m_msecLabel->setReadOnly(true);
-        tqlayout->addWidget(m_msecLabel, 2, 3);
+        layout->addWidget(m_msecLabel, 2, 3);
     }
 
     if (m_isDuration) {
         m_tempo = new TQLabel(frame);
-        tqlayout->addWidget(m_tempo, 2, 6);
+        layout->addWidget(m_tempo, 2, 6);
     } else {
         m_tempo = 0;
     }
@@ -383,7 +383,7 @@ TimeWidget::populate()
             }
             m_bar->setValue(bars);
         } else {
-            m_barLabel->setText(TQString("%1").tqarg(bars));
+            m_barLabel->setText(TQString("%1").arg(bars));
         }
 
         if (m_beat) {
@@ -391,7 +391,7 @@ TimeWidget::populate()
             m_beat->setMaxValue(timeSig.getBeatsPerBar() - 1);
             m_beat->setValue(beats);
         } else {
-            m_beatLabel->setText(TQString("%1").tqarg(beats));
+            m_beatLabel->setText(TQString("%1").arg(beats));
         }
 
         if (m_fraction) {
@@ -401,10 +401,10 @@ TimeWidget::populate()
                                     getDuration() - 1);
             m_fraction->setValue(hemidemis);
         } else {
-            m_fractionLabel->setText(TQString("%1").tqarg(hemidemis));
+            m_fractionLabel->setText(TQString("%1").arg(hemidemis));
         }
 
-        m_timeSig->setText(i18n("(%1/%2 time)").tqarg(timeSig.getNumerator()).
+        m_timeSig->setText(i18n("(%1/%2 time)").arg(timeSig.getNumerator()).
                            arg(timeSig.getDenominator()));
 
         timeT endTime = m_startTime + m_time;
@@ -422,7 +422,7 @@ TimeWidget::populate()
             }
             m_sec->setValue(rt.sec);
         } else {
-            m_secLabel->setText(TQString("%1").tqarg(rt.sec));
+            m_secLabel->setText(TQString("%1").arg(rt.sec));
         }
 
         if (m_msec) {
@@ -430,7 +430,7 @@ TimeWidget::populate()
             m_msec->setMaxValue(999);
             m_msec->setValue(rt.msec());
         } else {
-            m_msecLabel->setText(TQString("%1").tqarg(rt.msec()));
+            m_msecLabel->setText(TQString("%1").arg(rt.msec()));
         }
 
         bool change = (m_composition->getTempoChangeNumberAt(endTime) !=
@@ -507,7 +507,7 @@ TimeWidget::populate()
             }
             m_bar->setValue(bar + 1);
         } else {
-            m_barLabel->setText(TQString("%1").tqarg(bar + 1));
+            m_barLabel->setText(TQString("%1").arg(bar + 1));
         }
 
         if (m_beat) {
@@ -515,7 +515,7 @@ TimeWidget::populate()
             m_beat->setMaxValue(timeSig.getBeatsPerBar());
             m_beat->setValue(beat);
         } else {
-            m_beatLabel->setText(TQString("%1").tqarg(beat));
+            m_beatLabel->setText(TQString("%1").arg(beat));
         }
 
         if (m_fraction) {
@@ -525,10 +525,10 @@ TimeWidget::populate()
                                     getDuration() - 1);
             m_fraction->setValue(hemidemis);
         } else {
-            m_fractionLabel->setText(TQString("%1").tqarg(hemidemis));
+            m_fractionLabel->setText(TQString("%1").arg(hemidemis));
         }
 
-        m_timeSig->setText(i18n("(%1/%2 time)").tqarg(timeSig.getNumerator()).
+        m_timeSig->setText(i18n("(%1/%2 time)").arg(timeSig.getNumerator()).
                            arg(timeSig.getDenominator()));
 
         RealTime rt = m_composition->getElapsedRealTime(m_time);
@@ -543,7 +543,7 @@ TimeWidget::populate()
             }
             m_sec->setValue(rt.sec);
         } else {
-            m_secLabel->setText(TQString("%1").tqarg(rt.sec));
+            m_secLabel->setText(TQString("%1").arg(rt.sec));
         }
 
         if (m_msec) {
@@ -551,7 +551,7 @@ TimeWidget::populate()
             m_msec->setMaxValue(999);
             m_msec->setValue(rt.msec());
         } else {
-            m_msecLabel->setText(TQString("%1").tqarg(rt.msec()));
+            m_msecLabel->setText(TQString("%1").arg(rt.msec()));
         }
     }
 
diff --git a/src/gui/widgets/VUMeter.cpp b/src/gui/widgets/VUMeter.cpp
index 2aa89e9..62b7128 100644
--- a/src/gui/widgets/VUMeter.cpp
+++ b/src/gui/widgets/VUMeter.cpp
@@ -29,7 +29,7 @@
 #include "base/AudioLevel.h"
 #include "gui/general/GUIPalette.h"
 #include "gui/rulers/VelocityColour.h"
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcolor.h>
 #include <tqlabel.h>
 #include <tqpainter.h>
@@ -46,13 +46,13 @@ VUMeter::VUMeter(TQWidget *parent,
                  bool hasRecord,
                  int width,
                  int height,
-                 VUAlignment tqalignment,
+                 VUAlignment alignment,
                  const char *name):
         TQLabel(parent, name),
         m_originalHeight(height),
         m_active(true),
         m_type(type),
-        m_tqalignment(tqalignment),
+        m_alignment(alignment),
         m_levelLeft(0),
         m_recordLevelLeft(0),
         m_peakLevelLeft(0),
@@ -121,7 +121,7 @@ VUMeter::VUMeter(TQWidget *parent,
     setMinimumSize(width, m_originalHeight);
     setMaximumSize(width, m_originalHeight);
 
-    if (m_tqalignment == Vertical)
+    if (m_alignment == Vertical)
         m_maxLevel = height;
     else
         m_maxLevel = width;
@@ -336,7 +336,7 @@ VUMeter::paintEvent(TQPaintEvent *e)
 
         drawMeterLevel(&paint);
 
-        paint.setPen(tqcolorGroup().background());
+        paint.setPen(colorGroup().background());
         paint.drawPoint(0, 0);
         paint.drawPoint(width() - 1, 0);
         paint.drawPoint(0, height() - 1);
@@ -381,7 +381,7 @@ VUMeter::drawColouredBar(TQPainter *paint, int channel,
         int medium = m_velocityColour->getMediumKnee(),
                      loud = m_velocityColour->getLoudKnee();
 
-        if (m_tqalignment == Vertical) {
+        if (m_alignment == Vertical) {
             if (h > loud) {
                 paint->setPen(m_velocityColour->getLoudColour());
                 paint->setBrush(TQBrush(m_velocityColour->getLoudColour(),
@@ -397,7 +397,7 @@ VUMeter::drawColouredBar(TQPainter *paint, int channel,
             }
         }
 
-        if (m_tqalignment == Vertical) {
+        if (m_alignment == Vertical) {
             if (h > medium) {
                 paint->setPen(m_velocityColour->getMediumColour());
                 paint->setBrush(TQBrush(m_velocityColour->getMediumColour(),
@@ -415,7 +415,7 @@ VUMeter::drawColouredBar(TQPainter *paint, int channel,
             }
         }
 
-        if (m_tqalignment == Vertical) {
+        if (m_alignment == Vertical) {
             paint->setPen(m_velocityColour->getQuietColour());
             paint->setBrush(TQBrush(m_velocityColour->getQuietColour(),
                                    style));
@@ -458,7 +458,7 @@ VUMeter::drawMeterLevel(TQPainter* paint)
                  loud = m_velocityColour->getLoudKnee();
 
     if (m_stereo) {
-        if (m_tqalignment == VUMeter::Vertical) {
+        if (m_alignment == VUMeter::Vertical) {
             int hW = width() / 2;
 
             int midWidth = 1;
@@ -561,7 +561,7 @@ VUMeter::drawMeterLevel(TQPainter* paint)
     } else {
         // Paint a vertical meter according to type
         //
-        if (m_tqalignment == VUMeter::Vertical) {
+        if (m_alignment == VUMeter::Vertical) {
             int y = height() - (m_levelLeft * height()) / m_maxLevel;
             drawColouredBar(paint, 0, 0, y, width(), height());
 
diff --git a/src/gui/widgets/VUMeter.h b/src/gui/widgets/VUMeter.h
index 53c90b3..c004b7e 100644
--- a/src/gui/widgets/VUMeter.h
+++ b/src/gui/widgets/VUMeter.h
@@ -89,7 +89,7 @@ protected:
             bool hasRecord = false,
             int width = 0,
             int height = 0,
-            VUAlignment tqalignment = Horizontal,
+            VUAlignment alignment = Horizontal,
             const char *name = 0);
     ~VUMeter();
 
@@ -115,7 +115,7 @@ private:
                          int x, int y, int w, int h);
 
     VUMeterType m_type;
-    VUAlignment m_tqalignment;
+    VUAlignment m_alignment;
     TQColor      m_background;
 
     short       m_maxLevel;
diff --git a/src/misc/Debug.cpp b/src/misc/Debug.cpp
index 502b68d..7218226 100644
--- a/src/misc/Debug.cpp
+++ b/src/misc/Debug.cpp
@@ -30,7 +30,7 @@
 #include <tqregion.h>
 #include <tqstringlist.h>
 #include <tqpen.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqsize.h>
 #include <kurl.h>
 #endif
@@ -307,8 +307,8 @@ operator<<(kdbgstream &dbg, const TQRegion& reg )
 
     TQMemArray<TQRect>rs = reg.rects();
     for (uint i = 0;i < rs.size();++i)
-        dbg << TQString("[%1,%2 - %3x%4] ").tqarg(rs[i].x()).tqarg(rs[i].y())
-        .tqarg(rs[i].width()).tqarg(rs[i].height() ) ;
+        dbg << TQString("[%1,%2 - %3x%4] ").arg(rs[i].x()).arg(rs[i].y())
+        .arg(rs[i].width()).arg(rs[i].height() ) ;
 
     dbg << "]";
     return dbg;
diff --git a/src/misc/Strings.cpp b/src/misc/Strings.cpp
index 57dc4d3..192044d 100644
--- a/src/misc/Strings.cpp
+++ b/src/misc/Strings.cpp
@@ -25,7 +25,7 @@
 #include "base/Segment.h"
 #include "base/Event.h"
 
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 
 
diff --git a/src/misc/stableheaders.h b/src/misc/stableheaders.h
index 6e2d55a..2bdbfa9 100644
--- a/src/misc/stableheaders.h
+++ b/src/misc/stableheaders.h
@@ -35,14 +35,14 @@
 #include <private/tqucomextra_p.h> 
 #include <tqmetaobject.h>
 #include <tqobjectdefs.h>
-#include <tqsignalslotimp.h>
+#include <signalslotimp.h>
 #include <tqstyle.h>
 
 // Headers used by Rosegarden or KDE3
 #include <tqaccel.h>
 #include <tqapplication.h>
 #include <tqbitmap.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqbuffer.h>
 #include <tqbuttongroup.h>
 #include <tqbutton.h>
@@ -78,7 +78,7 @@
 #include <tqimage.h>
 #include <tqinputdialog.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
 #include <tqlistview.h>
@@ -88,7 +88,7 @@
 #include <tqobjectlist.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpen.h>
 #include <tqpixmap.h>
 #include <tqpointarray.h>
@@ -118,9 +118,9 @@
 #include <tqstrlist.h>
 #include <tqtable.h>
 #include <tqtabwidget.h>
-#include <tqtextcodec.h>
-#include <tqtextedit.h>
-#include <tqtextstream.h>
+#include <textcodec.h>
+#include <textedit.h>
+#include <textstream.h>
 #include <tqthread.h>
 #include <tqtimer.h>
 #include <tqtoolbutton.h>
diff --git a/src/sequencer/ControlBlockMmapper.cpp b/src/sequencer/ControlBlockMmapper.cpp
index 51389de..d1dfa2d 100644
--- a/src/sequencer/ControlBlockMmapper.cpp
+++ b/src/sequencer/ControlBlockMmapper.cpp
@@ -60,7 +60,7 @@ ControlBlockMmapper::ControlBlockMmapper(TQString fileName)
     if (m_mmappedBuffer == (void*) - 1) {
 
         SEQUENCER_DEBUG << TQString("mmap failed : (%1) %2\n").
-        tqarg(errno).tqarg(strerror(errno));
+        arg(errno).arg(strerror(errno));
 
         throw Exception("mmap failed");
     }
diff --git a/src/sequencer/MmappedSegment.cpp b/src/sequencer/MmappedSegment.cpp
index eab5d4a..2176bdd 100644
--- a/src/sequencer/MmappedSegment.cpp
+++ b/src/sequencer/MmappedSegment.cpp
@@ -71,7 +71,7 @@ void MmappedSegment::map()
     if (m_mmappedRegion == (void*) - 1) {
 
         SEQUENCER_DEBUG << TQString("mmap failed : (%1) %2\n").
-        tqarg(errno).tqarg(strerror(errno));
+        arg(errno).arg(strerror(errno));
 
         throw Exception("mmap failed");
     }
@@ -146,7 +146,7 @@ bool MmappedSegment::remap(size_t newSize)
     if (m_mmappedRegion == (void*) - 1) {
 
         SEQUENCER_DEBUG << TQString("mremap failed : (%1) %2\n").
-        tqarg(errno).tqarg(strerror(errno));
+        arg(errno).arg(strerror(errno));
 
         throw Exception("mremap failed");
     }
diff --git a/src/sequencer/RosegardenSequencerApp.cpp b/src/sequencer/RosegardenSequencerApp.cpp
index 9e9b301..51240dc 100644
--- a/src/sequencer/RosegardenSequencerApp.cpp
+++ b/src/sequencer/RosegardenSequencerApp.cpp
@@ -66,7 +66,7 @@ namespace Rosegarden
 RosegardenSequencerApp::RosegardenSequencerApp() :
         DCOPObject("RosegardenSequencerIface"),
         m_driver(0),
-        m_transporttqStatus(STOPPED),
+        m_transportStatus(STOPPED),
         m_songPosition(0, 0),
         m_lastFetchSongPosition(0, 0),
         m_readAhead(0, 80000000),          // default value
@@ -143,7 +143,7 @@ RosegardenSequencerApp::quit()
     close();
 
     // and break out of the loop next time around
-    m_transporttqStatus = TQUIT;
+    m_transportStatus = TQUIT;
 }
 
 
@@ -152,7 +152,7 @@ RosegardenSequencerApp::stop()
 {
     // set our state at this level to STOPPING (pending any
     // unfinished NOTES)
-    m_transporttqStatus = STOPPING;
+    m_transportStatus = STOPPING;
 
     // report
     //
@@ -186,7 +186,7 @@ RosegardenSequencerApp::fetchEvents(MappedComposition &composition,
 {
     // Always return nothing if we're stopped
     //
-    if ( m_transporttqStatus == STOPPED || m_transporttqStatus == STOPPING )
+    if ( m_transportStatus == STOPPED || m_transportStatus == STOPPING )
         return ;
 
     // If we're looping then we should get as much of the rest of
@@ -361,8 +361,8 @@ RosegardenSequencerApp::updateClocks()
 
     // If we're not playing etc. then that's all we need to do
     //
-    if (m_transporttqStatus != PLAYING &&
-            m_transporttqStatus != RECORDING)
+    if (m_transportStatus != PLAYING &&
+            m_transportStatus != RECORDING)
         return ;
 
     RealTime newPosition = m_driver->getSequencerTime();
@@ -409,13 +409,13 @@ RosegardenSequencerApp::updateClocks()
 }
 
 void
-RosegardenSequencerApp::notifySequencertqStatus()
+RosegardenSequencerApp::notifySequencerStatus()
 {
     TQByteArray data, replyData;
     TQCString replyType;
     TQDataStream arg(data, IO_WriteOnly);
 
-    arg << (int)m_transporttqStatus;
+    arg << (int)m_transportStatus;
 
     if (!kapp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME,
                                   ROSEGARDEN_GUI_IFACE_NAME,
@@ -645,12 +645,12 @@ RosegardenSequencerApp::record(const RealTime &time,
                                long smallFileSize,
                                long recordMode)
 {
-    TransporttqStatus localRecordMode = (TransporttqStatus) recordMode;
+    TransportStatus localRecordMode = (TransportStatus) recordMode;
 
-    SEQUENCER_DEBUG << "RosegardenSequencerApp::record - recordMode is " << recordMode << ", transport status is " << m_transporttqStatus << endl;
+    SEQUENCER_DEBUG << "RosegardenSequencerApp::record - recordMode is " << recordMode << ", transport status is " << m_transportStatus << endl;
 
     // punch in recording
-    if (m_transporttqStatus == PLAYING) {
+    if (m_transportStatus == PLAYING) {
         if (localRecordMode == STARTING_TO_RECORD) {
             SEQUENCER_DEBUG << "RosegardenSequencerApp::record: punching in" << endl;
             localRecordMode = RECORDING; // no need to start playback
@@ -758,7 +758,7 @@ RosegardenSequencerApp::record(const RealTime &time,
     // Now set the local transport status to the record mode
     //
     //
-    m_transporttqStatus = localRecordMode;
+    m_transportStatus = localRecordMode;
 
     if (localRecordMode == RECORDING) { // punch in
         return 1;
@@ -787,14 +787,14 @@ RosegardenSequencerApp::play(const RealTime &time,
                              const RealTime &audioWrite,
                              long smallFileSize)
 {
-    if (m_transporttqStatus == PLAYING ||
-            m_transporttqStatus == STARTING_TO_PLAY)
+    if (m_transportStatus == PLAYING ||
+            m_transportStatus == STARTING_TO_PLAY)
         return true;
 
     // Check for record toggle (punch out)
     //
-    if (m_transporttqStatus == RECORDING) {
-        m_transporttqStatus = PLAYING;
+    if (m_transportStatus == RECORDING) {
+        m_transportStatus = PLAYING;
         return punchOut();
     }
 
@@ -809,9 +809,9 @@ RosegardenSequencerApp::play(const RealTime &time,
         (m_songPosition);
     }
 
-    if (m_transporttqStatus != RECORDING &&
-            m_transporttqStatus != STARTING_TO_RECORD) {
-        m_transporttqStatus = STARTING_TO_PLAY;
+    if (m_transportStatus != RECORDING &&
+            m_transportStatus != STARTING_TO_RECORD) {
+        m_transportStatus = STARTING_TO_PLAY;
     }
 
     m_driver->stopClocks();
@@ -898,9 +898,9 @@ RosegardenSequencerApp::punchOut()
 {
     // Check for record toggle (punch out)
     //
-    if (m_transporttqStatus == RECORDING) {
+    if (m_transportStatus == RECORDING) {
         m_driver->punchOut();
-        m_transporttqStatus = PLAYING;
+        m_transportStatus = PLAYING;
         return true;
     }
     return false;
@@ -943,7 +943,7 @@ void RosegardenSequencerApp::cleanupMmapData()
 
 void RosegardenSequencerApp::remapSegment(const TQString& filename, size_t newSize)
 {
-    if (m_transporttqStatus != PLAYING)
+    if (m_transportStatus != PLAYING)
         return ;
 
     SEQUENCER_DEBUG << "RosegardenSequencerApp::remapSegment(" << filename << ")\n";
@@ -955,7 +955,7 @@ void RosegardenSequencerApp::remapSegment(const TQString& filename, size_t newSi
 
 void RosegardenSequencerApp::addSegment(const TQString& filename)
 {
-    if (m_transporttqStatus != PLAYING)
+    if (m_transportStatus != PLAYING)
         return ;
 
     SEQUENCER_DEBUG << "MmappedSegment::addSegment(" << filename << ")\n";
@@ -968,7 +968,7 @@ void RosegardenSequencerApp::addSegment(const TQString& filename)
 
 void RosegardenSequencerApp::deleteSegment(const TQString& filename)
 {
-    if (m_transporttqStatus != PLAYING)
+    if (m_transportStatus != PLAYING)
         return ;
 
     SEQUENCER_DEBUG << "MmappedSegment::deleteSegment(" << filename << ")\n";
@@ -1097,18 +1097,18 @@ RosegardenSequencerApp::setLoop(long loopStartSec,
 // Return the status of the sound systems (audio and MIDI)
 //
 unsigned int
-RosegardenSequencerApp::getSoundDrivertqStatus(const TQString &guiVersion)
+RosegardenSequencerApp::getSoundDriverStatus(const TQString &guiVersion)
 {
-    unsigned int drivertqStatus = m_driver->gettqStatus();
+    unsigned int driverStatus = m_driver->getStatus();
     if (guiVersion == VERSION)
-        drivertqStatus |= VERSION_OK;
+        driverStatus |= VERSION_OK;
     else {
         std::cerr << "WARNING: RosegardenSequencerApp::getSoundDriverStatus: "
         << "GUI version \"" << guiVersion.ascii()
         << "\" does not match sequencer version \"" << VERSION
         << "\"" << std::endl;
     }
-    return drivertqStatus;
+    return driverStatus;
 }
 
 
@@ -1561,8 +1561,8 @@ RosegardenSequencerApp::connectMappedObjects(int id1, int id2)
 
     // When this happens we need to resynchronise our audio processing,
     // and this is the easiest (and most brutal) way to do it.
-    if (m_transporttqStatus == PLAYING ||
-            m_transporttqStatus == RECORDING) {
+    if (m_transportStatus == PLAYING ||
+            m_transportStatus == RECORDING) {
         RealTime seqTime = m_driver->getSequencerTime();
         jumpTo(seqTime.sec, seqTime.nsec);
     }
@@ -1637,8 +1637,8 @@ RosegardenSequencerApp::slotCheckForNewClients()
 {
     // Don't do this check if any of these conditions hold
     //
-    if (m_transporttqStatus == PLAYING ||
-            m_transporttqStatus == RECORDING)
+    if (m_transportStatus == PLAYING ||
+            m_transportStatus == RECORDING)
         return ;
 
     if (m_driver->checkForNewClients()) {
@@ -1795,8 +1795,8 @@ RosegardenSequencerApp::checkExternalTransport()
                                          "jumpToTime(int, int)",
                                          data);
 
-                if (m_transporttqStatus == PLAYING ||
-                        m_transporttqStatus != RECORDING) {
+                if (m_transportStatus == PLAYING ||
+                        m_transportStatus != RECORDING) {
                     jumpTo(pair.second.sec, pair.second.usec() * 1000);
                 }
 
diff --git a/src/sequencer/RosegardenSequencerApp.h b/src/sequencer/RosegardenSequencerApp.h
index 0926911..59d3b48 100644
--- a/src/sequencer/RosegardenSequencerApp.h
+++ b/src/sequencer/RosegardenSequencerApp.h
@@ -162,7 +162,7 @@ public:
  
     // Return the Sound system status (audio/MIDI)
     //
-    virtual unsigned int getSoundDrivertqStatus(const TQString &guiVersion);
+    virtual unsigned int getSoundDriverStatus(const TQString &guiVersion);
 
     // Add and remove Audio files on the sequencer
     //
@@ -330,9 +330,9 @@ public:
 
 
 
-    void settqStatus(TransporttqStatus status)
-            { m_transporttqStatus = status; }
-    TransporttqStatus gettqStatus() { return m_transporttqStatus; }
+    void setStatus(TransportStatus status)
+            { m_transportStatus = status; }
+    TransportStatus getStatus() { return m_transportStatus; }
    
     // Process the first chunk of Sequencer events
     bool startPlaying();
@@ -346,7 +346,7 @@ public:
     bool checkExternalTransport();
 
     // Sends status changes up to GUI
-    void notifySequencertqStatus();
+    void notifySequencerStatus();
 
     // Send latest slice information back to GUI for display
     void notifyVisuals(MappedComposition *mC);
@@ -461,7 +461,7 @@ protected:
     //--------------- Data members ---------------------------------
 
     SoundDriver *m_driver;
-    TransporttqStatus m_transporttqStatus;
+    TransportStatus m_transportStatus;
 
     // Position pointer
     RealTime m_songPosition;
diff --git a/src/sequencer/RosegardenSequencerIface.h b/src/sequencer/RosegardenSequencerIface.h
index f66c7e8..ac401ae 100644
--- a/src/sequencer/RosegardenSequencerIface.h
+++ b/src/sequencer/RosegardenSequencerIface.h
@@ -104,7 +104,7 @@ public:
 
     // Get the status of the Sequencer
     //
-    virtual unsigned int getSoundDrivertqStatus(const TQString &guiVersion) = 0;
+    virtual unsigned int getSoundDriverStatus(const TQString &guiVersion) = 0;
 
     // Add and delete audio files on the Sequencer
     //
diff --git a/src/sequencer/SequencerMmapper.cpp b/src/sequencer/SequencerMmapper.cpp
index f3808a1..0a7e487 100644
--- a/src/sequencer/SequencerMmapper.cpp
+++ b/src/sequencer/SequencerMmapper.cpp
@@ -81,7 +81,7 @@ SequencerMmapper::SequencerMmapper():
 
     if (m_mmappedBuffer == (void*) - 1) {
         SEQUENCER_DEBUG <<
-        TQString("mmap failed : (%1) %2\n").tqarg(errno).tqarg(strerror(errno));
+        TQString("mmap failed : (%1) %2\n").arg(errno).arg(strerror(errno));
         throw Exception("mmap failed");
     }
 
diff --git a/src/sequencer/main.cpp b/src/sequencer/main.cpp
index 4c10362..af3d9a3 100644
--- a/src/sequencer/main.cpp
+++ b/src/sequencer/main.cpp
@@ -131,21 +131,21 @@ int main(int argc, char *argv[])
     // make sure the loop doesn't eat up all the
     // processor - we're not in that much of a rush!
     //
-    TransporttqStatus lastSeqtqStatus = roseSeq->gettqStatus();
+    TransportStatus lastSeqStatus = roseSeq->getStatus();
 
     RealTime sleepTime = RealTime(0, 10000000);
 
-    while (!_exiting && roseSeq && roseSeq->gettqStatus() != TQUIT) {
+    while (!_exiting && roseSeq && roseSeq->getStatus() != TQUIT) {
 
         bool atLeisure = true;
 
-        switch (roseSeq->gettqStatus()) {
+        switch (roseSeq->getStatus()) {
         case STARTING_TO_PLAY:
             if (!roseSeq->startPlaying()) {
                 // send result failed and stop Sequencer
-                roseSeq->settqStatus(STOPPING);
+                roseSeq->setStatus(STOPPING);
             } else {
-                roseSeq->settqStatus(PLAYING);
+                roseSeq->setStatus(PLAYING);
             }
             break;
 
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
             if (!roseSeq->keepPlaying()) {
                 // there's a problem or the piece has
                 // finished - so stop playing
-                roseSeq->settqStatus(STOPPING);
+                roseSeq->setStatus(STOPPING);
             } else {
                 // process any async events
                 //
@@ -163,9 +163,9 @@ int main(int argc, char *argv[])
 
         case STARTING_TO_RECORD:
             if (!roseSeq->startPlaying()) {
-                roseSeq->settqStatus(STOPPING);
+                roseSeq->setStatus(STOPPING);
             } else {
-                roseSeq->settqStatus(RECORDING);
+                roseSeq->setStatus(RECORDING);
             }
             break;
 
@@ -173,7 +173,7 @@ int main(int argc, char *argv[])
             if (!roseSeq->keepPlaying()) {
                 // there's a problem or the piece has
                 // finished - so stop playing
-                roseSeq->settqStatus(STOPPING);
+                roseSeq->setStatus(STOPPING);
             } else {
                 // Now process any incoming MIDI events
                 // and return them to the gui
@@ -196,7 +196,7 @@ int main(int argc, char *argv[])
             // There's no call to roseSeq to actually process the
             // stop, because this arises from a DCOP call from the GUI
             // direct to roseSeq to start with
-            roseSeq->settqStatus(STOPPED);
+            roseSeq->setStatus(STOPPED);
             SEQUENCER_DEBUG << "RosegardenSequencer - Stopped" << endl;
             break;
 
@@ -226,10 +226,10 @@ int main(int argc, char *argv[])
         // we want to process transport changes immediately
         if (roseSeq->checkExternalTransport()) {
             atLeisure = false;
-        } else if (lastSeqtqStatus != roseSeq->gettqStatus()) {
-            SEQUENCER_DEBUG << "Sequencer status changed from " << lastSeqtqStatus << " to " << roseSeq->gettqStatus() << endl;
-            roseSeq->notifySequencertqStatus();
-            lastSeqtqStatus = roseSeq->gettqStatus();
+        } else if (lastSeqStatus != roseSeq->getStatus()) {
+            SEQUENCER_DEBUG << "Sequencer status changed from " << lastSeqStatus << " to " << roseSeq->getStatus() << endl;
+            roseSeq->notifySequencerStatus();
+            lastSeqStatus = roseSeq->getStatus();
             atLeisure = false;
         }
 
diff --git a/src/sound/AlsaDriver.cpp b/src/sound/AlsaDriver.cpp
index 921b17f..58d8093 100644
--- a/src/sound/AlsaDriver.cpp
+++ b/src/sound/AlsaDriver.cpp
@@ -223,7 +223,7 @@ AlsaDriver::getSystemInfo()
 }
 
 void
-AlsaDriver::showQueuetqStatus(int queue)
+AlsaDriver::showQueueStatus(int queue)
 {
     int err, idx, min, max;
     snd_seq_queue_status_t *status;
@@ -705,7 +705,7 @@ AlsaDriver::generateInstruments()
 
         DeviceId ssiDeviceId = getSpareDeviceId();
 
-        if (m_drivertqStatus & AUDIO_OK) {
+        if (m_driverStatus & AUDIO_OK) {
             for (int i = 0; i < count; ++i) {
                 sprintf(number, " #%d", i + 1);
                 std::string name = "Synth plugin" + std::string(number);
@@ -743,7 +743,7 @@ AlsaDriver::generateInstruments()
 
         DeviceId audioDeviceId = getSpareDeviceId();
 
-        if (m_drivertqStatus & AUDIO_OK)
+        if (m_driverStatus & AUDIO_OK)
         {
             for (int channel = 0; channel < audioCount; ++channel) {
                 sprintf(number, " #%d", channel + 1);
@@ -973,11 +973,11 @@ AlsaDriver::createMidiDevice(AlsaPortDescription *port,
 
         if (TQString(deviceName).startsWith("Anonymous MIDI device ")) {
             portName = TQString("out %1")
-                       .tqarg(m_outputPorts.size() + 1);
+                       .arg(m_outputPorts.size() + 1);
         } else {
             portName = TQString("out %1 - %2")
-                       .tqarg(m_outputPorts.size() + 1)
-                       .tqarg(deviceName);
+                       .arg(m_outputPorts.size() + 1)
+                       .arg(deviceName);
         }
 
         int outputPort = checkAlsaError(snd_seq_create_simple_port
@@ -1507,7 +1507,7 @@ AlsaDriver::checkTimerSync(size_t frames)
 #ifdef HAVE_LIBJACK
 
     if (!m_jackDriver || !m_queueRunning || frames == 0 ||
-            (getMTCtqStatus() == TRANSPORT_SLAVE)) {
+            (getMTCStatus() == TRANSPORT_SLAVE)) {
         m_firstTimerCheck = true;
         return ;
     }
@@ -1817,7 +1817,7 @@ AlsaDriver::initialiseMidi()
 
     // Modify status with MIDI success
     //
-    m_drivertqStatus |= MIDI_OK;
+    m_driverStatus |= MIDI_OK;
 
     generateTimerList();
     setCurrentTimer(AUTO_TIMER_NAME);
@@ -1851,7 +1851,7 @@ AlsaDriver::initialiseAudio()
     m_jackDriver = new JackDriver(this);
 
     if (m_jackDriver->isOK()) {
-        m_drivertqStatus |= AUDIO_OK;
+        m_driverStatus |= AUDIO_OK;
     } else {
         delete m_jackDriver;
         m_jackDriver = 0;
@@ -1876,19 +1876,19 @@ AlsaDriver::initialisePlayback(const RealTime &position)
     m_mtcSigmaE = 0;
     m_mtcSigmaC = 0;
 
-    if (getMMCtqStatus() == TRANSPORT_MASTER) {
+    if (getMMCStatus() == TRANSPORT_MASTER) {
         sendMMC(127, MIDI_MMC_PLAY, true, "");
         m_eat_mtc = 0;
     }
 
-    if (getMTCtqStatus() == TRANSPORT_MASTER) {
+    if (getMTCStatus() == TRANSPORT_MASTER) {
         insertMTCFullFrame(position);
     }
 
     // If MIDI Sync is enabled then adjust for the MIDI Clock to
     // synchronise the sequencer with the clock.
     //
-    if (getMIDISynctqStatus() == TRANSPORT_MASTER) {
+    if (getMIDISyncStatus() == TRANSPORT_MASTER) {
         // Send the Song Position Pointer for MIDI CLOCK positioning
         //
         // Get time from current alsa time to start of alsa timing -
@@ -1935,11 +1935,11 @@ AlsaDriver::stopPlayback()
     std::cerr << "\n\nAlsaDriver - stopPlayback" << std::endl;
 #endif
 
-    if (getMIDISynctqStatus() == TRANSPORT_MASTER) {
+    if (getMIDISyncStatus() == TRANSPORT_MASTER) {
         sendSystemDirect(SND_SEQ_EVENT_STOP, NULL);
     }
 
-    if (getMMCtqStatus() == TRANSPORT_MASTER) {
+    if (getMMCStatus() == TRANSPORT_MASTER) {
         sendMMC(127, MIDI_MMC_STOP, true, "");
         //<VN> need to throw away the next MTC event
         m_eat_mtc = 3;
@@ -1992,7 +1992,7 @@ AlsaDriver::punchOut()
 
 #ifdef HAVE_LIBJACK
     // Close any recording file
-    if (m_recordtqStatus == RECORD_ON) {
+    if (m_recordStatus == RECORD_ON) {
         for (InstrumentSet::const_iterator i = m_recordingInstruments.begin();
                 i != m_recordingInstruments.end(); ++i) {
 
@@ -2037,8 +2037,8 @@ AlsaDriver::punchOut()
 
     // Change recorded state if any set
     //
-    if (m_recordtqStatus == RECORD_ON)
-        m_recordtqStatus = RECORD_OFF;
+    if (m_recordStatus == RECORD_ON)
+        m_recordStatus = RECORD_OFF;
 
     m_recordingInstruments.clear();
 }
@@ -2050,7 +2050,7 @@ AlsaDriver::resetPlayback(const RealTime &oldPosition, const RealTime &position)
     std::cerr << "\n\nAlsaDriver - resetPlayback(" << oldPosition << "," << position << ")" << std::endl;
 #endif
 
-    if (getMMCtqStatus() == TRANSPORT_MASTER) {
+    if (getMMCStatus() == TRANSPORT_MASTER) {
         unsigned char t_sec = (unsigned char) position.sec % 60;
         unsigned char t_min = (unsigned char) (position.sec / 60) % 60;
         unsigned char t_hrs = (unsigned char) (position.sec / 3600);
@@ -2135,7 +2135,7 @@ AlsaDriver::resetPlayback(const RealTime &oldPosition, const RealTime &position)
     snd_seq_remove_events_set_condition(info, SND_SEQ_REMOVE_OUTPUT);
     snd_seq_remove_events(m_midiHandle, info);
 
-    if (getMTCtqStatus() == TRANSPORT_MASTER) {
+    if (getMTCStatus() == TRANSPORT_MASTER) {
         m_mtcFirstTime = -1;
         m_mtcSigmaE = 0;
         m_mtcSigmaC = 0;
@@ -2718,7 +2718,7 @@ AlsaDriver::getMappedComposition()
         case SND_SEQ_EVENT_QFRAME:
             if (fromController)
                 continue;
-            if (getMTCtqStatus() == TRANSPORT_SLAVE) {
+            if (getMTCStatus() == TRANSPORT_SLAVE) {
                 handleMTCTQFrame(event->data.control.value, eventTime);
             }
             break;
@@ -2733,7 +2733,7 @@ AlsaDriver::getMappedComposition()
             break;
 
         case SND_SEQ_EVENT_START:
-            if ((getMIDISynctqStatus() == TRANSPORT_SLAVE) && !isPlaying()) {
+            if ((getMIDISyncStatus() == TRANSPORT_SLAVE) && !isPlaying()) {
                 ExternalTransport *transport = getExternalTransportControl();
                 if (transport) {
                     transport->transportJump(ExternalTransport::TransportStopAtTime,
@@ -2749,7 +2749,7 @@ AlsaDriver::getMappedComposition()
             break;
 
         case SND_SEQ_EVENT_CONTINUE:
-            if ((getMIDISynctqStatus() == TRANSPORT_SLAVE) && !isPlaying()) {
+            if ((getMIDISyncStatus() == TRANSPORT_SLAVE) && !isPlaying()) {
                 ExternalTransport *transport = getExternalTransportControl();
                 if (transport) {
                     transport->transportChange(ExternalTransport::TransportPlay);
@@ -2763,7 +2763,7 @@ AlsaDriver::getMappedComposition()
             break;
 
         case SND_SEQ_EVENT_STOP:
-            if ((getMIDISynctqStatus() == TRANSPORT_SLAVE) && isPlaying()) {
+            if ((getMIDISyncStatus() == TRANSPORT_SLAVE) && isPlaying()) {
                 ExternalTransport *transport = getExternalTransportControl();
                 if (transport) {
                     transport->transportChange(ExternalTransport::TransportStop);
@@ -2819,7 +2819,7 @@ AlsaDriver::getMappedComposition()
         }
     }
 
-    if (getMTCtqStatus() == TRANSPORT_SLAVE && isPlaying()) {
+    if (getMTCStatus() == TRANSPORT_SLAVE && isPlaying()) {
 #ifdef MTC_DEBUG
         std::cerr << "seq time is " << getSequencerTime() << ", last MTC receive "
         << m_mtcLastReceive << ", first time " << m_mtcFirstTime << std::endl;
@@ -2846,7 +2846,7 @@ static int lock_count = 0;
 void
 AlsaDriver::handleMTCTQFrame(unsigned int data_byte, RealTime the_time)
 {
-    if (getMTCtqStatus() != TRANSPORT_SLAVE)
+    if (getMTCStatus() != TRANSPORT_SLAVE)
         return ;
 
     switch (data_byte & 0xF0) {
@@ -3172,7 +3172,7 @@ AlsaDriver::insertMTCTQFrames(RealTime sliceStart, RealTime sliceEnd)
 bool
 AlsaDriver::testForMTCSysex(const snd_seq_event_t *event)
 {
-    if (getMTCtqStatus() != TRANSPORT_SLAVE)
+    if (getMTCStatus() != TRANSPORT_SLAVE)
         return false;
 
     // At this point, and possibly for the foreseeable future, the only
@@ -3344,7 +3344,7 @@ AlsaDriver::tweakSkewForMTC(int factor)
 bool
 AlsaDriver::testForMMCSysex(const snd_seq_event_t *event)
 {
-    if (getMMCtqStatus() != TRANSPORT_SLAVE)
+    if (getMMCStatus() != TRANSPORT_SLAVE)
         return false;
 
     if (event->data.ext.len != 6)
@@ -3764,7 +3764,7 @@ AlsaDriver::processMidiOut(const MappedComposition &mC,
 
     processNotesOff(sliceEnd - m_playStartPosition + m_alsaPlayStartTime, now);
 
-    if (getMTCtqStatus() == TRANSPORT_MASTER) {
+    if (getMTCStatus() == TRANSPORT_MASTER) {
         insertMTCTQFrames(sliceStart, sliceEnd);
     }
 
@@ -4009,7 +4009,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
         // we're really rolling.
         m_playing = true;
 
-        if (getMTCtqStatus() == TRANSPORT_SLAVE) {
+        if (getMTCStatus() == TRANSPORT_SLAVE) {
             tweakSkewForMTC(0);
         }
     }
@@ -4155,7 +4155,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
                 << std::endl;
 #endif
 
-                setMIDISynctqStatus(TRANSPORT_OFF);
+                setMIDISyncStatus(TRANSPORT_OFF);
                 break;
 
             case 1:
@@ -4167,7 +4167,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
                 << std::endl;
 #endif
 
-                setMIDISynctqStatus(TRANSPORT_MASTER);
+                setMIDISyncStatus(TRANSPORT_MASTER);
                 break;
 
             case 2:
@@ -4179,7 +4179,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
                 << std::endl;
 #endif
 
-                setMIDISynctqStatus(TRANSPORT_SLAVE);
+                setMIDISyncStatus(TRANSPORT_SLAVE);
                 break;
             }
         }
@@ -4274,7 +4274,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
                 << std::endl;
 #endif
 
-                setMMCtqStatus(TRANSPORT_MASTER);
+                setMMCStatus(TRANSPORT_MASTER);
                 break;
 
             case 2:
@@ -4285,7 +4285,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
                 << std::endl;
 #endif
 
-                setMMCtqStatus(TRANSPORT_SLAVE);
+                setMMCStatus(TRANSPORT_SLAVE);
                 break;
 
             case 0:
@@ -4297,7 +4297,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
                 << std::endl;
 #endif
 
-                setMMCtqStatus(TRANSPORT_OFF);
+                setMMCStatus(TRANSPORT_OFF);
                 break;
             }
         }
@@ -4312,7 +4312,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
                 << std::endl;
 #endif
 
-                setMTCtqStatus(TRANSPORT_MASTER);
+                setMTCStatus(TRANSPORT_MASTER);
                 tweakSkewForMTC(0);
                 m_mtcFirstTime = -1;
                 break;
@@ -4325,7 +4325,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
                 << std::endl;
 #endif
 
-                setMTCtqStatus(TRANSPORT_SLAVE);
+                setMTCStatus(TRANSPORT_SLAVE);
                 m_mtcFirstTime = -1;
                 break;
 
@@ -4338,7 +4338,7 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
                 << std::endl;
 #endif
 
-                setMTCtqStatus(TRANSPORT_OFF);
+                setMTCStatus(TRANSPORT_OFF);
                 m_mtcFirstTime = -1;
                 break;
             }
@@ -4477,15 +4477,15 @@ AlsaDriver::processEventsOut(const MappedComposition &mC,
 }
 
 bool
-AlsaDriver::record(RecordtqStatus recordtqStatus,
+AlsaDriver::record(RecordStatus recordStatus,
                    const std::vector<InstrumentId> *armedInstruments,
                    const std::vector<TQString> *audioFileNames)
 {
     m_recordingInstruments.clear();
 
-    if (recordtqStatus == RECORD_ON) {
+    if (recordStatus == RECORD_ON) {
         // start recording
-        m_recordtqStatus = RECORD_ON;
+        m_recordStatus = RECORD_ON;
         m_alsaRecordStartTime = RealTime::zeroTime;
 
         unsigned int audioCount = 0;
@@ -4522,7 +4522,7 @@ AlsaDriver::record(RecordtqStatus recordtqStatus,
 #endif
 
                     if (!good) {
-                        m_recordtqStatus = RECORD_OFF;
+                        m_recordStatus = RECORD_OFF;
                         std::cerr << "AlsaDriver::record: No JACK driver, or JACK driver failed to prepare for recording audio" << std::endl;
                         return false;
                     }
@@ -4532,8 +4532,8 @@ AlsaDriver::record(RecordtqStatus recordtqStatus,
             }
         }
     } else
-        if (recordtqStatus == RECORD_OFF) {
-            m_recordtqStatus = RECORD_OFF;
+        if (recordStatus == RECORD_OFF) {
+            m_recordStatus = RECORD_OFF;
         }
 #ifdef DEBUG_ALSA
         else {
diff --git a/src/sound/AlsaDriver.h b/src/sound/AlsaDriver.h
index a7c83ee..4a22126 100644
--- a/src/sound/AlsaDriver.h
+++ b/src/sound/AlsaDriver.h
@@ -68,7 +68,7 @@ public:
 
     virtual MappedComposition *getMappedComposition();
     
-    virtual bool record(RecordtqStatus recordtqStatus,
+    virtual bool record(RecordStatus recordStatus,
                         const std::vector<InstrumentId> *armedInstruments = 0,
                         const std::vector<TQString> *audioFileNames = 0);
 
@@ -105,7 +105,7 @@ public:
     // Some stuff to help us debug this
     //
     void getSystemInfo();
-    void showQueuetqStatus(int queue);
+    void showQueueStatus(int queue);
 
     // Process pending
     //
diff --git a/src/sound/AudioFileManager.cpp b/src/sound/AudioFileManager.cpp
index f8b57b1..10d6474 100644
--- a/src/sound/AudioFileManager.cpp
+++ b/src/sound/AudioFileManager.cpp
@@ -537,8 +537,8 @@ AudioFileManager::createRecordingAudioFile()
     while (fileName == "") {
 
         fileName = TQString("rg-%1-%2.wav")
-                   .tqarg(TQDateTime::tqcurrentDateTime().toString("yyyyMMdd-hhmmss"))
-                   .tqarg(newId + 1);
+                   .arg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
+                   .arg(newId + 1);
 
         if (TQFile(m_audioPath.c_str() + fileName).exists()) {
             fileName = "";
@@ -622,10 +622,10 @@ AudioFileManager::createDerivedAudioFile(AudioFileId source,
     while (fileName == "") {
 
         fileName = TQString("%1-%2-%3-%4.wav")
-	    .tqarg(prefix)
-	    .tqarg(sourceBase.c_str())
-	    .tqarg(TQDateTime::tqcurrentDateTime().toString("yyyyMMdd-hhmmss"))
-	    .tqarg(newId + 1);
+	    .arg(prefix)
+	    .arg(sourceBase.c_str())
+	    .arg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
+	    .arg(newId + 1);
 
         if (TQFile(m_audioPath.c_str() + fileName).exists()) {
             fileName = "";
@@ -657,11 +657,11 @@ AudioFileManager::importURL(const KURL &url, int sampleRate)
 
     std::cerr << "AudioFileManager::importURL("<< url.prettyURL().ascii() << ", " << sampleRate << ")" << std::endl;
 
-    emit setOperationName(i18n("Downloading file %1").tqarg(url.prettyURL()));
+    emit setOperationName(i18n("Downloading file %1").arg(url.prettyURL()));
 
     TQString localPath = "";
     if (!KIO::NetAccess::download(url, localPath)) {
-	KMessageBox::error(0, i18n("Cannot download file %1").tqarg(url.prettyURL()));
+	KMessageBox::error(0, i18n("Cannot download file %1").arg(url.prettyURL()));
 	throw SoundFile::BadSoundFileException(url.prettyURL().ascii());
     }
     
@@ -688,7 +688,7 @@ AudioFileManager::fileNeedsConversion(const std::string &fileName,
     *proc << "rosegarden-audiofile-importer";
     if (sampleRate > 0) {
         *proc << "-r";
-        *proc << TQString("%1").tqarg(sampleRate);
+        *proc << TQString("%1").arg(sampleRate);
     }
     *proc << "-w";
     *proc << fileName.c_str();
@@ -715,7 +715,7 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
     *proc << "rosegarden-audiofile-importer";
     if (sampleRate > 0) {
 	*proc << "-r";
-	*proc << TQString("%1").tqarg(sampleRate);
+	*proc << TQString("%1").arg(sampleRate);
     }
     *proc << "-w";
     *proc << fileName.c_str();
@@ -753,9 +753,9 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
     while (targetName == "") {
 
         targetName = TQString("conv-%2-%3-%4.wav")
-	    .tqarg(sourceBase)
-	    .tqarg(TQDateTime::tqcurrentDateTime().toString("yyyyMMdd-hhmmss"))
-	    .tqarg(newId + 1);
+	    .arg(sourceBase)
+	    .arg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
+	    .arg(newId + 1);
 
         if (TQFile(m_audioPath.c_str() + targetName).exists()) {
             targetName = "";
@@ -768,7 +768,7 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
     *m_importProcess << "rosegarden-audiofile-importer";
     if (sampleRate > 0) {
 	*m_importProcess << "-r";
-	*m_importProcess << TQString("%1").tqarg(sampleRate);
+	*m_importProcess << TQString("%1").arg(sampleRate);
     }
     *m_importProcess << "-c";
     *m_importProcess << fileName.c_str();
@@ -777,7 +777,7 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
     m_importProcess->start(KProcess::NotifyOnExit, KProcess::NoCommunication);
 
     while (m_importProcess->isRunning()) {
-	kapp->tqprocessEvents(100);
+	kapp->processEvents(100);
     }
 
     if (!m_importProcess->normalExit()) {
diff --git a/src/sound/AudioProcess.cpp b/src/sound/AudioProcess.cpp
index 7a7f1ab..c811654 100644
--- a/src/sound/AudioProcess.cpp
+++ b/src/sound/AudioProcess.cpp
@@ -2337,7 +2337,7 @@ AudioFileWriter::closeRecordFile(InstrumentId id, AudioFileId &returnedId)
         return false;
 
     returnedId = m_files[id].first->getId();
-    m_files[id].second->settqStatus(RecordableAudioFile::DEFUNCT);
+    m_files[id].second->setStatus(RecordableAudioFile::DEFUNCT);
 
 #ifdef DEBUG_WRITER
 
@@ -2364,7 +2364,7 @@ AudioFileWriter::haveRecordFileOpen(InstrumentId id)
     }
 
     return (m_files[id].first &&
-            (m_files[id].second->gettqStatus() != RecordableAudioFile::DEFUNCT));
+            (m_files[id].second->getStatus() != RecordableAudioFile::DEFUNCT));
 }
 
 bool
@@ -2377,7 +2377,7 @@ AudioFileWriter::haveRecordFilesOpen()
     for (InstrumentId id = instrumentBase; id < instrumentBase + instrumentCount; ++id) {
 
         if (m_files[id].first &&
-                (m_files[id].second->gettqStatus() != RecordableAudioFile::DEFUNCT)) {
+                (m_files[id].second->getStatus() != RecordableAudioFile::DEFUNCT)) {
 #ifdef DEBUG_WRITER
             std::cerr << "AudioFileWriter::haveRecordFilesOpen: found open record file for instrument " << id << std::endl;
 #endif
@@ -2410,7 +2410,7 @@ AudioFileWriter::kick(bool wantLock)
 
         RecordableAudioFile *raf = m_files[id].second;
 
-        if (raf->gettqStatus() == RecordableAudioFile::DEFUNCT) {
+        if (raf->getStatus() == RecordableAudioFile::DEFUNCT) {
 
 #ifdef DEBUG_WRITER
             std::cerr << "AudioFileWriter::kick: found defunct file on instrument " << id << std::endl;
diff --git a/src/sound/AudioTimeStretcher.h b/src/sound/AudioTimeStretcher.h
index 96fc54c..fb2029b 100644
--- a/src/sound/AudioTimeStretcher.h
+++ b/src/sound/AudioTimeStretcher.h
@@ -159,7 +159,7 @@ protected:
     /**
      * Resynthesise from m_freq[channel] adding in to "out",
      * adjusting phases on the basis of a prior step size of lastStep.
-     * Also add the window tqshape in to the modulation array (if
+     * Also add the window shape in to the modulation array (if
      * present) -- for use in ensuring the output has the correct
      * magnitude afterwards.
      */
diff --git a/src/sound/DSSIPluginFactory.cpp b/src/sound/DSSIPluginFactory.cpp
index 9189fa6..9e10778 100644
--- a/src/sound/DSSIPluginFactory.cpp
+++ b/src/sound/DSSIPluginFactory.cpp
@@ -67,14 +67,14 @@ DSSIPluginFactory::enumeratePlugins(MappedObjectPropertyList &list)
 
         list.push_back(*i);
         list.push_back(descriptor->Name);
-        list.push_back(TQString("%1").tqarg(descriptor->UniqueID));
+        list.push_back(TQString("%1").arg(descriptor->UniqueID));
         list.push_back(descriptor->Label);
         list.push_back(descriptor->Maker);
         list.push_back(descriptor->Copyright);
         list.push_back((ddesc->run_synth || ddesc->run_multiple_synths) ? "true" : "false");
         list.push_back(ddesc->run_multiple_synths ? "true" : "false");
         list.push_back(m_taxonomy[descriptor->UniqueID]);
-        list.push_back(TQString("%1").tqarg(descriptor->PortCount));
+        list.push_back(TQString("%1").arg(descriptor->PortCount));
 
         for (unsigned long p = 0; p < descriptor->PortCount; ++p) {
 
@@ -90,13 +90,13 @@ DSSIPluginFactory::enumeratePlugins(MappedObjectPropertyList &list)
                 type |= PluginPort::Output;
             }
 
-            list.push_back(TQString("%1").tqarg(p));
+            list.push_back(TQString("%1").arg(p));
             list.push_back(descriptor->PortNames[p]);
-            list.push_back(TQString("%1").tqarg(type));
-            list.push_back(TQString("%1").tqarg(getPortDisplayHint(descriptor, p)));
-            list.push_back(TQString("%1").tqarg(getPortMinimum(descriptor, p)));
-            list.push_back(TQString("%1").tqarg(getPortMaximum(descriptor, p)));
-            list.push_back(TQString("%1").tqarg(getPortDefault(descriptor, p)));
+            list.push_back(TQString("%1").arg(type));
+            list.push_back(TQString("%1").arg(getPortDisplayHint(descriptor, p)));
+            list.push_back(TQString("%1").arg(getPortMinimum(descriptor, p)));
+            list.push_back(TQString("%1").arg(getPortMaximum(descriptor, p)));
+            list.push_back(TQString("%1").arg(getPortDefault(descriptor, p)));
         }
     }
 
diff --git a/src/sound/DSSIPluginInstance.cpp b/src/sound/DSSIPluginInstance.cpp
index df18b59..c89aca2 100644
--- a/src/sound/DSSIPluginInstance.cpp
+++ b/src/sound/DSSIPluginInstance.cpp
@@ -451,7 +451,7 @@ DSSIPluginInstance::checkProgramCache()
         ProgramDescriptor d;
         d.bank = programDescriptor->Bank;
         d.program = programDescriptor->Program;
-        d.name = TQString("%1. %2").tqarg(index).tqarg(programDescriptor->Name);
+        d.name = TQString("%1. %2").arg(index).arg(programDescriptor->Name);
         m_cachedPrograms.push_back(d);
     }
 
diff --git a/src/sound/DummyDriver.h b/src/sound/DummyDriver.h
index 5cb5cad..d60c7c0 100644
--- a/src/sound/DummyDriver.h
+++ b/src/sound/DummyDriver.h
@@ -60,7 +60,7 @@ public:
 
     // Activate a recording state
     //
-    virtual bool record(RecordtqStatus /*recordtqStatus*/,
+    virtual bool record(RecordStatus /*recordStatus*/,
                         const std::vector<InstrumentId> */*armedInstruments = 0*/,
                         const std::vector<TQString> */*audioFileNames = 0*/)
         { return false; }
diff --git a/src/sound/JackDriver.cpp b/src/sound/JackDriver.cpp
index ecd6739..673f5ea 100644
--- a/src/sound/JackDriver.cpp
+++ b/src/sound/JackDriver.cpp
@@ -1383,7 +1383,7 @@ JackDriver::jackProcessRecord(InstrumentId id,
 
     float gain = AudioLevel::dB_to_multiplier(level);
 
-    if (m_alsaDriver->getRecordtqStatus() == RECORD_ON &&
+    if (m_alsaDriver->getRecordStatus() == RECORD_ON &&
             clocksRunning &&
             m_fileWriter->haveRecordFileOpen(id)) {
 
diff --git a/src/sound/LADSPAPluginFactory.cpp b/src/sound/LADSPAPluginFactory.cpp
index 9a7b49a..b1560d8 100644
--- a/src/sound/LADSPAPluginFactory.cpp
+++ b/src/sound/LADSPAPluginFactory.cpp
@@ -81,7 +81,7 @@ LADSPAPluginFactory::enumeratePlugins(MappedObjectPropertyList &list)
 
         list.push_back(*i);
         list.push_back(descriptor->Name);
-        list.push_back(TQString("%1").tqarg(descriptor->UniqueID));
+        list.push_back(TQString("%1").arg(descriptor->UniqueID));
         list.push_back(descriptor->Label);
         list.push_back(descriptor->Maker);
         list.push_back(descriptor->Copyright);
@@ -104,7 +104,7 @@ LADSPAPluginFactory::enumeratePlugins(MappedObjectPropertyList &list)
 
         }
 
-        list.push_back(TQString("%1").tqarg(descriptor->PortCount));
+        list.push_back(TQString("%1").arg(descriptor->PortCount));
 
         for (unsigned long p = 0; p < descriptor->PortCount; ++p) {
 
@@ -120,13 +120,13 @@ LADSPAPluginFactory::enumeratePlugins(MappedObjectPropertyList &list)
                 type |= PluginPort::Output;
             }
 
-            list.push_back(TQString("%1").tqarg(p));
+            list.push_back(TQString("%1").arg(p));
             list.push_back(descriptor->PortNames[p]);
-            list.push_back(TQString("%1").tqarg(type));
-            list.push_back(TQString("%1").tqarg(getPortDisplayHint(descriptor, p)));
-            list.push_back(TQString("%1").tqarg(getPortMinimum(descriptor, p)));
-            list.push_back(TQString("%1").tqarg(getPortMaximum(descriptor, p)));
-            list.push_back(TQString("%1").tqarg(getPortDefault(descriptor, p)));
+            list.push_back(TQString("%1").arg(type));
+            list.push_back(TQString("%1").arg(getPortDisplayHint(descriptor, p)));
+            list.push_back(TQString("%1").arg(getPortMinimum(descriptor, p)));
+            list.push_back(TQString("%1").arg(getPortMaximum(descriptor, p)));
+            list.push_back(TQString("%1").arg(getPortDefault(descriptor, p)));
         }
     }
 
@@ -664,7 +664,7 @@ LADSPAPluginFactory::discoverPlugins()
         TQDir pluginDir(*i, "*.so");
 
         for (unsigned int j = 0; j < pluginDir.count(); ++j) {
-            discoverPlugins(TQString("%1/%2").tqarg(*i).tqarg(pluginDir[j]));
+            discoverPlugins(TQString("%1/%2").arg(*i).arg(pluginDir[j]));
         }
     }
 
diff --git a/src/sound/MappedEvent.cpp b/src/sound/MappedEvent.cpp
index 2eb6382..4bae51e 100644
--- a/src/sound/MappedEvent.cpp
+++ b/src/sound/MappedEvent.cpp
@@ -390,7 +390,7 @@ protected:
 };
 
 DataBlockFile::DataBlockFile(DataBlockRepository::blockid id)
-        : m_fileName(KGlobal::dirs()->resourceDirs("tmp").first() + TQString("/rosegarden_datablock_%1").tqarg(id)),
+        : m_fileName(KGlobal::dirs()->resourceDirs("tmp").first() + TQString("/rosegarden_datablock_%1").arg(id)),
         m_file(m_fileName),
         m_cleared(false)
 {
diff --git a/src/sound/MappedStudio.cpp b/src/sound/MappedStudio.cpp
index e5a583c..9911b67 100644
--- a/src/sound/MappedStudio.cpp
+++ b/src/sound/MappedStudio.cpp
@@ -185,21 +185,21 @@ const MappedObjectProperty MappedPluginPort::Value = "value";
 void
 MappedObject::addChild(MappedObject *object)
 {
-    std::vector<MappedObject*>::iterator it = m_tqchildren.begin();
-    for (; it != m_tqchildren.end(); it++)
+    std::vector<MappedObject*>::iterator it = m_children.begin();
+    for (; it != m_children.end(); it++)
         if ((*it) == object)
             return ;
 
-    m_tqchildren.push_back(object);
+    m_children.push_back(object);
 }
 
 void
 MappedObject::removeChild(MappedObject *object)
 {
-    std::vector<MappedObject*>::iterator it = m_tqchildren.begin();
-    for (; it != m_tqchildren.end(); it++) {
+    std::vector<MappedObject*>::iterator it = m_children.begin();
+    for (; it != m_children.end(); it++) {
         if ((*it) == object) {
-            m_tqchildren.erase(it);
+            m_children.erase(it);
             return ;
         }
     }
@@ -211,9 +211,9 @@ MappedObjectPropertyList
 MappedObject::getChildren()
 {
     MappedObjectPropertyList list;
-    std::vector<MappedObject*>::iterator it = m_tqchildren.begin();
-    for (; it != m_tqchildren.end(); it++)
-        list.push_back(TQString("%1").tqarg((*it)->getId()));
+    std::vector<MappedObject*>::iterator it = m_children.begin();
+    for (; it != m_children.end(); it++)
+        list.push_back(TQString("%1").arg((*it)->getId()));
 
     return list;
 }
@@ -225,10 +225,10 @@ MappedObjectPropertyList
 MappedObject::getChildren(MappedObjectType type)
 {
     MappedObjectPropertyList list;
-    std::vector<MappedObject*>::iterator it = m_tqchildren.begin();
-    for (; it != m_tqchildren.end(); it++) {
+    std::vector<MappedObject*>::iterator it = m_children.begin();
+    for (; it != m_children.end(); it++) {
         if ((*it)->getType() == type)
-            list.push_back(TQString("%1").tqarg((*it)->getId()));
+            list.push_back(TQString("%1").arg((*it)->getId()));
     }
 
     return list;
@@ -244,16 +244,16 @@ MappedObject::destroyChildren()
 
     // see note in destroy() below
 
-    std::vector<MappedObject *> tqchildren = m_tqchildren;
-    m_tqchildren.clear();
+    std::vector<MappedObject *> children = m_children;
+    m_children.clear();
 
-    std::vector<MappedObject *>::iterator it = tqchildren.begin();
-    for (; it != tqchildren.end(); it++)
+    std::vector<MappedObject *>::iterator it = children.begin();
+    for (; it != children.end(); it++)
         (*it)->destroy(); // remove from studio and destroy
 }
 
 // Destroy this object and remove it from the studio and
-// do the same for all its tqchildren.
+// do the same for all its children.
 //
 void
 MappedObject::destroy()
@@ -268,14 +268,14 @@ MappedObject::destroy()
     // which calls back on the parent (in this case us) to remove the
     // child.  (That's necessary for the case of destroying a plugin,
     // where we need to remove it from its plugin manager -- etc.)  So
-    // we don't want to be iterating over m_tqchildren here, as it will
+    // we don't want to be iterating over m_children here, as it will
     // change from under us.
 
-    std::vector<MappedObject *> tqchildren = m_tqchildren;
-    m_tqchildren.clear();
+    std::vector<MappedObject *> children = m_children;
+    m_children.clear();
 
-    std::vector<MappedObject *>::iterator it = tqchildren.begin();
-    for (; it != tqchildren.end(); it++) {
+    std::vector<MappedObject *>::iterator it = children.begin();
+    for (; it != children.end(); it++) {
         (*it)->destroy();
     }
 
@@ -875,30 +875,30 @@ MappedAudioFader::getPropertyList(const MappedObjectProperty &property)
         list.push_back(MappedConnectableObject::ConnectionsIn);
         list.push_back(MappedConnectableObject::ConnectionsOut);
     } else if (property == MappedObject::Instrument) {
-        list.push_back(MappedObjectProperty("%1").tqarg(m_instrumentId));
+        list.push_back(MappedObjectProperty("%1").arg(m_instrumentId));
     } else if (property == MappedAudioFader::FaderLevel) {
-        list.push_back(MappedObjectProperty("%1").tqarg(m_level));
+        list.push_back(MappedObjectProperty("%1").arg(m_level));
     } else if (property == MappedAudioFader::FaderRecordLevel) {
-        list.push_back(MappedObjectProperty("%1").tqarg(m_recordLevel));
+        list.push_back(MappedObjectProperty("%1").arg(m_recordLevel));
     } else if (property == MappedAudioFader::Channels) {
-        list.push_back(MappedObjectProperty("%1").tqarg(m_channels));
+        list.push_back(MappedObjectProperty("%1").arg(m_channels));
     } else if (property == MappedAudioFader::InputChannel) {
-        list.push_back(MappedObjectProperty("%1").tqarg(m_inputChannel));
+        list.push_back(MappedObjectProperty("%1").arg(m_inputChannel));
     } else if (property == MappedAudioFader::Pan) {
-        list.push_back(MappedObjectProperty("%1").tqarg(m_pan));
+        list.push_back(MappedObjectProperty("%1").arg(m_pan));
     } else if (property == MappedConnectableObject::ConnectionsIn) {
         MappedObjectValueList::const_iterator
         it = m_connectionsIn.begin();
 
         for ( ; it != m_connectionsIn.end(); ++it) {
-            list.push_back(TQString("%1").tqarg(*it));
+            list.push_back(TQString("%1").arg(*it));
         }
     } else if (property == MappedConnectableObject::ConnectionsOut) {
         MappedObjectValueList::const_iterator
         it = m_connectionsOut.begin();
 
         for ( ; it != m_connectionsOut.end(); ++it) {
-            list.push_back(TQString("%1").tqarg(*it));
+            list.push_back(TQString("%1").arg(*it));
         }
     }
 
@@ -1013,22 +1013,22 @@ MappedAudioBuss::getPropertyList(const MappedObjectProperty &property)
         list.push_back(MappedConnectableObject::ConnectionsIn);
         list.push_back(MappedConnectableObject::ConnectionsOut);
     } else if (property == BussId) {
-        list.push_back(MappedObjectProperty("%1").tqarg(m_bussId));
+        list.push_back(MappedObjectProperty("%1").arg(m_bussId));
     } else if (property == Level) {
-        list.push_back(MappedObjectProperty("%1").tqarg(m_level));
+        list.push_back(MappedObjectProperty("%1").arg(m_level));
     } else if (property == MappedConnectableObject::ConnectionsIn) {
         MappedObjectValueList::const_iterator
         it = m_connectionsIn.begin();
 
         for ( ; it != m_connectionsIn.end(); ++it) {
-            list.push_back(TQString("%1").tqarg(*it));
+            list.push_back(TQString("%1").arg(*it));
         }
     } else if (property == MappedConnectableObject::ConnectionsOut) {
         MappedObjectValueList::const_iterator
         it = m_connectionsOut.begin();
 
         for ( ; it != m_connectionsOut.end(); ++it) {
-            list.push_back(TQString("%1").tqarg(*it));
+            list.push_back(TQString("%1").arg(*it));
         }
     }
 
@@ -1152,7 +1152,7 @@ MappedAudioInput::getPropertyList(const MappedObjectProperty &property)
     if (property == "") {
         list.push_back(MappedAudioInput::InputNumber);
     } else if (property == InputNumber) {
-        list.push_back(MappedObjectProperty("%1").tqarg(m_inputNumber));
+        list.push_back(MappedObjectProperty("%1").arg(m_inputNumber));
     }
 
     return list;
diff --git a/src/sound/MappedStudio.h b/src/sound/MappedStudio.h
index 96c5639..89acc9b 100644
--- a/src/sound/MappedStudio.h
+++ b/src/sound/MappedStudio.h
@@ -135,7 +135,7 @@ public:
     void destroy();
     void destroyChildren();
 
-    std::vector<MappedObject*> getChildObjects() { return m_tqchildren; }
+    std::vector<MappedObject*> getChildObjects() { return m_children; }
 
 protected:
 
@@ -144,7 +144,7 @@ protected:
     std::string      m_name;
 
     MappedObject                *m_parent;
-    std::vector<MappedObject*>   m_tqchildren;
+    std::vector<MappedObject*>   m_children;
 };
 
 
diff --git a/src/sound/MidiFile.cpp b/src/sound/MidiFile.cpp
index 509b3d3..a2a4475 100644
--- a/src/sound/MidiFile.cpp
+++ b/src/sound/MidiFile.cpp
@@ -171,7 +171,7 @@ MidiFile::getMidiByte(ifstream* midiFile)
 
             emit setProgress((int)(double(midiFile->tellg()) /
                                    double(m_fileSize) * 20.0));
-            kapp->tqprocessEvents(50);
+            kapp->processEvents(50);
         }
 
         return (MidiByte)byte;
@@ -249,7 +249,7 @@ MidiFile::getMidiBytes(ifstream* midiFile, unsigned long numberOfBytes)
     if (bytesGot % 2000 == 0) {
         emit setProgress((int)(double(midiFile->tellg()) /
                                double(m_fileSize) * 20.0));
-        kapp->tqprocessEvents(50);
+        kapp->processEvents(50);
     }
 
     return stringRet;
@@ -524,7 +524,7 @@ MidiFile::parseTrack(ifstream* midiFile, TrackId &lastTrackNum)
     TrackId metaTrack = lastTrackNum;
 
     // Remember the last non-meta status byte (-1 if we haven't seen one)
-    int runningtqStatus = -1;
+    int runningStatus = -1;
 
     bool firstTrack = true;
 
@@ -550,11 +550,11 @@ MidiFile::parseTrack(ifstream* midiFile, TrackId &lastTrackNum)
         midiByte = getMidiByte(midiFile);
 
         if (!(midiByte & MIDI_STATUS_BYTE_MASK)) {
-            if (runningtqStatus < 0) {
+            if (runningStatus < 0) {
                 throw (Exception("Running status used for first event in track"));
             }
 
-            eventCode = (MidiByte)runningtqStatus;
+            eventCode = (MidiByte)runningStatus;
             data1 = midiByte;
 
 #ifdef MIDI_DEBUG
@@ -603,7 +603,7 @@ MidiFile::parseTrack(ifstream* midiFile, TrackId &lastTrackNum)
 
         } else // the rest
         {
-            runningtqStatus = eventCode;
+            runningStatus = eventCode;
 
             MidiEvent *midiEvent;
 
@@ -842,7 +842,7 @@ MidiFile::convertToRosegarden(Composition &composition, ConversionType type)
         // split over these tracks
         emit setProgress(20 +
                          (int)((80.0 * double(i) / double(m_numberOfTracks))));
-        kapp->tqprocessEvents(50);
+        kapp->processEvents(50);
 
         // Convert the deltaTime to an absolute time since
         // the start of the segment.  The addTime method
@@ -2120,7 +2120,7 @@ MidiFile::writeTrack(std::ofstream* midiFile, TrackId trackNumber)
 
         if (progressCount % 500 == 0) {
             emit setProgress(progressCount * 100 / progressTotal);
-            kapp->tqprocessEvents(500);
+            kapp->processEvents(500);
         }
     }
 
diff --git a/src/sound/PeakFile.cpp b/src/sound/PeakFile.cpp
index aebd7c7..12e9186 100644
--- a/src/sound/PeakFile.cpp
+++ b/src/sound/PeakFile.cpp
@@ -24,7 +24,7 @@
 
 #include <tqdatetime.h>
 #include <tqstringlist.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <kapp.h>
 
 #include "PeakFile.h"
@@ -286,7 +286,7 @@ PeakFile::close()
 
     // Set modification time to now
     //
-    m_modificationTime = m_modificationTime.tqcurrentDateTime();
+    m_modificationTime = m_modificationTime.currentDateTime();
 
     TQString fDate;
     fDate.sprintf("%04d:%02d:%02d:%02d:%02d:%02d:%03d",
diff --git a/src/sound/RIFFAudioFile.cpp b/src/sound/RIFFAudioFile.cpp
index 823ee4f..c34435f 100644
--- a/src/sound/RIFFAudioFile.cpp
+++ b/src/sound/RIFFAudioFile.cpp
@@ -154,7 +154,7 @@ RIFFAudioFile::scanTo(std::ifstream *file, const RealTime &time)
     if (file == 0)
         return false;
 
-    // whatever we do here we tqinvalidate the read buffer
+    // whatever we do here we invalidate the read buffer
     //
     m_loseBuffer = true;
 
diff --git a/src/sound/RecordableAudioFile.h b/src/sound/RecordableAudioFile.h
index 886b07c..06df6f0 100644
--- a/src/sound/RecordableAudioFile.h
+++ b/src/sound/RecordableAudioFile.h
@@ -44,21 +44,21 @@ public:
         IDLE,
         RECORDING,
         DEFUNCT
-    } RecordtqStatus;
+    } RecordStatus;
 
     RecordableAudioFile(AudioFile *audioFile, // should be already open for writing
                         size_t bufferSize);
     ~RecordableAudioFile();
 
-    void settqStatus(const RecordtqStatus &status) { m_status = status; }
-    RecordtqStatus gettqStatus() const { return m_status; }
+    void setStatus(const RecordStatus &status) { m_status = status; }
+    RecordStatus getStatus() const { return m_status; }
 
     size_t buffer(const sample_t *data, int channel, size_t frames);
     void write();
 
 protected:
     AudioFile            *m_audioFile;
-    RecordtqStatus          m_status;
+    RecordStatus          m_status;
 
     std::vector<RingBuffer<sample_t> *> m_ringBuffers; // one per channel
 };
diff --git a/src/sound/SoundDriver.cpp b/src/sound/SoundDriver.cpp
index f09de3b..aab641c 100644
--- a/src/sound/SoundDriver.cpp
+++ b/src/sound/SoundDriver.cpp
@@ -40,12 +40,12 @@ namespace Rosegarden
 
 SoundDriver::SoundDriver(MappedStudio *studio, const std::string &name):
         m_name(name),
-        m_drivertqStatus(NO_DRIVER),
+        m_driverStatus(NO_DRIVER),
         m_playStartPosition(0, 0),
         m_startPlayback(false),
         m_playing(false),
         m_midiRecordDevice(0),
-        m_recordtqStatus(RECORD_OFF),
+        m_recordStatus(RECORD_OFF),
         m_midiRunningId(MidiInstrumentBase),
         m_audioRunningId(AudioInstrumentBase),
         //    m_audioQueueScavenger(4, 50),
@@ -55,8 +55,8 @@ SoundDriver::SoundDriver(MappedStudio *studio, const std::string &name):
         m_studio(studio),
         m_sequencerDataBlock(0),
         m_externalTransport(0),
-        m_mmctqStatus(TRANSPORT_OFF),
-        m_mtctqStatus(TRANSPORT_OFF),
+        m_mmcStatus(TRANSPORT_OFF),
+        m_mtcStatus(TRANSPORT_OFF),
         m_mmcId(0),            // default MMC id of 0
         m_midiClockEnabled(false),
         m_midiClockInterval(0, 0),
diff --git a/src/sound/SoundDriver.h b/src/sound/SoundDriver.h
index ee6f9da..74bd966 100644
--- a/src/sound/SoundDriver.h
+++ b/src/sound/SoundDriver.h
@@ -54,10 +54,10 @@ typedef enum
 {
     RECORD_OFF,
     RECORD_ON,
-} RecordtqStatus;
+} RecordStatus;
 
 
-// tqStatus of a SoundDriver - whether we're got an audio and
+// Status of a SoundDriver - whether we're got an audio and
 // MIDI subsystem or not.  This is reported right up to the
 // gui.
 //
@@ -67,7 +67,7 @@ typedef enum
     AUDIO_OK   = 0x01,          // AUDIO's OK
     MIDI_OK    = 0x02,          // MIDI's OK
     VERSION_OK = 0x04           // GUI and sequencer versions match
-} SoundDrivertqStatus;
+} SoundDriverStatus;
 
 
 // Used for MMC and MTC, not for JACK transport
@@ -77,7 +77,7 @@ typedef enum
     TRANSPORT_OFF,
     TRANSPORT_MASTER,
     TRANSPORT_SLAVE
-} TransportSynctqStatus;
+} TransportSyncStatus;
 
 
 // The NoteOffQueue holds a time ordered set of
@@ -179,7 +179,7 @@ public:
     // Activate a recording state.  armedInstruments and audioFileNames
     // can be NULL if no audio tracks recording.
     //
-    virtual bool record(RecordtqStatus recordtqStatus,
+    virtual bool record(RecordStatus recordStatus,
                         const std::vector<InstrumentId> *armedInstruments = 0,
                         const std::vector<TQString> *audioFileNames = 0) = 0;
 
@@ -269,7 +269,7 @@ public:
 
     // Return the current status of the driver
     //
-    unsigned int gettqStatus() const { return m_drivertqStatus; }
+    unsigned int getStatus() const { return m_driverStatus; }
 
     // Are we playing?
     //
@@ -281,7 +281,7 @@ public:
     virtual bool areClocksRunning() const = 0;
 
     RealTime getStartPosition() const { return m_playStartPosition; }
-    RecordtqStatus getRecordtqStatus() const { return m_recordtqStatus; }
+    RecordStatus getRecordStatus() const { return m_recordStatus; }
 
     // Return a MappedDevice full of the Instrument mappings
     // that the driver has discovered.  The gui can then use
@@ -385,18 +385,18 @@ public:
 
     // MIDI Realtime Sync setting
     //
-    TransportSynctqStatus getMIDISynctqStatus() const { return m_midiSynctqStatus; }
-    void setMIDISynctqStatus(TransportSynctqStatus status) { m_midiSynctqStatus = status; }
+    TransportSyncStatus getMIDISyncStatus() const { return m_midiSyncStatus; }
+    void setMIDISyncStatus(TransportSyncStatus status) { m_midiSyncStatus = status; }
 
     // MMC master/slave setting
     //
-    TransportSynctqStatus getMMCtqStatus() const { return m_mmctqStatus; }
-    void setMMCtqStatus(TransportSynctqStatus status) { m_mmctqStatus = status; }
+    TransportSyncStatus getMMCStatus() const { return m_mmcStatus; }
+    void setMMCStatus(TransportSyncStatus status) { m_mmcStatus = status; }
 
     // MTC master/slave setting
     //
-    TransportSynctqStatus getMTCtqStatus() const { return m_mtctqStatus; }
-    void setMTCtqStatus(TransportSynctqStatus status) { m_mtctqStatus = status; }
+    TransportSyncStatus getMTCStatus() const { return m_mtcStatus; }
+    void setMTCStatus(TransportSyncStatus status) { m_mtcStatus = status; }
 
     // MMC Id
     //
@@ -446,7 +446,7 @@ protected:
     AudioFile* getAudioFile(unsigned int id);
 
     std::string                                 m_name;
-    unsigned int                                m_drivertqStatus;
+    unsigned int                                m_driverStatus;
     RealTime                                    m_playStartPosition;
     bool                                        m_startPlayback;
     bool                                        m_playing;
@@ -470,7 +470,7 @@ protected:
 
     MappedComposition                           m_recordComposition;
     MappedComposition                           m_returnComposition;
-    RecordtqStatus                                m_recordtqStatus;
+    RecordStatus                                m_recordStatus;
 
 
     InstrumentId                                m_midiRunningId;
@@ -506,9 +506,9 @@ protected:
 
     // MMC and MTC status and ID
     //
-    TransportSynctqStatus          m_midiSynctqStatus;
-    TransportSynctqStatus          m_mmctqStatus;
-    TransportSynctqStatus          m_mtctqStatus;
+    TransportSyncStatus          m_midiSyncStatus;
+    TransportSyncStatus          m_mmcStatus;
+    TransportSyncStatus          m_mtcStatus;
     MidiByte                     m_mmcId;      // device id
 
     // MIDI clock interval