diff --git a/autotests/validators/unsigned-long-parsing.cpp b/autotests/validators/unsigned-long-parsing.cpp index b3e315d..bb4fc29 100644 --- a/autotests/validators/unsigned-long-parsing.cpp +++ b/autotests/validators/unsigned-long-parsing.cpp @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later - * SPDX-FileCopyrightText: 2019 Johan Ouwerkerk + * SPDX-FileCopyrightText: 2019-2020 Johan Ouwerkerk */ #include "validators/countervalidator.h" @@ -17,16 +17,16 @@ class UnsignedLongParsingSamplesTest: public QObject { Q_OBJECT private Q_SLOTS: - void testParsea(void); - void testParsea_data(void); + void testParseUnsignedInteger(void); + void testParseUnsignedInteger_data(void); }; -void UnsignedLongParsingSamplesTest::testParsea(void) +void UnsignedLongParsingSamplesTest::testParseUnsignedInteger(void) { QFETCH(QString, input); QFETCH(QLocale, locale); - QTEST(validators::parse(input, locale), "result"); + QTEST(validators::parseUnsignedInteger(input, locale), "result"); } static void define_test_case(const QString &input, const QLocale &locale, const std::optional &result) @@ -34,7 +34,7 @@ static void define_test_case(const QString &input, const QLocale &locale, const QTest::newRow(qPrintable(input)) << input << locale << result; } -void UnsignedLongParsingSamplesTest::testParsea_data(void) +void UnsignedLongParsingSamplesTest::testParseUnsignedInteger_data(void) { QTest::addColumn("input"); QTest::addColumn("locale"); diff --git a/src/model/input.cpp b/src/model/input.cpp index b59b8ad..cbdaa63 100644 --- a/src/model/input.cpp +++ b/src/model/input.cpp @@ -187,7 +187,7 @@ namespace model if (m_counter != counter) { m_counter = counter; - m_counterValue = validators::parse(counter, validator->locale()).value_or(0ULL); + m_counterValue = validators::parseUnsignedInteger(counter, validator->locale()).value_or(0ULL); Q_EMIT counterChanged(); } } diff --git a/src/validators/countervalidator.cpp b/src/validators/countervalidator.cpp index 6ffe0d9..ba74e9c 100644 --- a/src/validators/countervalidator.cpp +++ b/src/validators/countervalidator.cpp @@ -9,7 +9,7 @@ namespace validators { - std::optional parse(const QString &input, const QLocale &locale) + std::optional parseUnsignedInteger(const QString &input, const QLocale &locale) { bool ok = false; @@ -54,7 +54,7 @@ namespace validators * This may also involve switching from Latin script (C locale) to * whatever script the configured locale uses natively. */ - const auto v = parse(fixed, l); + const auto v = parseUnsignedInteger(fixed, l); if (v) { fixed = l.toString(v.value()); } @@ -71,7 +71,7 @@ namespace validators } else { const QLocale l = locale(); - const auto parsed = parse(input, l); + const auto parsed = parseUnsignedInteger(input, l); /* * The actual value is a don't care at this point. diff --git a/src/validators/countervalidator.h b/src/validators/countervalidator.h index 4e8de67..bc33510 100644 --- a/src/validators/countervalidator.h +++ b/src/validators/countervalidator.h @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later - * SPDX-FileCopyrightText: 2019 Johan Ouwerkerk + * SPDX-FileCopyrightText: 2019-2020 Johan Ouwerkerk */ #ifndef COUNTER_VALIDATOR_H @@ -14,7 +14,7 @@ namespace validators { - std::optional parse(const QString &input, const QLocale &locale = QLocale::system()); + std::optional parseUnsignedInteger(const QString &input, const QLocale &locale = QLocale::system()); class UnsignedLongValidator: public QValidator {