[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: [Amarok]  Fix build failures on arm(el). Thanks to Michael C
From:       Orville Bennett <illogical1 () gmail ! com>
Date:       2009-07-28 12:30:40
Message-ID: 4A6EEF70.3060303 () gmail ! com
[Download RAW message or body]

Nevermind. My other email client ate the <qreal>'s. html tag parsing fail.

Big o wrote:
> Eh? Nothing changed.
>
> Modestas Vainius<modestas@vainius.eu>  wrote:
>
>> commit 2cf43fb4eb5d5956424592ab1743f8e9fd2a15f6
>> Author:     Modestas Vainius<modestas@vainius.eu>
>> AuthorDate: Tue Jul 28 02:08:18 2009 +0300
>> Commit:     Modestas Vainius<modestas@vainius.eu>
>> CommitDate: Tue Jul 28 11:35:59 2009 +0300
>>
>>     Fix build failures on arm(el). Thanks to Michael Casadevall for the patch.
>>
>>     Signed-off-by: Modestas Vainius<modestas@vainius.eu>
>>     Signed-off-by: Michael Andrew Casadevall<mcasadevall@kubuntu.org>
>>
>> diff --git a/src/EngineController.cpp b/src/EngineController.cpp
>> index 657fa6d..5356e58 100644
>> --- a/src/EngineController.cpp
>> +++ b/src/EngineController.cpp
>> @@ -536,12 +536,12 @@ EngineController::decreaseVolume( int ticks ) //SLOT
>> int
>> EngineController::setVolume( int percent ) //SLOT
>> {
>> -    percent = qBound( 0, percent, 100 );
>> +    percent = qBound<qreal>( 0, percent, 100 );
>>      m_volume = percent;
>>
>>      // Phonon stays completely mute if the volume is lower than 0.05, so we shift and limit the range
>>      qreal newVolume =  ( percent + 4 ) / 100.0;
>> -    newVolume = qBound( 0.04, newVolume, 1.0 );
>> +    newVolume = qBound<qreal>( 0.04, newVolume, 1.0 );
>>      m_audio->setVolume( newVolume );
>>
>>      AmarokConfig::setMasterVolume( percent );
>> diff --git a/src/widgets/TokenWithLayout.cpp b/src/widgets/TokenWithLayout.cpp
>> index a09c76a..0f38c61 100644
>> --- a/src/widgets/TokenWithLayout.cpp
>> +++ b/src/widgets/TokenWithLayout.cpp
>> @@ -213,11 +213,11 @@ void TokenWithLayout::fillMenu( QMenu * menu )
>>                  }
>>              }
>>
>> -            int max = qMax( spareWidth, 0.0 );
>> +            int max = qMax<qreal>( spareWidth, 0.0 );
>>              debug()<<  "slider max value: "<<  max;
>>
>>              if ( max>= m_width * 100.0 )
>> -                slider->setMaximum( qMax( spareWidth, 0.0 ) );
>> +                slider->setMaximum( qMax<qreal>( spareWidth, 0.0 ) );
>>              else
>>                  slider->setMaximum( m_width * 100.0 );
>>          }
>>
>>

[prev in list] [next in list] [prev in thread] [next in thread]