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
70a73ff7
Commit
70a73ff7
authored
May 14, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: more of the same warnings killing
parent
ab055487
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
29 additions
and
22 deletions
+29
-22
modules/gui/qt4/components/open_panels.cpp
modules/gui/qt4/components/open_panels.cpp
+2
-2
modules/gui/qt4/components/playlist/ml_model.cpp
modules/gui/qt4/components/playlist/ml_model.cpp
+9
-2
modules/gui/qt4/components/playlist/selector.cpp
modules/gui/qt4/components/playlist/selector.cpp
+3
-3
modules/gui/qt4/components/playlist/standardpanel.cpp
modules/gui/qt4/components/playlist/standardpanel.cpp
+2
-2
modules/gui/qt4/components/playlist/views.cpp
modules/gui/qt4/components/playlist/views.cpp
+7
-7
modules/gui/qt4/components/sout/sout_widgets.cpp
modules/gui/qt4/components/sout/sout_widgets.cpp
+3
-3
modules/gui/qt4/main_interface_win32.cpp
modules/gui/qt4/main_interface_win32.cpp
+3
-3
No files found.
modules/gui/qt4/components/open_panels.cpp
View file @
70a73ff7
...
@@ -729,12 +729,12 @@ void CaptureOpenPanel::initialize()
...
@@ -729,12 +729,12 @@ void CaptureOpenPanel::initialize()
module_config_t
*
p_config
=
module_config_t
*
p_config
=
config_FindConfig
(
VLC_OBJECT
(
p_intf
),
"dshow-vdev"
);
config_FindConfig
(
VLC_OBJECT
(
p_intf
),
"dshow-vdev"
);
vdevDshowW
=
new
StringListConfigControl
(
vdevDshowW
=
new
StringListConfigControl
(
VLC_OBJECT
(
p_intf
),
p_config
,
this
,
false
,
dshowDevLayout
,
line
);
VLC_OBJECT
(
p_intf
),
p_config
,
this
,
dshowDevLayout
,
line
);
line
++
;
line
++
;
p_config
=
config_FindConfig
(
VLC_OBJECT
(
p_intf
),
"dshow-adev"
);
p_config
=
config_FindConfig
(
VLC_OBJECT
(
p_intf
),
"dshow-adev"
);
adevDshowW
=
new
StringListConfigControl
(
adevDshowW
=
new
StringListConfigControl
(
VLC_OBJECT
(
p_intf
),
p_config
,
this
,
false
,
dshowDevLayout
,
line
);
VLC_OBJECT
(
p_intf
),
p_config
,
this
,
dshowDevLayout
,
line
);
line
++
;
line
++
;
/* dshow Properties */
/* dshow Properties */
...
...
modules/gui/qt4/components/playlist/ml_model.cpp
View file @
70a73ff7
...
@@ -106,7 +106,7 @@ QModelIndex MLModel::index( int row, int column,
...
@@ -106,7 +106,7 @@ QModelIndex MLModel::index( int row, int column,
}
}
}
}
QModelIndex
MLModel
::
parent
(
const
QModelIndex
&
index
)
const
QModelIndex
MLModel
::
parent
(
const
QModelIndex
&
)
const
{
{
return
QModelIndex
();
return
QModelIndex
();
}
}
...
@@ -215,7 +215,7 @@ QMimeData* MLModel::mimeData( const QModelIndexList &indexes ) const
...
@@ -215,7 +215,7 @@ QMimeData* MLModel::mimeData( const QModelIndexList &indexes ) const
return
data
;
return
data
;
}
}
int
MLModel
::
columnCount
(
const
QModelIndex
&
parent
)
const
int
MLModel
::
columnCount
(
const
QModelIndex
&
)
const
{
{
return
columnFromMeta
(
COLUMN_END
);
return
columnFromMeta
(
COLUMN_END
);
}
}
...
@@ -590,6 +590,8 @@ static int mediaAdded( vlc_object_t *p_this, char const *psz_var,
...
@@ -590,6 +590,8 @@ static int mediaAdded( vlc_object_t *p_this, char const *psz_var,
vlc_value_t
oldval
,
vlc_value_t
newval
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
data
)
void
*
data
)
{
{
VLC_UNUSED
(
psz_var
);
VLC_UNUSED
(
oldval
);
int
ret
=
VLC_SUCCESS
;
int
ret
=
VLC_SUCCESS
;
media_library_t
*
p_ml
=
(
media_library_t
*
)
p_this
;
media_library_t
*
p_ml
=
(
media_library_t
*
)
p_this
;
MLModel
*
p_model
=
(
MLModel
*
)
data
;
MLModel
*
p_model
=
(
MLModel
*
)
data
;
...
@@ -609,6 +611,8 @@ static int mediaDeleted( vlc_object_t *p_this, char const *psz_var,
...
@@ -609,6 +611,8 @@ static int mediaDeleted( vlc_object_t *p_this, char const *psz_var,
vlc_value_t
oldval
,
vlc_value_t
newval
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
data
)
void
*
data
)
{
{
VLC_UNUSED
(
p_this
);
VLC_UNUSED
(
psz_var
);
VLC_UNUSED
(
oldval
);
MLModel
*
p_model
=
(
MLModel
*
)
data
;
MLModel
*
p_model
=
(
MLModel
*
)
data
;
QModelIndex
remove_idx
=
QModelIndex
();
QModelIndex
remove_idx
=
QModelIndex
();
for
(
int
i
=
0
;
i
<
p_model
->
rowCount
(
);
i
++
)
for
(
int
i
=
0
;
i
<
p_model
->
rowCount
(
);
i
++
)
...
@@ -630,6 +634,9 @@ static int mediaUpdated( vlc_object_t *p_this, char const *psz_var,
...
@@ -630,6 +634,9 @@ static int mediaUpdated( vlc_object_t *p_this, char const *psz_var,
vlc_value_t
oldval
,
vlc_value_t
newval
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
data
)
void
*
data
)
{
{
VLC_UNUSED
(
p_this
);
VLC_UNUSED
(
psz_var
);
VLC_UNUSED
(
oldval
);
VLC_UNUSED
(
newval
);
VLC_UNUSED
(
data
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
...
...
modules/gui/qt4/components/playlist/selector.cpp
View file @
70a73ff7
...
@@ -356,8 +356,8 @@ QStringList PLSelector::mimeTypes() const
...
@@ -356,8 +356,8 @@ QStringList PLSelector::mimeTypes() const
return
types
;
return
types
;
}
}
bool
PLSelector
::
dropMimeData
(
QTreeWidgetItem
*
parent
,
int
index
,
bool
PLSelector
::
dropMimeData
(
QTreeWidgetItem
*
parent
,
int
,
const
QMimeData
*
data
,
Qt
::
DropAction
action
)
const
QMimeData
*
data
,
Qt
::
DropAction
)
{
{
if
(
!
parent
)
return
false
;
if
(
!
parent
)
return
false
;
...
@@ -464,7 +464,7 @@ void PLSelector::inputItemUpdate( input_item_t *arg )
...
@@ -464,7 +464,7 @@ void PLSelector::inputItemUpdate( input_item_t *arg )
}
}
}
}
void
PLSelector
::
podcastAdd
(
PLSelItem
*
item
)
void
PLSelector
::
podcastAdd
(
PLSelItem
*
)
{
{
bool
ok
;
bool
ok
;
QString
url
=
QInputDialog
::
getText
(
this
,
qtr
(
"Subscribe"
),
QString
url
=
QInputDialog
::
getText
(
this
,
qtr
(
"Subscribe"
),
...
...
modules/gui/qt4/components/playlist/standardpanel.cpp
View file @
70a73ff7
...
@@ -130,7 +130,7 @@ void StandardPLPanel::popupPlView( const QPoint &point )
...
@@ -130,7 +130,7 @@ void StandardPLPanel::popupPlView( const QPoint &point )
QVLCMenu
::
PopupMenu
(
p_intf
,
true
);
QVLCMenu
::
PopupMenu
(
p_intf
,
true
);
}
}
void
StandardPLPanel
::
popupSelectColumn
(
QPoint
pos
)
void
StandardPLPanel
::
popupSelectColumn
(
QPoint
)
{
{
QMenu
menu
;
QMenu
menu
;
assert
(
treeView
);
assert
(
treeView
);
...
@@ -228,7 +228,7 @@ void StandardPLPanel::wheelEvent( QWheelEvent *e )
...
@@ -228,7 +228,7 @@ void StandardPLPanel::wheelEvent( QWheelEvent *e )
e
->
accept
();
e
->
accept
();
}
}
bool
StandardPLPanel
::
eventFilter
(
QObject
*
watched
,
QEvent
*
event
)
bool
StandardPLPanel
::
eventFilter
(
QObject
*
,
QEvent
*
event
)
{
{
if
(
event
->
type
()
==
QEvent
::
KeyPress
)
if
(
event
->
type
()
==
QEvent
::
KeyPress
)
{
{
...
...
modules/gui/qt4/components/playlist/views.cpp
View file @
70a73ff7
...
@@ -160,7 +160,7 @@ void PlIconViewItemDelegate::paint( QPainter * painter, const QStyleOptionViewIt
...
@@ -160,7 +160,7 @@ void PlIconViewItemDelegate::paint( QPainter * painter, const QStyleOptionViewIt
painter
->
restore
();
painter
->
restore
();
}
}
QSize
PlIconViewItemDelegate
::
sizeHint
(
const
QStyleOptionViewItem
&
option
,
const
QModelIndex
&
index
)
const
QSize
PlIconViewItemDelegate
::
sizeHint
(
const
QStyleOptionViewItem
&
,
const
QModelIndex
&
index
)
const
{
{
QFont
f
(
index
.
data
(
Qt
::
FontRole
).
value
<
QFont
>
()
);
QFont
f
(
index
.
data
(
Qt
::
FontRole
).
value
<
QFont
>
()
);
f
.
setBold
(
true
);
f
.
setBold
(
true
);
...
@@ -257,7 +257,7 @@ void PlListViewItemDelegate::paint( QPainter * painter, const QStyleOptionViewIt
...
@@ -257,7 +257,7 @@ void PlListViewItemDelegate::paint( QPainter * painter, const QStyleOptionViewIt
painter
->
restore
();
painter
->
restore
();
}
}
QSize
PlListViewItemDelegate
::
sizeHint
(
const
QStyleOptionViewItem
&
option
,
const
QModelIndex
&
index
)
const
QSize
PlListViewItemDelegate
::
sizeHint
(
const
QStyleOptionViewItem
&
,
const
QModelIndex
&
)
const
{
{
QFont
f
;
QFont
f
;
f
.
setBold
(
true
);
f
.
setBold
(
true
);
...
@@ -275,7 +275,7 @@ static inline void plViewStartDrag( QAbstractItemView *view, const Qt::DropActio
...
@@ -275,7 +275,7 @@ static inline void plViewStartDrag( QAbstractItemView *view, const Qt::DropActio
drag
->
exec
(
supportedActions
);
drag
->
exec
(
supportedActions
);
}
}
static
void
plViewDragMoveEvent
(
QAbstractItemView
*
view
,
QDragMoveEvent
*
event
)
static
void
plViewDragMoveEvent
(
QAbstractItemView
*
,
QDragMoveEvent
*
event
)
{
{
if
(
event
->
keyboardModifiers
()
&
Qt
::
ControlModifier
&&
if
(
event
->
keyboardModifiers
()
&
Qt
::
ControlModifier
&&
event
->
possibleActions
()
&
Qt
::
CopyAction
)
event
->
possibleActions
()
&
Qt
::
CopyAction
)
...
@@ -283,7 +283,7 @@ static void plViewDragMoveEvent( QAbstractItemView *view, QDragMoveEvent * event
...
@@ -283,7 +283,7 @@ static void plViewDragMoveEvent( QAbstractItemView *view, QDragMoveEvent * event
else
event
->
acceptProposedAction
();
else
event
->
acceptProposedAction
();
}
}
PlIconView
::
PlIconView
(
PLModel
*
model
,
QWidget
*
parent
)
:
QListView
(
parent
)
PlIconView
::
PlIconView
(
PLModel
*
,
QWidget
*
parent
)
:
QListView
(
parent
)
{
{
PlIconViewItemDelegate
*
delegate
=
new
PlIconViewItemDelegate
(
this
);
PlIconViewItemDelegate
*
delegate
=
new
PlIconViewItemDelegate
(
this
);
...
@@ -313,7 +313,7 @@ void PlIconView::dragMoveEvent ( QDragMoveEvent * event )
...
@@ -313,7 +313,7 @@ void PlIconView::dragMoveEvent ( QDragMoveEvent * event )
QAbstractItemView
::
dragMoveEvent
(
event
);
QAbstractItemView
::
dragMoveEvent
(
event
);
}
}
PlListView
::
PlListView
(
PLModel
*
model
,
QWidget
*
parent
)
:
QListView
(
parent
)
PlListView
::
PlListView
(
PLModel
*
,
QWidget
*
parent
)
:
QListView
(
parent
)
{
{
setViewMode
(
QListView
::
ListMode
);
setViewMode
(
QListView
::
ListMode
);
setUniformItemSizes
(
true
);
setUniformItemSizes
(
true
);
...
@@ -393,7 +393,7 @@ int PicFlowView::verticalOffset() const
...
@@ -393,7 +393,7 @@ int PicFlowView::verticalOffset() const
return
0
;
return
0
;
}
}
QRect
PicFlowView
::
visualRect
(
const
QModelIndex
&
index
)
const
QRect
PicFlowView
::
visualRect
(
const
QModelIndex
&
)
const
{
{
return
QRect
(
QPoint
(
0
,
0
),
picFlow
->
slideSize
()
);
return
QRect
(
QPoint
(
0
,
0
),
picFlow
->
slideSize
()
);
}
}
...
@@ -420,7 +420,7 @@ QModelIndex PicFlowView::indexAt(const QPoint &) const
...
@@ -420,7 +420,7 @@ QModelIndex PicFlowView::indexAt(const QPoint &) const
// No idea, PictureFlow doesn't provide anything to help this
// No idea, PictureFlow doesn't provide anything to help this
}
}
QModelIndex
PicFlowView
::
moveCursor
(
QAbstractItemView
::
CursorAction
action
,
Qt
::
KeyboardModifiers
)
QModelIndex
PicFlowView
::
moveCursor
(
QAbstractItemView
::
CursorAction
,
Qt
::
KeyboardModifiers
)
{
{
return
QModelIndex
();
return
QModelIndex
();
}
}
...
...
modules/gui/qt4/components/sout/sout_widgets.cpp
View file @
70a73ff7
...
@@ -232,7 +232,7 @@ MMSHDestBox::MMSHDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
...
@@ -232,7 +232,7 @@ MMSHDestBox::MMSHDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
CT
(
MMSHEdit
);
CT
(
MMSHEdit
);
}
}
QString
MMSHDestBox
::
getMRL
(
const
QString
&
mux
)
QString
MMSHDestBox
::
getMRL
(
const
QString
&
)
{
{
if
(
MMSHEdit
->
text
().
isEmpty
()
)
return
""
;
if
(
MMSHEdit
->
text
().
isEmpty
()
)
return
""
;
...
@@ -277,7 +277,7 @@ RTSPDestBox::RTSPDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
...
@@ -277,7 +277,7 @@ RTSPDestBox::RTSPDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
CT
(
RTSPEdit
);
CT
(
RTSPEdit
);
}
}
QString
RTSPDestBox
::
getMRL
(
const
QString
&
mux
)
QString
RTSPDestBox
::
getMRL
(
const
QString
&
)
{
{
if
(
RTSPEdit
->
text
().
isEmpty
()
)
return
""
;
if
(
RTSPEdit
->
text
().
isEmpty
()
)
return
""
;
...
@@ -435,7 +435,7 @@ ICEDestBox::ICEDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
...
@@ -435,7 +435,7 @@ ICEDestBox::ICEDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
#undef CS
#undef CS
#undef CT
#undef CT
QString
ICEDestBox
::
getMRL
(
const
QString
&
mux
)
QString
ICEDestBox
::
getMRL
(
const
QString
&
)
{
{
if
(
ICEEdit
->
text
().
isEmpty
()
)
return
""
;
if
(
ICEEdit
->
text
().
isEmpty
()
)
return
""
;
...
...
modules/gui/qt4/main_interface_win32.cpp
View file @
70a73ff7
...
@@ -135,12 +135,12 @@ void MainInterface::createTaskBarButtons()
...
@@ -135,12 +135,12 @@ void MainInterface::createTaskBarButtons()
HRESULT
hr
=
p_taskbl
->
vt
->
ThumbBarSetImageList
(
p_taskbl
,
winId
(),
himl
);
HRESULT
hr
=
p_taskbl
->
vt
->
ThumbBarSetImageList
(
p_taskbl
,
winId
(),
himl
);
if
(
S_OK
!=
hr
)
if
(
S_OK
!=
hr
)
msg_Err
(
p_intf
,
"ThumbBarSetImageList failed with error %08x"
,
hr
);
msg_Err
(
p_intf
,
"ThumbBarSetImageList failed with error %08
l
x"
,
hr
);
else
else
{
{
hr
=
p_taskbl
->
vt
->
ThumbBarAddButtons
(
p_taskbl
,
winId
(),
3
,
thbButtons
);
hr
=
p_taskbl
->
vt
->
ThumbBarAddButtons
(
p_taskbl
,
winId
(),
3
,
thbButtons
);
if
(
S_OK
!=
hr
)
if
(
S_OK
!=
hr
)
msg_Err
(
p_intf
,
"ThumbBarAddButtons failed with error %08x"
,
hr
);
msg_Err
(
p_intf
,
"ThumbBarAddButtons failed with error %08
l
x"
,
hr
);
}
}
CONNECT
(
THEMIM
->
getIM
(),
playingStatusChanged
(
int
),
this
,
changeThumbbarButtons
(
int
)
);
CONNECT
(
THEMIM
->
getIM
(),
playingStatusChanged
(
int
),
this
,
changeThumbbarButtons
(
int
)
);
}
}
...
@@ -288,7 +288,7 @@ void MainInterface::changeThumbbarButtons( int i_status)
...
@@ -288,7 +288,7 @@ void MainInterface::changeThumbbarButtons( int i_status)
}
}
HRESULT
hr
=
p_taskbl
->
vt
->
ThumbBarUpdateButtons
(
p_taskbl
,
this
->
winId
(),
3
,
thbButtons
);
HRESULT
hr
=
p_taskbl
->
vt
->
ThumbBarUpdateButtons
(
p_taskbl
,
this
->
winId
(),
3
,
thbButtons
);
if
(
S_OK
!=
hr
)
if
(
S_OK
!=
hr
)
msg_Err
(
p_intf
,
"ThumbBarUpdateButtons failed with error %08x"
,
hr
);
msg_Err
(
p_intf
,
"ThumbBarUpdateButtons failed with error %08
l
x"
,
hr
);
#endif
#endif
}
}
...
...
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