upgrade to qt 6 compliance

This commit is contained in:
itsmattkc
2022-10-28 19:42:14 -07:00
parent 2a595cb4c7
commit 4d80044d6d
69 changed files with 152 additions and 130 deletions
+3 -18
View File
@@ -12,22 +12,7 @@ const QVector<QString> Html::kBlockTags = {
QStringLiteral("div")
};
inline bool StrEquals(const QString &a, const QStringRef &b)
{
return !a.compare(b, Qt::CaseInsensitive);
}
inline bool StrEquals(const QString &a, const QString &b)
{
return !a.compare(b, Qt::CaseInsensitive);
}
inline bool StrEquals(const QStringRef &a, const QString &b)
{
return !a.compare(b, Qt::CaseInsensitive);
}
inline bool StrEquals(const QStringRef &a, const QStringRef &b)
inline bool StrEquals(const QStringView &a, const QStringView &b)
{
return !a.compare(b, Qt::CaseInsensitive);
}
@@ -421,7 +406,7 @@ QMap<QString, QStringList> Html::GetCSSFromStyle(const QString &s)
// match. Also commas should be filtered out.
QStringList values;
const QString &val = kv.at(1);
QChar in_quote = 0;
QChar in_quote(0);
QString current_str;
for (int i=0; i<val.size(); i++) {
const QChar &current_char = val.at(i);
@@ -429,7 +414,7 @@ QMap<QString, QStringList> Html::GetCSSFromStyle(const QString &s)
if (!in_quote.isNull()) {
// If inside quotes and character isn't quote, indiscriminately append char
if (current_char == in_quote) {
in_quote = 0;
in_quote = QChar(0);
} else {
current_str.append(current_char);
}
-1
View File
@@ -25,7 +25,6 @@
#include <QApplication>
#include <QDateTime>
#include <QDebug>
#include <QLinkedList>
#include <QMutex>
#include <QTimer>
#include <stdint.h>
+2 -1
View File
@@ -22,6 +22,7 @@
#include <QCoreApplication>
#include <QMessageBox>
#include <QRegularExpression>
namespace olive {
@@ -49,7 +50,7 @@ double GetFloatRatioFromUser(QWidget* parent,
return qSNaN();
}
QStringList ratio_components = s.split(QRegExp(QStringLiteral(":|;|\\/")));
QStringList ratio_components = s.split(QRegularExpression(QStringLiteral(":|;|\\/")));
if (ratio_components.size() == 1) {
bool float_ok;
+2 -1
View File
@@ -24,6 +24,7 @@ extern "C" {
#include <libavutil/mathematics.h>
}
#include <QRegularExpression>
#include <QtMath>
#include "config/config.h"
@@ -149,7 +150,7 @@ int64_t Timecode::timecode_to_timestamp(const QString &timecode, const rational
case kTimecodeSeconds:
{
const int kTimecodeElementCount = 4;
QStringList timecode_split = timecode.split(QRegExp("(:)|(;)|(\\.)"));
QStringList timecode_split = timecode.split(QRegularExpression("(:)|(;)|(\\.)"));
bool valid;