From fd681d3e85d944feed76063555d7122383c70f51 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Mon, 1 Aug 2022 13:35:33 +0200 Subject: Move q{,Utf8, Utf16}Printable to qstring.h Task-number: QTBUG-99313 Change-Id: I76ef84e4c90ab04a3e04c165ba46800e27ea6122 Reviewed-by: Edward Welbourne Reviewed-by: Qt CI Bot --- src/corelib/global/qglobal.h | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'src/corelib/global/qglobal.h') diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index d1207498af..705438cea6 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -633,24 +633,6 @@ Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qSharedBuild() noexcept; # define QT_DEBUG #endif -// QtPrivate::asString defined in qstring.h -#ifndef qPrintable -# define qPrintable(string) QtPrivate::asString(string).toLocal8Bit().constData() -#endif - -#ifndef qUtf8Printable -# define qUtf8Printable(string) QtPrivate::asString(string).toUtf8().constData() -#endif - -/* - Wrap QString::utf16() with enough casts to allow passing it - to QString::asprintf("%ls") without warnings. -*/ -#ifndef qUtf16Printable -# define qUtf16Printable(string) \ - static_cast(static_cast(QtPrivate::asString(string).utf16())) -#endif - class QString; Q_DECL_COLD_FUNCTION Q_CORE_EXPORT QString qt_error_string(int errorCode = -1); -- cgit v1.2.3