diff options
Diffstat (limited to 'src/gui/editors/segment/segmentcanvas')
11 files changed, 19 insertions, 19 deletions
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionItemHelper.cpp b/src/gui/editors/segment/segmentcanvas/CompositionItemHelper.cpp index fe4b926..9579ba2 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionItemHelper.cpp +++ b/src/gui/editors/segment/segmentcanvas/CompositionItemHelper.cpp @@ -60,12 +60,12 @@ timeT CompositionItemHelper::getEndTime(const CompositionItem& item, const Roseg timeT t = 0; if (item) { - TQRect tqitemRect = item->rect(); + TQRect itemRect = item->rect(); - t = std::max(grid.snapX(tqitemRect.x() + tqitemRect.width()), 0L); + t = std::max(grid.snapX(itemRect.x() + itemRect.width()), 0L); // RG_DEBUG << "CompositionItemHelper::getEndTime() : rect width = " -// << tqitemRect.width() +// << itemRect.width() // << " - item is repeating : " << item->isRepeating() // << " - endTime = " << t // << endl; diff --git a/src/gui/editors/segment/segmentcanvas/CompositionItemImpl.cpp b/src/gui/editors/segment/segmentcanvas/CompositionItemImpl.cpp index 76cbe70..4b2926e 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionItemImpl.cpp +++ b/src/gui/editors/segment/segmentcanvas/CompositionItemImpl.cpp @@ -28,7 +28,7 @@ #include "misc/Debug.h" #include "base/Segment.h" #include "CompositionRect.h" -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqpen.h> #include <tqpoint.h> diff --git a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp index eb79e45..e9cc333 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp +++ b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp @@ -50,7 +50,7 @@ #include "AudioPreviewPainter.h" #include "gui/general/GUIPalette.h" #include "SegmentOrderer.h" -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqpen.h> #include <tqpoint.h> diff --git a/src/gui/editors/segment/segmentcanvas/CompositionRect.cpp b/src/gui/editors/segment/segmentcanvas/CompositionRect.cpp index ec4bef0..679ffce 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionRect.cpp +++ b/src/gui/editors/segment/segmentcanvas/CompositionRect.cpp @@ -26,7 +26,7 @@ #include "CompositionRect.h" #include "base/ColourMap.h" -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqpen.h> #include <tqpoint.h> diff --git a/src/gui/editors/segment/segmentcanvas/CompositionRect.h b/src/gui/editors/segment/segmentcanvas/CompositionRect.h index 53dcc2e..e969d17 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionRect.h +++ b/src/gui/editors/segment/segmentcanvas/CompositionRect.h @@ -26,7 +26,7 @@ #ifndef _RG_COMPOSITIONRECT_H_ #define _RG_COMPOSITIONRECT_H_ -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqpen.h> #include <tqrect.h> diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp index 75216b8..516573e 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp +++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp @@ -47,7 +47,7 @@ #include "SegmentToolBox.h" #include "SegmentTool.h" #include <kmessagebox.h> -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqevent.h> #include <tqfont.h> @@ -227,7 +227,7 @@ void CompositionView::slotUpdateSize() RulerScale *ruler = grid().getRulerScale(); - int minWidth = tqsizeHint().width(); + int minWidth = sizeHint().width(); int computedWidth = int(nearbyint(ruler->getTotalWidth())); int width = std::max(computedWidth, minWidth); @@ -327,7 +327,7 @@ void CompositionView::slotSetTool(const TQString& toolName) if (m_tool) m_tool->ready(); else { - KMessageBox::error(0, TQString("CompositionView::slotSetTool() : unknown tool name %1").tqarg(toolName)); + KMessageBox::error(0, TQString("CompositionView::slotSetTool() : unknown tool name %1").arg(toolName)); } } @@ -495,7 +495,7 @@ void CompositionView::resizeEvent(TQResizeEvent* e) void CompositionView::viewportPaintEvent(TQPaintEvent* e) { - TQMemArray<TQRect> rects = TQRegion(e->region()).tqrects(); + TQMemArray<TQRect> rects = TQRegion(e->region()).rects(); for (unsigned int i = 0; i < rects.size(); ++i) { viewportPaintRect(rects[i]); @@ -682,7 +682,7 @@ void CompositionView::refreshArtifactsDrawBuffer(const TQRect& rect) // << rect << endl; TQPainter p; - p.tqbegin(&m_artifactsDrawBuffer, viewport()); + p.begin(&m_artifactsDrawBuffer, viewport()); p.translate( -contentsX(), -contentsY()); // TQRect r(contentsX(), contentsY(), m_artifactsDrawBuffer.width(), m_artifactsDrawBuffer.height()); drawAreaArtifacts(&p, rect); diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.h b/src/gui/editors/segment/segmentcanvas/CompositionView.h index a1f6f07..95a1926 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionView.h +++ b/src/gui/editors/segment/segmentcanvas/CompositionView.h @@ -30,7 +30,7 @@ #include "CompositionModel.h" #include "CompositionItem.h" #include "gui/general/RosegardenScrollView.h" -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqpen.h> #include <tqpixmap.h> diff --git a/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h b/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h index cdf373e..d1bb9a7 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h +++ b/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h @@ -59,7 +59,7 @@ public: PreviewState getPreviewState() const { return m_previewState; } /** - * Sets whether the preview tqshape shown in the segment needs + * Sets whether the preview shape shown in the segment needs * to be refreshed */ void setPreviewCurrent(bool c) diff --git a/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp b/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp index e2970ab..04da855 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp +++ b/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp @@ -328,8 +328,8 @@ int SegmentMover::handleMouseMove(TQMouseEvent *e) comp.getMusicalTimeForAbsoluteTime(currentItemStartTime, bar, beat, fraction, remainder); TQString posString = TQString("%1.%2s (%3, %4, %5)") - .tqarg(time.sec).tqarg(ms) - .tqarg(bar + 1).tqarg(beat).tqarg(fraction); + .arg(time.sec).arg(ms) + .arg(bar + 1).arg(beat).arg(fraction); m_canvas->setTextFloat(guideX + 10, guideY - 30, posString); m_canvas->updateContents(); diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp index 964bc3b..c1b1f4b 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp +++ b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp @@ -466,8 +466,8 @@ SegmentSelector::handleMouseMove(TQMouseEvent *e) comp.getMusicalTimeForAbsoluteTime(currentItemStartTime, bar, beat, fraction, remainder); TQString posString = TQString("%1.%2s (%3, %4, %5)") - .tqarg(time.sec).tqarg(ms) - .tqarg(bar + 1).tqarg(beat).tqarg(fraction); + .arg(time.sec).arg(ms) + .arg(bar + 1).arg(beat).arg(fraction); m_canvas->setTextFloat(guideX + 10, guideY - 30, posString); m_canvas->updateContents(); diff --git a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp index 68bee60..5ce8a58 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp +++ b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp @@ -84,7 +84,7 @@ SegmentTool* SegmentToolBox::createTool(const TQString& toolName) else { KMessageBox::error(0, TQString("SegmentToolBox::createTool : unrecognised toolname %1 (%2)") - .tqarg(toolName).tqarg(toolNamelc)); + .arg(toolName).arg(toolNamelc)); return 0; } |