Merge branch '1.0' of git@scm.dev.nokia.troll.no:qtmobility/qtmobility into 1.0.2

1 files changed, 9 insertions, 11 deletions

diff --git a/examples/audiorecorder/audiorecorder.cpp b/examples/audiorecorder/audiorecorder.cpp
index 9ba27b2f52..fd782ca5fd 100644
--- a/examples/audiorecorder/audiorecorder.cpp
+++ b/examples/audiorecorder/audiorecorder.cpp
@@ -163,14 +163,13 @@ void AudioRecorder::updateState(QMediaRecorder::State state)
         ui->statusbar->showMessage(statusMessage);
 }
 
-template <typename T>
-static T boxValue(const QComboBox *box)
+static QVariant boxValue(const QComboBox *box)
 {
     int idx = box->currentIndex();
     if (idx == -1)
-        return T();
+        return QVariant();
 
-    return box->itemData(idx).value<T>();
+    return box->itemData(idx);
 }
 
 
@@ -178,22 +177,21 @@ void AudioRecorder::toggleRecord()
 {
     if (capture->state() == QMediaRecorder::StoppedState) {
 #ifdef Q_OS_SYMBIAN
-        if (!paused)
-            capture->setOutputLocation(recordPathAudio(destination));
+        capture->setOutputLocation(recordPathAudio(destination));
 #endif
-        audiosource->setAudioInput(boxValue<QString>(ui->audioDeviceBox));
+        audiosource->setAudioInput(boxValue(ui->audioDeviceBox).toString());
 
 
         QAudioEncoderSettings settings;
-        settings.setCodec(boxValue<QString>(ui->audioCodecBox));
-        settings.setSampleRate(boxValue<int>(ui->sampleRateBox));
-        settings.setBitRate(boxValue<int>(ui->bitrateBox));
+        settings.setCodec(boxValue(ui->audioCodecBox).toString());
+        settings.setSampleRate(boxValue(ui->sampleRateBox).toInt());
+        settings.setBitRate(boxValue(ui->bitrateBox).toInt());
         settings.setQuality(QtMultimediaKit::EncodingQuality(ui->qualitySlider->value()));
         settings.setEncodingMode(ui->constantQualityRadioButton->isChecked() ?
                                  QtMultimediaKit::ConstantQualityEncoding :
                                  QtMultimediaKit::ConstantBitRateEncoding);
 
-        QString container = boxValue<QString>(ui->containerBox);
+        QString container = boxValue(ui->containerBox).toString();
 
         capture->setEncodingSettings(settings, QVideoEncoderSettings(), container);
         capture->record();