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>

3 files changed, 29 insertions, 29 deletions

diff --git a/unittests/declarative/tst_declarative_mimetypes.qml b/unittests/declarative/tst_declarative_mimetypes.qml
index c15357a..8f7b4a8 100644
--- a/unittests/declarative/tst_declarative_mimetypes.qml
+++ b/unittests/declarative/tst_declarative_mimetypes.qml
@@ -58,7 +58,7 @@ TestCase {
         return "/usr/share/icons/oxygen/64x64/mimetypes/image-x-generic.png"
     }
 
-    function firstPngMimeTypeFileExtention() {
+    function firstPngMimeTypeFilenameExtension() {
         return ".png"
     }
 
@@ -67,7 +67,7 @@ TestCase {
         name: pngMimeTypeName()
         displayName: pngMimeTypeDisplayName()
         iconUrl: pngMimeTypeIconUrl()
-        fileExtentions: [ firstPngMimeTypeFileExtention() ]
+        filenameExtensions: [ firstPngMimeTypeFilenameExtension() ]
     }
 
     MimeType {
@@ -120,14 +120,14 @@ TestCase {
         compare(instantiatedPngMimeType.equals(otherPngMimeType), false)
     }
 
-    function test_MimeType_fileExtentions() {
+    function test_MimeType_filenameExtensions() {
         otherPngMimeType.assign(instantiatedPngMimeType)
-        otherPngMimeType.fileExtentions = []
-        compare(otherPngMimeType.fileExtentions.length, 0)
+        otherPngMimeType.filenameExtensions = []
+        compare(otherPngMimeType.filenameExtensions.length, 0)
 
         // Verify that the Id is part of the equality test:
-        compare(instantiatedPngMimeType.fileExtentions.length, 1)
-        compare(instantiatedPngMimeType.fileExtentions[0], ".png")
+        compare(instantiatedPngMimeType.filenameExtensions.length, 1)
+        compare(instantiatedPngMimeType.filenameExtensions[0], ".png")
 
         compare(instantiatedPngMimeType.equals(otherPngMimeType), false)
     }
@@ -213,11 +213,11 @@ TestCase {
         compare(1, 0)
     }
 
-    function test_MimeTypeRegistry_fileExtentions() {
+    function test_MimeTypeRegistry_filenameExtensions() {
         compare(1, 0)
     }
 
-    function test_MimeTypeRegistry_extractFileExtention() {
+    function test_MimeTypeRegistry_extractFilenameExtension() {
         compare(1, 0)
     }
 
diff --git a/unittests/tst_mimetypes-empty.cpp b/unittests/tst_mimetypes-empty.cpp
index 3e8c7b2..9625918 100644
--- a/unittests/tst_mimetypes-empty.cpp
+++ b/unittests/tst_mimetypes-empty.cpp
@@ -77,7 +77,7 @@ static const QString &pngMimeTypeIconUrl()
 
 // ------------------------------------------------------------------------------------------------
 
-static QList<QString> buildPngMimeTypeFileExtentions()
+static QList<QString> buildPngMimeTypeFilenameExtensions()
 {
     QList<QString> result;
     result << ".png";
@@ -86,9 +86,9 @@ static QList<QString> buildPngMimeTypeFileExtentions()
 
 // ------------------------------------------------------------------------------------------------
 
-static const QList<QString> &pngMimeTypeFileExtentions()
+static const QList<QString> &pngMimeTypeFilenameExtensions()
 {
-    static const QList<QString> result (buildPngMimeTypeFileExtentions());
+    static const QList<QString> result (buildPngMimeTypeFilenameExtensions());
     return result;
 }
 
@@ -97,7 +97,7 @@ static const QList<QString> &pngMimeTypeFileExtentions()
 void tst_mimetypes::test_QMimeType_isValid()
 {
     QMimeType instantiatedPngMimeType (
-                  pngMimeTypeName(), pngMimeTypeDisplayName(), pngMimeTypeIconUrl(), pngMimeTypeFileExtentions()
+                  pngMimeTypeName(), pngMimeTypeDisplayName(), pngMimeTypeIconUrl(), pngMimeTypeFilenameExtensions()
               );
 
     QVERIFY(instantiatedPngMimeType.isValid());
@@ -117,11 +117,11 @@ void tst_mimetypes::test_QMimeType_isValid()
 void tst_mimetypes::test_QMimeType_name()
 {
     QMimeType instantiatedPngMimeType (
-                  pngMimeTypeName(), pngMimeTypeDisplayName(), pngMimeTypeIconUrl(), pngMimeTypeFileExtentions()
+                  pngMimeTypeName(), pngMimeTypeDisplayName(), pngMimeTypeIconUrl(), pngMimeTypeFilenameExtensions()
               );
 
     QMimeType otherPngMimeType (
-                  QMimeTypeName(), pngMimeTypeDisplayName(), pngMimeTypeIconUrl(), pngMimeTypeFileExtentions()
+                  QMimeTypeName(), pngMimeTypeDisplayName(), pngMimeTypeIconUrl(), pngMimeTypeFilenameExtensions()
               );
 
     // Verify that the Id is part of the equality test:
@@ -135,11 +135,11 @@ void tst_mimetypes::test_QMimeType_name()
 void tst_mimetypes::test_QMimeType_displayName()
 {
     QMimeType instantiatedPngMimeType (
-                  pngMimeTypeName(), pngMimeTypeDisplayName(), pngMimeTypeIconUrl(), pngMimeTypeFileExtentions()
+                  pngMimeTypeName(), pngMimeTypeDisplayName(), pngMimeTypeIconUrl(), pngMimeTypeFilenameExtensions()
               );
 
     QMimeType otherPngMimeType (
-                  pngMimeTypeName(), QString(), pngMimeTypeIconUrl(), pngMimeTypeFileExtentions()
+                  pngMimeTypeName(), QString(), pngMimeTypeIconUrl(), pngMimeTypeFilenameExtensions()
               );
 
     // Verify that the IconUrl is part of the equality test:
@@ -153,11 +153,11 @@ void tst_mimetypes::test_QMimeType_displayName()
 void tst_mimetypes::test_QMimeType_iconUrl()
 {
     QMimeType instantiatedPngMimeType (
-                  pngMimeTypeName(), pngMimeTypeDisplayName(), pngMimeTypeIconUrl(), pngMimeTypeFileExtentions()
+                  pngMimeTypeName(), pngMimeTypeDisplayName(), pngMimeTypeIconUrl(), pngMimeTypeFilenameExtensions()
               );
 
     QMimeType otherPngMimeType (
-                  pngMimeTypeName(), pngMimeTypeDisplayName(), QString(), pngMimeTypeFileExtentions()
+                  pngMimeTypeName(), pngMimeTypeDisplayName(), QString(), pngMimeTypeFilenameExtensions()
               );
 
     // Verify that the IconUrl is part of the equality test:
@@ -168,18 +168,18 @@ void tst_mimetypes::test_QMimeType_iconUrl()
 
 // ------------------------------------------------------------------------------------------------
 
-void tst_mimetypes::test_QMimeType_fileExtentions()
+void tst_mimetypes::test_QMimeType_filenameExtensions()
 {
     QMimeType instantiatedPngMimeType (
-                  pngMimeTypeName(), pngMimeTypeDisplayName(), pngMimeTypeIconUrl(), pngMimeTypeFileExtentions()
+                  pngMimeTypeName(), pngMimeTypeDisplayName(), pngMimeTypeIconUrl(), pngMimeTypeFilenameExtensions()
               );
 
     QMimeType otherPngMimeType (
                   pngMimeTypeName(), pngMimeTypeDisplayName(), pngMimeTypeIconUrl(), QList<QString>()
               );
 
-    // Verify that the FileExtentions are part of the equality test:
-    QCOMPARE(instantiatedPngMimeType.fileExtentions(), pngMimeTypeFileExtentions());
+    // Verify that the FilenameExtensions are part of the equality test:
+    QCOMPARE(instantiatedPngMimeType.filenameExtensions(), pngMimeTypeFilenameExtensions());
 
     QVERIFY(instantiatedPngMimeType != otherPngMimeType);
 }
@@ -290,7 +290,7 @@ const QMimeType &pngMimeType()
                                pngMimeTypeName(),
                                pngMimeTypeDisplayName(),
                                pngMimeTypeIconUrl(),
-                               pngMimeTypeFileExtentions()
+                               pngMimeTypeFilenameExtensions()
                            );
     return result;
 }
@@ -309,14 +309,14 @@ void tst_mimetypes::test_QMimeTypeRegistry_findMimeType()
 
 // ------------------------------------------------------------------------------------------------
 
-void tst_mimetypes::test_QMimeTypeRegistry_fileExtentions()
+void tst_mimetypes::test_QMimeTypeRegistry_filenameExtensions()
 {
     QVERIFY(false);
 }
 
 // ------------------------------------------------------------------------------------------------
 
-void tst_mimetypes::test_QMimeTypeRegistry_extractFileExtention()
+void tst_mimetypes::test_QMimeTypeRegistry_extractFilenameExtension()
 {
     QVERIFY(false);
 }
diff --git a/unittests/tst_mimetypes.h b/unittests/tst_mimetypes.h
index 19d2162..3e73bab 100644
--- a/unittests/tst_mimetypes.h
+++ b/unittests/tst_mimetypes.h
@@ -55,7 +55,7 @@ private slots:
     void test_QMimeType_name();
     void test_QMimeType_displayName();
     void test_QMimeType_iconUrl();
-    void test_QMimeType_fileExtentions();
+    void test_QMimeType_filenameExtensions();
 
     void test_QServiceAction_isValid();
     void test_QServiceAction_name();
@@ -64,8 +64,8 @@ private slots:
 
     void test_QMimeTypeRegistry_mimeTypes();
     void test_QMimeTypeRegistry_findMimeType();
-    void test_QMimeTypeRegistry_fileExtentions();
-    void test_QMimeTypeRegistry_extractFileExtention();
+    void test_QMimeTypeRegistry_filenameExtensions();
+    void test_QMimeTypeRegistry_extractFilenameExtension();
     void test_QMimeTypeRegistry_findMimeTypes();
     void test_QMimeTypeRegistry_determineMimeType();
     void test_QMimeTypeRegistry_serviceActions();