diff options
Diffstat (limited to 'amarok/src/analyzers/blockanalyzer.cpp')
| -rw-r--r-- | amarok/src/analyzers/blockanalyzer.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/amarok/src/analyzers/blockanalyzer.cpp b/amarok/src/analyzers/blockanalyzer.cpp index 886243d8..ed61161a 100644 --- a/amarok/src/analyzers/blockanalyzer.cpp +++ b/amarok/src/analyzers/blockanalyzer.cpp @@ -29,8 +29,8 @@ static inline uint myMax( uint v1, uint v2 ) { return v1 > v2 ? v1 : v2; } namespace Amarok { extern KConfig *config( const TQString& ); } -BlockAnalyzer::BlockAnalyzer( TQWidget *parent ) - : Analyzer::Base2D( parent, 20, 9 ) +BlockAnalyzer::BlockAnalyzer( TQWidget *tqparent ) + : Analyzer::Base2D( tqparent, 20, 9 ) , m_columns( 0 ) //uint , m_rows( 0 ) //uint , m_y( 0 ) //uint @@ -141,7 +141,7 @@ BlockAnalyzer::analyze( const Analyzer::Scope &s ) // y starts from the top and increases in units of blocks // m_yscale looks similar to: { 0.7, 0.5, 0.25, 0.15, 0.1, 0 } - // if it contains 6 elements there are 5 rows in the analyzer + // if it tqcontains 6 elements there are 5 rows in the analyzer Analyzer::interpolate( s, m_scope ); @@ -222,7 +222,7 @@ adjustToLimits( int &b, int &f, uint &amount ) * It won't modify the hue of fg unless absolutely necessary * @return the adjusted form of fg */ -QColor +TQColor ensureContrast( const TQColor &bg, const TQColor &fg, uint _amount = 150 ) { class OutputOnExit { @@ -244,8 +244,8 @@ ensureContrast( const TQColor &bg, const TQColor &fg, uint _amount = 150 ) int bh, bs, bv; int fh, fs, fv; - bg.getHsv( bh, bs, bv ); - fg.getHsv( fh, fs, fv ); + bg.getHsv( &bh, &bs, &bv ); + fg.getHsv( &fh, &fs, &fv ); int dv = abs( bv - fv ); @@ -345,7 +345,7 @@ ensureContrast( const TQColor &bg, const TQColor &fg, uint _amount = 150 ) // STAMP // debug() << "Something went wrong!\n"; - return Qt::blue; + return TQt::blue; #undef amount // #undef STAMP @@ -354,7 +354,7 @@ ensureContrast( const TQColor &bg, const TQColor &fg, uint _amount = 150 ) void BlockAnalyzer::paletteChange( const TQPalette& ) //virtual { - const TQColor bg = palette().active().background(); + const TQColor bg = tqpalette().active().background(); const TQColor fg = ensureContrast( bg, KGlobalSettings::activeTitleColor() ); m_topBarPixmap.fill( fg ); @@ -372,11 +372,11 @@ BlockAnalyzer::paletteChange( const TQPalette& ) //virtual p.fillRect( 0, y*(HEIGHT+1), WIDTH, HEIGHT, TQColor( r+int(dr*y), g+int(dg*y), b+int(db*y) ) ); { - const TQColor bg = palette().active().background().dark( 112 ); + const TQColor bg = tqpalette().active().background().dark( 112 ); //make a complimentary fadebar colour //TODO dark is not always correct, dumbo! - int h,s,v; palette().active().background().dark( 150 ).getHsv( &h, &s, &v ); + int h,s,v; tqpalette().active().background().dark( 150 ).getHsv( &h, &s, &v ); const TQColor fg( h + 120, s, v, TQColor::Hsv ); const double dr = fg.red() - bg.red(); @@ -386,7 +386,7 @@ BlockAnalyzer::paletteChange( const TQPalette& ) //virtual // Precalculate all fade-bar pixmaps for( uint y = 0; y < FADE_SIZE; ++y ) { - m_fade_bars[y].fill( palette().active().background() ); + m_fade_bars[y].fill( tqpalette().active().background() ); TQPainter f( &m_fade_bars[y] ); for( int z = 0; (uint)z < m_rows; ++z ) { const double Y = 1.0 - (log10( FADE_SIZE - y ) / log10( FADE_SIZE )); @@ -401,7 +401,7 @@ BlockAnalyzer::paletteChange( const TQPalette& ) //virtual void BlockAnalyzer::drawBackground() { - const TQColor bg = palette().active().background(); + const TQColor bg = tqpalette().active().background(); const TQColor bgdark = bg.dark( 112 ); background()->fill( bg ); @@ -430,7 +430,7 @@ BlockAnalyzer::contextMenuEvent( TQContextMenuEvent *e ) { const uint v = ids[x]; - menu.insertItem( i18n( "%1 fps" ).arg( 1000/v ), v ); + menu.insertItem( i18n( "%1 fps" ).tqarg( 1000/v ), v ); menu.setItemChecked( v, v == timeout() ); } |