From 03f22bcdaf1f80083618856d6e4140d3062f175b Mon Sep 17 00:00:00 2001
From: Michael Goddard <michael.goddard@nokia.com>
Date: Thu, 6 Oct 2011 14:31:58 +1000
Subject: Rename QtMultimediaKit to QtMultimedia.

There are a few legacy bits left in place so it passes CI, and
then qt5.git etc can be updated.

Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a
Reviewed-on: http://codereview.qt-project.org/5368
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
---
 src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp')

diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
index 7fb5599c2..7aef9065e 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
@@ -1219,7 +1219,7 @@ void QGstreamerPlayerSession::getStreamsInfo()
 
         for (int i=0; i<m_streamTypes.count(); i++) {
             QMediaStreamsControl::StreamType streamType = m_streamTypes[i];
-            QMap<QtMultimediaKit::MetaData, QVariant> streamProperties;
+            QMap<QtMultimedia::MetaData, QVariant> streamProperties;
 
             int streamIndex = i - m_playbin2StreamOffset[streamType];
 
@@ -1241,7 +1241,7 @@ void QGstreamerPlayerSession::getStreamsInfo()
             if (tags && gst_is_tag_list(tags)) {
                 gchar *languageCode = 0;
                 if (gst_tag_list_get_string(tags, GST_TAG_LANGUAGE_CODE, &languageCode))
-                    streamProperties[QtMultimediaKit::Language] = QString::fromUtf8(languageCode);
+                    streamProperties[QtMultimedia::Language] = QString::fromUtf8(languageCode);
 
                 //qDebug() << "language for setream" << i << QString::fromUtf8(languageCode);
                 g_free (languageCode);
@@ -1301,8 +1301,8 @@ void QGstreamerPlayerSession::getStreamsInfo()
                 break;
             }
 
-            QMap<QtMultimediaKit::MetaData, QVariant> streamProperties;
-            streamProperties[QtMultimediaKit::Language] = QString::fromUtf8(languageCode);
+            QMap<QtMultimedia::MetaData, QVariant> streamProperties;
+            streamProperties[QtMultimedia::Language] = QString::fromUtf8(languageCode);
 
             m_streamProperties.append(streamProperties);
             m_streamTypes.append(streamType);
-- 
cgit v1.2.3