diff --git a/src/corelib/text/qstringconverter.cpp b/src/corelib/text/qstringconverter.cpp index 03715b54296..9fc3318d716 100644 --- a/src/corelib/text/qstringconverter.cpp +++ b/src/corelib/text/qstringconverter.cpp @@ -2523,20 +2523,13 @@ const char *QStringConverter::nameForEncoding(QStringConverter::Encoding e) */ /*! - \fn constexpr QStringEncoder::QStringEncoder(const char *name, Flags flags = Flag::Default) + \fn QStringEncoder::QStringEncoder(QAnyStringView name, Flags flags = Flag::Default) Creates an encoder object using \a name and \a flags. If \a name is not the name of a known encoding an invalid converter will get created. - \sa isValid() -*/ - -/*! - \fn constexpr QStringEncoder::QStringEncoder(const QString &name, Flags flags = Flag::Default) - \since 6.8 - - Creates an encoder object using \a name and \a flags. - If \a name is not the name of a known encoding an invalid converter will get created. + \note In Qt versions prior to 6.8, this function took only a \c{const char *}, + which was expected to be UTF-8-encoded. \sa isValid() */ @@ -2624,20 +2617,13 @@ const char *QStringConverter::nameForEncoding(QStringConverter::Encoding e) */ /*! - \fn constexpr QStringDecoder::QStringDecoder(const char *name, Flags flags = Flag::Default) + \fn QStringDecoder::QStringDecoder(QAnyStringView name, Flags flags = Flag::Default) Creates an decoder object using \a name and \a flags. If \a name is not the name of a known encoding an invalid converter will get created. - \sa isValid() -*/ - -/*! - \fn constexpr QStringDecoder::QStringDecoder(const QString &name, Flags flags = Flag::Default) - \since 6.8 - - Creates an decoder object using \a name and \a flags. - If \a name is not the name of a known encoding an invalid converter will get created. + \note In Qt versions prior to 6.8, this function took only a \c{const char *}, + which was expected to be UTF-8-encoded. \sa isValid() */ diff --git a/src/corelib/text/qstringconverter.h b/src/corelib/text/qstringconverter.h index 40791f8e26c..5df6f84e069 100644 --- a/src/corelib/text/qstringconverter.h +++ b/src/corelib/text/qstringconverter.h @@ -30,12 +30,9 @@ public: constexpr explicit QStringEncoder(Encoding encoding, Flags flags = Flag::Default) : QStringConverter(encoding, flags) {} - explicit QStringEncoder(const char *name, Flags flags = Flag::Default) + explicit QStringEncoder(QAnyStringView name, Flags flags = Flag::Default) : QStringConverter(name, flags) {} - Q_WEAK_OVERLOAD explicit QStringEncoder(const QString &name, Flags flags = Flag::Default) - : QStringEncoder(name.toLatin1().constData(), flags) - {} template struct DecodedData @@ -95,12 +92,9 @@ public: constexpr QStringDecoder() noexcept : QStringConverter() {} - explicit QStringDecoder(const char *name, Flags f = Flag::Default) + explicit QStringDecoder(QAnyStringView name, Flags f = Flag::Default) : QStringConverter(name, f) {} - Q_WEAK_OVERLOAD explicit QStringDecoder(const QString &name, Flags f = Flag::Default) - : QStringDecoder(name.toLatin1().constData(), f) - {} template struct EncodedData