Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
f85eafb4
Commit
f85eafb4
authored
Aug 16, 2009
by
Ilkka Ollakka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qt4: remove b_is_node and use childCount() > 0 instead in playlist_model
parent
2c3bac1e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
4 deletions
+1
-4
modules/gui/qt4/components/playlist/playlist_item.cpp
modules/gui/qt4/components/playlist/playlist_item.cpp
+0
-2
modules/gui/qt4/components/playlist/playlist_item.hpp
modules/gui/qt4/components/playlist/playlist_item.hpp
+0
-1
modules/gui/qt4/components/playlist/playlist_model.cpp
modules/gui/qt4/components/playlist/playlist_model.cpp
+1
-1
No files found.
modules/gui/qt4/components/playlist/playlist_item.cpp
View file @
f85eafb4
...
@@ -54,7 +54,6 @@ void PLItem::init( playlist_item_t *_playlist_item, PLItem *parent, PLModel *m,
...
@@ -54,7 +54,6 @@ void PLItem::init( playlist_item_t *_playlist_item, PLItem *parent, PLModel *m,
i_id
=
_playlist_item
->
i_id
;
/* Playlist item specific id */
i_id
=
_playlist_item
->
i_id
;
/* Playlist item specific id */
model
=
m
;
/* PLModel (QAbsmodel) */
model
=
m
;
/* PLModel (QAbsmodel) */
i_type
=
-
1
;
/* Item type - Avoid segfault */
i_type
=
-
1
;
/* Item type - Avoid segfault */
b_is_node
=
_playlist_item
->
i_children
>
-
1
;
p_input
=
_playlist_item
->
p_input
;
p_input
=
_playlist_item
->
p_input
;
vlc_gc_incref
(
p_input
);
vlc_gc_incref
(
p_input
);
...
@@ -144,7 +143,6 @@ void PLItem::update( playlist_item_t *p_item )
...
@@ -144,7 +143,6 @@ void PLItem::update( playlist_item_t *p_item )
/* Useful for the model */
/* Useful for the model */
i_type
=
p_item
->
p_input
->
i_type
;
i_type
=
p_item
->
p_input
->
i_type
;
b_is_node
=
p_item
->
i_children
>
-
1
;
i_showflags
=
parentItem
?
parentItem
->
i_showflags
:
i_showflags
;
i_showflags
=
parentItem
?
parentItem
->
i_showflags
:
i_showflags
;
}
}
...
...
modules/gui/qt4/components/playlist/playlist_item.hpp
View file @
f85eafb4
...
@@ -66,7 +66,6 @@ protected:
...
@@ -66,7 +66,6 @@ protected:
int
i_type
;
int
i_type
;
int
i_id
;
int
i_id
;
int
i_showflags
;
int
i_showflags
;
bool
b_is_node
;
input_item_t
*
p_input
;
input_item_t
*
p_input
;
private:
private:
...
...
modules/gui/qt4/components/playlist/playlist_model.cpp
View file @
f85eafb4
...
@@ -146,7 +146,7 @@ Qt::ItemFlags PLModel::flags( const QModelIndex &index ) const
...
@@ -146,7 +146,7 @@ Qt::ItemFlags PLModel::flags( const QModelIndex &index ) const
}
}
else
else
{
{
if
(
item
->
b_is_node
&&
if
(
(
item
->
childCount
()
>
0
)
&&
(
rootItem
->
p_input
==
pl_input
||
(
rootItem
->
p_input
==
pl_input
||
rootItem
->
p_input
==
ml_input
)
)
rootItem
->
p_input
==
ml_input
)
)
flags
|=
Qt
::
ItemIsDropEnabled
;
flags
|=
Qt
::
ItemIsDropEnabled
;
...
...
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