Finish TQt4 porting of Amarok

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1228394 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 10 insertions, 10 deletions

diff --git a/amarok/src/equalizergraph.cpp b/amarok/src/equalizergraph.cpp
index bdc007b7..b8207eaa 100644
--- a/amarok/src/equalizergraph.cpp
+++ b/amarok/src/equalizergraph.cpp
@@ -25,8 +25,8 @@
 
 #include <kapplication.h>
 
-EqualizerGraph::EqualizerGraph( TQWidget* parent )
-    : TQWidget( parent, 0, Qt::WNoAutoErase )
+EqualizerGraph::EqualizerGraph( TQWidget* tqparent )
+    : TQWidget( tqparent, 0, TQt::WNoAutoErase )
     , m_backgroundPixmap( new TQPixmap() )
     , m_composePixmap( new TQPixmap() )
 {
@@ -50,8 +50,8 @@ EqualizerGraph::resizeEvent( TQResizeEvent* )
     drawBackground();
 }
 
-QSize
-EqualizerGraph::sizeHint() const
+TQSize
+EqualizerGraph::tqsizeHint() const
 {
    return TQSize( 100, 60 );
 }
@@ -65,11 +65,11 @@ EqualizerGraph::paintEvent( TQPaintEvent* )
 
     // Draw middle line
     int middleLineY = (int) ( ( height() - 1 ) / 2.0 + AmarokConfig::equalizerPreamp() * ( height() - 1 ) / 200.0 );
-    TQPen pen( colorGroup().dark(), 0, Qt::DotLine);
+    TQPen pen( tqcolorGroup().dark(), 0, TQt::DotLine);
     p.setPen( pen );
     p.drawLine( 8, middleLineY, width() - 1, middleLineY );
 
-    TQColor color( colorGroup().highlight() );
+    TQColor color( tqcolorGroup().highlight() );
     int h, s, v;
     color.getHsv( &h, &s, &v );
 
@@ -113,7 +113,7 @@ EqualizerGraph::paintEvent( TQPaintEvent* )
         for ( y = ymin; y <= ymax; y++ ) {
             // Absolute carthesian coordinate
             s = y - ( height() - 1 ) / 2;
-            s = QABS(s);
+            s = TQABS(s);
 
             // Normalise to a base of 256
             // short for: s / ( ( height() / 2.0 ) * 255;
@@ -141,14 +141,14 @@ EqualizerGraph::drawBackground()
     m_backgroundPixmap->resize( size() );
     m_composePixmap->resize( size() );
 
-    m_backgroundPixmap->fill( colorGroup().background().dark( 105 ) );
+    m_backgroundPixmap->fill( tqcolorGroup().background().dark( 105 ) );
     TQPainter p( m_backgroundPixmap );
 
     // Erase background for scale
-    p.fillRect( 0, 0, 7, height() -1, colorGroup().background());
+    p.fillRect( 0, 0, 7, height() -1, tqcolorGroup().background());
 
     // Draw scale
-    p.setPen( colorGroup().shadow() );
+    p.setPen( tqcolorGroup().shadow() );
     p.drawLine( 7, 0, 7, height() - 1 );
     p.drawLine( 0, 0, 7, 0 );
     p.drawLine( 0, height() / 2 - 1, 7, height() / 2 - 1 );