Change namespace; QtMedia -> QtMultimedia

1 files changed, 74 insertions, 74 deletions

diff --git a/src/multimedia/qml/qmetadatacontrolmetaobject.cpp b/src/multimedia/qml/qmetadatacontrolmetaobject.cpp
index 882d8a6..7f9575e 100644
--- a/src/multimedia/qml/qmetadatacontrolmetaobject.cpp
+++ b/src/multimedia/qml/qmetadatacontrolmetaobject.cpp
@@ -106,101 +106,101 @@ namespace
 {
     struct MetaDataKey
     {
-        QtMedia::MetaData key;
+        QtMultimedia::MetaData key;
         const char *name;
     };
 
     const MetaDataKey qt_metaDataKeys[] =
     {
-        { QtMedia::Title, "title" },
-        { QtMedia::SubTitle, "subTitle" },
-        { QtMedia::Author, "author" },
-        { QtMedia::Comment, "comment" },
-        { QtMedia::Description, "description" },
-        { QtMedia::Category, "category" },
-        { QtMedia::Genre, "genre" },
-        { QtMedia::Year, "year" },
-        { QtMedia::Date, "date" },
-        { QtMedia::UserRating, "userRating" },
-        { QtMedia::Keywords, "keywords" },
-        { QtMedia::Language, "language" },
-        { QtMedia::Publisher, "publisher" },
-        { QtMedia::Copyright, "copyright" },
-        { QtMedia::ParentalRating, "parentalRating" },
-        { QtMedia::RatingOrganisation, "ratingOrganisation" },
+        { QtMultimedia::Title, "title" },
+        { QtMultimedia::SubTitle, "subTitle" },
+        { QtMultimedia::Author, "author" },
+        { QtMultimedia::Comment, "comment" },
+        { QtMultimedia::Description, "description" },
+        { QtMultimedia::Category, "category" },
+        { QtMultimedia::Genre, "genre" },
+        { QtMultimedia::Year, "year" },
+        { QtMultimedia::Date, "date" },
+        { QtMultimedia::UserRating, "userRating" },
+        { QtMultimedia::Keywords, "keywords" },
+        { QtMultimedia::Language, "language" },
+        { QtMultimedia::Publisher, "publisher" },
+        { QtMultimedia::Copyright, "copyright" },
+        { QtMultimedia::ParentalRating, "parentalRating" },
+        { QtMultimedia::RatingOrganisation, "ratingOrganisation" },
 
         // Media
-        { QtMedia::Size, "size" },
-        { QtMedia::MediaType, "mediaType" },
+        { QtMultimedia::Size, "size" },
+        { QtMultimedia::MediaType, "mediaType" },
 //        { QtMedia::Duration, "duration" },
 
         // Audio
-        { QtMedia::AudioBitRate, "audioBitRate" },
-        { QtMedia::AudioCodec, "audioCodec" },
-        { QtMedia::AverageLevel, "averageLevel" },
-        { QtMedia::ChannelCount, "channelCount" },
-        { QtMedia::PeakValue, "peakValue" },
-        { QtMedia::SampleRate, "sampleRate" },
+        { QtMultimedia::AudioBitRate, "audioBitRate" },
+        { QtMultimedia::AudioCodec, "audioCodec" },
+        { QtMultimedia::AverageLevel, "averageLevel" },
+        { QtMultimedia::ChannelCount, "channelCount" },
+        { QtMultimedia::PeakValue, "peakValue" },
+        { QtMultimedia::SampleRate, "sampleRate" },
 
         // Music
-        { QtMedia::AlbumTitle, "albumTitle" },
-        { QtMedia::AlbumArtist, "albumArtist" },
-        { QtMedia::ContributingArtist, "contributingArtist" },
-        { QtMedia::Composer, "composer" },
-        { QtMedia::Conductor, "conductor" },
-        { QtMedia::Lyrics, "lyrics" },
-        { QtMedia::Mood, "mood" },
-        { QtMedia::TrackNumber, "trackNumber" },
-        { QtMedia::TrackCount, "trackCount" },
-
-        { QtMedia::CoverArtUrlSmall, "coverArtUrlSmall" },
-        { QtMedia::CoverArtUrlLarge, "coverArtUrlLarge" },
+        { QtMultimedia::AlbumTitle, "albumTitle" },
+        { QtMultimedia::AlbumArtist, "albumArtist" },
+        { QtMultimedia::ContributingArtist, "contributingArtist" },
+        { QtMultimedia::Composer, "composer" },
+        { QtMultimedia::Conductor, "conductor" },
+        { QtMultimedia::Lyrics, "lyrics" },
+        { QtMultimedia::Mood, "mood" },
+        { QtMultimedia::TrackNumber, "trackNumber" },
+        { QtMultimedia::TrackCount, "trackCount" },
+
+        { QtMultimedia::CoverArtUrlSmall, "coverArtUrlSmall" },
+        { QtMultimedia::CoverArtUrlLarge, "coverArtUrlLarge" },
 
         // Image/Video
-        { QtMedia::Resolution, "resolution" },
-        { QtMedia::PixelAspectRatio, "pixelAspectRatio" },
+        { QtMultimedia::Resolution, "resolution" },
+        { QtMultimedia::PixelAspectRatio, "pixelAspectRatio" },
 
         // Video
-        { QtMedia::VideoFrameRate, "videoFrameRate" },
-        { QtMedia::VideoBitRate, "videoBitRate" },
-        { QtMedia::VideoCodec, "videoCodec" },
+        { QtMultimedia::VideoFrameRate, "videoFrameRate" },
+        { QtMultimedia::VideoBitRate, "videoBitRate" },
+        { QtMultimedia::VideoCodec, "videoCodec" },
 
-        { QtMedia::PosterUrl, "posterUrl" },
+        { QtMultimedia::PosterUrl, "posterUrl" },
 
         // Movie
-        { QtMedia::ChapterNumber, "chapterNumber" },
-        { QtMedia::Director, "director" },
-        { QtMedia::LeadPerformer, "leadPerformer" },
-        { QtMedia::Writer, "writer" },
+        { QtMultimedia::ChapterNumber, "chapterNumber" },
+        { QtMultimedia::Director, "director" },
+        { QtMultimedia::LeadPerformer, "leadPerformer" },
+        { QtMultimedia::Writer, "writer" },
 
         // Photos
-        { QtMedia::CameraManufacturer, "cameraManufacturer" },
-        { QtMedia::CameraModel, "cameraModel" },
-        { QtMedia::Event, "event" },
-        { QtMedia::Subject, "subject" },
-        { QtMedia::Orientation, "orientation" },
-        { QtMedia::ExposureTime, "exposureTime" },
-        { QtMedia::FNumber, "fNumber" },
-        { QtMedia::ExposureProgram, "exposureProgram" },
-        { QtMedia::ISOSpeedRatings, "isoSpeedRatings" },
-        { QtMedia::ExposureBiasValue, "exposureBiasValue" },
-        { QtMedia::DateTimeOriginal, "dateTimeOriginal" },
-        { QtMedia::DateTimeDigitized, "dateTimeDigitized" },
-        { QtMedia::SubjectDistance, "subjectDistance" },
-        { QtMedia::MeteringMode, "meteringMode" },
-        { QtMedia::LightSource, "lightSource" },
-        { QtMedia::Flash, "flash" },
-        { QtMedia::FocalLength, "focalLength" },
-        { QtMedia::ExposureMode, "exposureMode" },
-        { QtMedia::WhiteBalance, "whiteBalance" },
-        { QtMedia::DigitalZoomRatio, "digitalZoomRatio" },
-        { QtMedia::FocalLengthIn35mmFilm, "focalLengthIn35mmFilm" },
-        { QtMedia::SceneCaptureType, "sceneCaptureType" },
-        { QtMedia::GainControl, "gainControl" },
-        { QtMedia::Contrast, "contrast" },
-        { QtMedia::Saturation, "saturation" },
-        { QtMedia::Sharpness, "sharpness" },
-        { QtMedia::DeviceSettingDescription, "deviceSettingDescription" }
+        { QtMultimedia::CameraManufacturer, "cameraManufacturer" },
+        { QtMultimedia::CameraModel, "cameraModel" },
+        { QtMultimedia::Event, "event" },
+        { QtMultimedia::Subject, "subject" },
+        { QtMultimedia::Orientation, "orientation" },
+        { QtMultimedia::ExposureTime, "exposureTime" },
+        { QtMultimedia::FNumber, "fNumber" },
+        { QtMultimedia::ExposureProgram, "exposureProgram" },
+        { QtMultimedia::ISOSpeedRatings, "isoSpeedRatings" },
+        { QtMultimedia::ExposureBiasValue, "exposureBiasValue" },
+        { QtMultimedia::DateTimeOriginal, "dateTimeOriginal" },
+        { QtMultimedia::DateTimeDigitized, "dateTimeDigitized" },
+        { QtMultimedia::SubjectDistance, "subjectDistance" },
+        { QtMultimedia::MeteringMode, "meteringMode" },
+        { QtMultimedia::LightSource, "lightSource" },
+        { QtMultimedia::Flash, "flash" },
+        { QtMultimedia::FocalLength, "focalLength" },
+        { QtMultimedia::ExposureMode, "exposureMode" },
+        { QtMultimedia::WhiteBalance, "whiteBalance" },
+        { QtMultimedia::DigitalZoomRatio, "digitalZoomRatio" },
+        { QtMultimedia::FocalLengthIn35mmFilm, "focalLengthIn35mmFilm" },
+        { QtMultimedia::SceneCaptureType, "sceneCaptureType" },
+        { QtMultimedia::GainControl, "gainControl" },
+        { QtMultimedia::Contrast, "contrast" },
+        { QtMultimedia::Saturation, "saturation" },
+        { QtMultimedia::Sharpness, "sharpness" },
+        { QtMultimedia::DeviceSettingDescription, "deviceSettingDescription" }
     };
 
     class QMetaDataControlObject : public QObject