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

1 files changed, 27 insertions, 27 deletions

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);