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/radio/main.cpp

@@ -47,11 +47,7 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
 
     Radio radio;
-#ifdef Q_OS_SYMBIAN
-    radio.showMaximized();
-#else
     radio.show();
-#endif
 
     return app.exec();
 };

examples/radio/radio.cpp

@@ -55,9 +55,6 @@ Radio::Radio()
     QWidget *window = new QWidget;
     QVBoxLayout* layout = new QVBoxLayout;
     QHBoxLayout* buttonBar = new QHBoxLayout;
-#if defined Q_OS_SYMBIAN // this is so that we can see all buttons also in 3.1 devices, where the screens are smaller..
-    QHBoxLayout* buttonBar2 = new QHBoxLayout;
-#endif
     QHBoxLayout* topBar = new QHBoxLayout;
 
     layout->addLayout(topBar);
@@ -72,22 +69,13 @@ Radio::Radio()
     else
         signal->setText(tr("No radio found"));
     topBar->addWidget(signal);
-#if defined Q_WS_MAEMO_5
-    QSpacerItem *spacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
-    topBar->addItem(spacer);
-    volumeSlider = new QSlider(Qt::Horizontal,this);
-#else
     volumeSlider = new QSlider(Qt::Vertical,this);
-#endif
     volumeSlider->setRange(0,100);
     volumeSlider->setValue(50);
     connect(volumeSlider,SIGNAL(valueChanged(int)),this,SLOT(updateVolume(int)));
     topBar->addWidget(volumeSlider);
 
     layout->addLayout(buttonBar);
-#if defined Q_OS_SYMBIAN
-    layout->addLayout(buttonBar2);
-#endif
 
     searchLeft = new QPushButton;
     searchLeft->setText(tr("scan Down"));
@@ -97,20 +85,12 @@ Radio::Radio()
     left = new QPushButton;
     left->setText(tr("Freq Down"));
     connect(left,SIGNAL(clicked()),SLOT(freqDown()));
-#if defined Q_OS_SYMBIAN
-    buttonBar2->addWidget(left);
-#else
     buttonBar->addWidget(left);
-#endif
 
     right = new QPushButton;
     connect(right,SIGNAL(clicked()),SLOT(freqUp()));
     right->setText(tr("Freq Up"));
-#if defined Q_OS_SYMBIAN
-    buttonBar2->addWidget(right);
-#else
     buttonBar->addWidget(right);
-#endif
 
     searchRight = new QPushButton;
     searchRight->setText(tr("scan Up"));

examples/radio/radio.pro

@@ -10,10 +10,6 @@ SOURCES = \
     main.cpp \
     radio.cpp
 
-symbian: {
-    TARGET.CAPABILITY = UserEnvironment WriteDeviceData ReadDeviceData SwEvent
-}
-
 target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/radio
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/radio