From 4bf45691b507a5905c8aae6f933f5a533b325d58 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 14 Jun 2018 18:00:24 -0700 Subject: [PATCH] Remove unused QString::toLatin1_helper overload Commit 5dc1e08c8c602738f6a827cea0de44683c7bbd0b changed QString::toLocal8Bit_helper to use qt_convert_to_latin1 so it became unused. It was never used in inline functions in the headers. Change-Id: I6efb28c3145047559ec0fffd15382f9d08efdfeb Reviewed-by: Lars Knoll --- src/corelib/tools/qstring.cpp | 5 ----- src/corelib/tools/qstring.h | 1 - 2 files changed, 6 deletions(-) diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index a04b2f0d02..df95938c41 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -5142,11 +5142,6 @@ QByteArray QString::toLatin1_helper(const QString &string) return qt_convert_to_latin1(string); } -QByteArray QString::toLatin1_helper(const QChar *data, int length) -{ - return qt_convert_to_latin1(QStringView(data, length)); -} - /*! \since 5.10 \internal diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index 447f000486..f18baf7065 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -878,7 +878,6 @@ private: static QString fromUtf8_helper(const char *str, int size); static QString fromLocal8Bit_helper(const char *, int size); static QByteArray toLatin1_helper(const QString &); - static QByteArray toLatin1_helper(const QChar *data, int size); static QByteArray toLatin1_helper_inplace(QString &); static QByteArray toUtf8_helper(const QString &); static QByteArray toLocal8Bit_helper(const QChar *data, int size);