diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2020-05-06 15:02:04 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2020-05-08 14:53:08 +0000 |
| commit | 93bc6be21d7a572f4a04b91441babecdc9a22447 (patch) | |
| tree | e8b6496d2471c224ec13832629bb0433919f7b63 /src/corelib/text/qstringview.h | |
| parent | dd4e96df528a64bd994bf44e9b618463e0562ab0 (diff) | |
QStringView: add toNSString() / toCFString()
Use it in QString and QCocoaMenuItem.
As a drive-by, s,OS X,\macos,g.
[ChangeLog][QtCore][QStringView] Added toNSString(), toCFString()
on macOS.
Change-Id: Ib05818015a4be11a0d72d4487fb82c580d27854e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/corelib/text/qstringview.h')
| -rw-r--r-- | src/corelib/text/qstringview.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/corelib/text/qstringview.h b/src/corelib/text/qstringview.h index a2e55f5b16..2dd933284b 100644 --- a/src/corelib/text/qstringview.h +++ b/src/corelib/text/qstringview.h @@ -51,6 +51,11 @@ #include <string> +#if defined(Q_OS_DARWIN) || defined(Q_QDOC) +Q_FORWARD_DECLARE_CF_TYPE(CFString); +Q_FORWARD_DECLARE_OBJC_CLASS(NSString); +#endif + QT_BEGIN_NAMESPACE class QString; @@ -215,6 +220,11 @@ public: : QStringView(str.data(), qsizetype(str.size())) {} Q_REQUIRED_RESULT inline QString toString() const; // defined in qstring.h +#if defined(Q_OS_DARWIN) || defined(Q_QDOC) + // defined in qcore_foundation.mm + Q_REQUIRED_RESULT Q_CORE_EXPORT CFStringRef toCFString() const Q_DECL_CF_RETURNS_RETAINED; + Q_REQUIRED_RESULT Q_CORE_EXPORT NSString *toNSString() const Q_DECL_NS_RETURNS_AUTORELEASED; +#endif Q_REQUIRED_RESULT Q_DECL_CONSTEXPR qsizetype size() const noexcept { return m_size; } Q_REQUIRED_RESULT const_pointer data() const noexcept { return reinterpret_cast<const_pointer>(m_data); } |