diff options
Diffstat (limited to 'src/imports/mimetypes')
| -rw-r--r-- | src/imports/mimetypes/plugins.qmltypes | 2 | ||||
| -rw-r--r-- | src/imports/mimetypes/qdeclarativemimedatabase.cpp | 6 | ||||
| -rw-r--r-- | src/imports/mimetypes/qdeclarativemimedatabase_p.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/mimetypes/plugins.qmltypes b/src/imports/mimetypes/plugins.qmltypes index 1f45f3c..3a2f099 100644 --- a/src/imports/mimetypes/plugins.qmltypes +++ b/src/imports/mimetypes/plugins.qmltypes @@ -15,7 +15,7 @@ Module { Parameter { name: "nameOrAlias"; type: "string" } } Method { - name: "findByName" + name: "findByFileName" type: "QDeclarativeMimeType*" Parameter { name: "fileName"; type: "string" } } diff --git a/src/imports/mimetypes/qdeclarativemimedatabase.cpp b/src/imports/mimetypes/qdeclarativemimedatabase.cpp index 7130191..51ea784 100644 --- a/src/imports/mimetypes/qdeclarativemimedatabase.cpp +++ b/src/imports/mimetypes/qdeclarativemimedatabase.cpp @@ -155,7 +155,7 @@ QDeclarativeMimeType *QDeclarativeMimeDatabase::mimeTypeForName ( // ------------------------------------------------------------------------------------------------ /*! - \qmlmethod MimeType MimeDatabase::findByName(string fileName) + \qmlmethod MimeType MimeDatabase::findByFileName(string fileName) \brief Returns a MIME type for the file \a fileName. A valid MIME type is always returned. If the file name doesn't match any @@ -165,12 +165,12 @@ QDeclarativeMimeType *QDeclarativeMimeDatabase::mimeTypeForName ( This function does not try to open the file. To also use the content when determining the MIME type, use findByFile(). */ -QDeclarativeMimeType *QDeclarativeMimeDatabase::findByName ( +QDeclarativeMimeType *QDeclarativeMimeDatabase::findByFileName ( const QString &fileName ) { return new QDeclarativeMimeType ( - m_MimeDatabase.findByName(fileName), + m_MimeDatabase.findByFileName(fileName), this // <- The new object will be released later // when this registry is released. ); diff --git a/src/imports/mimetypes/qdeclarativemimedatabase_p.h b/src/imports/mimetypes/qdeclarativemimedatabase_p.h index 25973ec..7d49fdf 100644 --- a/src/imports/mimetypes/qdeclarativemimedatabase_p.h +++ b/src/imports/mimetypes/qdeclarativemimedatabase_p.h @@ -76,7 +76,7 @@ public: const QString &nameOrAlias ); - Q_INVOKABLE QDeclarativeMimeType *findByName ( + Q_INVOKABLE QDeclarativeMimeType *findByFileName ( const QString &fileName ); |