diff options
| author | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-09-17 13:51:06 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-09-23 12:39:26 (GMT) |
| commit | c85d1764d713722f1bb1108087d41ff7904ab3cb (patch) | |
| tree | f7c2cc12df6fa4c7b38a4fbfd8e383fe77405b79 /src/3rdparty/phonon/mmf/videooutput.cpp | |
| parent | cabf0776a3e879aa80e4dc01fd470248c429d9b0 (diff) | |
| download | Qt-c85d1764d713722f1bb1108087d41ff7904ab3cb.zip Qt-c85d1764d713722f1bb1108087d41ff7904ab3cb.tar.gz Qt-c85d1764d713722f1bb1108087d41ff7904ab3cb.tar.bz2 | |
Removed temporary hacks used during initial development of video widget
Diffstat (limited to 'src/3rdparty/phonon/mmf/videooutput.cpp')
| -rw-r--r-- | src/3rdparty/phonon/mmf/videooutput.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/3rdparty/phonon/mmf/videooutput.cpp b/src/3rdparty/phonon/mmf/videooutput.cpp index b1a2b4f..c2bd775 100644 --- a/src/3rdparty/phonon/mmf/videooutput.cpp +++ b/src/3rdparty/phonon/mmf/videooutput.cpp @@ -52,12 +52,10 @@ MMF::VideoOutput::VideoOutput(QWidget* parent) TRACE_CONTEXT(VideoOutput::VideoOutput, EVideoInternal); TRACE_ENTRY("parent 0x%08x", parent); -#ifndef PHONON_MMF_VIDEOOUTPUT_IS_QWIDGET setPalette(QPalette(Qt::black)); setAttribute(Qt::WA_OpaquePaintEvent, true); setAttribute(Qt::WA_NoSystemBackground, true); setAutoFillBackground(false); -#endif // PHONON_MMF_VIDEOOUTPUT_IS_QWIDGET dump(); @@ -74,9 +72,6 @@ MMF::VideoOutput::~VideoOutput() void MMF::VideoOutput::setFrameSize(const QSize& frameSize) { -#ifdef PHONON_MMF_VIDEOOUTPUT_IS_QWIDGET - Q_UNUSED(frameSize); -#else TRACE_CONTEXT(VideoOutput::setFrameSize, EVideoInternal); TRACE("oldSize %d %d newSize %d %d", m_frameSize.width(), m_frameSize.height(), @@ -86,7 +81,6 @@ void MMF::VideoOutput::setFrameSize(const QSize& frameSize) m_frameSize = frameSize; updateGeometry(); } -#endif // PHONON_MMF_VIDEOOUTPUT_IS_QWIDGET } void MMF::VideoOutput::setObserver(VideoOutputObserver* observer) @@ -102,8 +96,6 @@ void MMF::VideoOutput::setObserver(VideoOutputObserver* observer) // QWidget //----------------------------------------------------------------------------- -#ifndef PHONON_MMF_VIDEOOUTPUT_IS_QWIDGET - QSize MMF::VideoOutput::sizeHint() const { // TODO: replace this with a more sensible default @@ -208,8 +200,6 @@ void MMF::VideoOutput::moveEvent(QMoveEvent* event) m_observer->videoOutputRegionChanged(); } -#endif // PHONON_MMF_VIDEOOUTPUT_IS_QWIDGET - //----------------------------------------------------------------------------- // Private functions |