kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Fix a type mismatch

Browse source
This commit is contained in:
Ilya Fedin 2021-10-20 09:31:15 +04:00 • committed by John Preston
parent ee36b1f451
commit 93987b3703
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ui/text/text_entity.cpp
View file

@ -2051,7 +2051,11 @@ QString TagWithRemoved(const QString &tag, const QString &removed) {
if (tag == removed) { if (tag == removed) {
return QString(); return QString();
} }
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
auto list = QStringView(tag).split('|'); auto list = QStringView(tag).split('|');
#else // Qt >= 6.0.0
auto list = QStringView(tag).split('|').toVector();
#endif // Qt < 6.0.0
list.erase(ranges::remove(list, QStringView(removed)), list.end()); list.erase(ranges::remove(list, QStringView(removed)), list.end());
return JoinTag(list); return JoinTag(list);
} }
@ -2060,7 +2064,11 @@ QString TagWithAdded(const QString &tag, const QString &added) {
if (tag.isEmpty() || tag == added) { if (tag.isEmpty() || tag == added) {
return added; return added;
} }
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
auto list = QStringView(tag).split('|'); auto list = QStringView(tag).split('|');
#else // Qt >= 6.0.0
auto list = QStringView(tag).split('|').toVector();
#endif // Qt < 6.0.0
const auto ref = QStringView(added); const auto ref = QStringView(added);
if (list.contains(ref)) { if (list.contains(ref)) {
return tag; return tag;