diff options
Diffstat (limited to 'src/gui/editors/segment')
| -rw-r--r-- | src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp | 6 | ||||
| -rw-r--r-- | src/gui/editors/segment/segmentcanvas/CompositionView.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp index 388a4c1..eb79e45 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp +++ b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp @@ -476,7 +476,7 @@ void CompositionModelImpl::slotAudioPreviewComplete(AudioPreviewUpdater* apu) TQRect updateRect; if (apData) { - RG_DEBUG << "CompositionModelImpl::slotAudioPreviewComplete(" << apu << "): apData tqcontains " << apData->getValues().size() << " values already" << endl; + RG_DEBUG << "CompositionModelImpl::slotAudioPreviewComplete(" << apu << "): apData contains " << apData->getValues().size() << " values already" << endl; unsigned int channels = 0; const std::vector<float> &values = apu->getComputedValues(channels); if (channels > 0) { @@ -796,7 +796,7 @@ CompositionModel::itemcontainer CompositionModelImpl::getItemsAt(const TQPoint& Segment* s = *i; CompositionRect sr = computeSegmentRect(*s); - if (sr.tqcontains(point)) { + if (sr.contains(point)) { // RG_DEBUG << "CompositionModelImpl::getItemsAt() adding " << sr << " for segment " << s << endl; CompositionItem item(new CompositionItemImpl(*s, sr)); unsigned int z = computeZForSegment(s); @@ -1124,7 +1124,7 @@ CompositionRect CompositionModelImpl::computeSegmentRect(const Segment& s, bool if (s.getType() == Segment::Audio) { static TQRegExp re1("( *\\([^)]*\\))*$"); // (inserted) (copied) (etc) static TQRegExp re2("\\.[^.]+$"); // filename suffix - label.tqreplace(re1, "").tqreplace(re2, ""); + label.replace(re1, "").replace(re2, ""); } cr.setLabel(label); diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp index 6faf230..d4e7909 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp +++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp @@ -929,7 +929,7 @@ void CompositionView::drawAreaArtifacts(TQPainter * p, const TQRect& clipRect) // // Split line // - if (m_splitLinePos.x() > 0 && clipRect.tqcontains(m_splitLinePos)) { + if (m_splitLinePos.x() > 0 && clipRect.contains(m_splitLinePos)) { p->save(); p->setPen(m_guideColor); p->drawLine(m_splitLinePos.x(), m_splitLinePos.y(), @@ -1128,7 +1128,7 @@ void CompositionView::drawRect(const TQRect& r, TQPainter *p, const TQRect& clip // Paint using the small coordinates... TQRect intersection = rect.intersect(clipRect); - if (clipRect.tqcontains(rect)) { + if (clipRect.contains(rect)) { p->drawRect(rect); } else { // draw only what's necessary |