slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use US spelling for organization.

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

Change-Id: Idc918548a4ed643ba7da35e97ce08f401e74303f
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2012-01-17 14:34:29 +10:00
committed by Qt by Nokia
parent 39e6da8f8e
commit f050d8fe2b
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/imports/multimedia/qdeclarativeaudio.cpp
View File

@@ -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. parental rating of the media.
\sa {QtMultimedia::RatingOrganisation} \sa {QtMultimedia::RatingOrganization}
*/ */
/*! /*!

6
src/imports/multimedia/qdeclarativemediametadata_p.h
View File

@@ -79,7 +79,7 @@ class QDeclarativeMediaMetaData : public QObject
Q_PROPERTY(QVariant publisher READ publisher NOTIFY metaDataChanged) Q_PROPERTY(QVariant publisher READ publisher NOTIFY metaDataChanged)
Q_PROPERTY(QVariant copyright READ copyright NOTIFY metaDataChanged) Q_PROPERTY(QVariant copyright READ copyright NOTIFY metaDataChanged)
Q_PROPERTY(QVariant parentalRating READ parentalRating 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 size READ size NOTIFY metaDataChanged)
Q_PROPERTY(QVariant mediaType READ mediaType NOTIFY metaDataChanged) Q_PROPERTY(QVariant mediaType READ mediaType NOTIFY metaDataChanged)
Q_PROPERTY(QVariant duration READ duration 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 publisher() const { return m_control->metaData(QtMultimedia::Publisher); }
QVariant copyright() const { return m_control->metaData(QtMultimedia::Copyright); } QVariant copyright() const { return m_control->metaData(QtMultimedia::Copyright); }
QVariant parentalRating() const { return m_control->metaData(QtMultimedia::ParentalRating); } QVariant parentalRating() const { return m_control->metaData(QtMultimedia::ParentalRating); }
QVariant ratingOrganisation() const { QVariant ratingOrganization() const {
return m_control->metaData(QtMultimedia::RatingOrganisation); } return m_control->metaData(QtMultimedia::RatingOrganization); }
QVariant size() const { return m_control->metaData(QtMultimedia::Size); } QVariant size() const { return m_control->metaData(QtMultimedia::Size); }
QVariant mediaType() const { return m_control->metaData(QtMultimedia::MediaType); } QVariant mediaType() const { return m_control->metaData(QtMultimedia::MediaType); }
QVariant duration() const { return m_control->metaData(QtMultimedia::Duration); } QVariant duration() const { return m_control->metaData(QtMultimedia::Duration); }

2
src/multimedia/qtmedianamespace.cpp
View File

@@ -86,7 +86,7 @@ namespace
\value Publisher The publisher of the media. QString. \value Publisher The publisher of the media. QString.
\value Copyright The media's copyright notice. QString. \value Copyright The media's copyright notice. QString.
\value ParentalRating The parental rating of the media. 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. QString.
Media attributes Media attributes

2
src/multimedia/qtmedianamespace.h
View File

@@ -73,7 +73,7 @@ namespace QtMultimedia
Publisher, Publisher,
Copyright, Copyright,
ParentalRating, ParentalRating,
RatingOrganisation, RatingOrganization,
// Media // Media
Size, Size,

2
src/plugins/directshow/player/directshowmetadatacontrol.cpp
View File

@@ -76,7 +76,7 @@ static const QWMMetaDataKeyLookup qt_wmMetaDataKeys[] =
{ QtMultimedia::Publisher, L"WM/Publisher" }, { QtMultimedia::Publisher, L"WM/Publisher" },
{ QtMultimedia::Copyright, L"Copyright" }, { QtMultimedia::Copyright, L"Copyright" },
{ QtMultimedia::ParentalRating, L"ParentalRating" }, { QtMultimedia::ParentalRating, L"ParentalRating" },
{ QtMultimedia::RatingOrganisation, L"RatingOrganisation" }, { QtMultimedia::RatingOrganization, L"RatingOrganisation" },
// Media // Media
{ QtMultimedia::Size, L"FileSize" }, { QtMultimedia::Size, L"FileSize" },

2
src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
View File

@@ -67,7 +67,7 @@ static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
{ QtMultimedia::Publisher, GST_TAG_ORGANIZATION }, { QtMultimedia::Publisher, GST_TAG_ORGANIZATION },
{ QtMultimedia::Copyright, GST_TAG_COPYRIGHT }, { QtMultimedia::Copyright, GST_TAG_COPYRIGHT },
//{ QtMultimedia::ParentalRating, 0 }, //{ QtMultimedia::ParentalRating, 0 },
//{ QtMultimedia::RatingOrganisation, 0 }, //{ QtMultimedia::RatingOrganization, 0 },
// Media // Media
//{ QtMultimedia::Size, 0 }, //{ QtMultimedia::Size, 0 },

2
src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
View File

@@ -67,7 +67,7 @@ static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
{ QtMultimedia::Publisher, GST_TAG_ORGANIZATION }, { QtMultimedia::Publisher, GST_TAG_ORGANIZATION },
{ QtMultimedia::Copyright, GST_TAG_COPYRIGHT }, { QtMultimedia::Copyright, GST_TAG_COPYRIGHT },
//{ QtMultimedia::ParentalRating, 0 }, //{ QtMultimedia::ParentalRating, 0 },
//{ QtMultimedia::RatingOrganisation, 0 }, //{ QtMultimedia::RatingOrganization, 0 },
// Media // Media
//{ QtMultimedia::Size, 0 }, //{ QtMultimedia::Size, 0 },

2
src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
View File

@@ -70,7 +70,7 @@ static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
{ QtMultimedia::Publisher, GST_TAG_ORGANIZATION }, { QtMultimedia::Publisher, GST_TAG_ORGANIZATION },
{ QtMultimedia::Copyright, GST_TAG_COPYRIGHT }, { QtMultimedia::Copyright, GST_TAG_COPYRIGHT },
//{ QtMultimedia::ParentalRating, 0 }, //{ QtMultimedia::ParentalRating, 0 },
//{ QtMultimedia::RatingOrganisation, 0 }, //{ QtMultimedia::RatingOrganization, 0 },
// Media // Media
//{ QtMultimedia::Size, 0 }, //{ QtMultimedia::Size, 0 },