diff options
| author | Wolf-Michael Bolle <wolf-michael.bolle@nokia.com> | 2011-09-19 11:35:22 +0200 |
|---|---|---|
| committer | Wolf-Michael Bolle <wolf-michael.bolle@nokia.com> | 2011-09-19 11:36:50 +0200 |
| commit | caff2617fc831a3a3b6c8ef43a2b7b098df16a03 (patch) | |
| tree | a1177e8ba93b6a0df7308105cac85b8e83beb2eb /src/imports/mimetypes/qdeclarativemimetype.cpp | |
| parent | fe6ae1932a2510ee748659901c2ed8565225e698 (diff) | |
Corrected file extention to filename extension.
Change-Id: Ic3853ace953678878659d86769f696846fffbc84
Reviewed-on: http://codereview.qt-project.org/5125
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Wolf-Michael Bolle <wolf-michael.bolle@nokia.com>
Diffstat (limited to 'src/imports/mimetypes/qdeclarativemimetype.cpp')
| -rw-r--r-- | src/imports/mimetypes/qdeclarativemimetype.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/imports/mimetypes/qdeclarativemimetype.cpp b/src/imports/mimetypes/qdeclarativemimetype.cpp index 558d633..f3bae8d 100644 --- a/src/imports/mimetypes/qdeclarativemimetype.cpp +++ b/src/imports/mimetypes/qdeclarativemimetype.cpp @@ -113,7 +113,7 @@ const QMimeTypeName &QDeclarativeMimeType::name() const void QDeclarativeMimeType::setName(const QMimeTypeName &newName) { - m_MimeType = QMimeType(newName, m_MimeType.displayName(), m_MimeType.iconUrl(), m_MimeType.fileExtentions()); + m_MimeType = QMimeType(newName, m_MimeType.displayName(), m_MimeType.iconUrl(), m_MimeType.filenameExtensions()); } // ------------------------------------------------------------------------------------------------ @@ -127,7 +127,7 @@ const QString &QDeclarativeMimeType::displayName() const void QDeclarativeMimeType::setDisplayName(const QString &newDisplayName) { - m_MimeType = QMimeType(m_MimeType.name(), newDisplayName, m_MimeType.iconUrl(), m_MimeType.fileExtentions()); + m_MimeType = QMimeType(m_MimeType.name(), newDisplayName, m_MimeType.iconUrl(), m_MimeType.filenameExtensions()); } // ------------------------------------------------------------------------------------------------ @@ -141,17 +141,17 @@ const QString &QDeclarativeMimeType::iconUrl() const void QDeclarativeMimeType::setIconUrl(const QString &newIconUrl) { - m_MimeType = QMimeType(m_MimeType.name(), m_MimeType.displayName(), newIconUrl, m_MimeType.fileExtentions()); + m_MimeType = QMimeType(m_MimeType.name(), m_MimeType.displayName(), newIconUrl, m_MimeType.filenameExtensions()); } // ------------------------------------------------------------------------------------------------ -QVariantList QDeclarativeMimeType::fileExtentions() const +QVariantList QDeclarativeMimeType::filenameExtensions() const { QVariantList result; - foreach (const QString &fileExtention, m_MimeType.fileExtentions()) { - result << fileExtention; + foreach (const QString &filenameExtension, m_MimeType.filenameExtensions()) { + result << filenameExtension; } return result; @@ -159,17 +159,17 @@ QVariantList QDeclarativeMimeType::fileExtentions() const // ------------------------------------------------------------------------------------------------ -void QDeclarativeMimeType::setFileExtentions(const QVariantList &newFileExtentions) +void QDeclarativeMimeType::setFilenameExtensions(const QVariantList &newFilenameExtensions) { QList<QString> result; - foreach (const QVariant &newFileExtention, newFileExtentions) { - if (newFileExtention.type() != QVariant::String) { - qWarning() << Q_FUNC_INFO << "newFileExtention" << newFileExtention << " is not a string!"; + foreach (const QVariant &newFilenameExtension, newFilenameExtensions) { + if (newFilenameExtension.type() != QVariant::String) { + qWarning() << Q_FUNC_INFO << "newFilenameExtension" << newFilenameExtension << " is not a string!"; continue; } - result << newFileExtention.toString(); + result << newFilenameExtension.toString(); } m_MimeType = QMimeType(m_MimeType.name(), m_MimeType.displayName(), m_MimeType.iconUrl(), result); |