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

This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.

26 files changed, 337 insertions, 337 deletions

diff --git a/src/gui/editors/notation/FontViewFrame.cpp b/src/gui/editors/notation/FontViewFrame.cpp
index 6e24a18..d07ba40 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").arg(m_fontName));
+        KMessageBox::error(this, i18n("Error: Unable to match font name %1").tqarg(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)").
-                           arg(m_fontName).arg(TQString((const char *)matchFamily)));
+                           tqarg(m_fontName).tqarg(TQString((const char *)matchFamily)));
         m_fontName = (const char *)matchFamily;
     }
 
@@ -125,7 +125,7 @@ void FontViewFrame::setGlyphs(bool glyphs)
     update();
 }
 
-TQSize FontViewFrame::sizeHint() const
+TQSize FontViewFrame::tqsizeHint() 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").arg(m_row * 256 + (j - 1) * 16);
+                TQString s = TQString("%1").tqarg(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").arg(i - 1);
+                TQString s = TQString("%1").tqarg(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 1d649c4..fbfc95a 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 sizeHint() const;
+    TQSize tqsizeHint() 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 2bb036f..6dfad3d 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 layout is performed on a
+ * The Notation H and V tqlayout 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 layout coords
+     * element as opposed to any other.  These are tqlayout 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 c7b1134..9906747 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 layout x
+     * notes in the group, as appropriate.  Does not require tqlayout x
      * coordinates to have been set.
      */
     void applyStemProperties();
 
     /**
-     * Writes beam data into each note in the group.  Notes' layout x
+     * Writes beam data into each note in the group.  Notes' tqlayout 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'
-     * layout x coordinates must already have been set.  Does nothing
+     * tqlayout 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 4d891a6..e971521 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());
 
-        layout(i, startTime, endTime);
+        tqlayout(i, startTime, endTime);
         ++staffNo;
     }
 }
 
 void
-NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
+NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime)
 {
-    Profiler profiler("NotationHLayout::layout");
+    Profiler profiler("NotationHLayout::tqlayout");
 
     Staff &staff = *(i->first);
     NotationElementList *notes = staff.getViewElementList();
@@ -1251,7 +1251,7 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
     //    bool haveSimpleOffset = false;
     //    double simpleOffset = 0;
 
-    NOTATION_DEBUG << "NotationHLayout::layout: full layout " << isFullLayout << ", times " << startTime << "->" << endTime << endl;
+    NOTATION_DEBUG << "NotationHLayout::tqlayout: full tqlayout " << isFullLayout << ", times " << startTime << "->" << endTime << endl;
 
     double x = 0, barX = 0;
     TieMap tieMap;
@@ -1287,7 +1287,7 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
         NotationElementList::iterator from = bdi->second.basicData.start;
         NotationElementList::iterator to;
 
-        NOTATION_DEBUG << "NotationHLayout::layout(): starting bar " << barNo << ", x = " << barX << ", width = " << bdi->second.sizeData.idealWidth << ", time = " << (from == notes->end() ? -1 : (*from)->getViewAbsoluteTime()) << endl;
+        NOTATION_DEBUG << "NotationHLayout::tqlayout(): 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::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
 
             double offset = barX - bdi->second.layoutData.x;
 
-            NOTATION_DEBUG << "NotationHLayout::layout(): bar " << barNo << " has needsLayout false and offset of " << offset << endl;
+            NOTATION_DEBUG << "NotationHLayout::tqlayout(): bar " << barNo << " has needsLayout false and offset of " << offset << endl;
 
             if (offset > -0.1 && offset < 0.1) {
-                NOTATION_DEBUG << "NotationHLayout::layout(): no offset, ignoring" << endl;
+                NOTATION_DEBUG << "NotationHLayout::tqlayout(): no offset, ignoring" << endl;
                 continue;
             }
 
@@ -1323,7 +1323,7 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
                     it != to && it != notes->end(); ++it) {
 
                 NotationElement* nel = static_cast<NotationElement*>(*it);
-                NOTATION_DEBUG << "NotationHLayout::layout(): shifting element's x to " << ((*it)->getLayoutX() + offset) << " (was " << (*it)->getLayoutX() << ")" << endl;
+                NOTATION_DEBUG << "NotationHLayout::tqlayout(): 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::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
             timeSigToPlace = !bdi->second.basicData.timeSignature.isHidden();
         }
         if (timeSigToPlace) {
-            NOTATION_DEBUG << "NotationHLayout::layout(): there's a time sig in this bar" << endl;
+            NOTATION_DEBUG << "NotationHLayout::tqlayout(): there's a time sig in this bar" << endl;
         }
 
         bool repeatClefAndKey = false;
@@ -1350,7 +1350,7 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
             repeatClefAndKey = true;
         }
         if (repeatClefAndKey) {
-            NOTATION_DEBUG << "NotationHLayout::layout(): need to repeat clef & key in this bar" << endl;
+            NOTATION_DEBUG << "NotationHLayout::tqlayout(): need to repeat clef & key in this bar" << endl;
         }
 
         double barInset = notationStaff.getBarInset(barNo, repeatClefAndKey);
@@ -1467,7 +1467,7 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
                 }
             }
 
-            NOTATION_DEBUG << "NotationHLayout::layout(): setting element's x to " << x << " (was " << el->getLayoutX() << ")" << endl;
+            NOTATION_DEBUG << "NotationHLayout::tqlayout(): 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) -- layout() updates the beamed group data
+        // triplet chord) -- tqlayout() 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 878dc17..07cf25e 100644
--- a/src/gui/editors/notation/NotationHLayout.h
+++ b/src/gui/editors/notation/NotationHLayout.h
@@ -56,7 +56,7 @@ class AccidentalTable;
 
 
 /**
- * Horizontal notation layout
+ * Horizontal notation tqlayout
  *
  * computes the X coordinates of notation elements
  */
@@ -77,9 +77,9 @@ public:
     }
 
     /**
-     * Precomputes layout data for a single staff.  The resulting data
+     * Precomputes tqlayout 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 layout().
+     * the entire map is then used by reconcileBars() and tqlayout().
      * 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 layout is done
+     * Returns the total length of all elements once tqlayout 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 layout.
+     * for any rulers associated with the tqlayout.
      */
     virtual double getXForTime(timeT time) const;
 
@@ -286,7 +286,7 @@ protected:
         } sizeData;
 
         struct LayoutData
-        {   // slots either assumed, or only known at layout time
+        {   // slots either assumed, or only known at tqlayout 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 layout(BarDataMap::iterator,
+    void tqlayout(BarDataMap::iterator,
                 timeT startTime,
                 timeT endTime);
     
diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp
index 1baa33c..83575c6 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 layout " << (*result)->getLayoutX() << " - we're at layout " << x << endl;
+    NOTATION_DEBUG << "NotationStaff::getClosestElementToLayoutX: found element at tqlayout " << (*result)->getLayoutX() << " - we're at tqlayout " << 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...").arg(getId() + 1));
+    emit setOperationName(i18n("Rendering staff %1...").tqarg(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...").arg(getId() + 1));
+    emit setOperationName(i18n("Rendering notes on staff %1...").tqarg(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...").arg(getId() + 1));
+    emit setOperationName(i18n("Positioning staff %1...").tqarg(getId() + 1));
     emit setProgress(0);
     throwIfCancelled();
 
diff --git a/src/gui/editors/notation/NotationStaff.h b/src/gui/editors/notation/NotationStaff.h
index f58e77d..bb056c0 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 layout X and Y coordinates they were
-     * given by the horizontal and vertical layout processes.
+     * based entirely on the tqlayout X and Y coordinates they were
+     * given by the horizontal and vertical tqlayout processes.
      *
      * This is necessary because the sprites that are being positioned
-     * may have been created either after the layout process completed
+     * may have been created either after the tqlayout process completed
      * (by renderElements) or before (by the previous renderElements
      * call, if the sprites are unchanged but have moved) -- so
-     * neither the layout nor renderElements can authoritatively set
+     * neither the tqlayout 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
-     * relayout.
+     * retqlayout.
      */
     virtual void markChanged(timeT from = 0,
                              timeT to = 0,
@@ -270,7 +270,7 @@ public:
      Accidentals::NoAccidental) const;
 
     /**
-     * Find the NotationElement whose layout x-coord is closest to x,
+     * Find the NotationElement whose tqlayout 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 layout x-coord,
+     * Find the NotationElement "under" the given tqlayout 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 layout
+     * In practice, calculates the offset between the intended tqlayout
      * 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
-     * layout-x coord x, starting at offset dx into the object, by
+     * tqlayout-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 BarStatus { UnRendered = 0, Rendered, Positioned };
-    typedef std::map<int, BarStatus> BarStatusMap;
+    enum BartqStatus { UnRendered = 0, Rendered, Positioned };
+    typedef std::map<int, BartqStatus> 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 9bbc6e6..e4cae98 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").arg(dots).arg(s);
+                return i18n("%1-dotted-%2").tqarg(dots).tqarg(s);
             else
-                return i18n("%1-dotted %2").arg(dots).arg(s);
+                return i18n("%1-dotted %2").tqarg(dots).tqarg(s);
         } else {
             if (hyphenate)
-                return i18n("dotted-%1").arg(s);
+                return i18n("dotted-%1").tqarg(s);
             else
-                return i18n("dotted %1").arg(s);
+                return i18n("dotted %1").tqarg(s);
         }
     } else {
         if (dots > 1) {
             if (hyphenate)
-                return TQString("%1-dotted-%2").arg(dots).arg(s);
+                return TQString("%1-dotted-%2").tqarg(dots).tqarg(s);
             else
-                return TQString("%1-dotted %2").arg(dots).arg(s);
+                return TQString("%1-dotted %2").tqarg(dots).tqarg(s);
         } else {
             if (hyphenate)
-                return TQString("dotted-%1").arg(s);
+                return TQString("dotted-%1").tqarg(s);
             else
-                return TQString("dotted %1").arg(s);
+                return TQString("dotted %1").tqarg(s);
         }
     }
 }
@@ -93,11 +93,11 @@ NotationStrings::getNoteName(Note note, bool plural, bool triplet)
                                          };
 
     if (plural && triplet) {
-        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
+        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
     } else if (plural) {
         return addDots(pluralnames[type], dots, false, true);
     } else if (triplet) {
-        return addDots(i18n("%1 triplet").arg(names[type]), dots, false, true);
+        return addDots(i18n("%1 triplet").tqarg(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").arg(names[type]), dots, false, false);
+        return addDots(TQString("%1 triplets").tqarg(names[type]), dots, false, false);
     } else if (plural) {
         return addDots(pluralnames[type], dots, false, false);
     } else if (triplet) {
-        return addDots(TQString("%1 triplet").arg(names[type]), dots, false, false);
+        return addDots(TQString("%1 triplet").tqarg(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").arg(names[type]), dots, false, true); // TODO - this is broken because it assumes there's only 1 plural form
+        return addDots(i18n("%1 triplets").tqarg(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").arg(names[type]), dots, false, true);
+        return addDots(i18n("%1 triplet").tqarg(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").arg(wholeNote / duration);
+            return TQString("1/%1").tqarg(wholeNote / duration);
         } else if ((duration / wholeNote) * wholeNote == duration) {
-            return TQString("%1/1").arg(duration / wholeNote);
+            return TQString("%1/1").tqarg(duration / wholeNote);
         } else {
-            return i18n("%1 ticks").arg(duration);
+            return i18n("%1 ticks").tqarg(duration);
             plural = false;
         }
 
diff --git a/src/gui/editors/notation/NotationToolBox.cpp b/src/gui/editors/notation/NotationToolBox.cpp
index 7632413..f2fa642 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)")
-                           .arg(toolName).arg(toolNamelc));
+                           .tqarg(toolName).tqarg(toolNamelc));
         return 0;
     }
 
diff --git a/src/gui/editors/notation/NotationVLayout.cpp b/src/gui/editors/notation/NotationVLayout.cpp
index 5afaa4a..af6a2fe 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)").arg((*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)").tqarg((*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 layout value
+            double y0 = -1E50;          // A very unlikely Y tqlayout 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::layout, which is called
+                // is called from NotationHLayout::tqlayout, 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 hlayout)
+            // elements within the chord (as we can in htqlayout)
             // 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)").arg((*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)").tqarg((*scooter)->getViewAbsoluteTime()));
                 event->dump(std::cerr);
             }
 
diff --git a/src/gui/editors/notation/NotationVLayout.h b/src/gui/editors/notation/NotationVLayout.h
index 2e718c7..b69c06c 100644
--- a/src/gui/editors/notation/NotationVLayout.h
+++ b/src/gui/editors/notation/NotationVLayout.h
@@ -52,7 +52,7 @@ class Composition;
 
 
 /**
- * Vertical notation layout
+ * Vertical notation tqlayout
  *
  * computes the Y coordinate of notation elements
  */
@@ -91,9 +91,9 @@ public:
                            timeT = 0);
 
     /**
-     * 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
+     * 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
      * (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 be96fdf..bd553ee 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 <layout.h>
+#include <tqlayout.h>
 #include "misc/Debug.h"
 #include <kapplication.h>
 
@@ -194,7 +194,7 @@
 #include <ktempfile.h>
 #include <ktoolbar.h>
 #include <kxmlguiclient.h>
-#include <brush.h>
+#include <tqbrush.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_hlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory,
+        m_htqlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory,
                                       m_properties, TQT_TQOBJECT(this))),
-        m_vlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory,
+        m_vtqlayout(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 layout toolbar
+    // by both the actions and the tqlayout 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_hlayout->setSpacing(defaultSpacing);
+    m_htqlayout->setSpacing(defaultSpacing);
 
     int defaultProportion = m_config->readNumEntry("proportion", 60);
-    m_hlayout->setProportion(defaultProportion);
+    m_htqlayout->setProportion(defaultProportion);
 
     delete m_notePixmapFactory;
     m_notePixmapFactory = new NotePixmapFactory(m_fontName, m_fontSize);
-    m_hlayout->setNotePixmapFactory(m_notePixmapFactory);
-    m_vlayout->setNotePixmapFactory(m_notePixmapFactory);
+    m_htqlayout->setNotePixmapFactory(m_notePixmapFactory);
+    m_vtqlayout->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_hlayout, doc, segments, m_leftGutter, 20, getCentralWidget());
+                       (m_htqlayout, doc, segments, m_leftGutter, 20, getCentralWidget());
     addRuler(m_chordNameRuler);
     if (showProgressive)
         m_chordNameRuler->show();
 
     m_tempoRuler = new TempoRuler
-                   (m_hlayout, doc, this, m_leftGutter, 24, false, getCentralWidget());
+                   (m_htqlayout, doc, this, m_leftGutter, 24, false, getCentralWidget());
     addRuler(m_tempoRuler);
     m_tempoRuler->hide();
     static_cast<TempoRuler *>(m_tempoRuler)->connectSignals();
 
     m_rawNoteRuler = new RawNoteRuler
-                     (m_hlayout, segments[0], m_leftGutter, 20, getCentralWidget());
+                     (m_htqlayout, 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_hlayout, m_leftGutter, 25,
+    setBottomStandardRuler(new StandardRuler(getDocument(), m_htqlayout, 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 layout is only here to maintain the button in a
+    // The grid tqlayout 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_hlayout, m_leftGutter, 25,
+                                    m_htqlayout, m_leftGutter, 25,
                                     false, getCentralWidget()), m_headersTopFrame);
 
     m_topStandardRuler->getLoopRuler()->setBackgroundColor
@@ -544,7 +544,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
 
 
     //
-    // layout
+    // tqlayout
     //
     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().getRefreshStatus
+            m_staffs[i]->getSegment().getRefreshtqStatus
             (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 : layout Cancelled" << endl;
+        NOTATION_DEBUG << "NotationView ctor : tqlayout 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);
-    slotUpdateInsertModeStatus();
-    m_chordNameRuler->repaint();
-    m_tempoRuler->repaint();
-    m_rawNoteRuler->repaint();
+    slotUpdateInsertModetqStatus();
+    m_chordNameRuler->tqrepaint();
+    m_tempoRuler->tqrepaint();
+    m_rawNoteRuler->tqrepaint();
     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_hlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory,
+        m_htqlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory,
                                       m_properties, TQT_TQOBJECT(this))),
-        m_vlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory,
+        m_vtqlayout(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 layout toolbar
+    // by both the actions and the tqlayout toolbar
 
     m_config->setGroup(NotationViewConfigGroup);
 
@@ -871,20 +871,20 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
 
     if (referenceView)
     {
-        m_hlayout->setSpacing(referenceView->m_hlayout->getSpacing());
-        m_hlayout->setProportion(referenceView->m_hlayout->getProportion());
+        m_htqlayout->setSpacing(referenceView->m_htqlayout->getSpacing());
+        m_htqlayout->setProportion(referenceView->m_htqlayout->getProportion());
     } else
     {
         int defaultSpacing = m_config->readNumEntry("spacing", 100);
-        m_hlayout->setSpacing(defaultSpacing);
+        m_htqlayout->setSpacing(defaultSpacing);
         int defaultProportion = m_config->readNumEntry("proportion", 60);
-        m_hlayout->setProportion(defaultProportion);
+        m_htqlayout->setProportion(defaultProportion);
     }
 
     delete m_notePixmapFactory;
     m_notePixmapFactory = new NotePixmapFactory(m_fontName, m_fontSize);
-    m_hlayout->setNotePixmapFactory(m_notePixmapFactory);
-    m_vlayout->setNotePixmapFactory(m_notePixmapFactory);
+    m_htqlayout->setNotePixmapFactory(m_notePixmapFactory);
+    m_vtqlayout->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().getRefreshStatus
+            m_staffs[i]->getSegment().getRefreshtqStatus
             (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 : layout Cancelled" << endl;
+        NOTATION_DEBUG << "NotationView ctor : tqlayout Cancelled" << endl;
     }
 
     NOTATION_DEBUG << "NotationView ctor : m_ok = " << m_ok << endl;
@@ -1223,7 +1223,7 @@ void NotationView::positionStaffs()
         }
     }
 
-    m_hlayout->setPageWidth(pageWidth - leftMargin * 2);
+    m_htqlayout->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").arg(pixmapDir));
+        deskBackground.load(TQString("%1/misc/bg-desktop.xpm").tqarg(pixmapDir));
     }
 
     int pageWidth = getPageWidth();
@@ -1365,14 +1365,14 @@ void NotationView::positionPages()
 
     if (m_pageMode != LinedStaff::MultiPageMode) {
         if (haveBackground) {
-            canvas()->setBackgroundPixmap(background);
+            canvas()->tqsetBackgroundPixmap(background);
             getCanvasView()->setBackgroundMode(TQt::FixedPixmap);
             getCanvasView()->setPaletteBackgroundPixmap(background);
             getCanvasView()->setErasePixmap(background);
         }
     } else {
         if (haveBackground) {
-            canvas()->setBackgroundPixmap(deskBackground);
+            canvas()->tqsetBackgroundPixmap(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").arg(page + 1);
+            TQString str = TQString("%1").tqarg(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);
-    slotUpdateAnnotationsStatus();
+    slotUpdateAnnotationstqStatus();
     //    slotToggleAnnotations();
 
     opt = m_config->readBoolEntry("Show LilyPond Directives", true);
     m_lilyPondDirectivesVisible = opt;
     getToggleAction("show_lilypond_directives")->setChecked(opt);
-    slotUpdateLilyPondDirectivesStatus();
+    slotUpdateLilyPondDirectivestqStatus();
 }
 
 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_hlayout->getSpacing();
+    int defaultSpacing = m_htqlayout->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%").arg(*i), 0, TQT_TQOBJECT(this),
+            (TQString("%1%").tqarg(*i), 0, TQT_TQOBJECT(this),
              TQT_SLOT(slotChangeSpacingFromAction()),
-             actionCollection(), TQString("spacing_%1").arg(*i).ascii());
+             actionCollection(), TQString("spacing_%1").tqarg(*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_hlayout->getProportion();
+    int defaultProportion = m_htqlayout->getProportion();
     std::vector<int> proportions = NotationHLayout::getAvailableProportions();
 
     for (std::vector<int>::iterator i = proportions.begin();
             i != proportions.end(); ++i) {
 
-        TQString name = TQString("%1%").arg(*i);
+        TQString name = TQString("%1%").tqarg(*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").arg(*i).ascii());
+             actionCollection(), TQString("proportion_%1").tqarg(*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-layout.xpm");
+    TQCanvasPixmap pixmap(pixmapDir + "/toolbar/linear-tqlayout.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(slotUpdateInsertModeStatus()),
+                       TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()),
                        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(slotUpdateInsertModeStatus()),
+                       TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()),
                        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(slotUpdateInsertModeStatus()),
+                       TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()),
                        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").arg(i).ascii());
+                    TQString("slashes_%1").tqarg(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").arg(sizes[i]).ascii());
+                (TQString("note_font_size_%1").tqarg(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").arg(sizes[i]);
+        TQString actionName = TQString("note_font_size_%1").tqarg(sizes[i]);
 
         KToggleAction *sizeAction = dynamic_cast<KToggleAction *>
                                     (actionCollection()->action(actionName.ascii()));
@@ -2611,7 +2611,7 @@ void NotationView::initLayoutToolbar()
 
     if (!layoutToolbar) {
         std::cerr
-        << "NotationView::initLayoutToolbar() : layout toolbar not found"
+        << "NotationView::initLayoutToolbar() : tqlayout toolbar not found"
         << std::endl;
         return ;
     }
@@ -2679,7 +2679,7 @@ void NotationView::initLayoutToolbar()
     //
     // spacing combo
     //
-    int defaultSpacing = m_hlayout->getSpacing();
+    int defaultSpacing = m_htqlayout->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_hlayout->setPageMode(pageMode != LinedStaff::LinearMode);
-    m_hlayout->setPageWidth(pageWidth - leftMargin * 2);
+    m_htqlayout->setPageMode(pageMode != LinedStaff::LinearMode);
+    m_htqlayout->setPageWidth(pageWidth - leftMargin * 2);
 
-    NOTATION_DEBUG << "NotationView::setPageMode: set layout's page width to "
+    NOTATION_DEBUG << "NotationView::setPageMode: set tqlayout's page width to "
     << (pageWidth - leftMargin * 2) << endl;
 
     positionStaffs();
 
     bool layoutApplied = applyLayout();
     if (!layoutApplied)
-        KMessageBox::sorry(0, "Couldn't apply layout");
+        KMessageBox::sorry(0, "Couldn't apply tqlayout");
     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_hlayout->getXForTime(t);
+    double notationViewLayoutCoord = m_htqlayout->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_hlayout;
+    return m_htqlayout;
 }
 
 void
@@ -2948,8 +2948,8 @@ NotationView::paintEvent(TQPaintEvent *e)
     getPageMargins(leftMargin, topMargin);
 
     if (m_pageMode == LinedStaff::ContinuousPageMode) {
-        // relayout if the window width changes significantly in continuous page mode
-        int diff = int(getPageWidth() - leftMargin * 2 - m_hlayout->getPageWidth());
+        // retqlayout if the window width changes significantly in continuous page mode
+        int diff = int(getPageWidth() - leftMargin * 2 - m_htqlayout->getPageWidth());
         if (diff < -10 || diff > 10) {
             setPageMode(m_pageMode);
             refreshSegment(0, 0, 0);
@@ -2990,15 +2990,15 @@ NotationView::paintEvent(TQPaintEvent *e)
         }
     }
 
-    slotSetOperationNameAndStatus(i18n("  Ready."));
+    slotSetOperationNameAndtqStatus(i18n("  Ready."));
 }
 
 bool NotationView::applyLayout(int staffNo, timeT startTime, timeT endTime)
 {
-    slotSetOperationNameAndStatus(i18n("Laying out score..."));
+    slotSetOperationNameAndtqStatus(i18n("Laying out score..."));
     ProgressDialog::processEvents();
 
-    m_hlayout->setStaffCount(m_staffs.size());
+    m_htqlayout->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;
 
-        slotSetOperationNameAndStatus(i18n("Laying out staff %1...").arg(i + 1));
+        slotSetOperationNameAndtqStatus(i18n("Laying out staff %1...").tqarg(i + 1));
         ProgressDialog::processEvents();
 
-        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);
+        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);
     }
 
-    slotSetOperationNameAndStatus(i18n("Reconciling staffs..."));
+    slotSetOperationNameAndtqStatus(i18n("Reconciling staffs..."));
     ProgressDialog::processEvents();
 
-    m_hlayout->finishLayout(startTime, endTime);
-    m_vlayout->finishLayout(startTime, endTime);
+    m_htqlayout->finishLayout(startTime, endTime);
+    m_vtqlayout->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 repaint
-                segment.getRefreshStatus
+                // mark refresh status and then request a tqrepaint
+                segment.getRefreshtqStatus
                 (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 repaint
+                // mark refresh status and then request a tqrepaint
 
-                oldSelection->getSegment().getRefreshStatus
+                oldSelection->getSegment().getRefreshtqStatus
                 (m_segmentsRefreshStatusIds
                  [getLinedStaff(oldSelection->getSegment())->getId()]).
                 push(startA, endA);
 
-                s->getSegment().getRefreshStatus
+                s->getSegment().getRefreshtqStatus
                 (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_hlayout)
-        m_hlayout->setNotePixmapFactory(m_notePixmapFactory);
-    if (m_vlayout)
-        m_vlayout->setNotePixmapFactory(m_notePixmapFactory);
+    if (m_htqlayout)
+        m_htqlayout->setNotePixmapFactory(m_notePixmapFactory);
+    if (m_vtqlayout)
+        m_vtqlayout->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_hlayout->getTimeForX(coords.first);
+        timeT t = m_htqlayout->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_hlayout->getTimeForX(coords.first);
+	    timeT t = m_htqlayout->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_hlayout->getTimeForX(cc0.first);
-            timeT t1 = m_hlayout->getTimeForX(cc1.first);
+            timeT t0 = m_htqlayout->getTimeForX(cc0.first);
+            timeT t1 = m_htqlayout->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_hlayout->getTimeForX(cc0.first);
-            timeT t1 = m_hlayout->getTimeForX(cc1.first);
+            timeT t0 = m_htqlayout->getTimeForX(cc0.first);
+            timeT t1 = m_htqlayout->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").arg(page + 1);
+            TQString str = TQString("%1").tqarg(page + 1);
 
             thumbPainter.drawRect(x / thumbScale, y / thumbScale,
                                   w / thumbScale, h / thumbScale);
@@ -3809,7 +3809,7 @@ void NotationView::refreshSegment(Segment *segment,
     }
 
     setMenuStates();
-    slotSetOperationNameAndStatus(i18n("  Ready."));
+    slotSetOperationNameAndtqStatus(i18n("  Ready."));
     NOTATION_DEBUG << "*** " << endl;
 }
 
@@ -3876,7 +3876,7 @@ void NotationView::readjustCanvasSize()
     double maxWidth = 0.0;
     int maxHeight = 0;
 
-    slotSetOperationNameAndStatus(i18n("Sizing and allocating canvas..."));
+    slotSetOperationNameAndtqStatus(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_hlayout);
+        staff.sizeStaff(*m_htqlayout);
         UPDATE_PROGRESS(1);
 
         if (staff.getTotalWidth() + staff.getX() > maxWidth) {
@@ -3944,7 +3944,7 @@ void NotationView::readjustCanvasSize()
         }
     }
 
-    // Give a correct vertical alignment to track headers
+    // Give a correct vertical tqalignment 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")
-                              .arg(notationOnly ? "notation_" : "").arg(refName));
+                              .tqarg(notationOnly ? "notation_" : "").tqarg(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").arg(markName);
+        TQString actionName = TQString("add_%1").tqarg(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_hlayout, TQT_SIGNAL(setProgress(int)),
+        connect(m_htqlayout, TQT_SIGNAL(setProgress(int)),
                 bar, TQT_SLOT(setValue(int)));
 
-        connect(m_hlayout, TQT_SIGNAL(incrementProgress(int)),
+        connect(m_htqlayout, 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_hlayout, TQT_SLOT(slotCancel()));
+                m_htqlayout, TQT_SLOT(slotCancel()));
 
         for (unsigned int i = 0; i < m_staffs.size(); ++i) {
             connect(m_staffs[i], TQT_SIGNAL(setOperationName(TQString)),
-                    this, TQT_SLOT(slotSetOperationNameAndStatus(TQString)));
+                    this, TQT_SLOT(slotSetOperationNameAndtqStatus(TQString)));
 
             connect(dialog, TQT_SIGNAL(cancelClicked()),
                     m_staffs[i], TQT_SLOT(slotCancel()));
@@ -4159,10 +4159,10 @@ void NotationView::setupProgress(ProgressDialog* dialog)
 
 }
 
-void NotationView::slotSetOperationNameAndStatus(TQString name)
+void NotationView::slotSetOperationNameAndtqStatus(TQString name)
 {
     emit setOperationName(name);
-    statusBar()->changeItem(TQString("  %1").arg(name),
+    statusBar()->changeItem(TQString("  %1").tqarg(name),
                             KTmpStatusMsg::getDefaultId());
 }
 
@@ -4170,7 +4170,7 @@ void NotationView::disconnectProgress()
 {
     NOTATION_DEBUG << "NotationView::disconnectProgress()" << endl;
 
-    m_hlayout->disconnect();
+    m_htqlayout->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")
-                   .arg(getDocument()->getTitle())
-                   .arg(trackPosition + 1));
+                   .tqarg(getDocument()->getTitle())
+                   .tqarg(trackPosition + 1));
 
     } else if (m_segments.size() == getDocument()->getComposition().getNbSegments()) {
 
         setCaption(i18n("%1 - All Segments - Notation")
-                   .arg(getDocument()->getTitle()));
+                   .tqarg(getDocument()->getTitle()));
 
     } else {
 
         setCaption(i18n("%1 - Segment - Notation", "%1 - %n Segments - Notation", m_segments.size())
-                   .arg(getDocument()->getTitle()));
+                   .tqarg(getDocument()->getTitle()));
 
     }
 }
@@ -4230,7 +4230,7 @@ NotationView::MarkActionDataMap* NotationView::m_markActionDataMap = 0;
 
 
 void
-NotationView::slotUpdateInsertModeStatus()
+NotationView::slotUpdateInsertModetqStatus()
 {
     TQString tripletMessage = i18n("Triplet");
     TQString chordMessage = i18n("Chord");
@@ -4238,22 +4238,22 @@ NotationView::slotUpdateInsertModeStatus()
     TQString message;
 
     if (isInTripletMode()) {
-        message = i18n("%1 %2").arg(message).arg(tripletMessage);
+        message = i18n("%1 %2").tqarg(message).tqarg(tripletMessage);
     }
 
     if (isInChordMode()) {
-        message = i18n("%1 %2").arg(message).arg(chordMessage);
+        message = i18n("%1 %2").tqarg(message).tqarg(chordMessage);
     }
 
     if (isInGraceMode()) {
-        message = i18n("%1 %2").arg(message).arg(graceMessage);
+        message = i18n("%1 %2").tqarg(message).tqarg(graceMessage);
     }
 
     m_insertModeLabel->setText(message);
 }
 
 void
-NotationView::slotUpdateAnnotationsStatus()
+NotationView::slotUpdateAnnotationstqStatus()
 {
     if (!areAnnotationsVisible()) {
         for (int i = 0; i < getStaffCount(); ++i) {
@@ -4273,7 +4273,7 @@ NotationView::slotUpdateAnnotationsStatus()
 }
 
 void
-NotationView::slotUpdateLilyPondDirectivesStatus()
+NotationView::slotUpdateLilyPondDirectivestqStatus()
 {
     if (!areLilyPondDirectivesVisible()) {
         for (int i = 0; i < getStaffCount(); ++i) {
@@ -4317,22 +4317,22 @@ NotationView::slotChangeSpacingFromAction()
 
     } else {
         KMessageBox::sorry
-        (this, i18n("Unknown spacing action %1").arg(name));
+        (this, i18n("Unknown spacing action %1").tqarg(name));
     }
 }
 
 void
 NotationView::slotChangeSpacing(int spacing)
 {
-    if (m_hlayout->getSpacing() == spacing)
+    if (m_htqlayout->getSpacing() == spacing)
         return ;
 
-    m_hlayout->setSpacing(spacing);
+    m_htqlayout->setSpacing(spacing);
 
     //     m_spacingSlider->setSize(spacing);
 
     KToggleAction *action = dynamic_cast<KToggleAction *>
-                            (actionCollection()->action(TQString("spacing_%1").arg(spacing).ascii()));
+                            (actionCollection()->action(TQString("spacing_%1").tqarg(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_hlayout->getAvailableProportions();
+    std::vector<int> proportions = m_htqlayout->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").arg(name));
+        (this, i18n("Unknown proportion action %1").tqarg(name));
     }
 }
 
 void
 NotationView::slotChangeProportion(int proportion)
 {
-    if (m_hlayout->getProportion() == proportion)
+    if (m_htqlayout->getProportion() == proportion)
         return ;
 
-    m_hlayout->setProportion(proportion);
+    m_htqlayout->setProportion(proportion);
 
     //    m_proportionSlider->setSize(proportion);
 
     KToggleAction *action = dynamic_cast<KToggleAction *>
-                            (actionCollection()->action(TQString("proportion_%1").arg(proportion).ascii()));
+                            (actionCollection()->action(TQString("proportion_%1").tqarg(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").arg(name));
+        (this, i18n("Unknown font action %1").tqarg(name));
     }
 }
 
@@ -4440,11 +4440,11 @@ NotationView::slotChangeFontSizeFromAction()
             slotChangeFont(m_fontName, size);
         else {
             KMessageBox::sorry
-            (this, i18n("Unknown font size %1").arg(name));
+            (this, i18n("Unknown font size %1").tqarg(name));
         }
     } else {
         KMessageBox::sorry
-        (this, i18n("Unknown font size action %1").arg(name));
+        (this, i18n("Unknown font size action %1").tqarg(name));
     }
 }
 
@@ -4581,7 +4581,7 @@ NotationView::slotChangeFont(std::string newName, int newSize)
         int topMargin = 0, leftMargin = 0;
         getPageMargins(leftMargin, topMargin);
 
-        m_hlayout->setPageWidth(pageWidth - leftMargin * 2);
+        m_htqlayout->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 layout");
+        KMessageBox::sorry(0, "Couldn't apply tqlayout");
     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").arg(desc)); // TODO PLURAL - how many 'indications' ?
+        KMessageBox::sorry(this, i18n("Can't add overlapping %1 indications").tqarg(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...").arg(name),
+        KTmpStatusMsg msg(i18n("Changing to %1 style...").tqarg(name),
                           this);
 
         addCommandToHistory(new ChangeStyleCommand
@@ -5576,7 +5576,7 @@ void NotationView::slotSetStyleFromAction()
                              *m_currentEventSelection));
     } else {
         KMessageBox::sorry
-            (this, i18n("Unknown style action %1").arg(name));
+            (this, i18n("Unknown style action %1").tqarg(name));
     }
 }
 
@@ -5608,7 +5608,7 @@ void NotationView::slotInsertNoteFromAction()
     } catch (...) {
 
         KMessageBox::sorry
-            (this, i18n("Unknown note insert action %1").arg(name));
+            (this, i18n("Unknown note insert action %1").tqarg(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").arg(track->getPosition() + 1).arg(barNo + 1));
+        name = TQString(i18n("Ornament track %1 bar %2").tqarg(track->getPosition() + 1).tqarg(barNo + 1));
     } else {
-        name = TQString(i18n("Ornament bar %1").arg(barNo + 1));
+        name = TQString(i18n("Ornament bar %1").tqarg(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_hlayout->getXForTimeByEvent(time);
+        double layoutX = m_htqlayout->getXForTimeByEvent(time);
         Segment &seg = m_staffs[i]->getSegment();
 
         bool good = true;
 
-        if (barNo >= m_hlayout->getLastVisibleBarOnStaff(*m_staffs[i])) {
+        if (barNo >= m_htqlayout->getLastVisibleBarOnStaff(*m_staffs[i])) {
             if (seg.isRepeating() && time < seg.getRepeatEndTime()) {
                 timeT mappedTime =
                     seg.getStartTime() +
                     ((time - seg.getStartTime()) %
                      (seg.getEndMarkerTime() - seg.getStartTime()));
-                layoutX = m_hlayout->getXForTimeByEvent(mappedTime);
+                layoutX = m_htqlayout->getXForTimeByEvent(mappedTime);
             } else {
                 good = false;
             }
-        } else if (barNo < m_hlayout->getFirstVisibleBarOnStaff(*m_staffs[i])) {
+        } else if (barNo < m_htqlayout->getFirstVisibleBarOnStaff(*m_staffs[i])) {
             good = false;
         }
 
@@ -6536,7 +6536,7 @@ NotationView::slotSetCurrentStaff(int staffNo)
 
         m_chordNameRuler->setCurrentSegment(segment);
         m_rawNoteRuler->setCurrentSegment(segment);
-        m_rawNoteRuler->repaint();
+        m_rawNoteRuler->tqrepaint();
         setControlRulersCurrentSegment();
 
         updateView();
@@ -6750,7 +6750,7 @@ NotationView::doDeferredCursorMove()
         t == segment.getEndTime() ||
         t == segment.getBarStartForTime(t)) {
 
-        staff->setInsertCursorPosition(*m_hlayout, t);
+        staff->setInsertCursorPosition(*m_htqlayout, t);
 
         if (type == CursorMoveAndMakeVisible) {
             double cx;
@@ -6976,21 +6976,21 @@ void NotationView::slotMultiPageMode()
 
 void NotationView::slotToggleChordsRuler()
 {
-    if (m_hlayout->isPageMode())
+    if (m_htqlayout->isPageMode())
         return ;
     toggleWidget(m_chordNameRuler, "show_chords_ruler");
 }
 
 void NotationView::slotToggleRawNoteRuler()
 {
-    if (m_hlayout->isPageMode())
+    if (m_htqlayout->isPageMode())
         return ;
     toggleWidget(m_rawNoteRuler, "show_raw_note_ruler");
 }
 
 void NotationView::slotToggleTempoRuler()
 {
-    if (m_hlayout->isPageMode())
+    if (m_htqlayout->isPageMode())
         return ;
     toggleWidget(m_tempoRuler, "show_tempo_ruler");
 }
@@ -6998,7 +6998,7 @@ void NotationView::slotToggleTempoRuler()
 void NotationView::slotToggleAnnotations()
 {
     m_annotationsVisible = !m_annotationsVisible;
-    slotUpdateAnnotationsStatus();
+    slotUpdateAnnotationstqStatus();
     //!!! use refresh mechanism
     refreshSegment(0, 0, 0);
 }
@@ -7006,7 +7006,7 @@ void NotationView::slotToggleAnnotations()
 void NotationView::slotToggleLilyPondDirectives()
 {
     m_lilyPondDirectivesVisible = !m_lilyPondDirectivesVisible;
-    slotUpdateLilyPondDirectivesStatus();
+    slotUpdateLilyPondDirectivestqStatus();
     //!!! 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_hlayout->getTimeForX(layoutX));
+        emit editTimeSignature(m_htqlayout->getTimeForX(layoutX));
     }
 }
 
@@ -7194,17 +7194,17 @@ NotationView::slotHoveredOverAbsoluteTimeChanged(unsigned int time)
 
     //    TQString message;
     //    TQString format("%ld (%ld.%03lds)");
-    //    format = i18n("Time: %1").arg(format);
+    //    format = i18n("Time: %1").tqarg(format);
     //    message.sprintf(format, t, rt.sec, ms);
 
     TQString message = i18n("Time: %1 (%2.%3s)")
-        .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'));
+        .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'));
 
     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_hlayout->getTimeForX(cc0.first);
-        timeT t1 = m_hlayout->getTimeForX(cc1.first);
+        timeT t0 = m_htqlayout->getTimeForX(cc0.first);
+        timeT t1 = m_htqlayout->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 ac8f58c..461d299 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- layout modes
+    /// Switches between page- and linear- tqlayout modes
     void setPageMode(LinedStaff::PageMode mode);
 
-    /// Returns the page width according to the layout mode (page/linear)
+    /// Returns the page width according to the tqlayout mode (page/linear)
     int getPageWidth();
 
-    /// Returns the page height according to the layout mode (page/linear)
+    /// Returns the page height according to the tqlayout 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 layout, rather than the optimal ones for the
+     * font size and tqlayout, 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 layout toolbar
+     * toggles the tqlayout toolbar
      */
     void slotToggleLayoutToolBar();
 
@@ -494,9 +494,9 @@ public slots:
     void slotToggleStepByStep();
 
     /// status stuff
-    void slotUpdateInsertModeStatus();
-    void slotUpdateAnnotationsStatus();
-    void slotUpdateLilyPondDirectivesStatus();
+    void slotUpdateInsertModetqStatus();
+    void slotUpdateAnnotationstqStatus();
+    void slotUpdateLilyPondDirectivestqStatus();
 
     /// edit menu
     void slotPreviewSelection();
@@ -773,22 +773,22 @@ public slots:
     /// Changes to the next font size down
     void slotZoomOut();
 
-    /// Changes the hlayout spacing of the staffs on the view
+    /// Changes the htqlayout spacing of the staffs on the view
     void slotChangeSpacing(int newSpacing);
 
-    /// Changes the hlayout spacing of the staffs on the view
+    /// Changes the htqlayout spacing of the staffs on the view
     void slotChangeSpacingFromStringValue(const TQString&);
 
-    /// Changes the hlayout spacing of the staffs on the view
+    /// Changes the htqlayout spacing of the staffs on the view
     void slotChangeSpacingFromAction();
 
-    /// Changes the hlayout proportion of the staffs on the view
+    /// Changes the htqlayout proportion of the staffs on the view
     void slotChangeProportion(int newProportion);
 
-    /// Changes the hlayout proportion of the staffs on the view
+    /// Changes the htqlayout proportion of the staffs on the view
     void slotChangeProportionFromIndex(int newProportionIndex);
 
-    /// Changes the hlayout proportion of the staffs on the view
+    /// Changes the htqlayout 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 slotSetOperationNameAndStatus(TQString);
+    void slotSetOperationNameAndtqStatus(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 geometry and the recent file list to the configuration
+     * as the tqgeometry 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 layout)
+     * Place the staffs at the correct x & y coordinates (before tqlayout)
      */
     void positionStaffs();
 
     /**
      * Place the page pixmaps (if any) at the correct x & y
-     * coordinates (after layout)
+     * coordinates (after tqlayout)
      */
     void positionPages();
 
@@ -929,7 +929,7 @@ protected:
     void updateThumbnails(bool complete);
 
     /**
-     * setup the layout/font toolbar
+     * setup the tqlayout/font toolbar
      */
     void initLayoutToolbar();
 
@@ -940,15 +940,15 @@ protected:
      */
     void toggleNamedToolBar(const TQString& toolBarName, bool* force = 0);
 
-    /// Calls all the relevant preparse and layout methods
+    /// Calls all the relevant preparse and tqlayout methods
     virtual bool applyLayout(int staffNo = -1,
                              timeT startTime = 0,
                              timeT endTime = 0);
 
     /**
-     * Readjust the size of the canvas after a layout
+     * Readjust the size of the canvas after a tqlayout
      *
-     * Checks the total width computed by the horizontal layout
+     * Checks the total width computed by the horizontal tqlayout
      *
      * @see NotationHLayout#getTotalWidth()
      */
@@ -1074,8 +1074,8 @@ protected:
 
     NotePixmapFactory *m_notePixmapFactory;
     
-    NotationHLayout* m_hlayout;
-    NotationVLayout* m_vlayout;
+    NotationHLayout* m_htqlayout;
+    NotationVLayout* m_vtqlayout;
 
     ChordNameRuler *m_chordNameRuler;
     TQWidget *m_tempoRuler;
diff --git a/src/gui/editors/notation/NoteFont.cpp b/src/gui/editors/notation/NoteFont.cpp
index 5f84e7a..18f82f7 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").arg(strtoqstr(fontName)).arg(size)));
+            throw BadNoteFont(qstrtostr(TQString("Font \"%1\" not available in size %2").tqarg(strtoqstr(fontName)).tqarg(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__")
-                                    .arg(strtoqstr(m_fontMap.getName()))
-                                    .arg(m_size));
+                                    .tqarg(strtoqstr(m_fontMap.getName()))
+                                    .tqarg(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").arg(hue).arg(strtoqstr(base)));
+    return qstrtostr(TQString("%1__%2").tqarg(hue).tqarg(strtoqstr(base)));
 }
 
 CharName
 NoteFont::getNameShaded(CharName base) const
 {
-    return qstrtostr(TQString("shaded__%1").arg(strtoqstr(base)));
+    return qstrtostr(TQString("shaded__%1").tqarg(strtoqstr(base)));
 }
 
 bool
diff --git a/src/gui/editors/notation/NoteFontMap.cpp b/src/gui/editors/notation/NoteFontMap.cpp
index f82a263..47fc9f5 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")
-                               .arg(m_fontDirectory)
-                               .arg(strtoqstr(name));
+                               .tqarg(m_fontDirectory)
+                               .tqarg(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")
-                                   .arg(m_fontDirectory)
-                                   .arg(lowerName);
+                                   .tqarg(m_fontDirectory)
+                                   .tqarg(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").
-                           arg(mapFileMixedName).arg(mapFileLowerName)));
+                           tqarg(mapFileMixedName).tqarg(mapFileLowerName)));
             } else {
                 throw MappingFileReadFailed
                 (qstrtostr(i18n("Can't open font mapping file %1").
-                           arg(mapFileMixedName)));
+                           tqarg(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\"").arg(name).ascii() << std::endl;
+                std::cerr << TQString("Warning: Unable to load font \"%1\"").tqarg(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\"").
-                arg(names).ascii() << std::endl;
+                tqarg(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")
-                    .arg(exception.message())
-                    .arg(exception.lineNumber())
-                    .arg(exception.columnNumber())
-                    .arg(m_errorString);
+                    .tqarg(exception.message())
+                    .tqarg(exception.lineNumber())
+                    .tqarg(exception.columnNumber())
+                    .tqarg(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")
-                    .arg(exception.message())
-                    .arg(exception.lineNumber())
-                    .arg(exception.columnNumber())
-                    .arg(m_errorString);
+                    .tqarg(exception.message())
+                    .tqarg(exception.lineNumber())
+                    .tqarg(exception.columnNumber())
+                    .tqarg(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")
-                                  .arg(m_fontDirectory)
-                                  .arg(strtoqstr(m_srcDirectory))
-                                  .arg(size)
-                                  .arg(strtoqstr(src));
+                                  .tqarg(m_fontDirectory)
+                                  .tqarg(strtoqstr(m_srcDirectory))
+                                  .tqarg(size)
+                                  .tqarg(strtoqstr(src));
 
     TQFileInfo pixmapFileMixedInfo(pixmapFileMixedName);
 
     if (!pixmapFileMixedInfo.isReadable()) {
 
         TQString pixmapFileLowerName = TQString("%1/%2/%3/%4.xpm")
-                                      .arg(m_fontDirectory)
-                                      .arg(strtoqstr(m_srcDirectory).lower())
-                                      .arg(size)
-                                      .arg(strtoqstr(src));
+                                      .tqarg(m_fontDirectory)
+                                      .tqarg(strtoqstr(m_srcDirectory).lower())
+                                      .tqarg(size)
+                                      .tqarg(strtoqstr(src));
 
         TQFileInfo pixmapFileLowerInfo(pixmapFileLowerName);
 
diff --git a/src/gui/editors/notation/NoteFontViewer.cpp b/src/gui/editors/notation/NoteFontViewer.cpp
index d3dc2a3..d485244 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").arg(r));
+            m_rows->insertItem(TQString("%1").tqarg(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").arg(noteFontName), Close)
+                    i18n("Note Font Viewer: %1").tqarg(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 9103d4e..2ff4969 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").arg(adjustedOctave);
+    TQString text = TQString("%1").tqarg(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").arg(adjustedOctave);
+            TQString text = TQString("%1").tqarg(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 2b502f1..9bf32b1 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 geometry methods:
+    // Bounding box and other tqgeometry 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 ff8edae..9b56052 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.begin(mask, unclipped);
+	    m_maskPainter.tqbegin(mask, unclipped);
 	} else {
 	    m_useMask = false;
 	}
 
 	m_painter = &m_myPainter;
-	return m_painter->begin(device, unclipped);
+	return m_painter->tqbegin(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->drawPolygon(a, winding, index, n);
-	if (m_useMask) m_maskPainter.drawPolygon(a, winding, index, n);
+	m_painter->tqdrawPolygon(a, winding, index, n);
+	if (m_useMask) m_maskPainter.tqdrawPolygon(a, winding, index, n);
     }
 
     void drawPolyline(const TQPointArray &a, int index = 0, int n = -1) {
-	m_painter->drawPolyline(a, index, n);
-	if (m_useMask) m_maskPainter.drawPolyline(a, index, n);
+	m_painter->tqdrawPolyline(a, index, n);
+	if (m_useMask) m_maskPainter.tqdrawPolyline(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->drawPixmap(x, y, pm, sx, sy, sw, sh);
-	if (m_useMask) m_maskPainter.drawPixmap(x, y, *(pm.mask()), sx, sy, sw, sh);
+	m_painter->tqdrawPixmap(x, y, pm, sx, sy, sw, sh);
+	if (m_useMask) m_maskPainter.tqdrawPixmap(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 1e316fd..00ce956 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 shape defined for note type "
+        << "WARNING: NoteStyle::getShape: No tqshape defined for note type "
         << type << ", defaulting to AngledOval" << std::endl;
         return AngledOval;
     }
 
-    return i->second.shape;
+    return i->second.tqshape;
 }
 
 bool
@@ -183,57 +183,57 @@ NoteStyle::getNoteHeadCharName(Note::Type type)
     CharName name = NoteCharacterNames::UNKNOWN;
     bool inverted = false;
 
-    if (desc.shape == AngledOval) {
+    if (desc.tqshape == AngledOval) {
 
         name = desc.filled ? NoteCharacterNames::NOTEHEAD_BLACK
                : NoteCharacterNames::VOID_NOTEHEAD;
 
-    } else if (desc.shape == LevelOval) {
+    } else if (desc.tqshape == LevelOval) {
 
         if (desc.filled) {
             std::cerr << "WARNING: NoteStyle::getNoteHeadCharName: No filled level oval head" << std::endl;
         }
         name = NoteCharacterNames::WHOLE_NOTE;
 
-    } else if (desc.shape == Breve) {
+    } else if (desc.tqshape == Breve) {
 
         if (desc.filled) {
             std::cerr << "WARNING: NoteStyle::getNoteHeadCharName: No filled breve head" << std::endl;
         }
         name = NoteCharacterNames::BREVE;
 
-    } else if (desc.shape == Cross) {
+    } else if (desc.tqshape == Cross) {
 
         name = desc.filled ? NoteCharacterNames::X_NOTEHEAD
                : NoteCharacterNames::CIRCLE_X_NOTEHEAD;
 
-    } else if (desc.shape == TriangleUp) {
+    } else if (desc.tqshape == TriangleUp) {
 
         name = desc.filled ? NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_BLACK
                : NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_WHITE;
 
-    } else if (desc.shape == TriangleDown) {
+    } else if (desc.tqshape == TriangleDown) {
 
         name = desc.filled ? NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_BLACK
                : NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_WHITE;
         inverted = true;
 
-    } else if (desc.shape == Diamond) {
+    } else if (desc.tqshape == Diamond) {
 
         name = desc.filled ? NoteCharacterNames::SEMIBREVIS_BLACK
                : NoteCharacterNames::SEMIBREVIS_WHITE;
 
-    } else if (desc.shape == Rectangle) {
+    } else if (desc.tqshape == Rectangle) {
 
         name = desc.filled ? NoteCharacterNames::STQUARE_NOTEHEAD_BLACK
                : NoteCharacterNames::STQUARE_NOTEHEAD_WHITE;
 
-    } else if (desc.shape == Number) {
+    } else if (desc.tqshape == Number) {
 
         std::cerr << "WARNING: NoteStyle::getNoteHeadCharName: Number not yet implemented" << std::endl;
         name = NoteCharacterNames::UNKNOWN; //!!!
 
-    } else if (desc.shape == CustomCharName) {
+    } else if (desc.tqshape == CustomCharName) {
 
         name = desc.charName;
 
@@ -433,10 +433,10 @@ NoteStyle::checkDescription(Note::Type note)
 }
 
 void
-NoteStyle::setShape(Note::Type note, NoteHeadShape shape)
+NoteStyle::setShape(Note::Type note, NoteHeadShape tqshape)
 {
     checkDescription(note);
-    m_notes[note].shape = shape;
+    m_notes[note].tqshape = tqshape;
 }
 
 void
diff --git a/src/gui/editors/notation/NoteStyle.h b/src/gui/editors/notation/NoteStyle.h
index 3959e01..4431c16 100644
--- a/src/gui/editors/notation/NoteStyle.h
+++ b/src/gui/editors/notation/NoteStyle.h
@@ -99,8 +99,8 @@ public:
 
 protected:
     struct NoteDescription {
-        NoteHeadShape shape; // if CustomCharName, use charName
-        CharName charName; // only used if shape == CustomCharName
+        NoteHeadShape tqshape; // if CustomCharName, use charName
+        CharName charName; // only used if tqshape == CustomCharName
         bool filled;
         bool stem;
         int flags;
@@ -109,14 +109,14 @@ protected:
         VFixPoint vfix;
 
         NoteDescription() :
-            shape(AngledOval), charName(NoteCharacterNames::UNKNOWN),
+            tqshape(AngledOval), charName(NoteCharacterNames::UNKNOWN),
             filled(true), stem(true), flags(0), slashes(0),
             hfix(Normal), vfix(Middle) { }
 
-        NoteDescription(NoteHeadShape _shape, CharName _charName,
+        NoteDescription(NoteHeadShape _tqshape, CharName _charName,
                         bool _filled, bool _stem, int _flags, int _slashes,
                         HFixPoint _hfix, VFixPoint _vfix) :
-            shape(_shape), charName(_charName),
+            tqshape(_tqshape), 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 4303cc6..d5e0815 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").arg(styleDir).arg(*i));
+            TQFileInfo fileInfo(TQString("%1/%2").tqarg(styleDir).tqarg(*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 10e5f13..b8619c9 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").arg(styleDirectory).arg(strtoqstr(name));
+	TQString("%1/%2.xml").tqarg(styleDirectory).tqarg(strtoqstr(name));
 
     TQFileInfo fileInfo(styleFileName);
 
     if (!fileInfo.isReadable()) {
         throw StyleFileReadFailed
-	    (qstrtostr(i18n("Can't open style file %1").arg(styleFileName)));
+	    (qstrtostr(i18n("Can't open style file %1").tqarg(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").arg(s);
+	    m_errorString = i18n("Unrecognised note name %1").tqarg(s);
 	    return false;
 	}
 
@@ -125,7 +125,7 @@ NoteStyleFileReader::setFromAttributes(Note::Type type,
     TQString s;
     bool haveShape = false;
 
-    s = attributes.value("shape");
+    s = attributes.value("tqshape");
     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 shape "
+	    m_errorString = i18n("global and note elements may have tqshape "
 				 "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 83dca88..fa19ca5 100644
--- a/src/gui/editors/notation/TrackHeader.cpp
+++ b/src/gui/editors/notation/TrackHeader.cpp
@@ -65,7 +65,7 @@ namespace Rosegarden
 {
 
 
-// Status bits
+// tqStatus 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\"")
-                            .arg(trackPos + 1)
-                            .arg(strtoqstr(track->getLabel())));
+                            .tqarg(trackPos + 1)
+                            .tqarg(strtoqstr(track->getLabel())));
 
     TQString preset = track->getPresetLabel().c_str();
     if (preset != TQString(""))
-        toolTipText += TQString(i18n("\nNotate for: %1").arg(preset));
+        toolTipText += TQString(i18n("\nNotate for: %1").tqarg(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 "))
-                            .arg(notationSize)
-                            .arg(bracketText);
+                            .tqarg(notationSize)
+                            .tqarg(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\""))
-                                    .arg(barStart)
-                                    .arg(barEnd)
-                                    .arg(transposeName)
-                                    .arg(transpose)
-                                    .arg(strtoqstr((*i)->getLabel()));
+                                    .tqarg(barStart)
+                                    .tqarg(barEnd)
+                                    .tqarg(transposeName)
+                                    .tqarg(transpose)
+                                    .tqarg(strtoqstr((*i)->getLabel()));
         } else {
             toolTipText += TQString(i18n("\nbars [%1-%2] (tr=%3) : \"%4\""))
-                                    .arg(barStart)
-                                    .arg(barEnd)
-                                    .arg(transpose)
-                                    .arg(strtoqstr((*i)->getLabel()));
+                                    .tqarg(barStart)
+                                    .tqarg(barEnd)
+                                    .tqarg(transpose)
+                                    .tqarg(strtoqstr((*i)->getLabel()));
         }
     }
 
@@ -350,9 +350,9 @@ TrackHeader::lookAtStaff(double x, int maxWidth)
     transposeValueToName(m_transpose, noteName);
 
     m_upperText = TQString(i18n("%1: %2")
-                                .arg(trackPos + 1)
-                                .arg(strtoqstr(track->getLabel())));
-    if (m_transpose) m_transposeText = i18n(" in %1").arg(noteName);
+                                .tqarg(trackPos + 1)
+                                .tqarg(strtoqstr(track->getLabel())));
+    if (m_transpose) m_transposeText = i18n(" in %1").tqarg(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 85ee067..3f7029e 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);
 
 
-    // Status bits
+    // tqStatus bits
     static const int SEGMENT_HERE;
     static const int SUPERIMPOSED_SEGMENTS;
     static const int INCONSISTENT_CLEFS;