Updated BasicXMLSyntaxHighlighter

Removed deprecated QRegExp class
Code rewritten using QRegularExpression class

Author: Vitozz

src/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.cpp

@@ -23,46 +23,39 @@
  */
 
 #include "BasicXMLSyntaxHighlighter.h"
+#include <QRegularExpressionMatchIterator>
 
-BasicXMLSyntaxHighlighter::BasicXMLSyntaxHighlighter(QObject * parent) :
-    QSyntaxHighlighter(parent)
+BasicXMLSyntaxHighlighter::BasicXMLSyntaxHighlighter(QObject *parent) : QSyntaxHighlighter(parent)
 {
     setRegexes();
     setFormats();
 }
 
-BasicXMLSyntaxHighlighter::BasicXMLSyntaxHighlighter(QTextDocument * parent) :
-    QSyntaxHighlighter(parent)
+BasicXMLSyntaxHighlighter::BasicXMLSyntaxHighlighter(QTextDocument *parent) : QSyntaxHighlighter(parent)
 {
     setRegexes();
     setFormats();
 }
 
-BasicXMLSyntaxHighlighter::BasicXMLSyntaxHighlighter(QTextEdit * parent) :
-    QSyntaxHighlighter(parent)
+BasicXMLSyntaxHighlighter::BasicXMLSyntaxHighlighter(QTextEdit *parent) : QSyntaxHighlighter(parent)
 {
     setRegexes();
     setFormats();
 }
 
-void BasicXMLSyntaxHighlighter::highlightBlock(const QString & text)
+void BasicXMLSyntaxHighlighter::highlightBlock(const QString &text)
 {
     // Special treatment for xml element regex as we use captured text to emulate lookbehind
-    int xmlElementIndex = m_xmlElementRegex.indexIn(text);
-    while(xmlElementIndex >= 0)
-    {
-        int matchedPos = m_xmlElementRegex.pos(1);
-        int matchedLength = m_xmlElementRegex.cap(1).length();
-        setFormat(matchedPos, matchedLength, m_xmlElementFormat);
-
-        xmlElementIndex = m_xmlElementRegex.indexIn(text, matchedPos + matchedLength);
+    auto matchIt = m_xmlElementRegex.globalMatch(text);
+
+    while (matchIt.hasNext()) {
+        auto match = matchIt.next();
+        setFormat(match.capturedStart(), match.capturedLength(), m_xmlElementFormat);
     }
 
     // Highlight xml keywords *after* xml elements to fix any occasional / captured into the enclosing element
-    typedef QList<QRegExp>::const_iterator Iter;
-    Iter xmlKeywordRegexesEnd = m_xmlKeywordRegexes.end();
-    for(Iter it = m_xmlKeywordRegexes.begin(); it != xmlKeywordRegexesEnd; ++it) {
-        const QRegExp & regex = *it;
+    for (auto it = m_xmlKeywordRegexes.begin(); it != m_xmlKeywordRegexes.end(); ++it) {
+        const QRegularExpression &regex = *it;
         highlightByRegex(m_xmlKeywordFormat, regex, text);
     }
 
@@ -71,17 +64,14 @@ void BasicXMLSyntaxHighlighter::highlightBlock(const QString & text)
     highlightByRegex(m_xmlValueFormat, m_xmlValueRegex, text);
 }
 
-void BasicXMLSyntaxHighlighter::highlightByRegex(const QTextCharFormat & format,
-                                                 const QRegExp & regex, const QString & text)
+void BasicXMLSyntaxHighlighter::highlightByRegex(const QTextCharFormat &format, const QRegularExpression &regex,
+                                                 const QString &text)
 {
-    int index = regex.indexIn(text);
-
-    while(index >= 0)
-    {
-        int matchedLength = regex.matchedLength();
-        setFormat(index, matchedLength, format);
+    auto matchIt = regex.globalMatch(text);
 
-        index = regex.indexIn(text, index + matchedLength);
+    while (matchIt.hasNext()) {
+        auto match = matchIt.next();
+        setFormat(match.capturedStart(), match.capturedLength(), format);
     }
 }
 
@@ -92,9 +82,9 @@ void BasicXMLSyntaxHighlighter::setRegexes()
     m_xmlValueRegex.setPattern("\"[^\\n\"]+\"(?=[?\\s/>])");
     m_xmlCommentRegex.setPattern("<!--[^\\n]*-->");
 
-    m_xmlKeywordRegexes = QList<QRegExp>() << QRegExp("<\\?") << QRegExp("/>")
-                                           << QRegExp(">") << QRegExp("<") << QRegExp("</")
-                                           << QRegExp("\\?>");
+    m_xmlKeywordRegexes = QList<QRegularExpression>()
+        << QRegularExpression("<\\?") << QRegularExpression("/>") << QRegularExpression(">") << QRegularExpression("<")
+        << QRegularExpression("</") << QRegularExpression("\\?>");
 }
 
 void BasicXMLSyntaxHighlighter::setFormats()

src/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.h

@@ -24,39 +24,38 @@
 #ifndef BASIC_XML_SYNTAX_HIGHLIGHTER_H
 #define BASIC_XML_SYNTAX_HIGHLIGHTER_H
 
+#include <QRegularExpression>
 #include <QSyntaxHighlighter>
 #include <QTextEdit>
 
-class BasicXMLSyntaxHighlighter : public QSyntaxHighlighter
-{
+class BasicXMLSyntaxHighlighter : public QSyntaxHighlighter {
     Q_OBJECT
 public:
-    BasicXMLSyntaxHighlighter(QObject * parent);
-    BasicXMLSyntaxHighlighter(QTextDocument * parent);
-    BasicXMLSyntaxHighlighter(QTextEdit * parent);
+    BasicXMLSyntaxHighlighter(QObject *parent);
+    BasicXMLSyntaxHighlighter(QTextDocument *parent);
+    BasicXMLSyntaxHighlighter(QTextEdit *parent);
 
 protected:
-    virtual void highlightBlock(const QString & text);
+    virtual void highlightBlock(const QString &text);
 
 private:
-    void highlightByRegex(const QTextCharFormat & format,
-                          const QRegExp & regex, const QString & text);
+    void highlightByRegex(const QTextCharFormat &format, const QRegularExpression &regex, const QString &text);
 
     void setRegexes();
     void setFormats();
 
 private:
-    QTextCharFormat     m_xmlKeywordFormat;
-    QTextCharFormat     m_xmlElementFormat;
-    QTextCharFormat     m_xmlAttributeFormat;
-    QTextCharFormat     m_xmlValueFormat;
-    QTextCharFormat     m_xmlCommentFormat;
-
-    QList<QRegExp>      m_xmlKeywordRegexes;
-    QRegExp             m_xmlElementRegex;
-    QRegExp             m_xmlAttributeRegex;
-    QRegExp             m_xmlValueRegex;
-    QRegExp             m_xmlCommentRegex;
+    QTextCharFormat m_xmlKeywordFormat;
+    QTextCharFormat m_xmlElementFormat;
+    QTextCharFormat m_xmlAttributeFormat;
+    QTextCharFormat m_xmlValueFormat;
+    QTextCharFormat m_xmlCommentFormat;
+
+    QList<QRegularExpression> m_xmlKeywordRegexes;
+    QRegularExpression        m_xmlElementRegex;
+    QRegularExpression        m_xmlAttributeRegex;
+    QRegularExpression        m_xmlValueRegex;
+    QRegularExpression        m_xmlCommentRegex;
 };
 
-#endif // BASIC_XML_SYNTAX_HIGHLIGHTER_H
+#endif // BASIC_XML_SYNTAX_HIGHLIGHTER_H