Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
b1d93541
Commit
b1d93541
authored
Dec 26, 2012
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: prefsItemData: rename ambigous var
parent
a05072b5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
modules/gui/qt4/components/complete_preferences.cpp
modules/gui/qt4/components/complete_preferences.cpp
+5
-5
modules/gui/qt4/components/complete_preferences.hpp
modules/gui/qt4/components/complete_preferences.hpp
+2
-2
No files found.
modules/gui/qt4/components/complete_preferences.cpp
View file @
b1d93541
...
...
@@ -270,7 +270,7 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
PrefsItemData
*
module_data
=
new
PrefsItemData
();
module_data
->
i_type
=
PrefsItemData
::
TYPE_MODULE
;
module_data
->
psz_
name
=
strdup
(
module_get_object
(
p_module
)
);
module_data
->
psz_
shortcut
=
strdup
(
module_get_object
(
p_module
)
);
module_data
->
name
=
qtr
(
module_get_name
(
p_module
,
false
)
);
module_data
->
help
.
clear
();
const
char
*
psz_help
=
module_get_help
(
p_module
);
...
...
@@ -436,7 +436,7 @@ void PrefsTree::updateLoadedStatus( QTreeWidgetItem *item = NULL,
{
PrefsItemData
*
data
=
item
->
data
(
0
,
Qt
::
UserRole
)
.
value
<
PrefsItemData
*>
();
data
->
b_loaded
=
loaded
->
contains
(
QString
(
data
->
psz_
name
)
);
data
->
b_loaded
=
loaded
->
contains
(
QString
(
data
->
psz_
shortcut
)
);
for
(
int
i
=
0
;
i
<
item
->
childCount
();
i
++
)
updateLoadedStatus
(
item
->
child
(
i
),
loaded
);
...
...
@@ -483,7 +483,7 @@ PrefsItemData::PrefsItemData()
panel
=
NULL
;
i_object_id
=
0
;
i_subcat_id
=
-
1
;
psz_
name
=
NULL
;
psz_
shortcut
=
NULL
;
b_loaded
=
false
;
}
...
...
@@ -496,7 +496,7 @@ bool PrefsItemData::contains( const QString &text, Qt::CaseSensitivity cs )
if
(
this
->
i_type
==
TYPE_CATEGORY
)
return
false
;
else
if
(
this
->
i_type
==
TYPE_MODULE
)
p_module
=
module_find
(
this
->
psz_
name
);
p_module
=
module_find
(
this
->
psz_
shortcut
);
else
{
p_module
=
module_get_main
();
...
...
@@ -584,7 +584,7 @@ AdvPrefsPanel::AdvPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
if
(
data
->
i_type
==
PrefsItemData
::
TYPE_CATEGORY
)
return
;
else
if
(
data
->
i_type
==
PrefsItemData
::
TYPE_MODULE
)
p_module
=
module_find
(
data
->
psz_
name
);
p_module
=
module_find
(
data
->
psz_
shortcut
);
else
{
p_module
=
module_get_main
();
...
...
modules/gui/qt4/components/complete_preferences.hpp
View file @
b1d93541
...
...
@@ -43,7 +43,7 @@ class PrefsItemData : public QObject
Q_OBJECT
public:
PrefsItemData
();
virtual
~
PrefsItemData
()
{
free
(
psz_
name
);
};
virtual
~
PrefsItemData
()
{
free
(
psz_
shortcut
);
};
bool
contains
(
const
QString
&
text
,
Qt
::
CaseSensitivity
cs
);
AdvPrefsPanel
*
panel
;
int
i_object_id
;
...
...
@@ -56,7 +56,7 @@ public:
TYPE_MODULE
};
prefsType
i_type
;
char
*
psz_
name
;
char
*
psz_
shortcut
;
bool
b_loaded
;
QString
name
;
QString
help
;
...
...
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