diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2023-01-21 11:04:35 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2023-01-30 23:20:32 +0000 |
| commit | b36f126668f5d7c0ac58f2d058861680df176ca2 (patch) | |
| tree | cd30a1aa3528b344d08a342da872d36255f24e77 /src | |
| parent | cb0bf5ad683b72d4ecb0d21dafde3a5acdaac800 (diff) | |
QUtiMimeConverter: document as public and fix \since
It's a new public API, so don't document it as internal. Fix the \since
to 6.5 - it's an old class under a new name, and make a small language
improvement in related documentation.
Pick-to: 6.5
Change-Id: I57bfa868f19aa293c01d6a1f8bbbff1bebe7541a
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/doc/src/dnd.qdoc | 3 | ||||
| -rw-r--r-- | src/gui/platform/darwin/qutimimeconverter.mm | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/gui/doc/src/dnd.qdoc b/src/gui/doc/src/dnd.qdoc index 033d913dfa..e8276f3465 100644 --- a/src/gui/doc/src/dnd.qdoc +++ b/src/gui/doc/src/dnd.qdoc @@ -376,11 +376,10 @@ Cocoa Drag Manager. On X11, XDND uses MIME, so no translation is necessary. The Qt API is the same regardless of the platform. On Windows, MIME-aware applications can communicate by using clipboard format names that are MIME - types. Already some Windows applications use MIME naming conventions for + types. Some Windows applications already use MIME naming conventions for their clipboard formats. Custom classes for translating proprietary clipboard formats can be registered by reimplementing QWindowsMimeConverter on Windows or QUtiMimeConverter on \macos. - */ diff --git a/src/gui/platform/darwin/qutimimeconverter.mm b/src/gui/platform/darwin/qutimimeconverter.mm index 8f8e348c0d..7be3fc7e00 100644 --- a/src/gui/platform/darwin/qutimimeconverter.mm +++ b/src/gui/platform/darwin/qutimimeconverter.mm @@ -36,11 +36,10 @@ using namespace Qt::StringLiterals; /*! \class QUtiMimeConverter - \internal \brief The QUtiMimeConverter class converts between a MIME type and a \l{https://developer.apple.com/documentation/uniformtypeidentifiers} {Uniform Type Identifier (UTI)} format. - \since 4.2 + \since 6.5 \ingroup draganddrop \inmodule QtGui @@ -82,6 +81,7 @@ using namespace Qt::StringLiterals; */ /*! + \internal Constructs a new conversion object of type \a scope, adding it to the globally accessed list of available converters. */ @@ -126,7 +126,7 @@ int QUtiMimeConverter::count(const QMimeData *mimeData) const */ /*! - \fn QString QUtiMimeConverter::mimeForUti(QString uti) + \fn QString QUtiMimeConverter::mimeForUti(const QString &uti) const Returns the MIME type used for Mac UTI \a uti, or an empty string if this converter does not support converting from \a uti. @@ -135,7 +135,7 @@ int QUtiMimeConverter::count(const QMimeData *mimeData) const */ /*! - \fn QString QUtiMimeConverter::utiForMime(const QString &mime) + \fn QString QUtiMimeConverter::utiForMime(const QString &mime) const Returns the Mac UTI used for MIME type \a mime, or an empty string if this converter does not support converting from \a mime. @@ -145,7 +145,7 @@ int QUtiMimeConverter::count(const QMimeData *mimeData) const /*! \fn QVariant QUtiMimeConverter::convertToMime(const QString &mime, - const QList<QByteArray> &data, const QString &uti) + const QList<QByteArray> &data, const QString &uti) const Returns \a data converted from Mac UTI \a uti to MIME type \a mime. @@ -157,7 +157,7 @@ int QUtiMimeConverter::count(const QMimeData *mimeData) const /*! \fn QList<QByteArray> QUtiMimeConverter::convertFromMime(const QString &mime, - const QVariant &data, const QString & uti) + const QVariant &data, const QString & uti) const Returns \a data converted from MIME type \a mime to Mac UTI \a uti. |