From eccb43d73c08b85bab89d8f632d423b63592e14f Mon Sep 17 00:00:00 2001
From: Michael Goddard <michael.goddard@nokia.com>
Date: Tue, 19 Jul 2011 10:40:05 +1000
Subject: Remove a few more obsolete parts.

Change-Id: I3a001f01ab7fd8cf63452126037b98c1b01df80d
Reviewed-on: http://codereview.qt.nokia.com/1797
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
---
 examples/player/main.cpp           |  2 +-
 examples/player/player.cpp         | 16 ----------------
 examples/player/player.pro         |  5 -----
 examples/player/playercontrols.cpp |  2 --
 examples/player/videowidget.cpp    | 12 ------------
 5 files changed, 1 insertion(+), 36 deletions(-)

(limited to 'examples/player')

diff --git a/examples/player/main.cpp b/examples/player/main.cpp
index 403a085f0..d2de33b0c 100644
--- a/examples/player/main.cpp
+++ b/examples/player/main.cpp
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
 
     Player player;
 
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
+#if defined(Q_WS_SIMULATOR)
 # if (QT_VERSION >= QT_VERSION_CHECK(4, 7, 2))
     player.setAttribute(Qt::WA_LockLandscapeOrientation);
 # else
diff --git a/examples/player/player.cpp b/examples/player/player.cpp
index 8fa387916..49c160ee0 100644
--- a/examples/player/player.cpp
+++ b/examples/player/player.cpp
@@ -182,14 +182,7 @@ Player::~Player()
 
 void Player::open()
 {
-#ifdef Q_WS_MAEMO_5
-    QStringList fileNames;
-    QString fileName = QFileDialog::getOpenFileName(this, tr("Open Files"), "/");
-    if (!fileName.isEmpty())
-        fileNames << fileName;
-#else
     QStringList fileNames = QFileDialog::getOpenFileNames(this, tr("Open Files"));
-#endif
     addToPlaylist(fileNames);
 }
 
@@ -405,25 +398,16 @@ void Player::showColorDialog()
         connect(saturationSlider, SIGNAL(sliderMoved(int)), videoWidget, SLOT(setSaturation(int)));
         connect(videoWidget, SIGNAL(saturationChanged(int)), saturationSlider, SLOT(setValue(int)));
 
-#if defined(Q_OS_SYMBIAN)
-        QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok);
-#endif
         QFormLayout *layout = new QFormLayout;
         layout->addRow(tr("Brightness"), brightnessSlider);
         layout->addRow(tr("Contrast"), contrastSlider);
         layout->addRow(tr("Hue"), hueSlider);
         layout->addRow(tr("Saturation"), saturationSlider);
-#if defined(Q_OS_SYMBIAN)
-        layout->addWidget(buttonBox);
-#endif
 
         QPushButton *button = new QPushButton(tr("Close"));
         layout->addRow(button);
 
         colorDialog = new QDialog(this);
-#if defined(Q_OS_SYMBIAN)
-        connect(buttonBox, SIGNAL(clicked(QAbstractButton*)), colorDialog, SLOT(hide()));
-#endif
         colorDialog->setWindowTitle(tr("Color Options"));
         colorDialog->setLayout(layout);
 
diff --git a/examples/player/player.pro b/examples/player/player.pro
index c22066dc2..687779f0f 100644
--- a/examples/player/player.pro
+++ b/examples/player/player.pro
@@ -22,11 +22,6 @@ maemo* {
     DEFINES += PLAYER_NO_COLOROPTIONS
 }
 
-symbian {
-    LIBS += -lavkon -lcone -leikcore
-    TARGET.CAPABILITY = ReadUserData
-}
-
 #install
 target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/player
 sources.files = $$SOURCES $HEADERS $$RESOURCES $$FORMS *.pro
diff --git a/examples/player/playercontrols.cpp b/examples/player/playercontrols.cpp
index bf4d96b2f..b4f623beb 100644
--- a/examples/player/playercontrols.cpp
+++ b/examples/player/playercontrols.cpp
@@ -84,7 +84,6 @@ PlayerControls::PlayerControls(QWidget *parent)
 
     connect(muteButton, SIGNAL(clicked()), this, SLOT(muteClicked()));
 
-#ifndef Q_WS_MAEMO_5
     volumeSlider = new QSlider(Qt::Horizontal, this);
     volumeSlider->setRange(0, 100);
 
@@ -98,7 +97,6 @@ PlayerControls::PlayerControls(QWidget *parent)
     rateBox->setCurrentIndex(1);
 
     connect(rateBox, SIGNAL(activated(int)), SLOT(updateRate()));
-#endif
 
     QBoxLayout *layout = new QHBoxLayout;
     layout->setMargin(0);
diff --git a/examples/player/videowidget.cpp b/examples/player/videowidget.cpp
index 46f1b33ff..87c9455d6 100644
--- a/examples/player/videowidget.cpp
+++ b/examples/player/videowidget.cpp
@@ -56,11 +56,6 @@ VideoWidget::VideoWidget(QWidget *parent)
 
 void VideoWidget::keyPressEvent(QKeyEvent *event)
 {
-#ifdef Q_OS_SYMBIAN
-    if (isFullScreen())
-        setFullScreen(false);
-#endif
-
     if (event->key() == Qt::Key_Escape && isFullScreen()) {
         showNormal();
 
@@ -83,13 +78,6 @@ void VideoWidget::mouseDoubleClickEvent(QMouseEvent *event)
 
 void VideoWidget::mousePressEvent(QMouseEvent *event)
 {
-#ifdef Q_WS_MAEMO_5
-    if (isFullScreen())
-        setFullScreen(false);
-
-    event->accept();
-#else
     QVideoWidget::mousePressEvent(event);
-#endif
 }
 
-- 
cgit v1.2.3