Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
01fcba7f
Commit
01fcba7f
authored
Jul 15, 2013
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: move Q_WS => Q_OS in widgets and playlist code
parent
8cecc7be
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
11 deletions
+11
-11
modules/gui/qt4/components/playlist/playlist.cpp
modules/gui/qt4/components/playlist/playlist.cpp
+1
-1
modules/gui/qt4/components/playlist/playlist.hpp
modules/gui/qt4/components/playlist/playlist.hpp
+2
-2
modules/gui/qt4/components/playlist/selector.cpp
modules/gui/qt4/components/playlist/selector.cpp
+1
-1
modules/gui/qt4/components/simple_preferences.cpp
modules/gui/qt4/components/simple_preferences.cpp
+2
-2
modules/gui/qt4/menus.cpp
modules/gui/qt4/menus.cpp
+1
-1
modules/gui/qt4/util/searchlineedit.cpp
modules/gui/qt4/util/searchlineedit.cpp
+1
-1
modules/gui/qt4/util/searchlineedit.hpp
modules/gui/qt4/util/searchlineedit.hpp
+1
-1
modules/gui/qt4/util/searchlineedit_mac.mm
modules/gui/qt4/util/searchlineedit_mac.mm
+2
-2
No files found.
modules/gui/qt4/components/playlist/playlist.cpp
View file @
01fcba7f
...
@@ -420,7 +420,7 @@ QSize LocationButton::sizeHint() const
...
@@ -420,7 +420,7 @@ QSize LocationButton::sizeHint() const
#undef PADDING
#undef PADDING
#ifdef Q_
W
S_MAC
#ifdef Q_
O
S_MAC
QSplitterHandle
*
PlaylistSplitter
::
createHandle
()
QSplitterHandle
*
PlaylistSplitter
::
createHandle
()
{
{
return
new
SplitterHandle
(
orientation
(),
this
);
return
new
SplitterHandle
(
orientation
(),
this
);
...
...
modules/gui/qt4/components/playlist/playlist.hpp
View file @
01fcba7f
...
@@ -82,7 +82,7 @@ private slots:
...
@@ -82,7 +82,7 @@ private slots:
friend
class
PlaylistDialog
;
friend
class
PlaylistDialog
;
};
};
#ifdef Q_
W
S_MAC
#ifdef Q_
O
S_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_
W
S_MAC
#ifdef Q_
O
S_MAC
class
SplitterHandle
:
public
QSplitterHandle
class
SplitterHandle
:
public
QSplitterHandle
{
{
public:
public:
...
...
modules/gui/qt4/components/playlist/selector.cpp
View file @
01fcba7f
...
@@ -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_
W
S_MAC
#ifdef Q_
O
S_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
)
);
...
...
modules/gui/qt4/components/simple_preferences.cpp
View file @
01fcba7f
...
@@ -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_
W
S_MAC )
#elif defined( Q_
O
S_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_
W
S_MAC )
#elif defined( Q_
O
S_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
...
...
modules/gui/qt4/menus.cpp
View file @
01fcba7f
...
@@ -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_
W
S_MAC
#ifndef Q_
O
S_MAC
/* Hide / Show VLC and cone */
/* Hide / Show VLC and cone */
if
(
mi
->
isVisible
()
||
b_force_visible
)
if
(
mi
->
isVisible
()
||
b_force_visible
)
{
{
...
...
modules/gui/qt4/util/searchlineedit.cpp
View file @
01fcba7f
...
@@ -103,7 +103,7 @@ void ClickLineEdit::focusOutEvent( QFocusEvent *ev )
...
@@ -103,7 +103,7 @@ void ClickLineEdit::focusOutEvent( QFocusEvent *ev )
}
}
#endif
#endif
#ifndef Q_
W
S_MAC
#ifndef Q_
O
S_MAC
SearchLineEdit
::
SearchLineEdit
(
QWidget
*
parent
)
:
QLineEdit
(
parent
)
SearchLineEdit
::
SearchLineEdit
(
QWidget
*
parent
)
:
QLineEdit
(
parent
)
{
{
clearButton
=
new
QFramelessButton
(
this
);
clearButton
=
new
QFramelessButton
(
this
);
...
...
modules/gui/qt4/util/searchlineedit.hpp
View file @
01fcba7f
...
@@ -72,7 +72,7 @@ private:
...
@@ -72,7 +72,7 @@ private:
};
};
#endif
#endif
#ifndef Q_
W
S_MAC
#ifndef Q_
O
S_MAC
class
QFramelessButton
;
class
QFramelessButton
;
class
SearchLineEdit
:
public
QLineEdit
class
SearchLineEdit
:
public
QLineEdit
{
{
...
...
modules/gui/qt4/util/searchlineedit_mac.mm
View file @
01fcba7f
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
#include "searchlineedit.hpp"
#include "searchlineedit.hpp"
#ifdef Q_
W
S_MAC
#ifdef Q_
O
S_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_
W
S_MAC
#endif // Q_
O
S_MAC
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment