1 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 9627b16..388a4c1 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp
@@ -231,7 +231,7 @@ void CompositionModelImpl::makeAudioPreviewRects(AudioPreviewDrawData* apRects,
 
     TQPoint basePoint = segRect.topLeft();
 
-    AudioPreviewDrawDataItem previewItem(previewImage, basePoint, segRect);
+    AudioPreviewDrawDataItem previewItem(previewImage, basePoint, static_cast<const TQRect&>(segRect));
 
     if (getChangeType() == ChangeResizeFromStart) {
         CompositionRect originalRect = computeSegmentRect(*segment);
@@ -476,7 +476,7 @@ void CompositionModelImpl::slotAudioPreviewComplete(AudioPreviewUpdater* apu)
     TQRect updateRect;
 
     if (apData) {
-        RG_DEBUG << "CompositionModelImpl::slotAudioPreviewComplete(" << apu << "): apData contains " << apData->getValues().size() << " values already" << endl;
+        RG_DEBUG << "CompositionModelImpl::slotAudioPreviewComplete(" << apu << "): apData tqcontains " << apData->getValues().size() << " values already" << endl;
         unsigned int channels = 0;
         const std::vector<float> &values = apu->getComputedValues(channels);
         if (channels > 0) {
@@ -501,7 +501,7 @@ TQRect CompositionModelImpl::postProcessAudioPreview(AudioPreviewData* apData, c
 
     m_audioSegmentPreviewMap[segment] = previewPainter.getPreviewImage();
 
-    return previewPainter.getSegmentRect();
+    return static_cast<const TQRect&>(previewPainter.getSegmentRect());
 }
 
 void CompositionModelImpl::slotInstrumentParametersChanged(InstrumentId id)
@@ -796,7 +796,7 @@ CompositionModel::itemcontainer CompositionModelImpl::getItemsAt(const TQPoint&
         Segment* s = *i;
 
         CompositionRect sr = computeSegmentRect(*s);
-        if (sr.contains(point)) {
+        if (sr.tqcontains(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.replace(re1, "").replace(re2, "");
+        label.tqreplace(re1, "").tqreplace(re2, "");
     }
     cr.setLabel(label);