summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/text/qlocale_p.h5
-rw-r--r--src/gui/util/qvalidator.cpp4
2 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/text/qlocale_p.h b/src/corelib/text/qlocale_p.h
index e19d2a4aeef..50de7a914f3 100644
--- a/src/corelib/text/qlocale_p.h
+++ b/src/corelib/text/qlocale_p.h
@@ -243,9 +243,6 @@ struct QLocaleId
};
Q_DECLARE_TYPEINFO(QLocaleId, Q_PRIMITIVE_TYPE);
-
-using CharBuff = QVarLengthArray<char, 256>;
-
struct QLocaleData
{
public:
@@ -291,6 +288,8 @@ public:
bool isValid() const { return least > 0 && higher > first && first > 0; }
};
+ using CharBuff = QVarLengthArray<char, 256>;
+
struct ParsingResult
{
enum State { // A duplicate of QValidator::State
diff --git a/src/gui/util/qvalidator.cpp b/src/gui/util/qvalidator.cpp
index 9aaaf4e6e1a..884b0ccfc6d 100644
--- a/src/gui/util/qvalidator.cpp
+++ b/src/gui/util/qvalidator.cpp
@@ -372,7 +372,7 @@ std::optional<QValidator::State> initialResultCheck(T min, T max,
if (result.state == ParsingResult::Invalid)
return QValidator::Invalid;
- const CharBuff &buff = result.buff;
+ const QLocaleData::CharBuff &buff = result.buff;
if (buff.isEmpty())
return QValidator::Intermediate;
@@ -397,7 +397,7 @@ QValidator::State QIntValidator::validate(QString & input, int&) const
if (opt)
return *opt;
- const CharBuff &buff = result.buff;
+ const QLocaleData::CharBuff &buff = result.buff;
QSimpleParsedNumber r = QLocaleData::bytearrayToLongLong(buff, 10);
if (!r.ok())
return Invalid;