Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

19 files changed, 182 insertions, 182 deletions

diff --git a/src/gui/editors/notation/ClefInserter.cpp b/src/gui/editors/notation/ClefInserter.cpp
index 8392aa5..eba4e7d 100644
--- a/src/gui/editors/notation/ClefInserter.cpp
+++ b/src/gui/editors/notation/ClefInserter.cpp
@@ -75,12 +75,12 @@ void ClefInserter::slotNotesSelected()
 
 void ClefInserter::slotEraseSelected()
 {
-    m_tqparentView->actionCollection()->action("erase")->activate();
+    m_parentView->actionCollection()->action("erase")->activate();
 }
 
 void ClefInserter::slotSelectSelected()
 {
-    m_tqparentView->actionCollection()->action("select")->activate();
+    m_parentView->actionCollection()->action("select")->activate();
 }
 
 void ClefInserter::ready()
diff --git a/src/gui/editors/notation/GuitarChordInserter.cpp b/src/gui/editors/notation/GuitarChordInserter.cpp
index f47f2c9..5c44420 100644
--- a/src/gui/editors/notation/GuitarChordInserter.cpp
+++ b/src/gui/editors/notation/GuitarChordInserter.cpp
@@ -85,12 +85,12 @@ void GuitarChordInserter::slotGuitarChordSelected()
 
 void GuitarChordInserter::slotEraseSelected()
 {
-    m_tqparentView->actionCollection()->action("erase")->activate();
+    m_parentView->actionCollection()->action("erase")->activate();
 }
 
 void GuitarChordInserter::slotSelectSelected()
 {
-    m_tqparentView->actionCollection()->action("select")->activate();
+    m_parentView->actionCollection()->action("select")->activate();
 }
 
 void GuitarChordInserter::handleLeftButtonPress(timeT,
diff --git a/src/gui/editors/notation/NotationChord.cpp b/src/gui/editors/notation/NotationChord.cpp
index 297cee7..7b0a263 100644
--- a/src/gui/editors/notation/NotationChord.cpp
+++ b/src/gui/editors/notation/NotationChord.cpp
@@ -110,7 +110,7 @@ NotationChord::hasStemUp() const
     NotationRules rules;
 
     // believe anything found in any of the notes, if in a persistent
-    // property or a property aptqparently set by the beaming algorithm
+    // property or a property apparently set by the beaming algorithm
 
     Iterator i(getInitialNote());
 
diff --git a/src/gui/editors/notation/NotationEraser.cpp b/src/gui/editors/notation/NotationEraser.cpp
index d9d5f3a..cc971ab 100644
--- a/src/gui/editors/notation/NotationEraser.cpp
+++ b/src/gui/editors/notation/NotationEraser.cpp
@@ -106,7 +106,7 @@ void NotationEraser::slotInsertSelected()
 
 void NotationEraser::slotSelectSelected()
 {
-    m_tqparentView->actionCollection()->action("select")->activate();
+    m_parentView->actionCollection()->action("select")->activate();
 }
 
 const TQString NotationEraser::ToolName   = "notationeraser";
diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp
index 20b7469..e00928c 100644
--- a/src/gui/editors/notation/NotationHLayout.cpp
+++ b/src/gui/editors/notation/NotationHLayout.cpp
@@ -324,7 +324,7 @@ NotationHLayout::scanStaff(Staff &staff, timeT startTime, timeT endTime)
 
         setBarBasicData(staff, barNo, from, barCorrect, timeSignature, newTimeSig);
         BarDataList::iterator bdli(barList.find(barNo));
-        bdli->second.tqlayoutData.needsLayout = true;
+        bdli->second.layoutData.needsLayout = true;
 
         ChunkList &chunks = bdli->second.chunks;
         chunks.clear();
@@ -655,10 +655,10 @@ NotationHLayout::scanChord(NotationElementList *notes,
         extraWidth += e;
     }
 
-    float tqlayoutExtra = 0;
+    float layoutExtra = 0;
     if (chord.hasNoteHeadShifted()) {
         if (chord.hasStemUp()) {
-            tqlayoutExtra += npf->getNoteBodyWidth();
+            layoutExtra += npf->getNoteBodyWidth();
         } else {
             extraWidth = std::max(extraWidth, float(npf->getNoteBodyWidth()));
         }
@@ -686,13 +686,13 @@ NotationHLayout::scanChord(NotationElementList *notes,
 
     if (grace) {
         chunks.push_back(Chunk(d, chord.getSubOrdering(),
-                               extraWidth + tqlayoutExtra
+                               extraWidth + layoutExtra
                                + getLayoutWidth(**myLongest, npf, key)
                                - npf->getNoteBodyWidth(), // tighten up
                                0));
     } else {
         chunks.push_back(Chunk(d, 0, extraWidth,
-                               std::max(tqlayoutExtra +
+                               std::max(layoutExtra +
                                         getLayoutWidth(**myLongest, npf, key),
                                         lyricWidth)));
         lyricWidth = 0;
@@ -847,7 +847,7 @@ NotationHLayout::preSquishBar(int barNo)
             bdli->second.sizeData.reconciledWidth =
                 bdli->second.sizeData.idealWidth;
 
-            bdli->second.tqlayoutData.needsLayout = true;
+            bdli->second.layoutData.needsLayout = true;
         }
     }
 }
@@ -987,7 +987,7 @@ NotationHLayout::reconcileBarsLinear()
                 double diff = maxWidth - bd.reconciledWidth;
                 if (diff < -0.1 || diff > 0.1) {
                     NOTATION_DEBUG << "(So needsLayout becomes true)" << endl;
-                    bdli->second.tqlayoutData.needsLayout = true;
+                    bdli->second.layoutData.needsLayout = true;
                 }
                 bd.reconciledWidth = maxWidth;
             }
@@ -1181,7 +1181,7 @@ NotationHLayout::reconcileBarsPage()
                     BarData::SizeData &bd(bdli->second.sizeData);
                     double diff = maxWidth - bd.reconciledWidth;
                     if (diff < -0.1 || diff > 0.1) {
-                        bdli->second.tqlayoutData.needsLayout = true;
+                        bdli->second.layoutData.needsLayout = true;
                     }
                     bd.reconciledWidth = maxWidth;
                 }
@@ -1247,7 +1247,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
 
     bool isFullLayout = (startTime == endTime);
 
-    // these two are for partial tqlayouts:
+    // these two are for partial layouts:
     //    bool haveSimpleOffset = false;
     //    double simpleOffset = 0;
 
@@ -1303,9 +1303,9 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
             NOTATION_DEBUG << "Start is to" << endl;
         }
 
-        if (!bdi->second.tqlayoutData.needsLayout) {
+        if (!bdi->second.layoutData.needsLayout) {
 
-            double offset = barX - bdi->second.tqlayoutData.x;
+            double offset = barX - bdi->second.layoutData.x;
 
             NOTATION_DEBUG << "NotationHLayout::tqlayout(): bar " << barNo << " has needsLayout false and offset of " << offset << endl;
 
@@ -1314,10 +1314,10 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
                 continue;
             }
 
-            bdi->second.tqlayoutData.x += offset;
+            bdi->second.layoutData.x += offset;
 
             if (bdi->second.basicData.newTimeSig)  
-                bdi->second.tqlayoutData.timeSigX += (int)offset;
+                bdi->second.layoutData.timeSigX += (int)offset;
 
             for (NotationElementList::iterator it = from;
                     it != to && it != notes->end(); ++it) {
@@ -1333,7 +1333,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
             continue;
         }
 
-        bdi->second.tqlayoutData.x = barX;
+        bdi->second.layoutData.x = barX;
         //	x = barX + getPostBarMargin();
 
         bool timeSigToPlace = false;
@@ -1446,9 +1446,9 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
                 }
 
 //                NOTATION_DEBUG << "Placing timesig at " << (x - fixed) << endl;
-//                bdi->second.tqlayoutData.timeSigX = (int)(x - fixed);
+//                bdi->second.layoutData.timeSigX = (int)(x - fixed);
                 NOTATION_DEBUG << "Placing timesig at " << sigx << " (would previously have been " << int(x-fixed) << "?)" << endl;
-                bdi->second.tqlayoutData.timeSigX = (int)sigx;
+                bdi->second.layoutData.timeSigX = (int)sigx;
                 double shift = getFixedItemSpacing() +
                                m_npf->getTimeSigWidth(timeSignature);
                 offset += shift;
@@ -1571,7 +1571,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
             // no other events in this bar, so we never managed to place it
             x = barX + offset;
             NOTATION_DEBUG << "Placing timesig reluctantly at " << x << endl;
-            bdi->second.tqlayoutData.timeSigX = (int)(x);
+            bdi->second.layoutData.timeSigX = (int)(x);
             timeSigToPlace = false;
         }
 
@@ -1583,7 +1583,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
         }
         m_groupsExtant.clear();
 
-        bdi->second.tqlayoutData.needsLayout = false;
+        bdi->second.layoutData.needsLayout = false;
     }
 }
 
@@ -2024,7 +2024,7 @@ bool NotationHLayout::getTimeSignaturePosition(Staff &staff,
     BarDataList::iterator bdli(bdl.find(i));
     if (bdli != bdl.end()) {
         timeSig = bdli->second.basicData.timeSignature;
-        timeSigX = (double)(bdli->second.tqlayoutData.timeSigX);
+        timeSigX = (double)(bdli->second.layoutData.timeSigX);
         return bdli->second.basicData.newTimeSig;
     } else
         return 0;
diff --git a/src/gui/editors/notation/NotationHLayout.h b/src/gui/editors/notation/NotationHLayout.h
index 59a666b..aba9a27 100644
--- a/src/gui/editors/notation/NotationHLayout.h
+++ b/src/gui/editors/notation/NotationHLayout.h
@@ -291,7 +291,7 @@ protected:
             double x;             // coordinate for display of barline
             int timeSigX;
 
-        } tqlayoutData;
+        } layoutData;
 
         BarData(NotationElementList::iterator i,
                 bool correct, TimeSignature timeSig, bool newTimeSig) {
@@ -304,9 +304,9 @@ protected:
             sizeData.fixedWidth = 0;
             sizeData.clefKeyWidth = 0;
             sizeData.actualDuration = 0;
-            tqlayoutData.needsLayout = true;
-            tqlayoutData.x = -1;
-            tqlayoutData.timeSigX = -1;
+            layoutData.needsLayout = true;
+            layoutData.x = -1;
+            layoutData.timeSigX = -1;
         }
     };
 
diff --git a/src/gui/editors/notation/NotationSelectionPaster.cpp b/src/gui/editors/notation/NotationSelectionPaster.cpp
index b1f8d4b..d3bba0e 100644
--- a/src/gui/editors/notation/NotationSelectionPaster.cpp
+++ b/src/gui/editors/notation/NotationSelectionPaster.cpp
@@ -75,14 +75,14 @@ void NotationSelectionPaster::handleLeftButtonPress(timeT,
 
     Segment& segment = staff->getSegment();
     PasteEventsCommand *command = new PasteEventsCommand
-                                  (segment, m_tqparentView->getDocument()->getClipboard(), time,
+                                  (segment, m_parentView->getDocument()->getClipboard(), time,
                                    PasteEventsCommand::Restricted);
 
     if (!command->isPossible()) {
-        m_tqparentView->slotStatusHelpMsg(i18n("Couldn't paste at this point"));
+        m_parentView->slotStatusHelpMsg(i18n("Couldn't paste at this point"));
     } else {
-        m_tqparentView->addCommandToHistory(command);
-        m_tqparentView->slotStatusHelpMsg(i18n("Ready."));
+        m_parentView->addCommandToHistory(command);
+        m_parentView->slotStatusHelpMsg(i18n("Ready."));
     }
 }
 
diff --git a/src/gui/editors/notation/NotationSelector.cpp b/src/gui/editors/notation/NotationSelector.cpp
index 3b5eda2..acd5604 100644
--- a/src/gui/editors/notation/NotationSelector.cpp
+++ b/src/gui/editors/notation/NotationSelector.cpp
@@ -71,11 +71,11 @@ NotationSelector::NotationSelector(NotationView* view)
         m_justSelectedBar(false),
         m_wholeStaffSelectionComplete(false)
 {
-    connect(m_tqparentView, TQT_SIGNAL(usedSelection()),
+    connect(m_parentView, TQT_SIGNAL(usedSelection()),
             this, TQT_SLOT(slotHideSelection()));
 
     connect(this, TQT_SIGNAL(editElement(NotationStaff *, NotationElement *, bool)),
-            m_tqparentView, TQT_SLOT(slotEditElement(NotationStaff *, NotationElement *, bool)));
+            m_parentView, TQT_SLOT(slotEditElement(NotationStaff *, NotationElement *, bool)));
 
     TQIconSet icon
     (NotePixmapFactory::toTQPixmap(NotePixmapFactory::
@@ -188,7 +188,7 @@ void NotationSelector::handleLeftButtonPress(timeT t,
     m_updateRect = true;
     m_startedFineDrag = false;
 
-    //m_tqparentView->setCursorPosition(p.x());
+    //m_parentView->setCursorPosition(p.x());
 }
 
 void NotationSelector::handleRightButtonPress(timeT t,
@@ -460,7 +460,7 @@ void NotationSelector::drag(int x, int y, bool final)
     ::Rosegarden::Key key;
 
     timeT dragTime = clickedTime;
-    double tqlayoutX = m_clickedElement->getLayoutX();
+    double layoutX = m_clickedElement->getLayoutX();
     timeT duration = m_clickedElement->getViewDuration();
 
     NotationElementList::iterator itr =
@@ -470,7 +470,7 @@ void NotationSelector::drag(int x, int y, bool final)
 
         NotationElement *elt = dynamic_cast<NotationElement *>(*itr);
         dragTime = elt->getViewAbsoluteTime();
-        tqlayoutX = elt->getLayoutX();
+        layoutX = elt->getLayoutX();
 
         if (elt->isRest() && duration > 0 && elt->getCanvasItem()) {
 
@@ -490,7 +490,7 @@ void NotationSelector::drag(int x, int y, bool final)
                     part = parts - 1;
 
                 dragTime += part * restDuration / parts;
-                tqlayoutX += part * restWidth / parts +
+                layoutX += part * restWidth / parts +
                            (restX - elt->getCanvasX());
             }
         }
@@ -532,7 +532,7 @@ void NotationSelector::drag(int x, int y, bool final)
             m_clickedElement->isNote()) {
 
             m_nParentView->showPreviewNote(targetStaff->getId(),
-                                           tqlayoutX, pitch, height,
+                                           layoutX, pitch, height,
                                            Note::getNearestNote(duration),
                                            m_clickedElement->isGrace());
             m_lastDragPitch = pitch;
@@ -738,57 +738,57 @@ void NotationSelector::slotInsertSelected()
 
 void NotationSelector::slotEraseSelected()
 {
-    m_tqparentView->actionCollection()->action("erase")->activate();
+    m_parentView->actionCollection()->action("erase")->activate();
 }
 
 void NotationSelector::slotCollapseRestsHard()
 {
-    m_tqparentView->actionCollection()->action("collapse_rests_aggressively")->activate();
+    m_parentView->actionCollection()->action("collapse_rests_aggressively")->activate();
 }
 
 void NotationSelector::slotRespellFlat()
 {
-    m_tqparentView->actionCollection()->action("respell_flat")->activate();
+    m_parentView->actionCollection()->action("respell_flat")->activate();
 }
 
 void NotationSelector::slotRespellSharp()
 {
-    m_tqparentView->actionCollection()->action("respell_sharp")->activate();
+    m_parentView->actionCollection()->action("respell_sharp")->activate();
 }
 
 void NotationSelector::slotRespellNatural()
 {
-    m_tqparentView->actionCollection()->action("respell_natural")->activate();
+    m_parentView->actionCollection()->action("respell_natural")->activate();
 }
 
 void NotationSelector::slotCollapseNotes()
 {
-    m_tqparentView->actionCollection()->action("collapse_notes")->activate();
+    m_parentView->actionCollection()->action("collapse_notes")->activate();
 }
 
 void NotationSelector::slotInterpret()
 {
-    m_tqparentView->actionCollection()->action("interpret")->activate();
+    m_parentView->actionCollection()->action("interpret")->activate();
 }
 
 void NotationSelector::slotStaffAbove()
 {
-    m_tqparentView->actionCollection()->action("move_events_up_staff")->activate();
+    m_parentView->actionCollection()->action("move_events_up_staff")->activate();
 }
 
 void NotationSelector::slotStaffBelow()
 {
-    m_tqparentView->actionCollection()->action("move_events_down_staff")->activate();
+    m_parentView->actionCollection()->action("move_events_down_staff")->activate();
 }
 
 void NotationSelector::slotMakeInvisible()
 {
-    m_tqparentView->actionCollection()->action("make_invisible")->activate();
+    m_parentView->actionCollection()->action("make_invisible")->activate();
 }
 
 void NotationSelector::slotMakeVisible()
 {
-    m_tqparentView->actionCollection()->action("make_visible")->activate();
+    m_parentView->actionCollection()->action("make_visible")->activate();
 }
 
 void NotationSelector::setViewCurrentSelection(bool preview)
diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp
index 1b875f3..6d68063 100644
--- a/src/gui/editors/notation/NotationStaff.cpp
+++ b/src/gui/editors/notation/NotationStaff.cpp
@@ -141,7 +141,7 @@ NotationStaff::changeFont(std::string fontName, int size)
 }
 
 void
-NotationStaff::insertTimeSignature(double tqlayoutX,
+NotationStaff::insertTimeSignature(double layoutX,
                                    const TimeSignature &timeSig)
 {
     if (timeSig.isHidden())
@@ -150,10 +150,10 @@ NotationStaff::insertTimeSignature(double tqlayoutX,
     m_notePixmapFactory->setSelected(false);
     TQCanvasPixmap *pixmap = m_notePixmapFactory->makeTimeSigPixmap(timeSig);
     TQCanvasTimeSigSprite *sprite =
-        new TQCanvasTimeSigSprite(tqlayoutX, pixmap, m_canvas);
+        new TQCanvasTimeSigSprite(layoutX, pixmap, m_canvas);
 
     LinedStaffCoords sigCoords =
-        getCanvasCoordsForLayoutCoords(tqlayoutX, getLayoutYForHeight(4));
+        getCanvasCoordsForLayoutCoords(layoutX, getLayoutYForHeight(4));
 
     sprite->move(sigCoords.first, (double)sigCoords.second);
     sprite->show();
@@ -174,7 +174,7 @@ NotationStaff::deleteTimeSignatures()
 }
 
 void
-NotationStaff::insertRepeatedClefAndKey(double tqlayoutX, int barNo)
+NotationStaff::insertRepeatedClefAndKey(double layoutX, int barNo)
 {
     bool needClef = false, needKey = false;
     timeT t;
@@ -196,10 +196,10 @@ NotationStaff::insertRepeatedClefAndKey(double tqlayoutX, int barNo)
 
     if (needClef) {
 
-        int tqlayoutY = getLayoutYForHeight(clef.getAxisHeight());
+        int layoutY = getLayoutYForHeight(clef.getAxisHeight());
 
         LinedStaffCoords coords =
-            getCanvasCoordsForLayoutCoords(tqlayoutX + dx, tqlayoutY);
+            getCanvasCoordsForLayoutCoords(layoutX + dx, layoutY);
 
         TQCanvasPixmap *pixmap = m_notePixmapFactory->makeClefPixmap(clef);
 
@@ -215,10 +215,10 @@ NotationStaff::insertRepeatedClefAndKey(double tqlayoutX, int barNo)
 
     if (needKey) {
 
-        int tqlayoutY = getLayoutYForHeight(12);
+        int layoutY = getLayoutYForHeight(12);
 
         LinedStaffCoords coords =
-            getCanvasCoordsForLayoutCoords(tqlayoutX + dx, tqlayoutY);
+            getCanvasCoordsForLayoutCoords(layoutX + dx, layoutY);
 
         TQCanvasPixmap *pixmap = m_notePixmapFactory->makeKeyPixmap(key, clef);
 
@@ -236,11 +236,11 @@ NotationStaff::insertRepeatedClefAndKey(double tqlayoutX, int barNo)
      
         if (m_notationView->isInPrintMode() && (needClef || needKey)) {
      
-    	int tqlayoutY = getLayoutYForHeight(14);
-    	int h = getLayoutYForHeight(-8) - tqlayoutY;
+    	int layoutY = getLayoutYForHeight(14);
+    	int h = getLayoutYForHeight(-8) - layoutY;
      
     	LinedStaffCoords coords =
-    	    getCanvasCoordsForLayoutCoords(tqlayoutX, tqlayoutY);
+    	    getCanvasCoordsForLayoutCoords(layoutX, layoutY);
         
     	TQCanvasRectangle *rect = new TQCanvasRectangle(coords.first, coords.second,
     						      dx, h, m_canvas);
@@ -282,8 +282,8 @@ NotationStaff::drawStaffName()
 
     m_staffName = new QCanvasStaffNameSprite(map, m_canvas);
 
-    int tqlayoutY = getLayoutYForHeight(3);
-    LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(0, tqlayoutY);
+    int layoutY = getLayoutYForHeight(3);
+    LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(0, layoutY);
     m_staffName->move(getX() + getMargin() + m_notePixmapFactory->getNoteBodyWidth(),
                       coords.second - map->height() / 2);
     m_staffName->show();
@@ -300,9 +300,9 @@ NotationStaff::isStaffNameUpToDate()
 timeT
 NotationStaff::getTimeAtCanvasCoords(double cx, int cy) const
 {
-    LinedStaffCoords tqlayoutCoords = getLayoutCoordsForCanvasCoords(cx, cy);
+    LinedStaffCoords layoutCoords = getLayoutCoordsForCanvasCoords(cx, cy);
     RulerScale * rs = m_notationView->getHLayout();
-    return rs->getTimeForX(tqlayoutCoords.first);
+    return rs->getTimeForX(layoutCoords.first);
 }
 
 void
@@ -310,17 +310,17 @@ NotationStaff::getClefAndKeyAtCanvasCoords(double cx, int cy,
         Clef &clef,
         ::Rosegarden::Key &key) const
 {
-    LinedStaffCoords tqlayoutCoords = getLayoutCoordsForCanvasCoords(cx, cy);
+    LinedStaffCoords layoutCoords = getLayoutCoordsForCanvasCoords(cx, cy);
     int i;
 
     for (i = 0; i < m_clefChanges.size(); ++i) {
-        if (m_clefChanges[i].first > tqlayoutCoords.first)
+        if (m_clefChanges[i].first > layoutCoords.first)
             break;
         clef = m_clefChanges[i].second;
     }
 
     for (i = 0; i < m_keyChanges.size(); ++i) {
-        if (m_keyChanges[i].first > tqlayoutCoords.first)
+        if (m_keyChanges[i].first > layoutCoords.first)
             break;
         key = m_keyChanges[i].second;
     }
@@ -1395,15 +1395,15 @@ void
 NotationStaff::setPixmap(NotationElement *elt, TQCanvasPixmap *pixmap, int z,
                          FitPolicy policy)
 {
-    double tqlayoutX = elt->getLayoutX();
-    int tqlayoutY = (int)elt->getLayoutY();
+    double layoutX = elt->getLayoutX();
+    int layoutY = (int)elt->getLayoutY();
 
     elt->removeCanvasItem();
 
     while (1) {
 
         LinedStaffCoords coords =
-            getCanvasCoordsForLayoutCoords(tqlayoutX, tqlayoutY);
+            getCanvasCoordsForLayoutCoords(layoutX, layoutY);
 
         double canvasX = coords.first;
         int canvasY = coords.second;
@@ -1416,7 +1416,7 @@ NotationStaff::setPixmap(NotationElement *elt, TQCanvasPixmap *pixmap, int z,
 
         } else {
 
-            int row = getRowForLayoutX(tqlayoutX);
+            int row = getRowForLayoutX(layoutX);
             double rightMargin = getCanvasXForRightOfRow(row);
             double extent = canvasX + pixmap->width();
 
@@ -1452,7 +1452,7 @@ NotationStaff::setPixmap(NotationElement *elt, TQCanvasPixmap *pixmap, int z,
                     delete pixmap;
                     pixmap = rightCanvasPixmap;
 
-                    tqlayoutX += rightMargin - canvasX + 0.01; // ensure flip to next row
+                    layoutX += rightMargin - canvasX + 0.01; // ensure flip to next row
 
                     continue;
 
@@ -1460,7 +1460,7 @@ NotationStaff::setPixmap(NotationElement *elt, TQCanvasPixmap *pixmap, int z,
 
                     item = new TQCanvasNotationSprite(*elt, pixmap, m_canvas);
                     elt->setLayoutX(elt->getLayoutX() - (extent - rightMargin));
-                    coords = getCanvasCoordsForLayoutCoords(tqlayoutX, tqlayoutY);
+                    coords = getCanvasCoordsForLayoutCoords(layoutX, layoutY);
                     canvasX = coords.first;
                 }
             } else {
@@ -1823,7 +1823,7 @@ NotationStaff::isSelected(NotationElementList::iterator it)
 }
 
 void
-NotationStaff::showPreviewNote(double tqlayoutX, int heightOnStaff,
+NotationStaff::showPreviewNote(double layoutX, int heightOnStaff,
                                const Note &note, bool grace)
 {
     NotePixmapFactory *npf = m_notePixmapFactory;
@@ -1851,8 +1851,8 @@ NotationStaff::showPreviewNote(double tqlayoutX, int heightOnStaff,
     m_previewSprite = new QCanvasSimpleSprite
                       (npf->makeNotePixmap(params), m_canvas);
 
-    int tqlayoutY = getLayoutYForHeight(heightOnStaff);
-    LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(tqlayoutX, tqlayoutY);
+    int layoutY = getLayoutYForHeight(heightOnStaff);
+    LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(layoutX, layoutY);
 
     m_previewSprite->move(coords.first, (double)coords.second);
     m_previewSprite->setZ(4);
diff --git a/src/gui/editors/notation/NotationStaff.h b/src/gui/editors/notation/NotationStaff.h
index b941ac0..bb056c0 100644
--- a/src/gui/editors/notation/NotationStaff.h
+++ b/src/gui/editors/notation/NotationStaff.h
@@ -223,7 +223,7 @@ public:
     /**
      * Insert time signature at x-coordinate \a x.
      */
-    virtual void insertTimeSignature(double tqlayoutX,
+    virtual void insertTimeSignature(double layoutX,
                                      const TimeSignature &timeSig);
 
     /**
@@ -234,7 +234,7 @@ public:
     /**
      * Insert repeated clef and key at start of new line, at x-coordinate \a x.
      */
-    virtual void insertRepeatedClefAndKey(double tqlayoutX, int barNo);
+    virtual void insertRepeatedClefAndKey(double layoutX, int barNo);
 
     /**
      * Delete all repeated clefs and keys.
@@ -301,7 +301,7 @@ public:
      * Draw a note on the staff to show an insert position prior to
      * an insert. 
      */
-    virtual void showPreviewNote(double tqlayoutX, int heightOnStaff,
+    virtual void showPreviewNote(double layoutX, int heightOnStaff,
                                  const Note &note, bool grace);
 
     /**
@@ -423,7 +423,7 @@ protected:
      * This function calls painter.save(), and the caller must call
      * painter.restore() after use.
      */
-    virtual double setPainterClipping(TQPainter *, double tqlayoutX, int tqlayoutY,
+    virtual double setPainterClipping(TQPainter *, double layoutX, int layoutY,
                                       double dx, double w, LinedStaffCoords &coords,
                                       FitPolicy policy);
 
diff --git a/src/gui/editors/notation/NotationTool.cpp b/src/gui/editors/notation/NotationTool.cpp
index 6d32782..06c7a7d 100644
--- a/src/gui/editors/notation/NotationTool.cpp
+++ b/src/gui/editors/notation/NotationTool.cpp
@@ -44,7 +44,7 @@ NotationTool::~NotationTool()
     NOTATION_DEBUG << "NotationTool::~NotationTool()" << endl;
 
     //     delete m_menu;
-    //     m_tqparentView->factory()->removeClient(this);
+    //     m_parentView->factory()->removeClient(this);
     //     m_instance = 0;
 }
 
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index d58515f..64b49ec 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -571,15 +571,15 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
     m_staffs[0]->setCurrent(true);
 
     m_config->setGroup(NotationViewConfigGroup);
-    int tqlayoutMode = m_config->readNumEntry("tqlayoutmode", 0);
+    int layoutMode = m_config->readNumEntry("layoutmode", 0);
 
     try
     {
 
         LinedStaff::PageMode mode = LinedStaff::LinearMode;
-        if (tqlayoutMode == 1)
+        if (layoutMode == 1)
             mode = LinedStaff::ContinuousPageMode;
-        else if (tqlayoutMode == 2)
+        else if (layoutMode == 2)
             mode = LinedStaff::MultiPageMode;
 
         setPageMode(mode);
@@ -1458,7 +1458,7 @@ void NotationView::readOptions()
     setOneToolbar("show_clefs_toolbar", "Clefs Toolbar");
     setOneToolbar("show_group_toolbar", "Group Toolbar");
     setOneToolbar("show_marks_toolbar", "Marks Toolbar");
-    setOneToolbar("show_tqlayout_toolbar", "Layout Toolbar");
+    setOneToolbar("show_layout_toolbar", "Layout Toolbar");
     setOneToolbar("show_transport_toolbar", "Transport Toolbar");
     setOneToolbar("show_accidentals_toolbar", "Accidentals Toolbar");
     setOneToolbar("show_meta_toolbar", "Meta Toolbar");
@@ -1816,7 +1816,7 @@ void NotationView::setupActions()
     //
     // Settings menu
     //
-    int tqlayoutMode = m_config->readNumEntry("tqlayoutmode", 0);
+    int layoutMode = m_config->readNumEntry("layoutmode", 0);
 
     TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
 
@@ -1825,8 +1825,8 @@ void NotationView::setupActions()
     KRadioAction *linearModeAction = new KRadioAction
                                      (i18n("&Linear Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotLinearMode()),
                                       actionCollection(), "linear_mode");
-    linearModeAction->setExclusiveGroup("tqlayoutMode");
-    if (tqlayoutMode == 0)
+    linearModeAction->setExclusiveGroup("layoutMode");
+    if (layoutMode == 0)
         linearModeAction->setChecked(true);
 
     pixmap.load(pixmapDir + "/toolbar/continuous-page-mode.xpm");
@@ -1834,8 +1834,8 @@ void NotationView::setupActions()
     KRadioAction *continuousPageModeAction = new KRadioAction
             (i18n("&Continuous Page Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotContinuousPageMode()),
              actionCollection(), "continuous_page_mode");
-    continuousPageModeAction->setExclusiveGroup("tqlayoutMode");
-    if (tqlayoutMode == 1)
+    continuousPageModeAction->setExclusiveGroup("layoutMode");
+    if (layoutMode == 1)
         continuousPageModeAction->setChecked(true);
 
     pixmap.load(pixmapDir + "/toolbar/multi-page-mode.xpm");
@@ -1843,8 +1843,8 @@ void NotationView::setupActions()
     KRadioAction *multiPageModeAction = new KRadioAction
                                         (i18n("&Multiple Page Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMultiPageMode()),
                                          actionCollection(), "multi_page_mode");
-    multiPageModeAction->setExclusiveGroup("tqlayoutMode");
-    if (tqlayoutMode == 2)
+    multiPageModeAction->setExclusiveGroup("layoutMode");
+    if (layoutMode == 2)
         multiPageModeAction->setChecked(true);
 
     new KToggleAction(i18n("Show Ch&ord Name Ruler"), 0, TQT_TQOBJECT(this),
@@ -2304,7 +2304,7 @@ void NotationView::setupActions()
               "palette-marks" },
             { i18n("Show &Group Toolbar"), "1slotToggleGroupToolBar()", "show_group_toolbar",
               "palette-group" },
-            { i18n("Show &Layout Toolbar"), "1slotToggleLayoutToolBar()", "show_tqlayout_toolbar",
+            { i18n("Show &Layout Toolbar"), "1slotToggleLayoutToolBar()", "show_layout_toolbar",
               "palette-font" },
             { i18n("Show Trans&port Toolbar"), "1slotToggleTransportToolBar()", "show_transport_toolbar",
               "palette-transport" },
@@ -2607,21 +2607,21 @@ bool NotationView::isCurrentStaff(int i)
 
 void NotationView::initLayoutToolbar()
 {
-    KToolBar *tqlayoutToolbar = toolBar("Layout Toolbar");
+    KToolBar *layoutToolbar = toolBar("Layout Toolbar");
 
-    if (!tqlayoutToolbar) {
+    if (!layoutToolbar) {
         std::cerr
         << "NotationView::initLayoutToolbar() : tqlayout toolbar not found"
         << std::endl;
         return ;
     }
 
-    new TQLabel(i18n("  Font:  "), tqlayoutToolbar, "font label");
+    new TQLabel(i18n("  Font:  "), layoutToolbar, "font label");
 
     //
     // font combo
     //
-    m_fontCombo = new KComboBox(tqlayoutToolbar);
+    m_fontCombo = new KComboBox(layoutToolbar);
     m_fontCombo->setEditable(false);
 
     std::set
@@ -2652,7 +2652,7 @@ void NotationView::initLayoutToolbar()
     connect(m_fontCombo, TQT_SIGNAL(activated(const TQString &)),
             this, TQT_SLOT(slotChangeFont(const TQString &)));
 
-    new TQLabel(i18n("  Size:  "), tqlayoutToolbar, "size label");
+    new TQLabel(i18n("  Size:  "), layoutToolbar, "size label");
 
     TQString value;
 
@@ -2660,7 +2660,7 @@ void NotationView::initLayoutToolbar()
     // font size combo
     //
     std::vector<int> sizes = NoteFontFactory::getScreenSizes(m_fontName);
-    m_fontSizeCombo = new KComboBox(tqlayoutToolbar, "font size combo");
+    m_fontSizeCombo = new KComboBox(layoutToolbar, "font size combo");
 
     for (std::vector<int>::iterator i = sizes.begin(); i != sizes.end(); ++i) {
 
@@ -2674,7 +2674,7 @@ void NotationView::initLayoutToolbar()
     connect(m_fontSizeCombo, TQT_SIGNAL(activated(const TQString&)),
             this, TQT_SLOT(slotChangeFontSizeFromStringValue(const TQString&)));
 
-    new TQLabel(i18n("  Spacing:  "), tqlayoutToolbar, "spacing label");
+    new TQLabel(i18n("  Spacing:  "), layoutToolbar, "spacing label");
 
     //
     // spacing combo
@@ -2682,7 +2682,7 @@ void NotationView::initLayoutToolbar()
     int defaultSpacing = m_htqlayout->getSpacing();
     std::vector<int> spacings = NotationHLayout::getAvailableSpacings();
 
-    m_spacingCombo = new KComboBox(tqlayoutToolbar, "spacing combo");
+    m_spacingCombo = new KComboBox(layoutToolbar, "spacing combo");
     for (std::vector<int>::iterator i = spacings.begin(); i != spacings.end(); ++i) {
 
         value.setNum(*i);
@@ -2794,8 +2794,8 @@ NotationView::setPageMode(LinedStaff::PageMode pageMode)
 
     positionStaffs();
 
-    bool tqlayoutApplied = applyLayout();
-    if (!tqlayoutApplied)
+    bool layoutApplied = applyLayout();
+    if (!layoutApplied)
         KMessageBox::sorry(0, "Couldn't apply tqlayout");
     else {
         for (unsigned int i = 0; i < m_staffs.size(); ++i) {
@@ -3329,12 +3329,12 @@ void NotationView::playNote(Segment &s, int pitch, int velocity)
     StudioControl::sendMappedEvent(mE);
 }
 
-void NotationView::showPreviewNote(int staffNo, double tqlayoutX,
+void NotationView::showPreviewNote(int staffNo, double layoutX,
                                    int pitch, int height,
                                    const Note &note, bool grace,
                                    int velocity)
 {
-    m_staffs[staffNo]->showPreviewNote(tqlayoutX, height, note, grace);
+    m_staffs[staffNo]->showPreviewNote(layoutX, height, note, grace);
     playNote(m_staffs[staffNo]->getSegment(), pitch, velocity);
 }
 
@@ -3446,10 +3446,10 @@ NotationView::getInsertionTime(Clef &clef,
     // the segment but the staff has a more efficient lookup
 
     LinedStaff *staff = m_staffs[m_currentStaff];
-    double tqlayoutX = staff->getLayoutXOfInsertCursor();
-    if (tqlayoutX < 0) tqlayoutX = 0;
+    double layoutX = staff->getLayoutXOfInsertCursor();
+    if (layoutX < 0) layoutX = 0;
     Event *clefEvt = 0, *keyEvt = 0;
-    (void)staff->getElementUnderLayoutX(tqlayoutX, clefEvt, keyEvt);
+    (void)staff->getElementUnderLayoutX(layoutX, clefEvt, keyEvt);
 
     if (clefEvt) clef = Clef(*clefEvt);
     else clef = Clef();
@@ -3599,7 +3599,7 @@ void NotationView::print(bool previewOnly)
         // Supplying doublebuffer==true to this method appears to
         // slow down printing considerably but without it we get
         // all sorts of horrible artifacts (possibly related to
-        // mishandling of pixmap tqmasks?) in qt-3.0.  Let's permit
+        // mishandling of pixmap masks?) in qt-3.0.  Let's permit
         // it as a "hidden" option.
 
         m_config->setGroup(NotationViewConfigGroup);
@@ -4592,8 +4592,8 @@ NotationView::slotChangeFont(std::string newName, int newSize)
 
     positionStaffs();
 
-    bool tqlayoutApplied = applyLayout();
-    if (!tqlayoutApplied)
+    bool layoutApplied = applyLayout();
+    if (!layoutApplied)
         KMessageBox::sorry(0, "Couldn't apply tqlayout");
     else {
         for (unsigned int i = 0; i < m_staffs.size(); ++i) {
@@ -6438,7 +6438,7 @@ NotationView::slotSetPointerPosition(timeT time, bool scroll)
 
     for (unsigned int i = 0; i < m_staffs.size(); ++i) {
 
-        double tqlayoutX = m_htqlayout->getXForTimeByEvent(time);
+        double layoutX = m_htqlayout->getXForTimeByEvent(time);
         Segment &seg = m_staffs[i]->getSegment();
 
         bool good = true;
@@ -6449,7 +6449,7 @@ NotationView::slotSetPointerPosition(timeT time, bool scroll)
                     seg.getStartTime() +
                     ((time - seg.getStartTime()) %
                      (seg.getEndMarkerTime() - seg.getStartTime()));
-                tqlayoutX = m_htqlayout->getXForTimeByEvent(mappedTime);
+                layoutX = m_htqlayout->getXForTimeByEvent(mappedTime);
             } else {
                 good = false;
             }
@@ -6463,7 +6463,7 @@ NotationView::slotSetPointerPosition(timeT time, bool scroll)
 
         } else {
 
-            m_staffs[i]->setPointerPosition(tqlayoutX);
+            m_staffs[i]->setPointerPosition(layoutX);
 
             int cy;
             m_staffs[i]->getPointerPosition(cx, cy);
@@ -7115,8 +7115,8 @@ void NotationView::slotNonNotationItemPressed(TQMouseEvent *e, TQCanvasItem *it)
 
     } else if (dynamic_cast<TQCanvasTimeSigSprite *>(it)) {
 
-        double tqlayoutX = (dynamic_cast<TQCanvasTimeSigSprite *>(it))->getLayoutX();
-        emit editTimeSignature(m_htqlayout->getTimeForX(tqlayoutX));
+        double layoutX = (dynamic_cast<TQCanvasTimeSigSprite *>(it))->getLayoutX();
+        emit editTimeSignature(m_htqlayout->getTimeForX(layoutX));
     }
 }
 
diff --git a/src/gui/editors/notation/NotationView.h b/src/gui/editors/notation/NotationView.h
index 1288b04..236b89b 100644
--- a/src/gui/editors/notation/NotationView.h
+++ b/src/gui/editors/notation/NotationView.h
@@ -262,7 +262,7 @@ public:
      * the pitch for performance, so the two need not correspond (e.g.
      * under ottava there may be octave differences).
      */
-    void showPreviewNote(int staffNo, double tqlayoutX,
+    void showPreviewNote(int staffNo, double layoutX,
                          int pitch, int height,
                          const Note &note,
                          bool grace,
diff --git a/src/gui/editors/notation/NoteInserter.cpp b/src/gui/editors/notation/NoteInserter.cpp
index 7827761..3179534 100644
--- a/src/gui/editors/notation/NoteInserter.cpp
+++ b/src/gui/editors/notation/NoteInserter.cpp
@@ -123,7 +123,7 @@ NoteInserter::NoteInserter(NotationView* view)
 
     createMenu("noteinserter.rc");
 
-    connect(m_tqparentView, TQT_SIGNAL(changeAccidental(Accidental, bool)),
+    connect(m_parentView, TQT_SIGNAL(changeAccidental(Accidental, bool)),
             this, TQT_SLOT(slotSetAccidental(Accidental, bool)));
 }
 
@@ -137,7 +137,7 @@ NoteInserter::NoteInserter(const TQString& menuName, NotationView* view)
         m_lastAccidental(Accidentals::NoAccidental),
         m_followAccidental(false)
 {
-    connect(m_tqparentView, TQT_SIGNAL(changeAccidental(Accidental, bool)),
+    connect(m_parentView, TQT_SIGNAL(changeAccidental(Accidental, bool)),
             this, TQT_SLOT(slotSetAccidental(Accidental, bool)));
 }
 
@@ -623,37 +623,37 @@ void NoteInserter::slotSetAccidental(Accidental accidental,
 
 void NoteInserter::slotNoAccidental()
 {
-    m_tqparentView->actionCollection()->action("no_accidental")->activate();
+    m_parentView->actionCollection()->action("no_accidental")->activate();
 }
 
 void NoteInserter::slotFollowAccidental()
 {
-    m_tqparentView->actionCollection()->action("follow_accidental")->activate();
+    m_parentView->actionCollection()->action("follow_accidental")->activate();
 }
 
 void NoteInserter::slotSharp()
 {
-    m_tqparentView->actionCollection()->action("sharp_accidental")->activate();
+    m_parentView->actionCollection()->action("sharp_accidental")->activate();
 }
 
 void NoteInserter::slotFlat()
 {
-    m_tqparentView->actionCollection()->action("flat_accidental")->activate();
+    m_parentView->actionCollection()->action("flat_accidental")->activate();
 }
 
 void NoteInserter::slotNatural()
 {
-    m_tqparentView->actionCollection()->action("natural_accidental")->activate();
+    m_parentView->actionCollection()->action("natural_accidental")->activate();
 }
 
 void NoteInserter::slotDoubleSharp()
 {
-    m_tqparentView->actionCollection()->action("double_sharp_accidental")->activate();
+    m_parentView->actionCollection()->action("double_sharp_accidental")->activate();
 }
 
 void NoteInserter::slotDoubleFlat()
 {
-    m_tqparentView->actionCollection()->action("double_flat_accidental")->activate();
+    m_parentView->actionCollection()->action("double_flat_accidental")->activate();
 }
 
 void NoteInserter::slotToggleDot()
@@ -662,7 +662,7 @@ void NoteInserter::slotToggleDot()
     Note note(m_noteType, m_noteDots);
     TQString actionName(NotationStrings::getReferenceName(note));
     actionName.tqreplace(TQRegExp("-"), "_");
-    KAction *action = m_tqparentView->actionCollection()->action(actionName);
+    KAction *action = m_parentView->actionCollection()->action(actionName);
     if (!action) {
         std::cerr << "WARNING: No such action as " << actionName << std::endl;
     } else {
@@ -677,12 +677,12 @@ void NoteInserter::slotToggleAutoBeam()
 
 void NoteInserter::slotEraseSelected()
 {
-    m_tqparentView->actionCollection()->action("erase")->activate();
+    m_parentView->actionCollection()->action("erase")->activate();
 }
 
 void NoteInserter::slotSelectSelected()
 {
-    m_tqparentView->actionCollection()->action("select")->activate();
+    m_parentView->actionCollection()->action("select")->activate();
 }
 
 void NoteInserter::slotRestsSelected()
@@ -690,7 +690,7 @@ void NoteInserter::slotRestsSelected()
     Note note(m_noteType, m_noteDots);
     TQString actionName(NotationStrings::getReferenceName(note, true));
     actionName.tqreplace(TQRegExp("-"), "_");
-    KAction *action = m_tqparentView->actionCollection()->action(actionName);
+    KAction *action = m_parentView->actionCollection()->action(actionName);
     if (!action) {
         std::cerr << "WARNING: No such action as " << actionName << std::endl;
     } else {
diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp
index e02e14e..365478a 100644
--- a/src/gui/editors/notation/NotePixmapFactory.cpp
+++ b/src/gui/editors/notation/NotePixmapFactory.cpp
@@ -893,7 +893,7 @@ NotePixmapFactory::drawMarks(bool isStemmed,
 
             m_p->painter().setFont(m_textMarkFont);
             if (!m_inPrinterMethod)
-                m_p->tqmaskPainter().setFont(m_textMarkFont);
+                m_p->maskPainter().setFont(m_textMarkFont);
 
             int x = m_left + m_noteBodyWidth / 2 - bounds.width() / 2;
             int y = (normalMarksAreAbove ?
@@ -978,7 +978,7 @@ NotePixmapFactory::drawMarks(bool isStemmed,
 
             m_p->painter().setFont(m_fingeringFont);
             if (!m_inPrinterMethod)
-                m_p->tqmaskPainter().setFont(m_fingeringFont);
+                m_p->maskPainter().setFont(m_fingeringFont);
 
             int x = m_left + m_noteBodyWidth / 2 - bounds.width() / 2;
             int y = m_above - dy - 3;
@@ -1630,7 +1630,7 @@ NotePixmapFactory::drawTuplingLine(const NotePixmapParameters &params)
 
     m_p->painter().setFont(m_tupletCountFont);
     if (!m_inPrinterMethod)
-        m_p->tqmaskPainter().setFont(m_tupletCountFont);
+        m_p->maskPainter().setFont(m_tupletCountFont);
 
     int textX = endX + countSpace;
     int textY = endY + cr.height() / 2;
@@ -1894,7 +1894,7 @@ NotePixmapFactory::makeClefPixmap(const Clef &clef)
 
     m_p->painter().setFont(m_clefOttavaFont);
     if (!m_inPrinterMethod)
-        m_p->tqmaskPainter().setFont(m_clefOttavaFont);
+        m_p->maskPainter().setFont(m_clefOttavaFont);
 
     m_p->drawText(plain.getWidth() / 2 - rect.width() / 2,
                   oct < 0 ? plain.getHeight() + rect.height() - 1 :
@@ -2234,7 +2234,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
             m_p->painter().setPen(colour);
 
             m_p->painter().setFont(m_clefOttavaFont);
-            // m_p->tqmaskPainter().setFont(m_clefOttavaFont);
+            // m_p->maskPainter().setFont(m_clefOttavaFont);
             int xpos = maxDelta + clefChar.getWidth() / 2 - rect.width() / 2;
             int ypos = y - clefChar.getHotspot().y() + offset 
                          + (oct < 0 ? clefChar.getHeight() + rect.height() - 1 : - rect.height() / 3);
@@ -2273,7 +2273,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
     }
 
     m_p->painter().setFont(m_trackHeaderFont);
-    // m_p->tqmaskPainter().setFont(m_trackHeaderFont);
+    // m_p->maskPainter().setFont(m_trackHeaderFont);
 
     TQString text;
     TQString textLine;
@@ -2315,7 +2315,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
     // TODO : use colours from GUIPalette
     colour = header->isTransposeInconsistent() ? TQt::red : TQt::black;
     m_p->painter().setFont(m_trackHeaderBoldFont);
-     // m_p->tqmaskPainter().setFont(m_trackHeaderBoldFont);
+     // m_p->maskPainter().setFont(m_trackHeaderBoldFont);
     m_p->painter().setPen(colour);
 
     m_p->drawText(width - transposeWidth - charWidth / 4,
@@ -2329,7 +2329,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
     // TODO : use colours from GUIPalette
     colour = header->isLabelInconsistent() ? TQt::red : TQt::black;
     m_p->painter().setFont(m_trackHeaderFont);
-    // m_p->tqmaskPainter().setFont(m_trackHeaderFont);
+    // m_p->maskPainter().setFont(m_trackHeaderFont);
 
     m_p->painter().setPen(colour);
     text = header->getLowerText();
@@ -2759,12 +2759,12 @@ NotePixmapFactory::drawSlurAux(int length, int dy, bool above,
                         painter->rotate(theta);
                 } else {
                     m_p->painter().save();
-                    m_p->tqmaskPainter().save();
+                    m_p->maskPainter().save();
                     m_p->painter().translate(x, y);
-                    m_p->tqmaskPainter().translate(x, y);
+                    m_p->maskPainter().translate(x, y);
                     if (rotate) {
                         m_p->painter().rotate(theta);
-                        m_p->tqmaskPainter().rotate(theta);
+                        m_p->maskPainter().rotate(theta);
                     }
                 }
 
@@ -2780,7 +2780,7 @@ NotePixmapFactory::drawSlurAux(int length, int dy, bool above,
                     m.translate(hotspot.x(), hotspot.y());
                 m.rotate(theta);
                 m_p->painter().setWorldMatrix(m);
-                m_p->tqmaskPainter().setWorldMatrix(m);
+                m_p->maskPainter().setWorldMatrix(m);
             }
 
             if (m_selected)
@@ -2843,7 +2843,7 @@ NotePixmapFactory::drawSlurAux(int length, int dy, bool above,
     if (painter) {
         painter->restore();
         if (!m_inPrinterMethod)
-            m_p->tqmaskPainter().restore();
+            m_p->maskPainter().restore();
     }
 }
 
@@ -2907,12 +2907,12 @@ NotePixmapFactory::drawOttavaAux(int length, int octavesUp,
 
     m_p->painter().setFont(m_ottavaFont);
     if (!m_inPrinterMethod)
-        m_p->tqmaskPainter().setFont(m_ottavaFont);
+        m_p->maskPainter().setFont(m_ottavaFont);
 
     m_p->drawText(0, m_ottavaFontMetrics.ascent(), label);
 
     m_p->painter().setPen(pen);
-    //    if (!m_inPrinterMethod) m_p->tqmaskPainter().setPen(pen);
+    //    if (!m_inPrinterMethod) m_p->maskPainter().setPen(pen);
 
     int x0 = m_ottavaFontMetrics.width(label) + thickness;
     int x1 = width - thickness;
@@ -2925,7 +2925,7 @@ NotePixmapFactory::drawOttavaAux(int length, int octavesUp,
 
     pen.setStyle(Qt::SolidLine);
     m_p->painter().setPen(pen);
-    //    if (!m_inPrinterMethod) m_p->tqmaskPainter().setPen(pen);
+    //    if (!m_inPrinterMethod) m_p->maskPainter().setPen(pen);
 
     NOTATION_DEBUG << "NotePixmapFactory::drawOttavaAux: drawing " << x1 << "," << y0 << " to " << x1 << "," << y1 << ", thickness " << thickness << endl;
 
@@ -2933,7 +2933,7 @@ NotePixmapFactory::drawOttavaAux(int length, int octavesUp,
 
     m_p->painter().setPen(TQPen());
     if (!m_inPrinterMethod)
-        m_p->tqmaskPainter().setPen(TQPen());
+        m_p->maskPainter().setPen(TQPen());
 
     if (painter) {
         painter->restore();
@@ -3043,7 +3043,7 @@ NotePixmapFactory::makeTimeSigPixmap(const TimeSignature& sig)
 
         m_p->painter().setFont(m_bigTimeSigFont);
         if (!m_inPrinterMethod)
-            m_p->tqmaskPainter().setFont(m_bigTimeSigFont);
+            m_p->maskPainter().setFont(m_bigTimeSigFont);
 
         m_p->drawText(0, r.height() + dy, c);
 
@@ -3122,7 +3122,7 @@ NotePixmapFactory::makeTimeSigPixmap(const TimeSignature& sig)
 
         m_p->painter().setFont(m_timeSigFont);
         if (!m_inPrinterMethod)
-            m_p->tqmaskPainter().setFont(m_timeSigFont);
+            m_p->maskPainter().setFont(m_timeSigFont);
 
         x = (width - numR.width()) / 2 - 1;
         m_p->drawText(x, denomR.height(), numS);
@@ -3353,7 +3353,7 @@ NotePixmapFactory::drawTextAux(const Text &text,
 
     m_p->painter().setFont(textFont);
     if (!m_inPrinterMethod)
-        m_p->tqmaskPainter().setFont(textFont);
+        m_p->maskPainter().setFont(textFont);
 
     m_p->drawText(offset, textMetrics.ascent() + offset, s);
 
@@ -3400,7 +3400,7 @@ NotePixmapFactory::makeAnnotationPixmap(const Text &text, const bool isLilyPondD
 
     m_p->painter().setFont(textFont);
     if (!m_inPrinterMethod)
-        m_p->tqmaskPainter().setFont(textFont);
+        m_p->maskPainter().setFont(textFont);
 
     if (isLilyPondDirective) {
         m_p->painter().setBrush(GUIPalette::getColour(GUIPalette::TextLilyPondDirectiveBackground));
@@ -3427,17 +3427,17 @@ NotePixmapFactory::makeAnnotationPixmap(const Text &text, const bool isLilyPondD
 
 void
 NotePixmapFactory::createPixmapAndMask(int width, int height,
-                                       int tqmaskWidth, int tqmaskHeight)
+                                       int maskWidth, int maskHeight)
 {
-    if (tqmaskWidth < 0)
-        tqmaskWidth = width;
-    if (tqmaskHeight < 0)
-        tqmaskHeight = height;
+    if (maskWidth < 0)
+        maskWidth = width;
+    if (maskHeight < 0)
+        maskHeight = height;
 
     m_generatedWidth = width;
     m_generatedHeight = height;
     m_generatedPixmap = new TQPixmap(width, height);
-    m_generatedMask = new TQBitmap(tqmaskWidth, tqmaskHeight);
+    m_generatedMask = new TQBitmap(maskWidth, maskHeight);
 
     static unsigned long total = 0;
     total += width * height;
@@ -3452,8 +3452,8 @@ NotePixmapFactory::createPixmapAndMask(int width, int height,
 
     m_p->painter().setPen(TQt::black);
     m_p->painter().setBrush(TQt::black);
-    m_p->tqmaskPainter().setPen(TQt::white);
-    m_p->tqmaskPainter().setBrush(TQt::white);
+    m_p->maskPainter().setPen(TQt::white);
+    m_p->maskPainter().setBrush(TQt::white);
 }
 
 TQCanvasPixmap*
diff --git a/src/gui/editors/notation/NotePixmapFactory.h b/src/gui/editors/notation/NotePixmapFactory.h
index cfc93dc..9bf32b1 100644
--- a/src/gui/editors/notation/NotePixmapFactory.h
+++ b/src/gui/editors/notation/NotePixmapFactory.h
@@ -276,8 +276,8 @@ protected:
     TQCanvasPixmap* makeAnnotationPixmap(const Text &text, const bool isLilyPondDirective);
 
     void createPixmapAndMask(int width, int height,
-                             int tqmaskWidth = -1,
-                             int tqmaskHeight = -1);
+                             int maskWidth = -1,
+                             int maskHeight = -1);
     TQCanvasPixmap* makeCanvasPixmap(TQPoint hotspot, bool generateMask = false);
 
     enum ColourType {
diff --git a/src/gui/editors/notation/NotePixmapPainter.h b/src/gui/editors/notation/NotePixmapPainter.h
index 51918ec..485f5a1 100644
--- a/src/gui/editors/notation/NotePixmapPainter.h
+++ b/src/gui/editors/notation/NotePixmapPainter.h
@@ -61,7 +61,7 @@ public:
 
 	if (tqmask) {
 	    m_useMask = true;
-	    m_tqmaskPainter.tqbegin(tqmask, unclipped);
+	    m_maskPainter.tqbegin(tqmask, unclipped);
 	} else {
 	    m_useMask = false;
 	}
@@ -71,7 +71,7 @@ public:
     }
 
     bool end() {
-	if (m_useMask) m_tqmaskPainter.end();
+	if (m_useMask) m_maskPainter.end();
 	return m_painter->end();
     }
 
@@ -79,66 +79,66 @@ public:
 	return *m_painter;
     }
 
-    TQPainter &tqmaskPainter() {
-	return m_tqmaskPainter;
+    TQPainter &maskPainter() {
+	return m_maskPainter;
     }
 
     void drawPoint(int x, int y) {
 	m_painter->drawPoint(x, y);
-	if (m_useMask) m_tqmaskPainter.drawPoint(x, y);
+	if (m_useMask) m_maskPainter.drawPoint(x, y);
     }
 
     void drawLine(int x1, int y1, int x2, int y2) {
 	m_painter->drawLine(x1, y1, x2, y2);
-	if (m_useMask) m_tqmaskPainter.drawLine(x1, y1, x2, y2);
+	if (m_useMask) m_maskPainter.drawLine(x1, y1, x2, y2);
     }
 
     void drawRect(int x, int y, int w, int h) {
 	m_painter->drawRect(x, y, w, h);
-	if (m_useMask) m_tqmaskPainter.drawRect(x, y, w, h);
+	if (m_useMask) m_maskPainter.drawRect(x, y, w, h);
     }
     
     void drawArc(int x, int y, int w, int h, int a, int alen) {
 	m_painter->drawArc(x, y, w, h, a, alen);
-	if (m_useMask) m_tqmaskPainter.drawArc(x, y, w, h, a, alen);
+	if (m_useMask) m_maskPainter.drawArc(x, y, w, h, a, alen);
     }
 
     void drawPolygon(const TQPointArray &a, bool winding = false,
 		     int index = 0, int n = -1) {
 	m_painter->tqdrawPolygon(a, winding, index, n);
-	if (m_useMask) m_tqmaskPainter.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->tqdrawPolyline(a, index, n);
-	if (m_useMask) m_tqmaskPainter.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->tqdrawPixmap(x, y, pm, sx, sy, sw, sh);
-	if (m_useMask) m_tqmaskPainter.tqdrawPixmap(x, y, *(pm.tqmask()), sx, sy, sw, sh);
+	if (m_useMask) m_maskPainter.tqdrawPixmap(x, y, *(pm.tqmask()), sx, sy, sw, sh);
     }
 
     void drawText(int x, int y, const TQString &string) {
 	m_painter->drawText(x, y, string);
-	if (m_useMask) m_tqmaskPainter.drawText(x, y, string);
+	if (m_useMask) m_maskPainter.drawText(x, y, string);
     }
 
     void drawNoteCharacter(int x, int y, const NoteCharacter &character) {
 	character.draw(m_painter, x, y);
-	if (m_useMask) character.drawMask(&m_tqmaskPainter, x, y);
+	if (m_useMask) character.drawMask(&m_maskPainter, x, y);
     }
 
     void drawEllipse(int x, int y, int w, int h) {
       m_painter->drawEllipse(x, y, w, h);
-      if (m_useMask) m_tqmaskPainter.drawEllipse(x, y, w, h);
+      if (m_useMask) m_maskPainter.drawEllipse(x, y, w, h);
     }
 
 private:
     bool m_useMask;
     TQPainter  m_myPainter;
-    TQPainter  m_tqmaskPainter;
+    TQPainter  m_maskPainter;
     TQPainter *m_externalPainter;
     TQPainter *m_painter;
 };
diff --git a/src/gui/editors/notation/RestInserter.cpp b/src/gui/editors/notation/RestInserter.cpp
index faef304..448b40a 100644
--- a/src/gui/editors/notation/RestInserter.cpp
+++ b/src/gui/editors/notation/RestInserter.cpp
@@ -128,7 +128,7 @@ void RestInserter::slotToggleDot()
     Note note(m_noteType, m_noteDots);
     TQString actionName(NotationStrings::getReferenceName(note, true));
     actionName.tqreplace(TQRegExp("-"), "_");
-    KAction *action = m_tqparentView->actionCollection()->action(actionName);
+    KAction *action = m_parentView->actionCollection()->action(actionName);
     if (!action) {
         std::cerr << "WARNING: No such action as " << actionName << std::endl;
     } else {
@@ -141,7 +141,7 @@ void RestInserter::slotNotesSelected()
     Note note(m_noteType, m_noteDots);
     TQString actionName(NotationStrings::getReferenceName(note));
     actionName.tqreplace(TQRegExp(" "), "_");
-    m_tqparentView->actionCollection()->action(actionName)->activate();
+    m_parentView->actionCollection()->action(actionName)->activate();
 }
 
 const TQString RestInserter::ToolName     = "restinserter";
diff --git a/src/gui/editors/notation/TextInserter.cpp b/src/gui/editors/notation/TextInserter.cpp
index 6b5f595..b3709f1 100644
--- a/src/gui/editors/notation/TextInserter.cpp
+++ b/src/gui/editors/notation/TextInserter.cpp
@@ -79,12 +79,12 @@ void TextInserter::slotNotesSelected()
 
 void TextInserter::slotEraseSelected()
 {
-    m_tqparentView->actionCollection()->action("erase")->activate();
+    m_parentView->actionCollection()->action("erase")->activate();
 }
 
 void TextInserter::slotSelectSelected()
 {
-    m_tqparentView->actionCollection()->action("select")->activate();
+    m_parentView->actionCollection()->action("select")->activate();
 }
 
 void TextInserter::ready()