#include "support/docstring.h"
#include "support/qstring_helpers.h"
-#include <QRegExp>
+#include <QRegularExpression>
+#include <QLocale>
#include <QString>
#include <QVector>
if (ucs4.empty())
return QString();
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
- return QString::fromStdWString(ucs4);
+ 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::fromWCharArray(&ucs4, 1);
+ return QString::fromStdU32String(std::u32string(1, ucs4));
#else
union { char_type c; uint i; } u = { ucs4 };
return QString::fromUcs4(&u.i, 1);
QString re = ".*";
for (QChar const & c : filter) {
if (c.isLower())
- re += "["+ QRegExp::escape(c) + QRegExp::escape(c.toUpper()) + "]";
+ re += "[" + QRegularExpression::escape(c)
+ + QRegularExpression::escape(c.toUpper()) + "]";
else
- re += QRegExp::escape(c);
+ re += QRegularExpression::escape(c);
}
return re;
}
QString re = "(";
for (QChar const & c : filter) {
if (c.isLower())
- re += "["+ QRegExp::escape(c) + QRegExp::escape(c.toUpper()) + "]";
+ re += "[" + QRegularExpression::escape(c)
+ + QRegularExpression::escape(c.toUpper()) + "]";
else
- re += QRegExp::escape(c);
+ re += QRegularExpression::escape(c);
}
return re + ")";
}
+QString locLengthString(QString const & str)
+{
+ QLocale loc;
+ QString res = str;
+ return res.replace(QString("."), loc.decimalPoint());
+}
+
+
+docstring locLengthDocString(docstring const str)
+{
+ return qstring_to_ucs4(locLengthString(toqstr(str)));
+}
+
+
+QString unlocLengthString(QString const & str)
+{
+ QLocale loc;
+ QString res = str;
+ return res.replace(loc.decimalPoint(), QString("."));
+}
} // namespace lyx