Use US spelling for organization.

Since it seems it was never implemented, don't keep the
legacy spelling.

Change-Id: Idc918548a4ed643ba7da35e97ce08f401e74303f
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

8 files changed, 12 insertions, 12 deletions

diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index 04085edfc..a09c342b2 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -479,12 +479,12 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.ratingOrganisation
+    \qmlproperty variant Audio::metaData.ratingOrganization
 
-    This property holds the name of the rating organisation responsible for the
+    This property holds the name of the rating organization responsible for the
     parental rating of the media.
 
-    \sa {QtMultimedia::RatingOrganisation}
+    \sa {QtMultimedia::RatingOrganization}
 */
 
 /*!
diff --git a/src/imports/multimedia/qdeclarativemediametadata_p.h b/src/imports/multimedia/qdeclarativemediametadata_p.h
index c082c11e5..c67507472 100644
--- a/src/imports/multimedia/qdeclarativemediametadata_p.h
+++ b/src/imports/multimedia/qdeclarativemediametadata_p.h
@@ -79,7 +79,7 @@ class QDeclarativeMediaMetaData : public QObject
     Q_PROPERTY(QVariant publisher READ publisher NOTIFY metaDataChanged)
     Q_PROPERTY(QVariant copyright READ copyright NOTIFY metaDataChanged)
     Q_PROPERTY(QVariant parentalRating READ parentalRating NOTIFY metaDataChanged)
-    Q_PROPERTY(QVariant ratingOrganisation READ ratingOrganisation NOTIFY metaDataChanged)
+    Q_PROPERTY(QVariant ratingOrganization READ ratingOrganization NOTIFY metaDataChanged)
     Q_PROPERTY(QVariant size READ size NOTIFY metaDataChanged)
     Q_PROPERTY(QVariant mediaType READ mediaType NOTIFY metaDataChanged)
     Q_PROPERTY(QVariant duration READ duration NOTIFY metaDataChanged)
@@ -132,8 +132,8 @@ public:
     QVariant publisher() const { return m_control->metaData(QtMultimedia::Publisher); }
     QVariant copyright() const { return m_control->metaData(QtMultimedia::Copyright); }
     QVariant parentalRating() const { return m_control->metaData(QtMultimedia::ParentalRating); }
-    QVariant ratingOrganisation() const {
-        return m_control->metaData(QtMultimedia::RatingOrganisation); }
+    QVariant ratingOrganization() const {
+        return m_control->metaData(QtMultimedia::RatingOrganization); }
     QVariant size() const { return m_control->metaData(QtMultimedia::Size); }
     QVariant mediaType() const { return m_control->metaData(QtMultimedia::MediaType); }
     QVariant duration() const { return m_control->metaData(QtMultimedia::Duration); }
diff --git a/src/multimedia/qtmedianamespace.cpp b/src/multimedia/qtmedianamespace.cpp
index 24a63e354..b228dad34 100644
--- a/src/multimedia/qtmedianamespace.cpp
+++ b/src/multimedia/qtmedianamespace.cpp
@@ -86,7 +86,7 @@ namespace
     \value Publisher The publisher of the media.  QString.
     \value Copyright The media's copyright notice.  QString.
     \value ParentalRating  The parental rating of the media.  QString.
-    \value RatingOrganisation The organisation responsible for the parental rating of the media.
+    \value RatingOrganization The organization responsible for the parental rating of the media.
     QString.
 
     Media attributes
diff --git a/src/multimedia/qtmedianamespace.h b/src/multimedia/qtmedianamespace.h
index 25c27b14f..d295f6067 100644
--- a/src/multimedia/qtmedianamespace.h
+++ b/src/multimedia/qtmedianamespace.h
@@ -73,7 +73,7 @@ namespace QtMultimedia
         Publisher,
         Copyright,
         ParentalRating,
-        RatingOrganisation,
+        RatingOrganization,
 
         // Media
         Size,
diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
index acf4c09db..1a133831e 100644
--- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp
+++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
@@ -76,7 +76,7 @@ static const QWMMetaDataKeyLookup qt_wmMetaDataKeys[] =
     { QtMultimedia::Publisher, L"WM/Publisher" },
     { QtMultimedia::Copyright, L"Copyright" },
     { QtMultimedia::ParentalRating, L"ParentalRating" },
-    { QtMultimedia::RatingOrganisation, L"RatingOrganisation" },
+    { QtMultimedia::RatingOrganization, L"RatingOrganisation" },
 
     // Media
     { QtMultimedia::Size, L"FileSize" },
diff --git a/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp b/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
index 48ff6cfcd..b0e899fc0 100644
--- a/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
@@ -67,7 +67,7 @@ static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
     { QtMultimedia::Publisher, GST_TAG_ORGANIZATION },
     { QtMultimedia::Copyright, GST_TAG_COPYRIGHT },
     //{ QtMultimedia::ParentalRating, 0 },
-    //{ QtMultimedia::RatingOrganisation, 0 },
+    //{ QtMultimedia::RatingOrganization, 0 },
 
     // Media
     //{ QtMultimedia::Size, 0 },
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
index 99606c1b3..958a07ef5 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
@@ -67,7 +67,7 @@ static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
     { QtMultimedia::Publisher, GST_TAG_ORGANIZATION },
     { QtMultimedia::Copyright, GST_TAG_COPYRIGHT },
     //{ QtMultimedia::ParentalRating, 0 },
-    //{ QtMultimedia::RatingOrganisation, 0 },
+    //{ QtMultimedia::RatingOrganization, 0 },
 
     // Media
     //{ QtMultimedia::Size, 0 },
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
index d68ca73a4..6da2919a3 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
@@ -70,7 +70,7 @@ static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
     { QtMultimedia::Publisher, GST_TAG_ORGANIZATION },
     { QtMultimedia::Copyright, GST_TAG_COPYRIGHT },
     //{ QtMultimedia::ParentalRating, 0 },
-    //{ QtMultimedia::RatingOrganisation, 0 },
+    //{ QtMultimedia::RatingOrganization, 0 },
 
     // Media
     //{ QtMultimedia::Size, 0 },