Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
fe853208
Commit
fe853208
authored
Aug 14, 2022
by
Julius Künzel
💬
Browse files
[Qt6] Fix parameter type
parent
72e4e684
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/bin/model/subtitlemodel.cpp
View file @
fe853208
...
...
@@ -178,7 +178,7 @@ void SubtitleModel::importSubtitle(const QString &filePath, int offset, bool ext
stream
.
setCodec
(
"UTF-8"
);
}
#else
std
::
optional
<
QStringConverter
::
Encoding
>
inputEncoding
=
QStringConverter
::
encodingForName
(
encoding
);
std
::
optional
<
QStringConverter
::
Encoding
>
inputEncoding
=
QStringConverter
::
encodingForName
(
encoding
.
data
()
);
if
(
inputEncoding
)
{
stream
.
setEncoding
(
inputEncoding
);
}
...
...
@@ -248,7 +248,7 @@ void SubtitleModel::importSubtitle(const QString &filePath, int offset, bool ext
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
stream
.
setCodec
(
QTextCodec
::
codecForName
(
encoding
));
#else
stream
.
setEncoding
(
QStringConverter
::
encodingForName
(
encoding
));
stream
.
setEncoding
(
QStringConverter
::
encodingForName
(
encoding
.
data
()
));
#endif
QString
line
;
qDebug
()
<<
" correct ass file "
<<
filePath
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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