From 88b54cc22a45f9724c201e7249ac79deb55ff48a Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 27 Aug 2021 15:48:12 +0200 Subject: Rework QLocalePrivate::bytearrayToU?LongLong() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change it to take a QByteArrayView instead of a plain char *; all its callers do know the size and propagating it enables the implementation to call strntou?ll() rather than strtou?ll(), thereby escaping the need for '\0'-termination. Fixes: QTBUG-74286 Change-Id: Ie9394786e9fcf25c1d1be2421805f47c018d13bb Reviewed-by: Thiago Macieira Reviewed-by: Mårten Nordheim --- src/gui/util/qvalidator.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gui/util') diff --git a/src/gui/util/qvalidator.cpp b/src/gui/util/qvalidator.cpp index f15057801b..95d8b2a542 100644 --- a/src/gui/util/qvalidator.cpp +++ b/src/gui/util/qvalidator.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo ** Contact: https://www.qt.io/licensing/ ** @@ -421,7 +421,7 @@ QValidator::State QIntValidator::validate(QString & input, int&) const return Intermediate; bool ok; - qlonglong entered = QLocaleData::bytearrayToLongLong(buff.constData(), 10, &ok); + qlonglong entered = QLocaleData::bytearrayToLongLong(buff, 10, &ok); if (!ok) return Invalid; @@ -456,7 +456,7 @@ void QIntValidator::fixup(QString &input) const return; } bool ok; - qlonglong entered = QLocaleData::bytearrayToLongLong(buff.constData(), 10, &ok); + qlonglong entered = QLocaleData::bytearrayToLongLong(buff, 10, &ok); if (ok) input = locale().toString(entered); } -- cgit v1.2.3