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
1fc508e4
Commit
1fc508e4
authored
Aug 14, 2022
by
Julius Künzel
💬
Browse files
[Qt6] Port QTextStream::setCodec to QTextStream::setEncoding
parent
7f93818e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/bin/model/subtitlemodel.cpp
View file @
1fc508e4
...
...
@@ -166,15 +166,21 @@ void SubtitleModel::importSubtitle(const QString &filePath, int offset, bool ext
qDebug
()
<<
"srt/vtt/sbv File"
;
//parsing srt file
QTextStream
stream
(
&
srtFile
);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QTextCodec
*
inputEncoding
=
QTextCodec
::
codecForName
(
encoding
);
if
(
inputEncoding
)
{
stream
.
setCodec
(
inputEncoding
);
}
else
{
qWarning
()
<<
"No QTextCodec named"
<<
encoding
;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
stream
.
setCodec
(
"UTF-8"
);
#endif
}
#else
std
::
optional
<
Encoding
>
inputEncoding
=
QStringConverter
::
encodingForName
(
encoding
);
if
(
!
inputEncoding
.
isEmpty
())
{
stream
.
setEncoding
(
inputEncoding
)
}
// else: UTF8 is the default
#endif
QString
line
;
QStringList
srtTime
;
QRegExp
rx
(
"([0-9]{1,2}):([0-9]{2})"
);
...
...
@@ -236,7 +242,11 @@ void SubtitleModel::importSubtitle(const QString &filePath, int offset, bool ext
return
;
}
QTextStream
stream
(
&
assFile
);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
stream
.
setCodec
(
QTextCodec
::
codecForName
(
encoding
));
#else
stream
.
setEncoding
(
QStringConverter
::
encodingForName
(
encoding
));
#endif
QString
line
;
qDebug
()
<<
" correct ass file "
<<
filePath
;
scriptInfoSection
.
clear
();
...
...
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