diff options
| author | Lorenz Haas <lorenz.haas@histomatics.de> | 2017-02-23 19:36:35 +0100 |
|---|---|---|
| committer | Lorenz Haas <lorenz.haas@histomatics.de> | 2017-02-23 21:42:45 +0000 |
| commit | f04c535ad2a1a2332c81ce69f24195d5271e1ebe (patch) | |
| tree | 90a54e8e074b1265ee974e7dd824ffa908160a88 /src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp | |
| parent | 037a96aefdb99c9e4cc714038078df4a37af67d4 (diff) | |
Beautifier: Get rid of QRegExp
Change-Id: If3f7e6d93ef1f0b6920f0958f1e2eb00c37462bf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp')
| -rw-r--r-- | src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp index 51a32863c4..da73a5a47e 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp @@ -37,6 +37,7 @@ #include <QDateTime> #include <QFile> #include <QFileInfo> +#include <QRegularExpression> #include <QXmlStreamWriter> namespace Beautifier { @@ -67,10 +68,11 @@ ArtisticStyleSettings::ArtisticStyleSettings() : static int parseVersion(const QString &text) { // The version in Artistic Style is printed like "Artistic Style Version 2.04" - const QRegExp rx("([2-9]{1})\\.([0-9]{2})(\\.[1-9]{1})?$"); - if (rx.indexIn(text) != -1) { - const int major = rx.cap(1).toInt() * 100; - const int minor = rx.cap(2).toInt(); + const QRegularExpression rx("([2-9]{1})\\.([0-9]{2})(\\.[1-9]{1})?$"); + const QRegularExpressionMatch match = rx.match(text); + if (match.hasMatch()) { + const int major = match.capturedRef(1).toInt() * 100; + const int minor = match.capturedRef(2).toInt(); return major + minor; } return 0; @@ -200,7 +202,7 @@ void ArtisticStyleSettings::createDocumentationFile() const stream.writeTextElement(Constants::DOCUMENTATION_XMLKEY, key); stream.writeEndElement(); const QString text = "<p><span class=\"option\">" - + keys.filter(QRegExp("^\\-")).join(", ") + "</span></p><p>" + + keys.filter(QRegularExpression("^\\-")).join(", ") + "</span></p><p>" + (docu.join(' ').toHtmlEscaped()) + "</p>"; stream.writeTextElement(Constants::DOCUMENTATION_XMLDOC, text); stream.writeEndElement(); |