sean-m
/
keysmith
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: rename unsigned integer parsing function 

Make the name for unsigned integer parsing (counter validator) fit better with the new custom datetime validator.
master
Johan Ouwerkerk 2020-07-25 23:44:32 +02:00
parent 63033b568d
commit 668a969d4f
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
autotests/validators/unsigned-long-parsing.cpp
View File

@ -1,6 +1,6 @@
/*
* SPDX-License-Identifier: GPL-3.0-or-later
* SPDX-FileCopyrightText: 2019 Johan Ouwerkerk <jm.ouwerkerk@gmail.com>
* SPDX-FileCopyrightText: 2019-2020 Johan Ouwerkerk <jm.ouwerkerk@gmail.com>
*/
#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<qulonglong> &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<QString>("input");
QTest::addColumn<QLocale>("locale");

2
src/model/input.cpp
View File

@ -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();
}
}

6
src/validators/countervalidator.cpp
View File

@ -9,7 +9,7 @@
namespace validators
{
std::optional<qulonglong> parse(const QString &input, const QLocale &locale)
std::optional<qulonglong> 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.

4
src/validators/countervalidator.h
View File

@ -1,6 +1,6 @@
/*
* SPDX-License-Identifier: GPL-3.0-or-later
* SPDX-FileCopyrightText: 2019 Johan Ouwerkerk <jm.ouwerkerk@gmail.com>
* SPDX-FileCopyrightText: 2019-2020 Johan Ouwerkerk <jm.ouwerkerk@gmail.com>
*/
#ifndef COUNTER_VALIDATOR_H
@ -14,7 +14,7 @@
namespace validators
{
std::optional<qulonglong> parse(const QString &input, const QLocale &locale = QLocale::system());
std::optional<qulonglong> parseUnsignedInteger(const QString &input, const QLocale &locale = QLocale::system());
class UnsignedLongValidator: public QValidator
{