[vlc-devel] Qt: use Q_OS_* in timetooltip for Win32 and OS/2

[KO Myung-Hun]

Hi/2.

Jean-Baptiste Kempf wrote:
> vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jul 15 17:15:35 2013 +0200| [dd10669d6c02be997cd870839229fa748c70a24f] | committer: Jean-Baptiste Kempf
> 
> Qt: use Q_OS_* in timetooltip for Win32 and OS/2
> 
> It might need more testing in some X11 setups on Windows
> 
>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dd10669d6c02be997cd870839229fa748c70a24f
> ---
> 
>  modules/gui/qt4/util/timetooltip.cpp |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/modules/gui/qt4/util/timetooltip.cpp b/modules/gui/qt4/util/timetooltip.cpp
> index 0f5666c..39ecc6f 100644
> --- a/modules/gui/qt4/util/timetooltip.cpp
> +++ b/modules/gui/qt4/util/timetooltip.cpp
> @@ -42,7 +42,7 @@ TimeTooltip::TimeTooltip( QWidget *parent ) :
>      // a paintEvent occurs. This should save some CPU cycles.
>      setAttribute( Qt::WA_OpaquePaintEvent );
>  
> -#if defined( Q_WS_WIN ) || defined( Q_WS_PM )
> +#if defined( Q_OS_WIN ) || defined( Q_OS_PM )
>      /*
>      - This attribute is required on Windows and OS/2 to avoid focus stealing of other windows.
>      - When set on Linux the TimeTooltip appears behind the FSController in fullscreen.
> @@ -142,7 +142,7 @@ void TimeTooltip::setTip( const QPoint& target, const QString& time, const QStri
>  void TimeTooltip::show()
>  {
>      QWidget::setVisible( mInitialized );
> -#ifdef Q_WS_PM
> +#ifdef Q_OS_PM
>      // Bring a tooltip on the top
>      // Without this, tooltip does not appear on fullscreen
>      // from the second fullscreen state change

The macro for OS/2 is Q_OS_OS2 not Q_OS_PM.

-- 
KO Myung-Hun

Using Mozilla SeaMonkey 2.7.2
Under OS/2 Warp 4 for Korean with FixPak #15
In VirtualBox v4.1.24 on Intel Core i7-3615QM 2.30GHz with 8GB RAM

Korean OS/2 User Community : http://www.ecomstation.co.kr