diff options
Diffstat (limited to 'src/gui/platform/darwin/qmacmimeregistry.mm')
-rw-r--r-- | src/gui/platform/darwin/qmacmimeregistry.mm | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/src/gui/platform/darwin/qmacmimeregistry.mm b/src/gui/platform/darwin/qmacmimeregistry.mm index abf013248f..6710a0656f 100644 --- a/src/gui/platform/darwin/qmacmimeregistry.mm +++ b/src/gui/platform/darwin/qmacmimeregistry.mm @@ -21,20 +21,6 @@ Q_GLOBAL_STATIC(QStringList, globalDraggedTypesList) // implemented in qutimimeconverter.mm void registerBuiltInTypes(); -/*! - \fn void qRegisterDraggedTypes(const QStringList &types) - \relates QUtiMimeConverter - - Registers the given \a types as custom pasteboard types. - - This function should be called to enable the Drag and Drop events - for custom pasteboard types on Cocoa implementations. This is required - in addition to a QUtiMimeConverter subclass implementation. By default - drag and drop is enabled for all standard pasteboard types. - - \sa QUtiMimeConverter -*/ - void registerDraggedTypes(const QStringList &types) { (*globalDraggedTypesList()) += types; @@ -82,15 +68,15 @@ void destroyMimeTypes() */ QString flavorToMime(QUtiMimeConverter::HandlerScope scope, const QString &uti) { - MimeList *mimes = globalMimeList(); - for (MimeList::const_iterator it = mimes->constBegin(); it != mimes->constEnd(); ++it) { - const bool relevantScope = uchar((*it)->scope()) & uchar(scope); + const MimeList &mimes = *globalMimeList(); + for (const auto &mime : mimes) { + const bool relevantScope = mime->scope() & scope; #ifdef DEBUG_MIME_MAPS qDebug("QMacMimeRegistry::flavorToMime: attempting (%d) for uti %s [%s]", relevantScope, qPrintable(uti), qPrintable((*it)->mimeForUti(uti))); #endif if (relevantScope) { - QString mimeType = (*it)->mimeForUti(uti); + const QString mimeType = mime->mimeForUti(uti); if (!mimeType.isNull()) return mimeType; } @@ -119,11 +105,10 @@ void unregisterMimeConverter(QUtiMimeConverter *macMime) QList<QUtiMimeConverter *> all(QUtiMimeConverter::HandlerScope scope) { MimeList ret; - MimeList *mimes = globalMimeList(); - for (MimeList::const_iterator it = mimes->constBegin(); it != mimes->constEnd(); ++it) { - const bool relevantScope = uchar((*it)->scope()) & uchar(scope); - if (relevantScope) - ret.append((*it)); + const MimeList &mimes = *globalMimeList(); + for (const auto &mime : mimes) { + if (mime->scope() & scope) + ret.append(mime); } return ret; } |