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

1 files changed, 5 insertions, 5 deletions

diff --git a/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp b/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
index b0d3f3b..786e1a4 100644
--- a/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
+++ b/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
@@ -60,7 +60,7 @@ AudioPreviewPainter::AudioPreviewPainter(CompositionModelImpl& model,
     m_image = TQImage(pixWidth, m_rect.height(), 8, 4);
     m_image.setAlphaBuffer(true);
 
-    m_penWidth = (std::max(1U, m_rect.getPen().width()) * 2);
+    m_penWidth = (std::max(1U, (uint)m_rect.getPen().width()) * 2);
     m_halfRectHeight = m_model.grid().getYSnap()/2 - m_penWidth / 2 - 2;
 }
 
@@ -276,7 +276,7 @@ void AudioPreviewPainter::paintPreviewImage()
                                                                      m_segment->getStartTime()) -
                                  m_model.grid().getRulerScale()->getXForTime(m_segment->getStartTime()));
 
-        m_p.setPen(Qt::blue);
+        m_p.setPen(TQt::blue);
         m_p.drawRect(0,  m_apData->getSegmentRect().height() - 1, audioFadeInEnd, 1);
         m_pb.drawRect(0, m_apData->getSegmentRect().height() - 1, audioFadeInEnd, 1);
     }
@@ -291,15 +291,15 @@ void AudioPreviewPainter::finalizeCurrentSlice()
 //     RG_DEBUG << "AudioPreviewPainter::finalizeCurrentSlice : copying pixmap to image at " << m_sliceNb * tileWidth() << endl;
 
     // transparent background
-    m_image.setColor(0, qRgba(255, 255, 255, 0));
+    m_image.setColor(0, tqRgba(255, 255, 255, 0));
 
     // foreground from computeSegmentPreviewColor
     TQColor c = m_model.computeSegmentPreviewColor(m_segment);
-    QRgb rgba = qRgba(c.red(), c.green(), c.blue(), 255);
+    TQRgb rgba = tqRgba(c.red(), c.green(), c.blue(), 255);
     m_image.setColor(1, rgba);
 
     // red for clipping
-    m_image.setColor(2, qRgba(255, 0, 0, 255));
+    m_image.setColor(2, tqRgba(255, 0, 0, 255));
 
     m_previewPixmaps.push_back(m_image.copy());