diff options
Diffstat (limited to 'rbutil/rbutilqt/logger/src/AbstractStringAppender.cpp')
-rw-r--r-- | rbutil/rbutilqt/logger/src/AbstractStringAppender.cpp | 11 |
1 files changed, 6 insertions, 5 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")) |