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>

4 files changed, 28 insertions, 28 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);
diff --git a/src/imports/mimetypes/qdeclarativemimetype_p.h b/src/imports/mimetypes/qdeclarativemimetype_p.h
index 5b147e3..c739900 100644
--- a/src/imports/mimetypes/qdeclarativemimetype_p.h
+++ b/src/imports/mimetypes/qdeclarativemimetype_p.h
@@ -66,9 +66,9 @@ class QDeclarativeMimeType : public QObject
                READ iconUrl
                WRITE setIconUrl)
 
-    Q_PROPERTY(QVariantList fileExtentions
-               READ fileExtentions
-               WRITE setFileExtentions
+    Q_PROPERTY(QVariantList filenameExtensions
+               READ filenameExtensions
+               WRITE setFilenameExtensions
                STORED false)
 
     Q_PROPERTY(bool isValid
@@ -101,8 +101,8 @@ public:
     void setDisplayName(const QString &newDisplayName);
     const QString &iconUrl() const;
     void setIconUrl(const QString &newIconUrl);
-    QVariantList fileExtentions() const;
-    void setFileExtentions(const QVariantList &newFileExtentions);
+    QVariantList filenameExtensions() const;
+    void setFilenameExtensions(const QVariantList &newFilenameExtensions);
 
 private:
     QMimeType m_MimeType;
diff --git a/src/imports/mimetypes/qdeclarativemimetyperegistry.cpp b/src/imports/mimetypes/qdeclarativemimetyperegistry.cpp
index 5794c0f..c49e2a5 100644
--- a/src/imports/mimetypes/qdeclarativemimetyperegistry.cpp
+++ b/src/imports/mimetypes/qdeclarativemimetyperegistry.cpp
@@ -95,12 +95,12 @@ QDeclarativeMimeType *QDeclarativeMimeTypeRegistry::findMimeType (
 
 // ------------------------------------------------------------------------------------------------
 
-QVariantList QDeclarativeMimeTypeRegistry::fileExtentions() const
+QVariantList QDeclarativeMimeTypeRegistry::filenameExtensions() const
 {
     QVariantList result;
 
-    foreach (const QString &fileExtention, m_MimeTypeRegistry.fileExtentions()) {
-        result << fileExtention;
+    foreach (const QString &filenameExtension, m_MimeTypeRegistry.filenameExtensions()) {
+        result << filenameExtension;
     }
 
     return result;
@@ -108,22 +108,22 @@ QVariantList QDeclarativeMimeTypeRegistry::fileExtentions() const
 
 // ------------------------------------------------------------------------------------------------
 
-QString QDeclarativeMimeTypeRegistry::extractFileExtention (
+QString QDeclarativeMimeTypeRegistry::extractFilenameExtension (
                                           const QString &fileName
                                       ) const
 {
-    return m_MimeTypeRegistry.extractFileExtention(fileName);
+    return m_MimeTypeRegistry.extractFilenameExtension(fileName);
 }
 
 // ------------------------------------------------------------------------------------------------
 
 QVariantList QDeclarativeMimeTypeRegistry::findMimeTypes (
-                                               const QString &fileExtention
+                                               const QString &filenameExtension
                                            ) const
 {
     QVariantList result;
 
-    foreach (const QMimeTypeName &mimeTypeName, m_MimeTypeRegistry.findMimeTypes(fileExtention)) {
+    foreach (const QMimeTypeName &mimeTypeName, m_MimeTypeRegistry.findMimeTypes(filenameExtension)) {
         result << mimeTypeName;
     }
 
diff --git a/src/imports/mimetypes/qdeclarativemimetyperegistry_p.h b/src/imports/mimetypes/qdeclarativemimetyperegistry_p.h
index 58c0bea..6e23b52 100644
--- a/src/imports/mimetypes/qdeclarativemimetyperegistry_p.h
+++ b/src/imports/mimetypes/qdeclarativemimetyperegistry_p.h
@@ -61,8 +61,8 @@ class QDeclarativeMimeTypeRegistry : public QObject
                READ mimeTypes
                STORED false)
 
-    Q_PROPERTY(QVariantList fileExtentions
-               READ fileExtentions
+    Q_PROPERTY(QVariantList filenameExtensions
+               READ filenameExtensions
                STORED false)
 
     Q_PROPERTY(QVariantList serviceActions
@@ -89,14 +89,14 @@ public:
 
     // --------------------------------------------------------------------------------------------
 
-    QVariantList fileExtentions() const;
+    QVariantList filenameExtensions() const;
 
-    Q_INVOKABLE QString extractFileExtention (
+    Q_INVOKABLE QString extractFilenameExtension (
                             const QString &fileName
                         ) const;
 
     Q_INVOKABLE QVariantList findMimeTypes (
-                                 const QString &fileExtention
+                                 const QString &filenameExtension
                              ) const;
 
     // --------------------------------------------------------------------------------------------