diff options
Diffstat (limited to 'src/corelib/text/qstringconverter_base.h')
-rw-r--r-- | src/corelib/text/qstringconverter_base.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/corelib/text/qstringconverter_base.h b/src/corelib/text/qstringconverter_base.h index bf464cbb6f..a78c64a96b 100644 --- a/src/corelib/text/qstringconverter_base.h +++ b/src/corelib/text/qstringconverter_base.h @@ -13,6 +13,8 @@ #include <QtCore/qglobal.h> // QT_{BEGIN,END}_NAMESPACE #include <QtCore/qflags.h> // Q_DECLARE_FLAGS +#include <QtCore/qcontainerfwd.h> +#include <QtCore/qstringfwd.h> #include <cstring> @@ -88,12 +90,14 @@ public: enum Encoding { Utf8, +#ifndef QT_BOOTSTRAPPED Utf16, Utf16LE, Utf16BE, Utf32, Utf32LE, Utf32BE, +#endif Latin1, System, LastEncoding = System @@ -134,7 +138,10 @@ protected: constexpr explicit QStringConverter(const Interface *i) noexcept : iface(i) {} +#if QT_CORE_REMOVED_SINCE(6, 8) Q_CORE_EXPORT explicit QStringConverter(const char *name, Flags f); +#endif + Q_CORE_EXPORT explicit QStringConverter(QAnyStringView name, Flags f); ~QStringConverter() = default; @@ -153,12 +160,17 @@ public: Q_CORE_EXPORT const char *name() const noexcept; +#if QT_CORE_REMOVED_SINCE(6, 8) Q_CORE_EXPORT static std::optional<Encoding> encodingForName(const char *name) noexcept; +#endif + Q_CORE_EXPORT static std::optional<Encoding> encodingForName(QAnyStringView name) noexcept; Q_CORE_EXPORT static const char *nameForEncoding(Encoding e); Q_CORE_EXPORT static std::optional<Encoding> encodingForData(QByteArrayView data, char16_t expectedFirstCharacter = 0) noexcept; Q_CORE_EXPORT static std::optional<Encoding> encodingForHtml(QByteArrayView data); + Q_CORE_EXPORT static QStringList availableCodecs(); + protected: const Interface *iface; State state; |