Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
7f120f79
Commit
7f120f79
authored
May 17, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4: do not use vlc_object_get
parent
602005bd
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
45 deletions
+34
-45
modules/gui/qt4/menus.cpp
modules/gui/qt4/menus.cpp
+27
-40
modules/gui/qt4/menus.hpp
modules/gui/qt4/menus.hpp
+7
-5
No files found.
modules/gui/qt4/menus.cpp
View file @
7f120f79
This diff is collapsed.
Click to expand it.
modules/gui/qt4/menus.hpp
View file @
7f120f79
...
@@ -49,9 +49,10 @@ class MenuItemData : public QObject
...
@@ -49,9 +49,10 @@ class MenuItemData : public QObject
Q_OBJECT
Q_OBJECT
public:
public:
MenuItemData
(
int
i_id
,
int
_i_type
,
vlc_value_t
_val
,
const
char
*
_var
)
MenuItemData
(
vlc_object_t
*
_obj
,
int
_i_type
,
vlc_value_t
_val
,
const
char
*
_var
)
{
{
i_object_id
=
i_id
;
obj
=
_obj
;
i_val_type
=
_i_type
;
i_val_type
=
_i_type
;
val
=
_val
;
val
=
_val
;
psz_var
=
strdup
(
_var
);
psz_var
=
strdup
(
_var
);
...
@@ -62,7 +63,7 @@ public:
...
@@ -62,7 +63,7 @@ public:
if
(
(
i_val_type
&
VLC_VAR_TYPE
)
==
VLC_VAR_STRING
)
if
(
(
i_val_type
&
VLC_VAR_TYPE
)
==
VLC_VAR_STRING
)
free
(
val
.
psz_string
);
free
(
val
.
psz_string
);
}
}
int
i_object_id
;
vlc_object_t
*
obj
;
int
i_val_type
;
int
i_val_type
;
vlc_value_t
val
;
vlc_value_t
val
;
char
*
psz_var
;
char
*
psz_var
;
...
@@ -102,11 +103,12 @@ public:
...
@@ -102,11 +103,12 @@ public:
private:
private:
/* Generic automenu methods */
/* Generic automenu methods */
static
QMenu
*
Populate
(
intf_thread_t
*
,
QMenu
*
current
,
static
QMenu
*
Populate
(
intf_thread_t
*
,
QMenu
*
current
,
vector
<
const
char
*>&
,
vector
<
int
>&
,
vector
<
const
char
*>&
,
vector
<
vlc_object_t
*
>&
,
bool
append
=
false
);
bool
append
=
false
);
static
void
CreateAndConnect
(
QMenu
*
,
const
char
*
,
QString
,
QString
,
static
void
CreateAndConnect
(
QMenu
*
,
const
char
*
,
QString
,
QString
,
int
,
int
,
vlc_value_t
,
int
,
bool
c
=
false
);
int
,
vlc_object_t
*
,
vlc_value_t
,
int
,
bool
c
=
false
);
static
void
CreateItem
(
QMenu
*
,
const
char
*
,
vlc_object_t
*
,
bool
);
static
void
CreateItem
(
QMenu
*
,
const
char
*
,
vlc_object_t
*
,
bool
);
static
int
CreateChoicesMenu
(
QMenu
*
,
const
char
*
,
vlc_object_t
*
,
bool
);
static
int
CreateChoicesMenu
(
QMenu
*
,
const
char
*
,
vlc_object_t
*
,
bool
);
};
};
...
...
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