From 458efa7b0c935cbaafa2791021a5f8f7241aa876 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 2 May 2011 22:38:52 +0000 Subject: Initial TQt4 port of Rosegarden This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1230242 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp') diff --git a/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp b/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp index 60a74f4..8f4399c 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp +++ b/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp @@ -64,7 +64,7 @@ SegmentPencil::SegmentPencil(CompositionView *c, RosegardenGUIDoc *d) void SegmentPencil::ready() { - m_canvas->viewport()->setCursor(Qt::ibeamCursor); + m_canvas->viewport()->setCursor(TQt::ibeamCursor); connect(m_canvas, TQT_SIGNAL(contentsMoving (int, int)), this, TQT_SLOT(slotCanvasScrolled(int, int))); setContextHelpFor(TQPoint(0, 0)); @@ -86,7 +86,7 @@ void SegmentPencil::slotCanvasScrolled(int newX, int newY) void SegmentPencil::handleMouseButtonPress(TQMouseEvent *e) { - if (e->button() == RightButton) + if (e->button() == Qt::RightButton) return; // is user holding Ctrl+Alt? (ugly, but we are running short on available @@ -153,7 +153,7 @@ void SegmentPencil::handleMouseButtonPress(TQMouseEvent *e) void SegmentPencil::handleMouseButtonRelease(TQMouseEvent* e) { - if (e->button() == RightButton) + if (e->button() == Qt::RightButton) return ; setContextHelpFor(e->pos()); @@ -196,9 +196,9 @@ void SegmentPencil::handleMouseButtonRelease(TQMouseEvent* e) segment->setLowestPlayable(track->getLowestPlayable()); segment->setHighestPlayable(track->getHighestPlayable()); - std::string label = qstrtostr(track->getPresetLabel()); + std::string label = (track->getPresetLabel()); if (label != "") { - segment->setLabel(qstrtostr(track->getPresetLabel())); + segment->setLabel((track->getPresetLabel())); } CompositionItem item = CompositionItemHelper::makeCompositionItem(segment); -- cgit v1.2.3