diff options
Diffstat (limited to 'src/gui/editors/notation/NotationStaff.cpp')
-rw-r--r-- | src/gui/editors/notation/NotationStaff.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp index c5219b4..717e418 100644 --- a/src/gui/editors/notation/NotationStaff.cpp +++ b/src/gui/editors/notation/NotationStaff.cpp @@ -64,16 +64,16 @@ #include "NoteStyleFactory.h" #include <kconfig.h> #include <kmessagebox.h> -#include <qcanvas.h> -#include <qpainter.h> -#include <qpoint.h> -#include <qrect.h> +#include <tqcanvas.h> +#include <tqpainter.h> +#include <tqpoint.h> +#include <tqrect.h> namespace Rosegarden { -NotationStaff::NotationStaff(QCanvas *canvas, Segment *segment, +NotationStaff::NotationStaff(TQCanvas *canvas, Segment *segment, SnapGrid *snapGrid, int id, NotationView *view, std::string fontName, int resolution) : @@ -148,7 +148,7 @@ NotationStaff::insertTimeSignature(double layoutX, return ; m_notePixmapFactory->setSelected(false); - QCanvasPixmap *pixmap = m_notePixmapFactory->makeTimeSigPixmap(timeSig); + TQCanvasPixmap *pixmap = m_notePixmapFactory->makeTimeSigPixmap(timeSig); QCanvasTimeSigSprite *sprite = new QCanvasTimeSigSprite(layoutX, pixmap, m_canvas); @@ -201,7 +201,7 @@ NotationStaff::insertRepeatedClefAndKey(double layoutX, int barNo) LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(layoutX + dx, layoutY); - QCanvasPixmap *pixmap = m_notePixmapFactory->makeClefPixmap(clef); + TQCanvasPixmap *pixmap = m_notePixmapFactory->makeClefPixmap(clef); QCanvasNonElementSprite *sprite = new QCanvasNonElementSprite(pixmap, m_canvas); @@ -220,7 +220,7 @@ NotationStaff::insertRepeatedClefAndKey(double layoutX, int barNo) LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(layoutX + dx, layoutY); - QCanvasPixmap *pixmap = m_notePixmapFactory->makeKeyPixmap(key, clef); + TQCanvasPixmap *pixmap = m_notePixmapFactory->makeKeyPixmap(key, clef); QCanvasNonElementSprite *sprite = new QCanvasNonElementSprite(pixmap, m_canvas); @@ -242,7 +242,7 @@ NotationStaff::insertRepeatedClefAndKey(double layoutX, int barNo) LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(layoutX, layoutY); - QCanvasRectangle *rect = new QCanvasRectangle(coords.first, coords.second, + TQCanvasRectangle *rect = new TQCanvasRectangle(coords.first, coords.second, dx, h, m_canvas); rect->setPen(Qt::black); rect->setBrush(Qt::white); @@ -276,7 +276,7 @@ NotationStaff::drawStaffName() getSegment().getComposition()-> getTrackById(getSegment().getTrack())->getLabel(); - QCanvasPixmap *map = + TQCanvasPixmap *map = m_notePixmapFactory->makeTextPixmap (Text(m_staffNameText, Text::StaffName)); @@ -942,7 +942,7 @@ NotationStaff::renderSingleElement(ViewElementList::iterator &vli, try { - QCanvasPixmap *pixmap = 0; + TQCanvasPixmap *pixmap = 0; m_notePixmapFactory->setSelected(selected); m_notePixmapFactory->setShaded(invisible); @@ -1343,7 +1343,7 @@ NotationStaff::renderSingleElement(ViewElementList::iterator &vli, } double -NotationStaff::setPainterClipping(QPainter *painter, double lx, int ly, +NotationStaff::setPainterClipping(TQPainter *painter, double lx, int ly, double dx, double w, LinedStaffCoords &coords, FitPolicy policy) { @@ -1369,9 +1369,9 @@ NotationStaff::setPainterClipping(QPainter *painter, double lx, int ly, clipWidth += clipLeft; clipLeft = 0; } - QRect clip(clipLeft, coords.second - getRowSpacing() / 2, + TQRect clip(clipLeft, coords.second - getRowSpacing() / 2, clipWidth, getRowSpacing()); - painter->setClipRect(clip, QPainter::CoordPainter); + painter->setClipRect(clip, TQPainter::CoordPainter); coords.first -= dx; } if (fit) { @@ -1392,7 +1392,7 @@ NotationStaff::setPainterClipping(QPainter *painter, double lx, int ly, } void -NotationStaff::setPixmap(NotationElement *elt, QCanvasPixmap *pixmap, int z, +NotationStaff::setPixmap(NotationElement *elt, TQCanvasPixmap *pixmap, int z, FitPolicy policy) { double layoutX = elt->getLayoutX(); @@ -1408,7 +1408,7 @@ NotationStaff::setPixmap(NotationElement *elt, QCanvasPixmap *pixmap, int z, double canvasX = coords.first; int canvasY = coords.second; - QCanvasItem *item = 0; + TQCanvasItem *item = 0; if (m_pageMode == LinearMode || policy == PretendItFittedAllAlong) { @@ -1428,15 +1428,15 @@ NotationStaff::setPixmap(NotationElement *elt, QCanvasPixmap *pixmap, int z, // NOTATION_DEBUG << "splitting at " << (rightMargin-canvasX) << endl; - std::pair<QPixmap, QPixmap> split = + std::pair<TQPixmap, TQPixmap> split = PixmapFunctions::splitPixmap(*pixmap, int(rightMargin - canvasX)); - QCanvasPixmap *leftCanvasPixmap = new QCanvasPixmap - (split.first, QPoint(pixmap->offsetX(), pixmap->offsetY())); + TQCanvasPixmap *leftCanvasPixmap = new QCanvasPixmap + (split.first, TQPoint(pixmap->offsetX(), pixmap->offsetY())); - QCanvasPixmap *rightCanvasPixmap = new QCanvasPixmap - (split.second, QPoint(0, pixmap->offsetY())); + TQCanvasPixmap *rightCanvasPixmap = new QCanvasPixmap + (split.second, TQPoint(0, pixmap->offsetY())); item = new QCanvasNotationSprite(*elt, leftCanvasPixmap, m_canvas); item->setZ(z); @@ -1736,18 +1736,18 @@ NotationStaff::renderNote(ViewElementList::iterator &vli) // The normal on-screen case bool collision = false; - QCanvasItem * haloItem = 0; + TQCanvasItem * haloItem = 0; if (m_showCollisions) { collision = elt->isColliding(); if (collision) { // Make collision halo - QCanvasPixmap *haloPixmap = factory->makeNoteHaloPixmap(params); + TQCanvasPixmap *haloPixmap = factory->makeNoteHaloPixmap(params); haloItem = new QCanvasNotationSprite(*elt, haloPixmap, m_canvas); haloItem->setZ(-1); } } - QCanvasPixmap *pixmap = factory->makeNotePixmap(params); + TQCanvasPixmap *pixmap = factory->makeNotePixmap(params); int z = 0; if (factory->isSelected()) @@ -1991,7 +1991,7 @@ NotationStaff::markChanged(timeT from, timeT to, bool movedOnly) } void -NotationStaff::setPrintPainter(QPainter *painter) +NotationStaff::setPrintPainter(TQPainter *painter) { m_printPainter = painter; } |