[vlc-commits] Qt: move Q_WS => Q_OS in widgets and playlist code

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jul 15 17:00:33 2013 +0200| [01fcba7ff894cac941a26bc448ad60187764dd35] | committer: Jean-Baptiste Kempf

Qt: move Q_WS => Q_OS in widgets and playlist code

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=01fcba7ff894cac941a26bc448ad60187764dd35
---

 modules/gui/qt4/components/playlist/playlist.cpp  |    2 +-
 modules/gui/qt4/components/playlist/playlist.hpp  |    4 ++--
 modules/gui/qt4/components/playlist/selector.cpp  |    2 +-
 modules/gui/qt4/components/simple_preferences.cpp |    4 ++--
 modules/gui/qt4/menus.cpp                         |    2 +-
 modules/gui/qt4/util/searchlineedit.cpp           |    2 +-
 modules/gui/qt4/util/searchlineedit.hpp           |    2 +-
 modules/gui/qt4/util/searchlineedit_mac.mm        |    4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/gui/qt4/components/playlist/playlist.cpp b/modules/gui/qt4/components/playlist/playlist.cpp
index 0837d46..cb8173e 100644
--- a/modules/gui/qt4/components/playlist/playlist.cpp
+++ b/modules/gui/qt4/components/playlist/playlist.cpp
@@ -420,7 +420,7 @@ QSize LocationButton::sizeHint() const
 
 #undef PADDING
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 QSplitterHandle *PlaylistSplitter::createHandle()
 {
     return new SplitterHandle( orientation(), this );
diff --git a/modules/gui/qt4/components/playlist/playlist.hpp b/modules/gui/qt4/components/playlist/playlist.hpp
index ff5c267..f34feec 100644
--- a/modules/gui/qt4/components/playlist/playlist.hpp
+++ b/modules/gui/qt4/components/playlist/playlist.hpp
@@ -82,7 +82,7 @@ private slots:
     friend class PlaylistDialog;
 };
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 class PlaylistSplitter : public QSplitter
 {
 public:
@@ -94,7 +94,7 @@ protected:
  #define PlaylistSplitter QSplitter
 #endif
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 class SplitterHandle : public QSplitterHandle
 {
 public:
diff --git a/modules/gui/qt4/components/playlist/selector.cpp b/modules/gui/qt4/components/playlist/selector.cpp
index 17ffd08..17fe64b 100644
--- a/modules/gui/qt4/components/playlist/selector.cpp
+++ b/modules/gui/qt4/components/playlist/selector.cpp
@@ -122,7 +122,7 @@ PLSelector::PLSelector( QWidget *p, intf_thread_t *_p_intf )
     setDropIndicatorShown(true);
     invisibleRootItem()->setFlags( invisibleRootItem()->flags() & ~Qt::ItemIsDropEnabled );
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     setAutoFillBackground( true );
     QPalette palette;
     palette.setColor( QPalette::Window, QColor(209,215,226) );
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index e643bef..cca97aa 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -349,7 +349,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                 i_volume = config_GetFloat( p_intf, "directx-volume") * 100 + 0.5;
             else if( get_vol_aout( "waveout" ) )
                 i_volume = config_GetFloat( p_intf, "waveout-volume") * 100 + 0.5;
-#elif defined( Q_WS_MAC )
+#elif defined( Q_OS_MAC )
             if( get_vol_aout( "auhal" ) )
                 i_volume = ( config_GetFloat( p_intf, "auhal-volume") * 100 + 0.5 )
                     / AOUT_VOLUME_DEFAULT;
@@ -918,7 +918,7 @@ void SPrefsPanel::apply()
             config_PutFloat( p_intf, "directx-volume", i_volume / 100.f );
         if( save_vol_aout( "waveout" ) )
             config_PutFloat( p_intf, "waveout-volume", i_volume / 100.f );
-#elif defined( Q_WS_MAC )
+#elif defined( Q_OS_MAC )
         VLC_UNUSED( f_gain );
         if( save_vol_aout( "auhal" ) )
             config_PutFloat( p_intf, "auhal-volume", i_volume / 100.f
diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 19bf1c5..70a20f6 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -1137,7 +1137,7 @@ void VLCMenuBar::updateSystrayMenu( MainInterface *mi,
     QMenu *sysMenu = mi->getSysTrayMenu();
     sysMenu->clear();
 
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
     /* Hide / Show VLC and cone */
     if( mi->isVisible() || b_force_visible )
     {
diff --git a/modules/gui/qt4/util/searchlineedit.cpp b/modules/gui/qt4/util/searchlineedit.cpp
index 27a9223..a0a6f4f 100644
--- a/modules/gui/qt4/util/searchlineedit.cpp
+++ b/modules/gui/qt4/util/searchlineedit.cpp
@@ -103,7 +103,7 @@ void ClickLineEdit::focusOutEvent( QFocusEvent *ev )
 }
 #endif
 
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
 SearchLineEdit::SearchLineEdit( QWidget *parent ) : QLineEdit( parent )
 {
     clearButton = new QFramelessButton( this );
diff --git a/modules/gui/qt4/util/searchlineedit.hpp b/modules/gui/qt4/util/searchlineedit.hpp
index 27bf5eb..fe81b30 100644
--- a/modules/gui/qt4/util/searchlineedit.hpp
+++ b/modules/gui/qt4/util/searchlineedit.hpp
@@ -72,7 +72,7 @@ private:
 };
 #endif
 
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
 class QFramelessButton;
 class SearchLineEdit : public QLineEdit
 {
diff --git a/modules/gui/qt4/util/searchlineedit_mac.mm b/modules/gui/qt4/util/searchlineedit_mac.mm
index 890c80a..6d4da6c 100644
--- a/modules/gui/qt4/util/searchlineedit_mac.mm
+++ b/modules/gui/qt4/util/searchlineedit_mac.mm
@@ -31,7 +31,7 @@
 
 #include "searchlineedit.hpp"
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 
 #include <Cocoa/Cocoa.h>
 
@@ -61,4 +61,4 @@ SearchLineEdit::SearchLineEdit(QWidget *parent)
 }
 //![0]
 
-#endif // Q_WS_MAC
+#endif // Q_OS_MAC