Added setChannelCount() to QAudioFormat.

Added setChannelCount() and updated docs/examples/tests to use it
instead of setChannels().

Reviewed-by:Justin McPherson

4 files changed, 8 insertions, 8 deletions

diff --git a/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp b/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
index 715f219..14cf6b3 100644
--- a/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
+++ b/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
@@ -170,7 +170,7 @@ void tst_QAudioDeviceInfo::isformat()
     if(available) {
         QAudioFormat     format;
         format.setFrequency(44100);
-        format.setChannels(2);
+        format.setChannelCount(2);
         format.setSampleType(QAudioFormat::SignedInt);
         format.setByteOrder(QAudioFormat::LittleEndian);
         format.setSampleSize(16);
diff --git a/tests/auto/qaudioformat/tst_qaudioformat.cpp b/tests/auto/qaudioformat/tst_qaudioformat.cpp
index 0778a8e..2742dd7 100644
--- a/tests/auto/qaudioformat/tst_qaudioformat.cpp
+++ b/tests/auto/qaudioformat/tst_qaudioformat.cpp
@@ -78,7 +78,7 @@ void tst_QAudioFormat::checkNull()
     QVERIFY(!audioFormat1.isValid());
 
     audioFormat0.setFrequency(44100);
-    audioFormat0.setChannels(2);
+    audioFormat0.setChannelCount(2);
     audioFormat0.setSampleSize(16);
     audioFormat0.setCodec("audio/pcm");
     audioFormat0.setSampleType(QAudioFormat::SignedInt);
@@ -95,7 +95,7 @@ void tst_QAudioFormat::checkFrequency()
 void tst_QAudioFormat::checkChannels()
 {
     QAudioFormat    audioFormat;
-    audioFormat.setChannels(2);
+    audioFormat.setChannelCount(2);
     QVERIFY(audioFormat.channels() == 2);
 }
 
@@ -138,14 +138,14 @@ void tst_QAudioFormat::checkEquality()
 
     // on filled formats
     audioFormat0.setFrequency(8000);
-    audioFormat0.setChannels(1);
+    audioFormat0.setChannelCount(1);
     audioFormat0.setSampleSize(8);
     audioFormat0.setCodec("audio/pcm");
     audioFormat0.setByteOrder(QAudioFormat::LittleEndian);
     audioFormat0.setSampleType(QAudioFormat::UnSignedInt);
 
     audioFormat1.setFrequency(8000);
-    audioFormat1.setChannels(1);
+    audioFormat1.setChannelCount(1);
     audioFormat1.setSampleSize(8);
     audioFormat1.setCodec("audio/pcm");
     audioFormat1.setByteOrder(QAudioFormat::LittleEndian);
@@ -165,7 +165,7 @@ void tst_QAudioFormat::checkAssignment()
     QAudioFormat    audioFormat1;
 
     audioFormat0.setFrequency(8000);
-    audioFormat0.setChannels(1);
+    audioFormat0.setChannelCount(1);
     audioFormat0.setSampleSize(8);
     audioFormat0.setCodec("audio/pcm");
     audioFormat0.setByteOrder(QAudioFormat::LittleEndian);
diff --git a/tests/auto/qaudioinput/tst_qaudioinput.cpp b/tests/auto/qaudioinput/tst_qaudioinput.cpp
index 744ce38..40bf01f 100644
--- a/tests/auto/qaudioinput/tst_qaudioinput.cpp
+++ b/tests/auto/qaudioinput/tst_qaudioinput.cpp
@@ -69,7 +69,7 @@ private:
 void tst_QAudioInput::initTestCase()
 {
     format.setFrequency(8000);
-    format.setChannels(1);
+    format.setChannelCount(1);
     format.setSampleSize(8);
     format.setCodec("audio/pcm");
     format.setByteOrder(QAudioFormat::LittleEndian);
diff --git a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
index 26694cc..f3feec1 100644
--- a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
+++ b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
@@ -72,7 +72,7 @@ private:
 void tst_QAudioOutput::initTestCase()
 {
     format.setFrequency(8000);
-    format.setChannels(1);
+    format.setChannelCount(1);
     format.setSampleSize(8);
     format.setCodec("audio/pcm");
     format.setByteOrder(QAudioFormat::LittleEndian);