Delete obsolete class methods and update related code

Delete obsolete methods from QAudioFormat and QAudioDeviceInfo
and update code that relied on the obsolete methods.

Change-Id: I007e36375a45399b1d5a289341bc5d5a05dc68cc
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

2 files changed, 21 insertions, 21 deletions

diff --git a/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp
index b593e414f..7b66c66ce 100755
--- a/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp
+++ b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp
@@ -128,11 +128,11 @@ QString tst_QAudioInput::formatToFileName(const QAudioFormat &format)
         ?   QString("signed") : QString("unsigned");
 
     return QString("%1_%2_%3_%4_%5")
-        .arg(format.frequency())
+        .arg(format.sampleRate())
         .arg(format.sampleSize())
         .arg(formatSigned)
         .arg(formatEndian)
-        .arg(format.channels());
+        .arg(format.channelCount());
 }
 
 void tst_QAudioInput::initTestCase()
@@ -157,37 +157,37 @@ void tst_QAudioInput::initTestCase()
         testFormats.append(audioDevice.preferredFormat());
 
     // PCM 8000  mono S8
-    format.setFrequency(8000);
+    format.setSampleRate(8000);
     format.setSampleSize(8);
     format.setSampleType(QAudioFormat::SignedInt);
     format.setByteOrder(QAudioFormat::LittleEndian);
-    format.setChannels(1);
+    format.setChannelCount(1);
     if (audioDevice.isFormatSupported(format))
         testFormats.append(format);
 
     // PCM 11025 mono S16LE
-    format.setFrequency(11025);
+    format.setSampleRate(11025);
     format.setSampleSize(16);
     if (audioDevice.isFormatSupported(format))
         testFormats.append(format);
 
     // PCM 22050 mono S16LE
-    format.setFrequency(22050);
+    format.setSampleRate(22050);
     if (audioDevice.isFormatSupported(format))
         testFormats.append(format);
 
     // PCM 22050 stereo S16LE
-    format.setChannels(2);
+    format.setChannelCount(2);
     if (audioDevice.isFormatSupported(format))
         testFormats.append(format);
 
     // PCM 44100 stereo S16LE
-    format.setFrequency(44100);
+    format.setSampleRate(44100);
     if (audioDevice.isFormatSupported(format))
         testFormats.append(format);
 
     // PCM 48000 stereo S16LE
-    format.setFrequency(48000);
+    format.setSampleRate(48000);
     if (audioDevice.isFormatSupported(format))
         testFormats.append(format);
 
@@ -217,10 +217,10 @@ void tst_QAudioInput::format()
     QAudioFormat requested = audioDevice.preferredFormat();
     QAudioFormat actual    = audioInput.format();
 
-    QVERIFY2((requested.channels() == actual.channels()),
-            QString("channels: requested=%1, actual=%2").arg(requested.channels()).arg(actual.channels()).toLocal8Bit().constData());
-    QVERIFY2((requested.frequency() == actual.frequency()),
-            QString("frequency: requested=%1, actual=%2").arg(requested.frequency()).arg(actual.frequency()).toLocal8Bit().constData());
+    QVERIFY2((requested.channelCount() == actual.channelCount()),
+            QString("channels: requested=%1, actual=%2").arg(requested.channelCount()).arg(actual.channelCount()).toLocal8Bit().constData());
+    QVERIFY2((requested.sampleRate() == actual.sampleRate()),
+            QString("sampleRate: requested=%1, actual=%2").arg(requested.sampleRate()).arg(actual.sampleRate()).toLocal8Bit().constData());
     QVERIFY2((requested.sampleSize() == actual.sampleSize()),
             QString("sampleSize: requested=%1, actual=%2").arg(requested.sampleSize()).arg(actual.sampleSize()).toLocal8Bit().constData());
     QVERIFY2((requested.codec() == actual.codec()),
@@ -620,7 +620,7 @@ void tst_QAudioInput::push()
         qint64 totalBytesRead = 0;
         bool firstBuffer = true;
         QByteArray buffer(AUDIO_BUFFER, 0);
-        qint64 len = (testFormats.at(i).frequency()*testFormats.at(i).channels()*(testFormats.at(i).sampleSize()/8)*2); // 2 seconds
+        qint64 len = (testFormats.at(i).sampleRate()*testFormats.at(i).channelCount()*(testFormats.at(i).sampleSize()/8)*2); // 2 seconds
         while (totalBytesRead < len) {
             if (audioInput.bytesReady() >= audioInput.periodSize()) {
                 qint64 bytesRead = feed->read(buffer.data(), audioInput.periodSize());
@@ -703,7 +703,7 @@ void tst_QAudioInput::pushSuspendResume()
         qint64 totalBytesRead = 0;
         bool firstBuffer = true;
         QByteArray buffer(AUDIO_BUFFER, 0);
-        qint64 len = (testFormats.at(i).frequency()*testFormats.at(i).channels()*(testFormats.at(i).sampleSize()/8)); // 1 seconds
+        qint64 len = (testFormats.at(i).sampleRate()*testFormats.at(i).channelCount()*(testFormats.at(i).sampleSize()/8)); // 1 seconds
         while (totalBytesRead < len) {
             if (audioInput.bytesReady() >= audioInput.periodSize()) {
                 qint64 bytesRead = feed->read(buffer.data(), audioInput.periodSize());
diff --git a/tests/auto/integration/qaudioinput/wavheader.cpp b/tests/auto/integration/qaudioinput/wavheader.cpp
index f73ae8ba1..770540ac4 100755
--- a/tests/auto/integration/qaudioinput/wavheader.cpp
+++ b/tests/auto/integration/qaudioinput/wavheader.cpp
@@ -111,9 +111,9 @@ bool WavHeader::read(QIODevice &device)
                 else
                     m_format.setByteOrder(QAudioFormat::BigEndian);
 
-                m_format.setChannels(qFromLittleEndian<quint16>(header.wave.numChannels));
+                m_format.setChannelCount(qFromLittleEndian<quint16>(header.wave.numChannels));
                 m_format.setCodec("audio/pcm");
-                m_format.setFrequency(qFromLittleEndian<quint32>(header.wave.sampleRate));
+                m_format.setSampleRate(qFromLittleEndian<quint32>(header.wave.sampleRate));
                 m_format.setSampleSize(qFromLittleEndian<quint16>(header.wave.bitsPerSample));
 
                 switch(header.wave.bitsPerSample) {
@@ -158,13 +158,13 @@ bool WavHeader::write(QIODevice &device)
                              reinterpret_cast<unsigned char*>(&header.wave.descriptor.size));
     qToLittleEndian<quint16>(quint16(1),
                              reinterpret_cast<unsigned char*>(&header.wave.audioFormat));
-    qToLittleEndian<quint16>(quint16(m_format.channels()),
+    qToLittleEndian<quint16>(quint16(m_format.channelCount()),
                              reinterpret_cast<unsigned char*>(&header.wave.numChannels));
-    qToLittleEndian<quint32>(quint32(m_format.frequency()),
+    qToLittleEndian<quint32>(quint32(m_format.sampleRate()),
                              reinterpret_cast<unsigned char*>(&header.wave.sampleRate));
-    qToLittleEndian<quint32>(quint32(m_format.frequency() * m_format.channels() * m_format.sampleSize() / 8),
+    qToLittleEndian<quint32>(quint32(m_format.sampleRate() * m_format.channelCount() * m_format.sampleSize() / 8),
                              reinterpret_cast<unsigned char*>(&header.wave.byteRate));
-    qToLittleEndian<quint16>(quint16(m_format.channels() * m_format.sampleSize() / 8),
+    qToLittleEndian<quint16>(quint16(m_format.channelCount() * m_format.sampleSize() / 8),
                              reinterpret_cast<unsigned char*>(&header.wave.blockAlign));
     qToLittleEndian<quint16>(quint16(m_format.sampleSize()),
                              reinterpret_cast<unsigned char*>(&header.wave.bitsPerSample));