Changeset 68526 in webkit

Timestamp:

Sep 28, 2010 9:21:31 AM (14 years ago)

Author:

vestbo@webkit.org

Message:

[Qt] Rename MediaPlayerPrivate to MediaPlayerPrivateQt/Phonon

Reviewed by Andreas Kling.

​https://bugs.webkit.org/show_bug.cgi?id=36663

• platform/graphics/MediaPlayer.cpp:
• platform/graphics/qt/MediaPlayerPrivateQt.cpp:
• platform/graphics/qt/MediaPlayerPrivateQt.h:
• platform/graphics/qt/MediaPlayerPrivatePhonon.cpp:
• platform/graphics/qt/MediaPlayerPrivatePhonon.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/MediaPlayer.cpp (modified) (1 diff)
• platform/graphics/qt/MediaPlayerPrivatePhonon.cpp (modified) (31 diffs)
• platform/graphics/qt/MediaPlayerPrivatePhonon.h (modified) (3 diffs)
• platform/graphics/qt/MediaPlayerPrivateQt.cpp (modified) (31 diffs)
• platform/graphics/qt/MediaPlayerPrivateQt.h (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-28  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Rename MediaPlayerPrivate to MediaPlayerPrivateQt/Phonon
+
+        https://bugs.webkit.org/show_bug.cgi?id=36663
+
+        * platform/graphics/MediaPlayer.cpp:
+        * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
+        * platform/graphics/qt/MediaPlayerPrivateQt.h:
+        * platform/graphics/qt/MediaPlayerPrivatePhonon.cpp:
+        * platform/graphics/qt/MediaPlayerPrivatePhonon.h:
+
 2010-09-28  Andras Becsi  <abecsi@webkit.org>
 

trunk/WebCore/platform/graphics/MediaPlayer.cpp

@@ -172 +172 @@
 #if PLATFORM(WIN)
         MediaPlayerPrivateQuickTimeVisualContext::registerMediaEngine(addMediaEngine);
+#elif PLATFORM(QT)
+#if USE(QT_MULTIMEDIA)
+        MediaPlayerPrivateQt::registerMediaEngine(addMediaEngine);
+#else
+        MediaPlayerPrivatePhonon::registerMediaEngine(addMediaEngine);
+#endif
 #elif !PLATFORM(GTK) && !PLATFORM(EFL)
         // FIXME: currently all the MediaEngines are named

trunk/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp

@@ -85 +85 @@
 namespace WebCore {
 
-MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player)
+MediaPlayerPrivatePhonon::MediaPlayerPrivatePhonon(MediaPlayer* player)
     : m_player(player)
     , m_networkState(MediaPlayer::Empty)
@@ -119 +119 @@
 }
 
-MediaPlayerPrivateInterface* MediaPlayerPrivate::create(MediaPlayer* player)
-{
-    return new MediaPlayerPrivate(player);
-}
-
-void MediaPlayerPrivate::registerMediaEngine(MediaEngineRegistrar registrar)
+MediaPlayerPrivateInterface* MediaPlayerPrivatePhonon::create(MediaPlayer* player)
+{
+    return new MediaPlayerPrivatePhonon(player);
+}
+
+void MediaPlayerPrivatePhonon::registerMediaEngine(MediaEngineRegistrar registrar)
 {
     if (isAvailable())
@@ -131 +131 @@
 
 
-MediaPlayerPrivate::~MediaPlayerPrivate()
+MediaPlayerPrivatePhonon::~MediaPlayerPrivatePhonon()
 {
     LOG(Media, "MediaPlayerPrivatePhonon::dtor deleting videowidget");
@@ -147 +147 @@
 }
 
-HashSet<String>& MediaPlayerPrivate::supportedTypesCache()
+HashSet<String>& MediaPlayerPrivatePhonon::supportedTypesCache()
 {
     static HashSet<String> supportedTypes;
@@ -191 +191 @@
 }
 
-void MediaPlayerPrivate::getSupportedTypes(HashSet<String>& types)
+void MediaPlayerPrivatePhonon::getSupportedTypes(HashSet<String>& types)
 {
     types = supportedTypesCache();
 }
 
-MediaPlayer::SupportsType MediaPlayerPrivate::supportsType(const String& type, const String& codecs)
+MediaPlayer::SupportsType MediaPlayerPrivatePhonon::supportsType(const String& type, const String& codecs)
 {
     if (type.isEmpty())
@@ -206 +206 @@
 }
 
-bool MediaPlayerPrivate::hasVideo() const
+bool MediaPlayerPrivatePhonon::hasVideo() const
 {
     bool hasVideo = m_mediaObject->hasVideo();
@@ -213 +213 @@
 }
 
-bool MediaPlayerPrivate::hasAudio() const
+bool MediaPlayerPrivatePhonon::hasAudio() const
 {
     // FIXME: Phonon::MediaObject does not have such a hasAudio() function
@@ -221 +221 @@
 }
 
-void MediaPlayerPrivate::load(const String& url)
+void MediaPlayerPrivatePhonon::load(const String& url)
 {
     LOG(Media, "MediaPlayerPrivatePhonon::load(\"%s\")", url.utf8().data());
@@ -242 +242 @@
 }
 
-void MediaPlayerPrivate::cancelLoad()
-{
-    notImplemented();
-}
-
-
-void MediaPlayerPrivate::play()
+void MediaPlayerPrivatePhonon::cancelLoad()
+{
+    notImplemented();
+}
+
+
+void MediaPlayerPrivatePhonon::play()
 {
     LOG(Media, "MediaPlayerPrivatePhonon::play()");
@@ -254 +254 @@
 }
 
-void MediaPlayerPrivate::pause()
+void MediaPlayerPrivatePhonon::pause()
 {
     LOG(Media, "MediaPlayerPrivatePhonon::pause()");
@@ -261 +261 @@
 
 
-bool MediaPlayerPrivate::paused() const
+bool MediaPlayerPrivatePhonon::paused() const
 {
     bool paused = m_mediaObject->state() == Phonon::PausedState;
@@ -268 +268 @@
 }
 
-void MediaPlayerPrivate::seek(float position)
+void MediaPlayerPrivatePhonon::seek(float position)
 {
     LOG(Media, "MediaPlayerPrivatePhonon::seek(%f)", position);
@@ -281 +281 @@
 }
 
-bool MediaPlayerPrivate::seeking() const
+bool MediaPlayerPrivatePhonon::seeking() const
 {
     return false;
 }
 
-float MediaPlayerPrivate::duration() const
+float MediaPlayerPrivatePhonon::duration() const
 {
     if (m_readyState < MediaPlayer::HaveMetadata)
@@ -300 +300 @@
 }
 
-float MediaPlayerPrivate::currentTime() const
+float MediaPlayerPrivatePhonon::currentTime() const
 {
     float currentTime = m_mediaObject->currentTime() / 1000.0f;
@@ -308 +308 @@
 }
 
-PassRefPtr<TimeRanges> MediaPlayerPrivate::buffered() const
+PassRefPtr<TimeRanges> MediaPlayerPrivatePhonon::buffered() const
 {
     notImplemented();
@@ -314 +314 @@
 }
 
-float MediaPlayerPrivate::maxTimeSeekable() const
+float MediaPlayerPrivatePhonon::maxTimeSeekable() const
 {
     notImplemented();
@@ -320 +320 @@
 }
 
-unsigned MediaPlayerPrivate::bytesLoaded() const
+unsigned MediaPlayerPrivatePhonon::bytesLoaded() const
 {
     notImplemented();
@@ -326 +326 @@
 }
 
-unsigned MediaPlayerPrivate::totalBytes() const
+unsigned MediaPlayerPrivatePhonon::totalBytes() const
 {
     //notImplemented();
@@ -332 +332 @@
 }
 
-void MediaPlayerPrivate::setRate(float)
-{
-    notImplemented();
-}
-
-void MediaPlayerPrivate::setVolume(float volume)
+void MediaPlayerPrivatePhonon::setRate(float)
+{
+    notImplemented();
+}
+
+void MediaPlayerPrivatePhonon::setVolume(float volume)
 {
     LOG(Media, "MediaPlayerPrivatePhonon::setVolume()");
@@ -343 +343 @@
 }
 
-void MediaPlayerPrivate::setMuted(bool muted)
+void MediaPlayerPrivatePhonon::setMuted(bool muted)
 {
     LOG(Media, "MediaPlayerPrivatePhonon::setMuted()");
@@ -349 +349 @@
 }
 
-MediaPlayer::NetworkState MediaPlayerPrivate::networkState() const
+MediaPlayer::NetworkState MediaPlayerPrivatePhonon::networkState() const
 {
     const QMetaObject* metaObj = this->metaObject();
@@ -357 +357 @@
 }
 
-MediaPlayer::ReadyState MediaPlayerPrivate::readyState() const
+MediaPlayer::ReadyState MediaPlayerPrivatePhonon::readyState() const
 {
     const QMetaObject* metaObj = this->metaObject();
@@ -365 +365 @@
 }
 
-void MediaPlayerPrivate::updateStates()
+void MediaPlayerPrivatePhonon::updateStates()
 {
     MediaPlayer::NetworkState oldNetworkState = m_networkState;
@@ -413 +413 @@
 }
 
-void MediaPlayerPrivate::setVisible(bool visible)
+void MediaPlayerPrivatePhonon::setVisible(bool visible)
 {
     m_isVisible = visible;
@@ -421 +421 @@
 }
 
-void MediaPlayerPrivate::setSize(const IntSize& newSize)
+void MediaPlayerPrivatePhonon::setSize(const IntSize& newSize)
 {
     if (!m_videoWidget)
@@ -435 +435 @@
 }
 
-IntSize MediaPlayerPrivate::naturalSize() const
+IntSize MediaPlayerPrivatePhonon::naturalSize() const
 {
     if (!hasVideo()) {
@@ -456 +456 @@
 }
 
-bool MediaPlayerPrivate::eventFilter(QObject* obj, QEvent* event)
+bool MediaPlayerPrivatePhonon::eventFilter(QObject* obj, QEvent* event)
 {
     if (event->type() == QEvent::UpdateRequest)
@@ -464 +464 @@
 }
 
-void MediaPlayerPrivate::paint(GraphicsContext* graphicsContect, const IntRect& rect)
+void MediaPlayerPrivatePhonon::paint(GraphicsContext* graphicsContect, const IntRect& rect)
 {
     if (graphicsContect->paintingDisabled())
@@ -482 +482 @@
 // ====================== Phonon::MediaObject signals ======================
 
-void MediaPlayerPrivate::stateChanged(Phonon::State newState, Phonon::State oldState)
+void MediaPlayerPrivatePhonon::stateChanged(Phonon::State newState, Phonon::State oldState)
 {
     const QMetaObject* metaObj = this->metaObject();
@@ -492 +492 @@
 }
 
-void MediaPlayerPrivate::metaDataChanged()
+void MediaPlayerPrivatePhonon::metaDataChanged()
 {
     LOG(Media, "MediaPlayerPrivatePhonon::metaDataChanged()");
@@ -498 +498 @@
 }
 
-void MediaPlayerPrivate::seekableChanged(bool)
-{
-    notImplemented();
-    LOG_MEDIAOBJECT();
-}
-
-void MediaPlayerPrivate::hasVideoChanged(bool hasVideo)
+void MediaPlayerPrivatePhonon::seekableChanged(bool)
+{
+    notImplemented();
+    LOG_MEDIAOBJECT();
+}
+
+void MediaPlayerPrivatePhonon::hasVideoChanged(bool hasVideo)
 {
     LOG(Media, "MediaPlayerPrivatePhonon::hasVideoChanged(%s)", hasVideo ? "true" : "false");
 }
 
-void MediaPlayerPrivate::bufferStatus(int)
-{
-    notImplemented();
-    LOG_MEDIAOBJECT();
-}
-
-void MediaPlayerPrivate::finished()
-{
-    notImplemented();
-    LOG_MEDIAOBJECT();
-}
-
-void MediaPlayerPrivate::currentSourceChanged(const Phonon::MediaSource&)
-{
-    notImplemented();
-    LOG_MEDIAOBJECT();
-}
-
-void MediaPlayerPrivate::aboutToFinish()
-{
-    notImplemented();
-    LOG_MEDIAOBJECT();
-}
-
-void MediaPlayerPrivate::totalTimeChanged(qint64 totalTime)
+void MediaPlayerPrivatePhonon::bufferStatus(int)
+{
+    notImplemented();
+    LOG_MEDIAOBJECT();
+}
+
+void MediaPlayerPrivatePhonon::finished()
+{
+    notImplemented();
+    LOG_MEDIAOBJECT();
+}
+
+void MediaPlayerPrivatePhonon::currentSourceChanged(const Phonon::MediaSource&)
+{
+    notImplemented();
+    LOG_MEDIAOBJECT();
+}
+
+void MediaPlayerPrivatePhonon::aboutToFinish()
+{
+    notImplemented();
+    LOG_MEDIAOBJECT();
+}
+
+void MediaPlayerPrivatePhonon::totalTimeChanged(qint64 totalTime)
 {
 #if OS(WINDOWS)

trunk/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.h

@@ -41 +41 @@
 namespace WebCore {
 
-    class MediaPlayerPrivate : public QObject, public MediaPlayerPrivateInterface {
+    class MediaPlayerPrivatePhonon : public QObject, public MediaPlayerPrivateInterface {
 
         Q_OBJECT
@@ -47 +47 @@
     public:
         static void registerMediaEngine(MediaEngineRegistrar);
-        ~MediaPlayerPrivate();
+        ~MediaPlayerPrivatePhonon();
 
         // These enums are used for debugging
@@ -128 +128 @@
 
     private:
-        MediaPlayerPrivate(MediaPlayer*);
+        MediaPlayerPrivatePhonon(MediaPlayer*);
         static MediaPlayerPrivateInterface* create(MediaPlayer* player);
 

trunk/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp

@@ -54 +54 @@
 namespace WebCore {
 
-MediaPlayerPrivateInterface* MediaPlayerPrivate::create(MediaPlayer* player)
-{
-    return new MediaPlayerPrivate(player);
-}
-
-void MediaPlayerPrivate::registerMediaEngine(MediaEngineRegistrar registrar)
+MediaPlayerPrivateInterface* MediaPlayerPrivateQt::create(MediaPlayer* player)
+{
+    return new MediaPlayerPrivateQt(player);
+}
+
+void MediaPlayerPrivateQt::registerMediaEngine(MediaEngineRegistrar registrar)
 {
     registrar(create, getSupportedTypes, supportsType);
 }
 
-void MediaPlayerPrivate::getSupportedTypes(HashSet<String> &supported)
+void MediaPlayerPrivateQt::getSupportedTypes(HashSet<String> &supported)
 {
     QStringList types = QMediaPlayer::supportedMimeTypes();
@@ -75 +75 @@
 }
 
-MediaPlayer::SupportsType MediaPlayerPrivate::supportsType(const String& mime, const String& codec)
+MediaPlayer::SupportsType MediaPlayerPrivateQt::supportsType(const String& mime, const String& codec)
 {
     if (!mime.startsWith("audio/") && !mime.startsWith("video/"))
@@ -86 +86 @@
 }
 
-MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player)
+MediaPlayerPrivateQt::MediaPlayerPrivateQt(MediaPlayer* player)
     : m_player(player)
     , m_mediaPlayer(new QMediaPlayer)
@@ -133 +133 @@
 }
 
-MediaPlayerPrivate::~MediaPlayerPrivate()
+MediaPlayerPrivateQt::~MediaPlayerPrivateQt()
 {
     delete m_mediaPlayer;
@@ -139 +139 @@
 }
 
-bool MediaPlayerPrivate::hasVideo() const
+bool MediaPlayerPrivateQt::hasVideo() const
 {
     return m_mediaPlayer->isVideoAvailable();
 }
 
-bool MediaPlayerPrivate::hasAudio() const
+bool MediaPlayerPrivateQt::hasAudio() const
 {
     return true;
 }
 
-void MediaPlayerPrivate::load(const String& url)
+void MediaPlayerPrivateQt::load(const String& url)
 {
     m_mediaUrl = url;
@@ -163 +163 @@
 }
 
-void MediaPlayerPrivate::commitLoad(const String& url)
+void MediaPlayerPrivateQt::commitLoad(const String& url)
 {
     // We are now loading
@@ -237 +237 @@
 }
 
-void MediaPlayerPrivate::resumeLoad()
+void MediaPlayerPrivateQt::resumeLoad()
 {
     m_delayingLoad = false;
@@ -245 +245 @@
 }
 
-void MediaPlayerPrivate::cancelLoad()
+void MediaPlayerPrivateQt::cancelLoad()
 {
     m_mediaPlayer->setMedia(QMediaContent());
@@ -251 +251 @@
 }
 
-void MediaPlayerPrivate::prepareToPlay()
+void MediaPlayerPrivateQt::prepareToPlay()
 {
     if (m_mediaPlayer->media().isNull() || m_delayingLoad)
@@ -257 +257 @@
 }
 
-void MediaPlayerPrivate::play()
+void MediaPlayerPrivateQt::play()
 {
     if (m_mediaPlayer->state() != QMediaPlayer::PlayingState)
@@ -263 +263 @@
 }
 
-void MediaPlayerPrivate::pause()
+void MediaPlayerPrivateQt::pause()
 {
     if (m_mediaPlayer->state() == QMediaPlayer::PlayingState)
@@ -269 +269 @@
 }
 
-bool MediaPlayerPrivate::paused() const
+bool MediaPlayerPrivateQt::paused() const
 {
     return (m_mediaPlayer->state() != QMediaPlayer::PlayingState);
 }
 
-void MediaPlayerPrivate::seek(float position)
+void MediaPlayerPrivateQt::seek(float position)
 {
     if (!m_mediaPlayer->isSeekable())
@@ -310 +310 @@
 }
 
-bool MediaPlayerPrivate::seeking() const
+bool MediaPlayerPrivateQt::seeking() const
 {
     return m_isSeeking;
 }
 
-float MediaPlayerPrivate::duration() const
+float MediaPlayerPrivateQt::duration() const
 {
     if (m_readyState < MediaPlayer::HaveMetadata)
@@ -329 +329 @@
 }
 
-float MediaPlayerPrivate::currentTime() const
+float MediaPlayerPrivateQt::currentTime() const
 {
     float currentTime = m_mediaPlayer->position() / 1000.0f;
@@ -335 +335 @@
 }
 
-PassRefPtr<TimeRanges> MediaPlayerPrivate::buffered() const
+PassRefPtr<TimeRanges> MediaPlayerPrivateQt::buffered() const
 {
     RefPtr<TimeRanges> buffered = TimeRanges::create();
@@ -353 +353 @@
 }
 
-float MediaPlayerPrivate::maxTimeSeekable() const
+float MediaPlayerPrivateQt::maxTimeSeekable() const
 {
     if (!m_mediaPlayerControl)
@@ -361 +361 @@
 }
 
-unsigned MediaPlayerPrivate::bytesLoaded() const
+unsigned MediaPlayerPrivateQt::bytesLoaded() const
 {
     QLatin1String bytesLoadedKey("bytes-loaded");
@@ -370 +370 @@
 }
 
-unsigned MediaPlayerPrivate::totalBytes() const
+unsigned MediaPlayerPrivateQt::totalBytes() const
 {
     if (m_mediaPlayer->availableMetaData().contains(QtMultimediaKit::Size))
@@ -378 +378 @@
 }
 
-void MediaPlayerPrivate::setPreload(MediaPlayer::Preload preload)
+void MediaPlayerPrivateQt::setPreload(MediaPlayer::Preload preload)
 {
     m_preload = preload;
@@ -385 +385 @@
 }
 
-void MediaPlayerPrivate::setRate(float rate)
+void MediaPlayerPrivateQt::setRate(float rate)
 {
     m_mediaPlayer->setPlaybackRate(rate);
 }
 
-void MediaPlayerPrivate::setVolume(float volume)
+void MediaPlayerPrivateQt::setVolume(float volume)
 {
     m_mediaPlayer->setVolume(static_cast<int>(volume * 100.0));
 }
 
-bool MediaPlayerPrivate::supportsMuting() const
+bool MediaPlayerPrivateQt::supportsMuting() const
 {
     return true;
 }
 
-void MediaPlayerPrivate::setMuted(bool muted)
+void MediaPlayerPrivateQt::setMuted(bool muted)
 {
     m_mediaPlayer->setMuted(muted);
 }
 
-MediaPlayer::NetworkState MediaPlayerPrivate::networkState() const
+MediaPlayer::NetworkState MediaPlayerPrivateQt::networkState() const
 {
     return m_networkState;
 }
 
-MediaPlayer::ReadyState MediaPlayerPrivate::readyState() const
+MediaPlayer::ReadyState MediaPlayerPrivateQt::readyState() const
 {
     return m_readyState;
 }
 
-void MediaPlayerPrivate::setVisible(bool visible)
+void MediaPlayerPrivateQt::setVisible(bool visible)
 {
     m_isVisible = visible;
 }
 
-void MediaPlayerPrivate::mediaStatusChanged(QMediaPlayer::MediaStatus)
+void MediaPlayerPrivateQt::mediaStatusChanged(QMediaPlayer::MediaStatus)
 {
     updateStates();
 }
 
-void MediaPlayerPrivate::handleError(QMediaPlayer::Error)
+void MediaPlayerPrivateQt::handleError(QMediaPlayer::Error)
 {
     updateStates();
 }
 
-void MediaPlayerPrivate::stateChanged(QMediaPlayer::State state)
+void MediaPlayerPrivateQt::stateChanged(QMediaPlayer::State state)
 {
     if (state != QMediaPlayer::PlayingState && m_isSeeking && m_queuedSeek >= 0) {
@@ -438 +438 @@
 }
 
-void MediaPlayerPrivate::nativeSizeChanged(const QSizeF&)
+void MediaPlayerPrivateQt::nativeSizeChanged(const QSizeF&)
 {
     m_player->sizeChanged();
 }
 
-void MediaPlayerPrivate::queuedSeekTimeout()
+void MediaPlayerPrivateQt::queuedSeekTimeout()
 {
     // If we haven't heard anything, assume the player is now paused
@@ -456 +456 @@
 }
 
-void MediaPlayerPrivate::seekTimeout()
+void MediaPlayerPrivateQt::seekTimeout()
 {
     // If we haven't heard anything, assume the seek succeeded
@@ -465 +465 @@
 }
 
-void MediaPlayerPrivate::positionChanged(qint64)
+void MediaPlayerPrivateQt::positionChanged(qint64)
 {
     // Only propogate this event if we are seeking
@@ -474 +474 @@
 }
 
-void MediaPlayerPrivate::bufferStatusChanged(int)
+void MediaPlayerPrivateQt::bufferStatusChanged(int)
 {
     notImplemented();
 }
 
-void MediaPlayerPrivate::durationChanged(qint64)
+void MediaPlayerPrivateQt::durationChanged(qint64)
 {
     m_player->durationChanged();
 }
 
-void MediaPlayerPrivate::volumeChanged(int volume)
+void MediaPlayerPrivateQt::volumeChanged(int volume)
 {
     m_player->volumeChanged(static_cast<float>(volume) / 100.0);
 }
 
-void MediaPlayerPrivate::mutedChanged(bool muted)
+void MediaPlayerPrivateQt::mutedChanged(bool muted)
 {
     m_player->muteChanged(muted);
 }
 
-void MediaPlayerPrivate::updateStates()
+void MediaPlayerPrivateQt::updateStates()
 {
     // Store the old states so that we can detect a change and raise change events
@@ -545 +545 @@
 }
 
-void MediaPlayerPrivate::setSize(const IntSize& size)
+void MediaPlayerPrivateQt::setSize(const IntSize& size)
 {
     if (size == m_currentSize)
@@ -554 +554 @@
 }
 
-IntSize MediaPlayerPrivate::naturalSize() const
+IntSize MediaPlayerPrivateQt::naturalSize() const
 {
     if (!hasVideo() || m_readyState < MediaPlayer::HaveMetadata)
@@ -562 +562 @@
 }
 
-void MediaPlayerPrivate::paint(GraphicsContext* context, const IntRect& rect)
+void MediaPlayerPrivateQt::paint(GraphicsContext* context, const IntRect& rect)
 {
 #if USE(ACCELERATED_COMPOSITING)
@@ -581 +581 @@
 }
 
-void MediaPlayerPrivate::repaint()
+void MediaPlayerPrivateQt::repaint()
 {
     m_player->repaint();
@@ -587 +587 @@
 
 #if USE(ACCELERATED_COMPOSITING)
-void MediaPlayerPrivate::acceleratedRenderingStateChanged()
+void MediaPlayerPrivateQt::acceleratedRenderingStateChanged()
 {
     bool composited = m_player->mediaPlayerClient()->mediaPlayerRenderingCanBeAccelerated(m_player);
@@ -600 +600 @@
 }
 
-PlatformLayer* MediaPlayerPrivate::platformLayer() const
+PlatformLayer* MediaPlayerPrivateQt::platformLayer() const
 {
     return m_composited ? m_videoItem : 0;
@@ -606 +606 @@
 #endif
 
-PlatformMedia MediaPlayerPrivate::platformMedia() const
+PlatformMedia MediaPlayerPrivateQt::platformMedia() const
 {
     PlatformMedia pm;
     pm.type = PlatformMedia::QtMediaPlayerType;
-    pm.media.qtMediaPlayer = const_cast<MediaPlayerPrivate*>(this);
+    pm.media.qtMediaPlayer = const_cast<MediaPlayerPrivateQt*>(this);
     return pm;
 }

trunk/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h

@@ -34 +34 @@
 namespace WebCore {
 
-class MediaPlayerPrivate : public QObject, public MediaPlayerPrivateInterface {
+class MediaPlayerPrivateQt : public QObject, public MediaPlayerPrivateInterface {
 
     Q_OBJECT
@@ -40 +40 @@
 public:
     static MediaPlayerPrivateInterface* create(MediaPlayer* player);
-    ~MediaPlayerPrivate();
+    ~MediaPlayerPrivateQt();
 
     static void registerMediaEngine(MediaEngineRegistrar);
@@ -119 +119 @@
 
 private:
-    MediaPlayerPrivate(MediaPlayer*);
+    MediaPlayerPrivateQt(MediaPlayer*);
 
     MediaPlayer* m_player;