Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
rbutil: Logger Qt6 fixes.
Fix various issues with building CuteLogger with Qt6.
Change-Id: Iceac8f8a19f6703868c5a41b725d3cd69c724239
+18
-7
+2
-1
rbutil/rbutilqt/logger/include/Logger.h
+2
-1
rbutil/rbutilqt/logger/include/Logger.h
···
18
18
#include <QString>
19
19
#include <QDebug>
20
20
#include <QDateTime>
21
+
#include <QElapsedTimer>
21
22
22
23
// Local
23
24
#include "CuteLogger_global.h"
···
224
225
225
226
private:
226
227
Logger* m_logger;
227
-
QTime m_time;
228
+
QElapsedTimer m_time;
228
229
Logger::LogLevel m_logLevel;
229
230
Logger::TimingMode m_timingMode;
230
231
const char* m_file;
+6
-5
rbutil/rbutilqt/logger/src/AbstractStringAppender.cpp
+6
-5
rbutil/rbutilqt/logger/src/AbstractStringAppender.cpp
···
20
20
#include <QReadLocker>
21
21
#include <QWriteLocker>
22
22
#include <QDateTime>
23
-
#include <QRegExp>
23
+
#include <QRegularExpression>
24
24
#include <QCoreApplication>
25
25
#include <QThread>
26
26
···
155
155
}
156
156
157
157
bool hasLambda = false;
158
-
QRegExp lambdaRegex("::<lambda\\(.*\\)>");
159
-
int lambdaIndex = lambdaRegex.indexIn(QString::fromLatin1(info));
158
+
QRegularExpression lambdaRegex("::<lambda\\(.*?\\)>");
159
+
QRegularExpressionMatch match = lambdaRegex.match(QString::fromLatin1(info));
160
+
int lambdaIndex = match.capturedStart();
160
161
if (lambdaIndex != -1)
161
162
{
162
163
hasLambda = true;
163
-
info.remove(lambdaIndex, lambdaRegex.matchedLength());
164
+
info.remove(lambdaIndex, match.capturedLength());
164
165
}
165
166
166
167
// operator names with '(', ')', '<', '>' in it
···
405
406
406
407
// Filename without a path
407
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
411
// Source line number
411
412
else if (command == QLatin1String("line"))
+10
-1
rbutil/rbutilqt/logger/src/Logger.cpp
+10
-1
rbutil/rbutilqt/logger/src/Logger.cpp
···
600
600
601
601
// Cleanup appenders
602
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
607
QSet<AbstractAppender*> deleteList(QSet<AbstractAppender*>::fromList(d->appenders));
604
608
deleteList.unite(QSet<AbstractAppender*>::fromList(d->categoryAppenders.values()));
609
+
#endif
605
610
qDeleteAll(deleteList);
606
611
607
612
appendersLocker.unlock();
···
1032
1037
{
1033
1038
va_list va;
1034
1039
va_start(va, msg);
1040
+
#if QT_VERSION >= 0x050500
1041
+
m_block = QString().vasprintf(msg, va);
1042
+
#else
1035
1043
m_block = QString().vsprintf(msg, va);
1044
+
#endif
1036
1045
va_end(va);
1037
1046
1038
1047
m_time.start();
···
1062
1071
else
1063
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
1075
if (elapsed >= 10000 && m_timingMode == Logger::TimingAuto)
1067
1076
message += QString(QLatin1String("%1 s.")).arg(elapsed / 1000);
1068
1077
else