Let paragraph::requestSpellcheck() consider contained insets

[lyx.git] / src / support / qstring_helpers.cpp

diff --git a/src/support/qstring_helpers.cpp b/src/support/qstring_helpers.cpp
index 4a09c1b6655a37f1848115f235c738c184c28d4d..bb800f3c67eeda9d84897efd9f99b9bac4a7c928 100644 (file)
--- a/src/support/qstring_helpers.cpp
+++ b/src/support/qstring_helpers.cpp
@@ -18,6 +18,7 @@
 #include "support/docstring.h"
 #include "support/qstring_helpers.h"
 
+#include <QRegExp>
 #include <QString>
 #include <QVector>
 
@@ -46,13 +47,21 @@ QString toqstr(docstring const & ucs4)
        // need to be superfast.
        if (ucs4.empty())
                return QString();
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+       return QString::fromStdU32String(reinterpret_cast<std::u32string const &>(ucs4));
+#else
        return QString::fromUcs4((uint const *)ucs4.data(), ucs4.length());
+#endif
 }
 
 QString toqstr(char_type ucs4)
 {
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+       return QString::fromStdU32String(std::u32string(1, ucs4));
+#else
        union { char_type c; uint i; } u = { ucs4 };
        return QString::fromUcs4(&u.i, 1);
+#endif
 }
 
 docstring qstring_to_ucs4(QString const & qstr)
@@ -70,22 +79,20 @@ std::string fromqstr(QString const & str)
 
 QString charFilterRegExp(QString const & filter)
 {
-    QString re = ".*";
-    for (int i = 0; i < filter.length(); ++i) {
-        QChar c = filter[i];
-        if (c.isLower())
-            re +=  "["+ QRegExp::escape(c) + QRegExp::escape(c.toUpper()) + "]";
-        else
-            re +=  QRegExp::escape(c);
-    }
-    return re;
+       QString re = ".*";
+       for (QChar const & c : filter) {
+               if (c.isLower())
+                       re +=  "["+ QRegExp::escape(c) + QRegExp::escape(c.toUpper()) + "]";
+               else
+                       re +=  QRegExp::escape(c);
+       }
+       return re;
 }
 
 QString charFilterRegExpC(QString const & filter)
 {
        QString re = "(";
-       for (int i = 0; i < filter.length(); ++i) {
-               QChar c = filter[i];
+       for (QChar const & c : filter) {
                if (c.isLower())
                        re +=  "["+ QRegExp::escape(c) + QRegExp::escape(c.toUpper()) + "]";
                else