diff options
Diffstat (limited to 'src/corelib/mimetypes/qmimedatabase_p.h')
| -rw-r--r-- | src/corelib/mimetypes/qmimedatabase_p.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/corelib/mimetypes/qmimedatabase_p.h b/src/corelib/mimetypes/qmimedatabase_p.h index 2dd8ecf984..cb28f0b791 100644 --- a/src/corelib/mimetypes/qmimedatabase_p.h +++ b/src/corelib/mimetypes/qmimedatabase_p.h @@ -60,15 +60,16 @@ public: QMimeType mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device); QMimeType mimeTypeForFileExtension(const QString &fileName); QMimeType mimeTypeForData(QIODevice *device); - QMimeType mimeTypeForFile(const QString &fileName, const QFileInfo *fileInfo, QMimeDatabase::MatchMode mode); + QMimeType mimeTypeForFile(const QString &fileName, const QFileInfo &fileInfo, QMimeDatabase::MatchMode mode); QMimeType findByData(const QByteArray &data, int *priorityPtr); QStringList mimeTypeForFileName(const QString &fileName); QMimeGlobMatchResult findByFileName(const QString &fileName); // API for QMimeType. Takes care of locking the mutex. - void loadMimeTypePrivate(QMimeTypePrivate &mimePrivate); - void loadGenericIcon(QMimeTypePrivate &mimePrivate); - void loadIcon(QMimeTypePrivate &mimePrivate); + QMimeTypePrivate::LocaleHash localeComments(const QString &name); + QStringList globPatterns(const QString &name); + QString genericIcon(const QString &name); + QString icon(const QString &name); QStringList mimeParents(const QString &mimeName); QStringList listAliases(const QString &mimeName); bool mimeInherits(const QString &mime, const QString &parent); @@ -81,7 +82,7 @@ private: QString fallbackParent(const QString &mimeTypeName) const; const QString m_defaultMimeType; - mutable Providers m_providers; + mutable Providers m_providers; // most local first, most global last QElapsedTimer m_lastCheck; public: |