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
8cecc7be
Commit
8cecc7be
authored
Jul 15, 2013
by
Ludovic Fauvet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: QString::toAscii has been deprecated in Qt5
parent
a6020fcc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
modules/gui/qt4/components/playlist/standardpanel.cpp
modules/gui/qt4/components/playlist/standardpanel.cpp
+1
-1
modules/gui/qt4/components/sout/profile_selector.cpp
modules/gui/qt4/components/sout/profile_selector.cpp
+5
-5
modules/gui/qt4/components/sout/sout_widgets.cpp
modules/gui/qt4/components/sout/sout_widgets.cpp
+1
-1
No files found.
modules/gui/qt4/components/playlist/standardpanel.cpp
View file @
8cecc7be
...
@@ -345,7 +345,7 @@ void StandardPLPanel::popupExplore()
...
@@ -345,7 +345,7 @@ void StandardPLPanel::popupExplore()
char
*
path
=
NULL
;
char
*
path
=
NULL
;
if
(
!
uri
.
isEmpty
()
)
if
(
!
uri
.
isEmpty
()
)
path
=
make_path
(
uri
.
to
Ascii
().
constData
()
);
path
=
make_path
(
uri
.
to
Latin1
().
constData
()
);
if
(
path
==
NULL
)
if
(
path
==
NULL
)
return
;
return
;
...
...
modules/gui/qt4/components/sout/profile_selector.cpp
View file @
8cecc7be
...
@@ -250,7 +250,7 @@ void VLCProfileSelector::updateOptions( int i )
...
@@ -250,7 +250,7 @@ void VLCProfileSelector::updateOptions( int i )
HASHPICK
(
"video"
,
"filters"
);
HASHPICK
(
"video"
,
"filters"
);
if
(
!
value
.
isEmpty
()
)
if
(
!
value
.
isEmpty
()
)
{
{
QStringList
valuesList
=
QUrl
::
fromPercentEncoding
(
value
.
to
Ascii
()
).
split
(
";"
);
QStringList
valuesList
=
QUrl
::
fromPercentEncoding
(
value
.
to
Latin1
()
).
split
(
";"
);
smrl
.
option
(
"vfilter"
,
valuesList
.
join
(
":"
)
);
smrl
.
option
(
"vfilter"
,
valuesList
.
join
(
":"
)
);
}
}
...
@@ -265,7 +265,7 @@ void VLCProfileSelector::updateOptions( int i )
...
@@ -265,7 +265,7 @@ void VLCProfileSelector::updateOptions( int i )
HASHPICK
(
"vcodec"
,
"custom"
);
HASHPICK
(
"vcodec"
,
"custom"
);
if
(
!
value
.
isEmpty
()
)
if
(
!
value
.
isEmpty
()
)
codecoptions
<<
QUrl
::
fromPercentEncoding
(
value
.
to
Ascii
()
);
codecoptions
<<
QUrl
::
fromPercentEncoding
(
value
.
to
Latin1
()
);
if
(
codecoptions
.
count
()
)
if
(
codecoptions
.
count
()
)
smrl
.
option
(
"venc"
,
smrl
.
option
(
"venc"
,
...
@@ -316,7 +316,7 @@ void VLCProfileSelector::updateOptions( int i )
...
@@ -316,7 +316,7 @@ void VLCProfileSelector::updateOptions( int i )
HASHPICK
(
"audio"
,
"filters"
);
HASHPICK
(
"audio"
,
"filters"
);
if
(
!
value
.
isEmpty
()
)
if
(
!
value
.
isEmpty
()
)
{
{
QStringList
valuesList
=
QUrl
::
fromPercentEncoding
(
value
.
to
Ascii
()
).
split
(
";"
);
QStringList
valuesList
=
QUrl
::
fromPercentEncoding
(
value
.
to
Latin1
()
).
split
(
";"
);
smrl
.
option
(
"afilter"
,
valuesList
.
join
(
":"
)
);
smrl
.
option
(
"afilter"
,
valuesList
.
join
(
":"
)
);
}
}
...
@@ -679,11 +679,11 @@ void VLCProfileEditor::fillProfile( const QString& qs )
...
@@ -679,11 +679,11 @@ void VLCProfileEditor::fillProfile( const QString& qs )
else
if
(
object
->
inherits
(
"QLineEdit"
)
)
else
if
(
object
->
inherits
(
"QLineEdit"
)
)
{
{
QLineEdit
*
box
=
qobject_cast
<
QLineEdit
*>
(
object
);
QLineEdit
*
box
=
qobject_cast
<
QLineEdit
*>
(
object
);
box
->
setText
(
QUrl
::
fromPercentEncoding
(
value
.
to
Ascii
()
)
);
box
->
setText
(
QUrl
::
fromPercentEncoding
(
value
.
to
Latin1
()
)
);
}
}
else
if
(
object
->
inherits
(
"QListWidget"
)
)
else
if
(
object
->
inherits
(
"QListWidget"
)
)
{
{
QStringList
valuesList
=
QUrl
::
fromPercentEncoding
(
value
.
to
Ascii
()
).
split
(
";"
);
QStringList
valuesList
=
QUrl
::
fromPercentEncoding
(
value
.
to
Latin1
()
).
split
(
";"
);
const
QListWidget
*
list
=
qobject_cast
<
const
QListWidget
*>
(
object
);
const
QListWidget
*
list
=
qobject_cast
<
const
QListWidget
*>
(
object
);
for
(
int
i
=
0
;
i
<
list
->
count
();
i
++
)
for
(
int
i
=
0
;
i
<
list
->
count
();
i
++
)
{
{
...
...
modules/gui/qt4/components/sout/sout_widgets.cpp
View file @
8cecc7be
...
@@ -69,7 +69,7 @@ SoutInputBox::SoutInputBox( QWidget *_parent, const QString& mrl ) : QGroupBox(
...
@@ -69,7 +69,7 @@ SoutInputBox::SoutInputBox( QWidget *_parent, const QString& mrl ) : QGroupBox(
void
SoutInputBox
::
setMRL
(
const
QString
&
mrl
)
void
SoutInputBox
::
setMRL
(
const
QString
&
mrl
)
{
{
QUrl
uri
=
QUrl
::
fromEncoded
(
mrl
.
to
Ascii
()
);
QUrl
uri
=
QUrl
::
fromEncoded
(
mrl
.
to
Latin1
()
);
sourceLine
->
setText
(
uri
.
toString
()
);
sourceLine
->
setText
(
uri
.
toString
()
);
QString
type
=
uri
.
scheme
();
QString
type
=
uri
.
scheme
();
if
(
type
.
isEmpty
()
)
type
=
qtr
(
I_FILE_SLASH_DIR
);
if
(
type
.
isEmpty
()
)
type
=
qtr
(
I_FILE_SLASH_DIR
);
...
...
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