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
3b67b27b
Commit
3b67b27b
authored
Aug 14, 2022
by
Julius Künzel
💬
Browse files
[Qt6] Fix syntax
parent
61a83171
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/bin/model/subtitlemodel.cpp
View file @
3b67b27b
...
...
@@ -28,6 +28,9 @@
#include
<QRegExp>
#include
<QTextCodec>
#include
<utility>
#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
#include
<QStringConverter>
#endif
SubtitleModel
::
SubtitleModel
(
Mlt
::
Tractor
*
tractor
,
std
::
shared_ptr
<
TimelineItemModel
>
timeline
,
QObject
*
parent
)
:
QAbstractListModel
(
parent
)
...
...
@@ -175,9 +178,9 @@ void SubtitleModel::importSubtitle(const QString &filePath, int offset, bool ext
stream
.
setCodec
(
"UTF-8"
);
}
#else
std
::
optional
<
Encoding
>
inputEncoding
=
QStringConverter
::
encodingForName
(
encoding
);
if
(
!
inputEncoding
.
isEmpty
()
)
{
stream
.
setEncoding
(
inputEncoding
)
std
::
optional
<
QStringConverter
::
Encoding
>
inputEncoding
=
QStringConverter
::
encodingForName
(
encoding
);
if
(
inputEncoding
)
{
stream
.
setEncoding
(
inputEncoding
)
;
}
// else: UTF8 is the default
#endif
...
...
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