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
934d0965
Commit
934d0965
authored
Nov 01, 2015
by
Hugo Beauzée-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qt4: Fix some missing "override" related warning
Also mark overriden function as virtual, for clarity.
parent
a286b2aa
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
32 additions
and
32 deletions
+32
-32
modules/gui/qt4/components/interface_widgets.hpp
modules/gui/qt4/components/interface_widgets.hpp
+1
-1
modules/gui/qt4/components/open_panels.hpp
modules/gui/qt4/components/open_panels.hpp
+1
-1
modules/gui/qt4/components/playlist/playlist_model.hpp
modules/gui/qt4/components/playlist/playlist_model.hpp
+20
-20
modules/gui/qt4/components/playlist/standardpanel.hpp
modules/gui/qt4/components/playlist/standardpanel.hpp
+1
-1
modules/gui/qt4/components/preferences_widgets.hpp
modules/gui/qt4/components/preferences_widgets.hpp
+2
-2
modules/gui/qt4/dialogs/help.hpp
modules/gui/qt4/dialogs/help.hpp
+2
-2
modules/gui/qt4/dialogs/openurl.hpp
modules/gui/qt4/dialogs/openurl.hpp
+1
-1
modules/gui/qt4/dialogs/playlist.hpp
modules/gui/qt4/dialogs/playlist.hpp
+4
-4
No files found.
modules/gui/qt4/components/interface_widgets.hpp
View file @
934d0965
...
@@ -69,7 +69,7 @@ protected:
...
@@ -69,7 +69,7 @@ protected:
return
NULL
;
return
NULL
;
}
}
virtual
void
resizeEvent
(
QResizeEvent
*
);
virtual
void
resizeEvent
(
QResizeEvent
*
)
Q_DECL_OVERRIDE
;
private:
private:
intf_thread_t
*
p_intf
;
intf_thread_t
*
p_intf
;
...
...
modules/gui/qt4/components/open_panels.hpp
View file @
934d0965
...
@@ -113,7 +113,7 @@ public:
...
@@ -113,7 +113,7 @@ public:
void
clear
()
Q_DECL_OVERRIDE
;
void
clear
()
Q_DECL_OVERRIDE
;
virtual
void
accept
()
;
virtual
void
accept
()
;
protected:
protected:
bool
eventFilter
(
QObject
*
,
QEvent
*
event
)
bool
eventFilter
(
QObject
*
,
QEvent
*
event
)
Q_DECL_OVERRIDE
{
{
if
(
event
->
type
()
==
QEvent
::
Hide
||
if
(
event
->
type
()
==
QEvent
::
Hide
||
event
->
type
()
==
QEvent
::
HideToParent
)
event
->
type
()
==
QEvent
::
HideToParent
)
...
...
modules/gui/qt4/components/playlist/playlist_model.hpp
View file @
934d0965
...
@@ -82,36 +82,36 @@ public:
...
@@ -82,36 +82,36 @@ public:
/* Drag and Drop */
/* Drag and Drop */
Qt
::
DropActions
supportedDropActions
()
const
Q_DECL_OVERRIDE
;
Qt
::
DropActions
supportedDropActions
()
const
Q_DECL_OVERRIDE
;
QMimeData
*
mimeData
(
const
QModelIndexList
&
indexes
)
const
Q_DECL_OVERRIDE
;
QMimeData
*
mimeData
(
const
QModelIndexList
&
indexes
)
const
Q_DECL_OVERRIDE
;
bool
dropMimeData
(
const
QMimeData
*
data
,
Qt
::
DropAction
action
,
virtual
bool
dropMimeData
(
const
QMimeData
*
data
,
Qt
::
DropAction
action
,
int
row
,
int
column
,
const
QModelIndex
&
target
);
int
row
,
int
column
,
const
QModelIndex
&
target
)
Q_DECL_OVERRIDE
;
QStringList
mimeTypes
()
const
Q_DECL_OVERRIDE
;
QStringList
mimeTypes
()
const
Q_DECL_OVERRIDE
;
/* Sort */
/* Sort */
void
sort
(
const
int
column
,
Qt
::
SortOrder
order
=
Qt
::
AscendingOrder
)
Q_DECL_OVERRIDE
;
void
sort
(
const
int
column
,
Qt
::
SortOrder
order
=
Qt
::
AscendingOrder
)
Q_DECL_OVERRIDE
;
/*** VLCModelSubInterface subclassing ***/
/*** VLCModelSubInterface subclassing ***/
void
rebuild
(
playlist_item_t
*
p
=
NULL
)
Q_DECL_OVERRIDE
;
v
irtual
v
oid
rebuild
(
playlist_item_t
*
p
=
NULL
)
Q_DECL_OVERRIDE
;
void
doDelete
(
QModelIndexList
selected
)
Q_DECL_OVERRIDE
;
v
irtual
v
oid
doDelete
(
QModelIndexList
selected
)
Q_DECL_OVERRIDE
;
void
createNode
(
QModelIndex
index
,
QString
name
)
Q_DECL_OVERRIDE
;
v
irtual
v
oid
createNode
(
QModelIndex
index
,
QString
name
)
Q_DECL_OVERRIDE
;
void
renameNode
(
QModelIndex
index
,
QString
name
)
Q_DECL_OVERRIDE
;
v
irtual
v
oid
renameNode
(
QModelIndex
index
,
QString
name
)
Q_DECL_OVERRIDE
;
v
oid
removeAll
()
;
v
irtual
void
removeAll
()
Q_DECL_OVERRIDE
;
/* Lookups */
/* Lookups */
QModelIndex
rootIndex
()
const
Q_DECL_OVERRIDE
;
virtual
QModelIndex
rootIndex
()
const
Q_DECL_OVERRIDE
;
void
filter
(
const
QString
&
search_text
,
const
QModelIndex
&
root
,
bool
b_recursive
)
Q_DECL_OVERRIDE
;
v
irtual
v
oid
filter
(
const
QString
&
search_text
,
const
QModelIndex
&
root
,
bool
b_recursive
)
Q_DECL_OVERRIDE
;
QModelIndex
currentIndex
()
const
Q_DECL_OVERRIDE
;
virtual
QModelIndex
currentIndex
()
const
Q_DECL_OVERRIDE
;
QModelIndex
indexByPLID
(
const
int
i_plid
,
const
int
c
)
const
Q_DECL_OVERRIDE
;
virtual
QModelIndex
indexByPLID
(
const
int
i_plid
,
const
int
c
)
const
Q_DECL_OVERRIDE
;
QModelIndex
indexByInputItemID
(
const
int
i_inputitem_id
,
const
int
c
)
const
Q_DECL_OVERRIDE
;
virtual
QModelIndex
indexByInputItemID
(
const
int
i_inputitem_id
,
const
int
c
)
const
Q_DECL_OVERRIDE
;
bool
isTree
()
const
Q_DECL_OVERRIDE
;
virtual
bool
isTree
()
const
Q_DECL_OVERRIDE
;
bool
canEdit
()
const
Q_DECL_OVERRIDE
;
virtual
bool
canEdit
()
const
Q_DECL_OVERRIDE
;
bool
action
(
QAction
*
action
,
const
QModelIndexList
&
indexes
)
Q_DECL_OVERRIDE
;
virtual
bool
action
(
QAction
*
action
,
const
QModelIndexList
&
indexes
)
Q_DECL_OVERRIDE
;
bool
isSupportedAction
(
actions
action
,
const
QModelIndex
&
)
const
Q_DECL_OVERRIDE
;
virtual
bool
isSupportedAction
(
actions
action
,
const
QModelIndex
&
)
const
Q_DECL_OVERRIDE
;
protected:
protected:
/* VLCModel subclassing */
/* VLCModel subclassing */
bool
isParent
(
const
QModelIndex
&
index
,
const
QModelIndex
&
current
)
const
;
virtual
bool
isParent
(
const
QModelIndex
&
index
,
const
QModelIndex
&
current
)
const
Q_DECL_OVERRIDE
;
bool
isLeaf
(
const
QModelIndex
&
index
)
const
;
virtual
bool
isLeaf
(
const
QModelIndex
&
index
)
const
Q_DECL_OVERRIDE
;
PLItem
*
getItem
(
const
QModelIndex
&
index
)
const
;
virtual
PLItem
*
getItem
(
const
QModelIndex
&
index
)
const
Q_DECL_OVERRIDE
;
private:
private:
/* General */
/* General */
...
@@ -162,7 +162,7 @@ private slots:
...
@@ -162,7 +162,7 @@ private slots:
void
processItemRemoval
(
int
i_pl_itemid
);
void
processItemRemoval
(
int
i_pl_itemid
);
void
processItemAppend
(
int
i_pl_itemid
,
int
i_pl_itemidparent
);
void
processItemAppend
(
int
i_pl_itemid
,
int
i_pl_itemidparent
);
void
activateItem
(
playlist_item_t
*
p_item
);
void
activateItem
(
playlist_item_t
*
p_item
);
v
oid
activateItem
(
const
QModelIndex
&
index
)
;
v
irtual
void
activateItem
(
const
QModelIndex
&
index
)
Q_DECL_OVERRIDE
;
};
};
class
PlMimeData
:
public
QMimeData
class
PlMimeData
:
public
QMimeData
...
...
modules/gui/qt4/components/playlist/standardpanel.hpp
View file @
934d0965
...
@@ -100,7 +100,7 @@ private:
...
@@ -100,7 +100,7 @@ private:
void
createListView
();
void
createListView
();
void
createCoverView
();
void
createCoverView
();
void
updateZoom
(
int
i_zoom
);
void
updateZoom
(
int
i_zoom
);
bool
eventFilter
(
QObject
*
watched
,
QEvent
*
event
)
;
virtual
bool
eventFilter
(
QObject
*
watched
,
QEvent
*
event
)
Q_DECL_OVERRIDE
;
/* Wait spinner */
/* Wait spinner */
PixmapAnimator
*
spinnerAnimation
;
PixmapAnimator
*
spinnerAnimation
;
...
...
modules/gui/qt4/components/preferences_widgets.hpp
View file @
934d0965
...
@@ -116,8 +116,8 @@ class VIntConfigControl : public ConfigControl
...
@@ -116,8 +116,8 @@ class VIntConfigControl : public ConfigControl
Q_OBJECT
Q_OBJECT
public:
public:
virtual
int
getValue
()
const
=
0
;
virtual
int
getValue
()
const
=
0
;
int
getType
()
const
Q_DECL_OVERRIDE
;
virtual
int
getType
()
const
Q_DECL_OVERRIDE
;
virtual
void
doApply
();
virtual
void
doApply
()
Q_DECL_OVERRIDE
;
protected:
protected:
VIntConfigControl
(
vlc_object_t
*
a
,
module_config_t
*
b
)
:
VIntConfigControl
(
vlc_object_t
*
a
,
module_config_t
*
b
)
:
ConfigControl
(
a
,
b
)
{}
ConfigControl
(
a
,
b
)
{}
...
...
modules/gui/qt4/dialogs/help.hpp
View file @
934d0965
...
@@ -61,8 +61,8 @@ public slots:
...
@@ -61,8 +61,8 @@ public slots:
friend
class
Singleton
<
AboutDialog
>
;
friend
class
Singleton
<
AboutDialog
>
;
protected:
protected:
bool
eventFilter
(
QObject
*
obj
,
QEvent
*
event
)
;
virtual
bool
eventFilter
(
QObject
*
obj
,
QEvent
*
event
)
Q_DECL_OVERRIDE
;
void
showEvent
(
QShowEvent
*
)
Q_DECL_OVERRIDE
;
v
irtual
v
oid
showEvent
(
QShowEvent
*
)
Q_DECL_OVERRIDE
;
private:
private:
bool
b_advanced
;
bool
b_advanced
;
...
...
modules/gui/qt4/dialogs/openurl.hpp
View file @
934d0965
...
@@ -53,7 +53,7 @@ public:
...
@@ -53,7 +53,7 @@ public:
QString
url
()
const
;
QString
url
()
const
;
bool
shouldEnqueue
()
const
;
bool
shouldEnqueue
()
const
;
v
oid
showEvent
(
QShowEvent
*
ev
)
;
v
irtual
void
showEvent
(
QShowEvent
*
ev
)
Q_DECL_OVERRIDE
;
public
slots
:
public
slots
:
void
close
()
Q_DECL_OVERRIDE
{
play
();
};
void
close
()
Q_DECL_OVERRIDE
{
play
();
};
...
...
modules/gui/qt4/dialogs/playlist.hpp
View file @
934d0965
...
@@ -49,10 +49,10 @@ private:
...
@@ -49,10 +49,10 @@ private:
PlaylistDialog
(
intf_thread_t
*
);
PlaylistDialog
(
intf_thread_t
*
);
virtual
~
PlaylistDialog
();
virtual
~
PlaylistDialog
();
v
oid
dropEvent
(
QDropEvent
*
)
;
v
irtual
void
dropEvent
(
QDropEvent
*
)
Q_DECL_OVERRIDE
;
v
oid
dragEnterEvent
(
QDragEnterEvent
*
)
;
v
irtual
void
dragEnterEvent
(
QDragEnterEvent
*
)
Q_DECL_OVERRIDE
;
v
oid
dragMoveEvent
(
QDragMoveEvent
*
)
;
v
irtual
void
dragMoveEvent
(
QDragMoveEvent
*
)
Q_DECL_OVERRIDE
;
v
oid
dragLeaveEvent
(
QDragLeaveEvent
*
)
;
v
irtual
void
dragLeaveEvent
(
QDragLeaveEvent
*
)
Q_DECL_OVERRIDE
;
friend
class
Singleton
<
PlaylistDialog
>
;
friend
class
Singleton
<
PlaylistDialog
>
;
...
...
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