Commit 01fcba7f authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

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

parent 8cecc7be
...@@ -420,7 +420,7 @@ QSize LocationButton::sizeHint() const ...@@ -420,7 +420,7 @@ QSize LocationButton::sizeHint() const
#undef PADDING #undef PADDING
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
QSplitterHandle *PlaylistSplitter::createHandle() QSplitterHandle *PlaylistSplitter::createHandle()
{ {
return new SplitterHandle( orientation(), this ); return new SplitterHandle( orientation(), this );
......
...@@ -82,7 +82,7 @@ private slots: ...@@ -82,7 +82,7 @@ private slots:
friend class PlaylistDialog; friend class PlaylistDialog;
}; };
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
class PlaylistSplitter : public QSplitter class PlaylistSplitter : public QSplitter
{ {
public: public:
...@@ -94,7 +94,7 @@ protected: ...@@ -94,7 +94,7 @@ protected:
#define PlaylistSplitter QSplitter #define PlaylistSplitter QSplitter
#endif #endif
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
class SplitterHandle : public QSplitterHandle class SplitterHandle : public QSplitterHandle
{ {
public: public:
......
...@@ -122,7 +122,7 @@ PLSelector::PLSelector( QWidget *p, intf_thread_t *_p_intf ) ...@@ -122,7 +122,7 @@ PLSelector::PLSelector( QWidget *p, intf_thread_t *_p_intf )
setDropIndicatorShown(true); setDropIndicatorShown(true);
invisibleRootItem()->setFlags( invisibleRootItem()->flags() & ~Qt::ItemIsDropEnabled ); invisibleRootItem()->setFlags( invisibleRootItem()->flags() & ~Qt::ItemIsDropEnabled );
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
setAutoFillBackground( true ); setAutoFillBackground( true );
QPalette palette; QPalette palette;
palette.setColor( QPalette::Window, QColor(209,215,226) ); palette.setColor( QPalette::Window, QColor(209,215,226) );
......
...@@ -349,7 +349,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -349,7 +349,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
i_volume = config_GetFloat( p_intf, "directx-volume") * 100 + 0.5; i_volume = config_GetFloat( p_intf, "directx-volume") * 100 + 0.5;
else if( get_vol_aout( "waveout" ) ) else if( get_vol_aout( "waveout" ) )
i_volume = config_GetFloat( p_intf, "waveout-volume") * 100 + 0.5; 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" ) ) if( get_vol_aout( "auhal" ) )
i_volume = ( config_GetFloat( p_intf, "auhal-volume") * 100 + 0.5 ) i_volume = ( config_GetFloat( p_intf, "auhal-volume") * 100 + 0.5 )
/ AOUT_VOLUME_DEFAULT; / AOUT_VOLUME_DEFAULT;
...@@ -918,7 +918,7 @@ void SPrefsPanel::apply() ...@@ -918,7 +918,7 @@ void SPrefsPanel::apply()
config_PutFloat( p_intf, "directx-volume", i_volume / 100.f ); config_PutFloat( p_intf, "directx-volume", i_volume / 100.f );
if( save_vol_aout( "waveout" ) ) if( save_vol_aout( "waveout" ) )
config_PutFloat( p_intf, "waveout-volume", i_volume / 100.f ); config_PutFloat( p_intf, "waveout-volume", i_volume / 100.f );
#elif defined( Q_WS_MAC ) #elif defined( Q_OS_MAC )
VLC_UNUSED( f_gain ); VLC_UNUSED( f_gain );
if( save_vol_aout( "auhal" ) ) if( save_vol_aout( "auhal" ) )
config_PutFloat( p_intf, "auhal-volume", i_volume / 100.f config_PutFloat( p_intf, "auhal-volume", i_volume / 100.f
......
...@@ -1137,7 +1137,7 @@ void VLCMenuBar::updateSystrayMenu( MainInterface *mi, ...@@ -1137,7 +1137,7 @@ void VLCMenuBar::updateSystrayMenu( MainInterface *mi,
QMenu *sysMenu = mi->getSysTrayMenu(); QMenu *sysMenu = mi->getSysTrayMenu();
sysMenu->clear(); sysMenu->clear();
#ifndef Q_WS_MAC #ifndef Q_OS_MAC
/* Hide / Show VLC and cone */ /* Hide / Show VLC and cone */
if( mi->isVisible() || b_force_visible ) if( mi->isVisible() || b_force_visible )
{ {
......
...@@ -103,7 +103,7 @@ void ClickLineEdit::focusOutEvent( QFocusEvent *ev ) ...@@ -103,7 +103,7 @@ void ClickLineEdit::focusOutEvent( QFocusEvent *ev )
} }
#endif #endif
#ifndef Q_WS_MAC #ifndef Q_OS_MAC
SearchLineEdit::SearchLineEdit( QWidget *parent ) : QLineEdit( parent ) SearchLineEdit::SearchLineEdit( QWidget *parent ) : QLineEdit( parent )
{ {
clearButton = new QFramelessButton( this ); clearButton = new QFramelessButton( this );
......
...@@ -72,7 +72,7 @@ private: ...@@ -72,7 +72,7 @@ private:
}; };
#endif #endif
#ifndef Q_WS_MAC #ifndef Q_OS_MAC
class QFramelessButton; class QFramelessButton;
class SearchLineEdit : public QLineEdit class SearchLineEdit : public QLineEdit
{ {
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "searchlineedit.hpp" #include "searchlineedit.hpp"
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
#include <Cocoa/Cocoa.h> #include <Cocoa/Cocoa.h>
...@@ -61,4 +61,4 @@ SearchLineEdit::SearchLineEdit(QWidget *parent) ...@@ -61,4 +61,4 @@ SearchLineEdit::SearchLineEdit(QWidget *parent)
} }
//![0] //![0]
#endif // Q_WS_MAC #endif // Q_OS_MAC
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment