diff options
Diffstat (limited to 'amarok/src/osd.cpp')
| -rw-r--r-- | amarok/src/osd.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/amarok/src/osd.cpp b/amarok/src/osd.cpp index 70f9a61b..187340ea 100644 --- a/amarok/src/osd.cpp +++ b/amarok/src/osd.cpp @@ -180,9 +180,9 @@ OSDWidget::determineMetrics( const uint M ) const TQSize max = TQApplication::desktop()->screen( m_screen )->size() - margin; // If we don't do that, the boundingRect() might not be suitable for drawText() (TQt issue N67674) - m_text.tqreplace( TQRegExp(" +\n"), "\n" ); + m_text.replace( TQRegExp(" +\n"), "\n" ); // remove consecutive line breaks - m_text.tqreplace( TQRegExp("\n+"), "\n" ); + m_text.replace( TQRegExp("\n+"), "\n" ); // The osd cannot be larger than the screen TQRect rect = fontMetrics().boundingRect( 0, 0, @@ -690,9 +690,9 @@ Amarok::OSD::show( const MetaBundle &bundle ) //slot const int column = availableTags.at( i ); TQString append = ( i == 0 ) ? "" : ( n > 1 && i == n / 2 ) ? "\n" - : ( parens.tqcontains( column ) || parens.tqcontains( availableTags.at( i - 1 ) ) ) ? " " + : ( parens.contains( column ) || parens.contains( availableTags.at( i - 1 ) ) ) ? " " : i18n(" - "); - append += ( parens.tqcontains( column ) ? "(%1)" : "%1" ); + append += ( parens.contains( column ) ? "(%1)" : "%1" ); text += append.tqarg( tags.at( column + 1 ) ); } } @@ -728,21 +728,21 @@ Amarok::OSD::show( const MetaBundle &bundle ) //slot QStringx osd = AmarokConfig::osdText(); // hacky, but works... - if( osd.tqcontains( "%rating" ) ) + if( osd.contains( "%rating" ) ) OSDWidget::setRating( AmarokConfig::useRatings() ? bundle.rating() : 0 ); else OSDWidget::setRating( 0 ); - osd.tqreplace( "%rating", "" ); + osd.replace( "%rating", "" ); - if( osd.tqcontains( "%moodbar" ) && AmarokConfig::showMoodbar() ) + if( osd.contains( "%moodbar" ) && AmarokConfig::showMoodbar() ) OSDWidget::setMoodbar( bundle ); - osd.tqreplace( "%moodbar", "" ); + osd.replace( "%moodbar", "" ); text = osd.namedOptArgs( args ); // KDE 3.3 rejects \n in the .kcfg file, and KConfig turns \n into \\n, so... - text.tqreplace( "\\n", "\n" ); + text.replace( "\\n", "\n" ); } if ( AmarokConfig::osdCover() ) { @@ -755,7 +755,7 @@ Amarok::OSD::show( const MetaBundle &bundle ) //slot else location = CollectionDB::instance()->albumImage( bundle, false, 0 ); - if ( location.tqfind( "nocover" ) != -1 ) + if ( location.find( "nocover" ) != -1 ) setImage( Amarok::icon() ); else setImage( location ); @@ -826,7 +826,7 @@ Amarok::OSD::slotCoverChanged( const TQString &artist, const TQString &album ) { TQString location = CollectionDB::instance()->albumImage( artist, album, false, 0 ); - if( location.tqfind( "nocover" ) != -1 ) + if( location.find( "nocover" ) != -1 ) setImage( Amarok::icon() ); else setImage( location ); |