From f2eba3828256e278ecf0a5dc4e993cfa06395435 Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Tue, 15 Dec 2020 23:35:57 +0000 Subject: [PATCH] Use QString::arg instead of std::sprintf --- src/blackmisc/pq/angle.cpp | 11 +++++------ src/blackmisc/stringutils.h | 9 --------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/blackmisc/pq/angle.cpp b/src/blackmisc/pq/angle.cpp index 0c6247a84..40fd97efe 100644 --- a/src/blackmisc/pq/angle.cpp +++ b/src/blackmisc/pq/angle.cpp @@ -73,12 +73,11 @@ namespace BlackMisc dms *= -1.0; } - char chars[16]; - std::sprintf(chars, "%014.10f", dms); // 000.0000000000 - values.deg = stringToInt(chars, chars + 3); - values.min = stringToInt(chars + 4, chars + 6); - values.sec = stringToInt(chars + 6, chars + 8); - values.fractionalSec = stringToInt(chars + 8, chars + 14) / 1000000.0; + QString str = QStringLiteral("%1").arg(dms, 14, 'f', 10, '0'); // 000.0000000000 + values.deg = str.midRef(0, 3).toInt(); + values.min = str.midRef(4, 2).toInt(); + values.sec = str.midRef(6, 2).toInt(); + values.fractionalSec = str.midRef(8, 6).toInt() / 1000000.0; return values; } diff --git a/src/blackmisc/stringutils.h b/src/blackmisc/stringutils.h index 59c4907e8..2a884a600 100644 --- a/src/blackmisc/stringutils.h +++ b/src/blackmisc/stringutils.h @@ -234,15 +234,6 @@ namespace BlackMisc //! Convert string to bool BLACKMISC_EXPORT bool stringToBool(const QString &boolString); - //! Convert string (begin and end iterators of char) to int - template - int stringToInt(It begin, It end) - { - int result = 0; - std::for_each(begin, end, [&result](char c) { Q_ASSERT(is09(c)); result *= 10; result += (c - '0'); }); - return result; - } - //! Fuzzy compare for short strings (like ICAO designators) //! \return int 0..100 (100 is perfect match) BLACKMISC_EXPORT int fuzzyShortStringComparision(const QString &str1, const QString &str2, Qt::CaseSensitivity cs = Qt::CaseSensitive);