diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-08-16 12:04:15 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-08-16 12:37:02 +0200 |
commit | 94eb1df58b4ad4e25941782832d20e1c8d57f0c5 (patch) | |
tree | d569e73ee64f887c78200ce0e7d83a4957fe129a /rbutil/rbutilqt/logger/src | |
parent | cd352d9052b42781887996da5b0691dd581ce48c (diff) | |
download | rockbox-94eb1df58b4ad4e25941782832d20e1c8d57f0c5.tar.gz rockbox-94eb1df58b4ad4e25941782832d20e1c8d57f0c5.zip |
rbutil: Logger Qt6 fixes.
Fix various issues with building CuteLogger with Qt6.
Change-Id: Iceac8f8a19f6703868c5a41b725d3cd69c724239
Diffstat (limited to 'rbutil/rbutilqt/logger/src')
-rw-r--r-- | rbutil/rbutilqt/logger/src/AbstractStringAppender.cpp | 11 | ||||
-rw-r--r-- | rbutil/rbutilqt/logger/src/Logger.cpp | 11 |
2 files changed, 16 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/logger/src/AbstractStringAppender.cpp b/rbutil/rbutilqt/logger/src/AbstractStringAppender.cpp index ce64aaeb43..ea5883f744 100644 --- a/rbutil/rbutilqt/logger/src/AbstractStringAppender.cpp +++ b/rbutil/rbutilqt/logger/src/AbstractStringAppender.cpp | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <QReadLocker> | 20 | #include <QReadLocker> |
21 | #include <QWriteLocker> | 21 | #include <QWriteLocker> |
22 | #include <QDateTime> | 22 | #include <QDateTime> |
23 | #include <QRegExp> | 23 | #include <QRegularExpression> |
24 | #include <QCoreApplication> | 24 | #include <QCoreApplication> |
25 | #include <QThread> | 25 | #include <QThread> |
26 | 26 | ||
@@ -155,12 +155,13 @@ QByteArray AbstractStringAppender::qCleanupFuncinfo(const char* name) | |||
155 | } | 155 | } |
156 | 156 | ||
157 | bool hasLambda = false; | 157 | bool hasLambda = false; |
158 | QRegExp lambdaRegex("::<lambda\\(.*\\)>"); | 158 | QRegularExpression lambdaRegex("::<lambda\\(.*?\\)>"); |
159 | int lambdaIndex = lambdaRegex.indexIn(QString::fromLatin1(info)); | 159 | QRegularExpressionMatch match = lambdaRegex.match(QString::fromLatin1(info)); |
160 | int lambdaIndex = match.capturedStart(); | ||
160 | if (lambdaIndex != -1) | 161 | if (lambdaIndex != -1) |
161 | { | 162 | { |
162 | hasLambda = true; | 163 | hasLambda = true; |
163 | info.remove(lambdaIndex, lambdaRegex.matchedLength()); | 164 | info.remove(lambdaIndex, match.capturedLength()); |
164 | } | 165 | } |
165 | 166 | ||
166 | // operator names with '(', ')', '<', '>' in it | 167 | // operator names with '(', ')', '<', '>' in it |
@@ -405,7 +406,7 @@ QString AbstractStringAppender::formattedString(const QDateTime& timeStamp, Logg | |||
405 | 406 | ||
406 | // Filename without a path | 407 | // Filename without a path |
407 | else if (command == QLatin1String("file")) | 408 | else if (command == QLatin1String("file")) |
408 | chunk = QString(QLatin1String(file)).section(QRegExp("[/\\\\]"), -1); | 409 | chunk = QString(QLatin1String(file)).section(QRegularExpression("[/\\\\]"), -1); |
409 | 410 | ||
410 | // Source line number | 411 | // Source line number |
411 | else if (command == QLatin1String("line")) | 412 | else if (command == QLatin1String("line")) |
diff --git a/rbutil/rbutilqt/logger/src/Logger.cpp b/rbutil/rbutilqt/logger/src/Logger.cpp index 16a18db728..689bc42e80 100644 --- a/rbutil/rbutilqt/logger/src/Logger.cpp +++ b/rbutil/rbutilqt/logger/src/Logger.cpp | |||
@@ -600,8 +600,13 @@ Logger::~Logger() | |||
600 | 600 | ||
601 | // Cleanup appenders | 601 | // Cleanup appenders |
602 | QMutexLocker appendersLocker(&d->loggerMutex); | 602 | QMutexLocker appendersLocker(&d->loggerMutex); |
603 | #if QT_VERSION >= 0x050e00 | ||
604 | QSet<AbstractAppender*> deleteList(QSet<AbstractAppender*>(d->appenders.begin(), d->appenders.end())); | ||
605 | deleteList.unite(QSet<AbstractAppender*>(d->categoryAppenders.values().begin(), d->categoryAppenders.values().end())); | ||
606 | #else | ||
603 | QSet<AbstractAppender*> deleteList(QSet<AbstractAppender*>::fromList(d->appenders)); | 607 | QSet<AbstractAppender*> deleteList(QSet<AbstractAppender*>::fromList(d->appenders)); |
604 | deleteList.unite(QSet<AbstractAppender*>::fromList(d->categoryAppenders.values())); | 608 | deleteList.unite(QSet<AbstractAppender*>::fromList(d->categoryAppenders.values())); |
609 | #endif | ||
605 | qDeleteAll(deleteList); | 610 | qDeleteAll(deleteList); |
606 | 611 | ||
607 | appendersLocker.unlock(); | 612 | appendersLocker.unlock(); |
@@ -1032,7 +1037,11 @@ void LoggerTimingHelper::start(const char* msg, ...) | |||
1032 | { | 1037 | { |
1033 | va_list va; | 1038 | va_list va; |
1034 | va_start(va, msg); | 1039 | va_start(va, msg); |
1040 | #if QT_VERSION >= 0x050500 | ||
1041 | m_block = QString().vasprintf(msg, va); | ||
1042 | #else | ||
1035 | m_block = QString().vsprintf(msg, va); | 1043 | m_block = QString().vsprintf(msg, va); |
1044 | #endif | ||
1036 | va_end(va); | 1045 | va_end(va); |
1037 | 1046 | ||
1038 | m_time.start(); | 1047 | m_time.start(); |
@@ -1062,7 +1071,7 @@ LoggerTimingHelper::~LoggerTimingHelper() | |||
1062 | else | 1071 | else |
1063 | message = QString(QLatin1String("\"%1\" finished in ")).arg(m_block); | 1072 | message = QString(QLatin1String("\"%1\" finished in ")).arg(m_block); |
1064 | 1073 | ||
1065 | int elapsed = m_time.elapsed(); | 1074 | qint64 elapsed = m_time.elapsed(); |
1066 | if (elapsed >= 10000 && m_timingMode == Logger::TimingAuto) | 1075 | if (elapsed >= 10000 && m_timingMode == Logger::TimingAuto) |
1067 | message += QString(QLatin1String("%1 s.")).arg(elapsed / 1000); | 1076 | message += QString(QLatin1String("%1 s.")).arg(elapsed / 1000); |
1068 | else | 1077 | else |