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
5feabe6b
Commit
5feabe6b
authored
May 14, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: kill unused_parameters warnings
parent
8b2c1499
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
8 deletions
+34
-8
modules/gui/qt4/dialogs/ml_configuration.cpp
modules/gui/qt4/dialogs/ml_configuration.cpp
+1
-1
modules/gui/qt4/dialogs/plugins.cpp
modules/gui/qt4/dialogs/plugins.cpp
+2
-2
modules/gui/qt4/input_manager.cpp
modules/gui/qt4/input_manager.cpp
+21
-0
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+6
-1
modules/gui/qt4/menus.cpp
modules/gui/qt4/menus.cpp
+3
-3
modules/gui/qt4/menus.hpp
modules/gui/qt4/menus.hpp
+1
-1
No files found.
modules/gui/qt4/dialogs/ml_configuration.cpp
View file @
5feabe6b
...
@@ -148,7 +148,7 @@ bool MLDirModel::setData( const QModelIndex &index, const QVariant &value,
...
@@ -148,7 +148,7 @@ bool MLDirModel::setData( const QModelIndex &index, const QVariant &value,
return
QDirModel
::
setData
(
index
,
value
,
role
);
return
QDirModel
::
setData
(
index
,
value
,
role
);
}
}
int
MLDirModel
::
columnCount
(
const
QModelIndex
&
parent
)
const
int
MLDirModel
::
columnCount
(
const
QModelIndex
&
)
const
{
{
return
1
;
return
1
;
}
}
...
...
modules/gui/qt4/dialogs/plugins.cpp
View file @
5feabe6b
...
@@ -334,7 +334,7 @@ void ExtensionListModel::updateList()
...
@@ -334,7 +334,7 @@ void ExtensionListModel::updateList()
emit
dataChanged
(
index
(
0
),
index
(
rowCount
()
-
1
)
);
emit
dataChanged
(
index
(
0
),
index
(
rowCount
()
-
1
)
);
}
}
int
ExtensionListModel
::
rowCount
(
const
QModelIndex
&
parent
)
const
int
ExtensionListModel
::
rowCount
(
const
QModelIndex
&
)
const
{
{
int
count
=
0
;
int
count
=
0
;
ExtensionsManager
*
EM
=
ExtensionsManager
::
getInstance
(
p_intf
);
ExtensionsManager
*
EM
=
ExtensionsManager
::
getInstance
(
p_intf
);
...
@@ -363,7 +363,7 @@ QVariant ExtensionListModel::data( const QModelIndex& index, int role ) const
...
@@ -363,7 +363,7 @@ QVariant ExtensionListModel::data( const QModelIndex& index, int role ) const
}
}
QModelIndex
ExtensionListModel
::
index
(
int
row
,
int
column
,
QModelIndex
ExtensionListModel
::
index
(
int
row
,
int
column
,
const
QModelIndex
&
parent
)
const
const
QModelIndex
&
)
const
{
{
if
(
column
!=
0
)
if
(
column
!=
0
)
return
QModelIndex
();
return
QModelIndex
();
...
...
modules/gui/qt4/input_manager.cpp
View file @
5feabe6b
...
@@ -285,6 +285,8 @@ inline void InputManager::delCallbacks()
...
@@ -285,6 +285,8 @@ inline void InputManager::delCallbacks()
static
int
ItemChanged
(
vlc_object_t
*
p_this
,
const
char
*
psz_var
,
static
int
ItemChanged
(
vlc_object_t
*
p_this
,
const
char
*
psz_var
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
param
)
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
param
)
{
{
VLC_UNUSED
(
p_this
);
VLC_UNUSED
(
psz_var
);
VLC_UNUSED
(
oldval
);
InputManager
*
im
=
(
InputManager
*
)
param
;
InputManager
*
im
=
(
InputManager
*
)
param
;
input_item_t
*
p_item
=
static_cast
<
input_item_t
*>
(
newval
.
p_address
);
input_item_t
*
p_item
=
static_cast
<
input_item_t
*>
(
newval
.
p_address
);
...
@@ -296,6 +298,8 @@ static int ItemChanged( vlc_object_t *p_this, const char *psz_var,
...
@@ -296,6 +298,8 @@ static int ItemChanged( vlc_object_t *p_this, const char *psz_var,
static
int
InputEvent
(
vlc_object_t
*
p_this
,
const
char
*
,
static
int
InputEvent
(
vlc_object_t
*
p_this
,
const
char
*
,
vlc_value_t
,
vlc_value_t
newval
,
void
*
param
)
vlc_value_t
,
vlc_value_t
newval
,
void
*
param
)
{
{
VLC_UNUSED
(
p_this
);
InputManager
*
im
=
(
InputManager
*
)
param
;
InputManager
*
im
=
(
InputManager
*
)
param
;
IMEvent
*
event
;
IMEvent
*
event
;
...
@@ -1179,6 +1183,8 @@ bool MainInputManager::getPlayExitState()
...
@@ -1179,6 +1183,8 @@ bool MainInputManager::getPlayExitState()
static
int
PLItemChanged
(
vlc_object_t
*
p_this
,
const
char
*
psz_var
,
static
int
PLItemChanged
(
vlc_object_t
*
p_this
,
const
char
*
psz_var
,
vlc_value_t
oldval
,
vlc_value_t
,
void
*
param
)
vlc_value_t
oldval
,
vlc_value_t
,
void
*
param
)
{
{
VLC_UNUSED
(
p_this
);
VLC_UNUSED
(
psz_var
);
VLC_UNUSED
(
oldval
);
MainInputManager
*
mim
=
(
MainInputManager
*
)
param
;
MainInputManager
*
mim
=
(
MainInputManager
*
)
param
;
IMEvent
*
event
=
new
IMEvent
(
ItemChanged_Type
);
IMEvent
*
event
=
new
IMEvent
(
ItemChanged_Type
);
...
@@ -1189,6 +1195,7 @@ static int PLItemChanged( vlc_object_t *p_this, const char *psz_var,
...
@@ -1189,6 +1195,7 @@ static int PLItemChanged( vlc_object_t *p_this, const char *psz_var,
static
int
LeafToParent
(
vlc_object_t
*
p_this
,
const
char
*
psz_var
,
static
int
LeafToParent
(
vlc_object_t
*
p_this
,
const
char
*
psz_var
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
param
)
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
param
)
{
{
VLC_UNUSED
(
p_this
);
VLC_UNUSED
(
psz_var
);
VLC_UNUSED
(
oldval
);
MainInputManager
*
mim
=
(
MainInputManager
*
)
param
;
MainInputManager
*
mim
=
(
MainInputManager
*
)
param
;
IMEvent
*
event
=
new
IMEvent
(
LeafToParent_Type
,
IMEvent
*
event
=
new
IMEvent
(
LeafToParent_Type
,
...
@@ -1200,6 +1207,8 @@ static int LeafToParent( vlc_object_t *p_this, const char *psz_var,
...
@@ -1200,6 +1207,8 @@ static int LeafToParent( vlc_object_t *p_this, const char *psz_var,
static
int
VolumeChanged
(
vlc_object_t
*
p_this
,
const
char
*
psz_var
,
static
int
VolumeChanged
(
vlc_object_t
*
p_this
,
const
char
*
psz_var
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
param
)
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
param
)
{
{
VLC_UNUSED
(
p_this
);
VLC_UNUSED
(
psz_var
);
VLC_UNUSED
(
oldval
);
VLC_UNUSED
(
newval
);
MainInputManager
*
mim
=
(
MainInputManager
*
)
param
;
MainInputManager
*
mim
=
(
MainInputManager
*
)
param
;
IMEvent
*
event
=
new
IMEvent
(
VolumeChanged_Type
);
IMEvent
*
event
=
new
IMEvent
(
VolumeChanged_Type
);
...
@@ -1210,6 +1219,8 @@ static int VolumeChanged( vlc_object_t *p_this, const char *psz_var,
...
@@ -1210,6 +1219,8 @@ static int VolumeChanged( vlc_object_t *p_this, const char *psz_var,
static
int
SoundMuteChanged
(
vlc_object_t
*
p_this
,
const
char
*
psz_var
,
static
int
SoundMuteChanged
(
vlc_object_t
*
p_this
,
const
char
*
psz_var
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
param
)
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
param
)
{
{
VLC_UNUSED
(
p_this
);
VLC_UNUSED
(
psz_var
);
VLC_UNUSED
(
oldval
);
VLC_UNUSED
(
newval
);
MainInputManager
*
mim
=
(
MainInputManager
*
)
param
;
MainInputManager
*
mim
=
(
MainInputManager
*
)
param
;
IMEvent
*
event
=
new
IMEvent
(
SoundMuteChanged_Type
);
IMEvent
*
event
=
new
IMEvent
(
SoundMuteChanged_Type
);
...
@@ -1220,6 +1231,8 @@ static int SoundMuteChanged( vlc_object_t *p_this, const char *psz_var,
...
@@ -1220,6 +1231,8 @@ static int SoundMuteChanged( vlc_object_t *p_this, const char *psz_var,
static
int
PLItemAppended
static
int
PLItemAppended
(
vlc_object_t
*
obj
,
const
char
*
var
,
vlc_value_t
old
,
vlc_value_t
cur
,
void
*
data
)
(
vlc_object_t
*
obj
,
const
char
*
var
,
vlc_value_t
old
,
vlc_value_t
cur
,
void
*
data
)
{
{
VLC_UNUSED
(
obj
);
VLC_UNUSED
(
var
);
VLC_UNUSED
(
old
);
MainInputManager
*
mim
=
static_cast
<
MainInputManager
*>
(
data
);
MainInputManager
*
mim
=
static_cast
<
MainInputManager
*>
(
data
);
playlist_add_t
*
p_add
=
static_cast
<
playlist_add_t
*>
(
cur
.
p_address
);
playlist_add_t
*
p_add
=
static_cast
<
playlist_add_t
*>
(
cur
.
p_address
);
...
@@ -1230,6 +1243,8 @@ static int PLItemAppended
...
@@ -1230,6 +1243,8 @@ static int PLItemAppended
static
int
PLItemRemoved
static
int
PLItemRemoved
(
vlc_object_t
*
obj
,
const
char
*
var
,
vlc_value_t
old
,
vlc_value_t
cur
,
void
*
data
)
(
vlc_object_t
*
obj
,
const
char
*
var
,
vlc_value_t
old
,
vlc_value_t
cur
,
void
*
data
)
{
{
VLC_UNUSED
(
obj
);
VLC_UNUSED
(
var
);
VLC_UNUSED
(
old
);
MainInputManager
*
mim
=
static_cast
<
MainInputManager
*>
(
data
);
MainInputManager
*
mim
=
static_cast
<
MainInputManager
*>
(
data
);
PLEvent
*
event
=
new
PLEvent
(
PLItemRemoved_Type
,
cur
.
i_int
,
0
);
PLEvent
*
event
=
new
PLEvent
(
PLItemRemoved_Type
,
cur
.
i_int
,
0
);
...
@@ -1240,6 +1255,8 @@ static int PLItemRemoved
...
@@ -1240,6 +1255,8 @@ static int PLItemRemoved
static
int
RandomChanged
static
int
RandomChanged
(
vlc_object_t
*
obj
,
const
char
*
var
,
vlc_value_t
old
,
vlc_value_t
cur
,
void
*
data
)
(
vlc_object_t
*
obj
,
const
char
*
var
,
vlc_value_t
old
,
vlc_value_t
cur
,
void
*
data
)
{
{
VLC_UNUSED
(
obj
);
VLC_UNUSED
(
var
);
VLC_UNUSED
(
old
);
VLC_UNUSED
(
cur
);
MainInputManager
*
mim
=
static_cast
<
MainInputManager
*>
(
data
);
MainInputManager
*
mim
=
static_cast
<
MainInputManager
*>
(
data
);
IMEvent
*
event
=
new
IMEvent
(
RandomChanged_Type
);
IMEvent
*
event
=
new
IMEvent
(
RandomChanged_Type
);
...
@@ -1251,6 +1268,8 @@ static int RandomChanged
...
@@ -1251,6 +1268,8 @@ static int RandomChanged
static
int
LoopChanged
static
int
LoopChanged
(
vlc_object_t
*
obj
,
const
char
*
var
,
vlc_value_t
old
,
vlc_value_t
cur
,
void
*
data
)
(
vlc_object_t
*
obj
,
const
char
*
var
,
vlc_value_t
old
,
vlc_value_t
cur
,
void
*
data
)
{
{
VLC_UNUSED
(
obj
);
VLC_UNUSED
(
var
);
VLC_UNUSED
(
old
);
VLC_UNUSED
(
cur
);
MainInputManager
*
mim
=
static_cast
<
MainInputManager
*>
(
data
);
MainInputManager
*
mim
=
static_cast
<
MainInputManager
*>
(
data
);
IMEvent
*
event
=
new
IMEvent
(
LoopChanged_Type
);
IMEvent
*
event
=
new
IMEvent
(
LoopChanged_Type
);
...
@@ -1261,6 +1280,8 @@ static int LoopChanged
...
@@ -1261,6 +1280,8 @@ static int LoopChanged
static
int
RepeatChanged
static
int
RepeatChanged
(
vlc_object_t
*
obj
,
const
char
*
var
,
vlc_value_t
old
,
vlc_value_t
cur
,
void
*
data
)
(
vlc_object_t
*
obj
,
const
char
*
var
,
vlc_value_t
old
,
vlc_value_t
cur
,
void
*
data
)
{
{
VLC_UNUSED
(
obj
);
VLC_UNUSED
(
var
);
VLC_UNUSED
(
old
);
VLC_UNUSED
(
cur
);
MainInputManager
*
mim
=
static_cast
<
MainInputManager
*>
(
data
);
MainInputManager
*
mim
=
static_cast
<
MainInputManager
*>
(
data
);
IMEvent
*
event
=
new
IMEvent
(
RepeatChanged_Type
);
IMEvent
*
event
=
new
IMEvent
(
RepeatChanged_Type
);
...
...
modules/gui/qt4/main_interface.cpp
View file @
5feabe6b
...
@@ -553,7 +553,7 @@ void MainInterface::destroyPopupMenu()
...
@@ -553,7 +553,7 @@ void MainInterface::destroyPopupMenu()
QVLCMenu
::
PopupMenu
(
p_intf
,
false
);
QVLCMenu
::
PopupMenu
(
p_intf
,
false
);
}
}
void
MainInterface
::
popupMenu
(
const
QPoint
&
p
)
void
MainInterface
::
popupMenu
(
const
QPoint
&
)
{
{
QVLCMenu
::
PopupMenu
(
p_intf
,
true
);
QVLCMenu
::
PopupMenu
(
p_intf
,
true
);
}
}
...
@@ -1272,6 +1272,8 @@ void MainInterface::toggleInterfaceFullScreen()
...
@@ -1272,6 +1272,8 @@ void MainInterface::toggleInterfaceFullScreen()
static
int
PopupMenuCB
(
vlc_object_t
*
p_this
,
const
char
*
psz_variable
,
static
int
PopupMenuCB
(
vlc_object_t
*
p_this
,
const
char
*
psz_variable
,
vlc_value_t
old_val
,
vlc_value_t
new_val
,
void
*
param
)
vlc_value_t
old_val
,
vlc_value_t
new_val
,
void
*
param
)
{
{
VLC_UNUSED
(
p_this
);
VLC_UNUSED
(
psz_variable
);
VLC_UNUSED
(
old_val
);
intf_thread_t
*
p_intf
=
(
intf_thread_t
*
)
param
;
intf_thread_t
*
p_intf
=
(
intf_thread_t
*
)
param
;
if
(
p_intf
->
pf_show_dialog
)
if
(
p_intf
->
pf_show_dialog
)
...
@@ -1289,6 +1291,9 @@ static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
...
@@ -1289,6 +1291,9 @@ static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
static
int
IntfShowCB
(
vlc_object_t
*
p_this
,
const
char
*
psz_variable
,
static
int
IntfShowCB
(
vlc_object_t
*
p_this
,
const
char
*
psz_variable
,
vlc_value_t
old_val
,
vlc_value_t
new_val
,
void
*
param
)
vlc_value_t
old_val
,
vlc_value_t
new_val
,
void
*
param
)
{
{
VLC_UNUSED
(
p_this
);
VLC_UNUSED
(
psz_variable
);
VLC_UNUSED
(
old_val
);
VLC_UNUSED
(
new_val
);
intf_thread_t
*
p_intf
=
(
intf_thread_t
*
)
param
;
intf_thread_t
*
p_intf
=
(
intf_thread_t
*
)
param
;
p_intf
->
p_sys
->
p_mi
->
toggleFSC
();
p_intf
->
p_sys
->
p_mi
->
toggleFSC
();
...
...
modules/gui/qt4/menus.cpp
View file @
5feabe6b
...
@@ -601,7 +601,7 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current )
...
@@ -601,7 +601,7 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current )
}
}
/* Subtitles */
/* Subtitles */
QMenu
*
QVLCMenu
::
SubtitleMenu
(
intf_thread_t
*
p_intf
,
QMenu
*
current
)
QMenu
*
QVLCMenu
::
SubtitleMenu
(
QMenu
*
current
)
{
{
QAction
*
action
;
QAction
*
action
;
QMenu
*
submenu
=
new
QMenu
(
qtr
(
"&Subtitles Track"
),
current
);
QMenu
*
submenu
=
new
QMenu
(
qtr
(
"&Subtitles Track"
),
current
);
...
@@ -628,7 +628,7 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current, bool b_subtit
...
@@ -628,7 +628,7 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current, bool b_subtit
{
{
addActionWithSubmenu
(
current
,
"video-es"
,
qtr
(
"Video &Track"
)
);
addActionWithSubmenu
(
current
,
"video-es"
,
qtr
(
"Video &Track"
)
);
if
(
b_subtitle
)
if
(
b_subtitle
)
SubtitleMenu
(
p_intf
,
current
);
SubtitleMenu
(
current
);
current
->
addSeparator
();
current
->
addSeparator
();
...
@@ -984,7 +984,7 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
...
@@ -984,7 +984,7 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
if
(
action
->
menu
()
->
isEmpty
()
)
if
(
action
->
menu
()
->
isEmpty
()
)
action
->
setEnabled
(
false
);
action
->
setEnabled
(
false
);
submenu
=
SubtitleMenu
(
p_intf
,
menu
);
submenu
=
SubtitleMenu
(
menu
);
submenu
->
setTitle
(
qtr
(
"Subti&tle"
)
);
submenu
->
setTitle
(
qtr
(
"Subti&tle"
)
);
UpdateItem
(
p_intf
,
menu
,
"spu-es"
,
VLC_OBJECT
(
p_input
),
true
);
UpdateItem
(
p_intf
,
menu
,
"spu-es"
,
VLC_OBJECT
(
p_input
),
true
);
...
...
modules/gui/qt4/menus.hpp
View file @
5feabe6b
...
@@ -113,7 +113,7 @@ private:
...
@@ -113,7 +113,7 @@ private:
static
QMenu
*
VideoMenu
(
intf_thread_t
*
p_intf
,
QWidget
*
parent
)
{
static
QMenu
*
VideoMenu
(
intf_thread_t
*
p_intf
,
QWidget
*
parent
)
{
return
VideoMenu
(
p_intf
,
new
QMenu
(
parent
)
);
return
VideoMenu
(
p_intf
,
new
QMenu
(
parent
)
);
}
}
static
QMenu
*
SubtitleMenu
(
intf_thread_t
*
p_intf
,
QMenu
*
current
);
static
QMenu
*
SubtitleMenu
(
QMenu
*
current
);
static
QMenu
*
AudioMenu
(
intf_thread_t
*
,
QMenu
*
);
static
QMenu
*
AudioMenu
(
intf_thread_t
*
,
QMenu
*
);
static
QMenu
*
AudioMenu
(
intf_thread_t
*
p_intf
,
QWidget
*
parent
)
{
static
QMenu
*
AudioMenu
(
intf_thread_t
*
p_intf
,
QWidget
*
parent
)
{
...
...
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