Revert "Added setChannelCount() to QAudioFormat."

This reverts commit f124538ef4840c3d24b4c7e9e7221adb52bdee2c.

Conflicts:

	examples/multimedia/audioinput/audioinput.cpp
	examples/multimedia/audiooutput/audiooutput.cpp
	src/multimedia/audio/qaudio_mac.cpp
	src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
	src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp
	src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
	src/multimedia/audio/qaudioformat.h
	src/multimedia/audio/qaudioinput.cpp
	src/multimedia/audio/qaudiooutput.cpp
	tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
	tests/auto/qaudioformat/tst_qaudioformat.cpp
	tests/auto/qaudioinput/tst_qaudioinput.cpp
	tests/auto/qaudiooutput/tst_qaudiooutput.cpp

1 files changed, 10 insertions, 10 deletions

diff --git a/tests/auto/qaudioformat/tst_qaudioformat.cpp b/tests/auto/qaudioformat/tst_qaudioformat.cpp
index a7200c4..1d3f313 100644
--- a/tests/auto/qaudioformat/tst_qaudioformat.cpp
+++ b/tests/auto/qaudioformat/tst_qaudioformat.cpp
@@ -77,8 +77,8 @@ void tst_QAudioFormat::checkNull()
     QAudioFormat    audioFormat1(audioFormat0);
     QVERIFY(!audioFormat1.isValid());
 
-    audioFormat0.setSampleRate(44100);
-    audioFormat0.setChannelCount(2);
+    audioFormat0.setFrequency(44100);
+    audioFormat0.setChannels(2);
     audioFormat0.setSampleSize(16);
     audioFormat0.setCodec("audio/pcm");
     audioFormat0.setSampleType(QAudioFormat::SignedInt);
@@ -95,8 +95,8 @@ void tst_QAudioFormat::checkFrequency()
 void tst_QAudioFormat::checkChannels()
 {
     QAudioFormat    audioFormat;
-    audioFormat.setChannelCount(2);
-    QVERIFY(audioFormat.channelCount() == 2);
+    audioFormat.setChannels(2);
+    QVERIFY(audioFormat.channels() == 2);
 }
 
 void tst_QAudioFormat::checkSampleSize()
@@ -137,15 +137,15 @@ void tst_QAudioFormat::checkEquality()
     QVERIFY(!(audioFormat0 != audioFormat1));
 
     // on filled formats
-    audioFormat0.setSampleRate(8000);
-    audioFormat0.setChannelCount(1);
+    audioFormat0.setFrequency(8000);
+    audioFormat0.setChannels(1);
     audioFormat0.setSampleSize(8);
     audioFormat0.setCodec("audio/pcm");
     audioFormat0.setByteOrder(QAudioFormat::LittleEndian);
     audioFormat0.setSampleType(QAudioFormat::UnSignedInt);
 
-    audioFormat1.setSampleRate(8000);
-    audioFormat1.setChannelCount(1);
+    audioFormat1.setFrequency(8000);
+    audioFormat1.setChannels(1);
     audioFormat1.setSampleSize(8);
     audioFormat1.setCodec("audio/pcm");
     audioFormat1.setByteOrder(QAudioFormat::LittleEndian);
@@ -164,8 +164,8 @@ void tst_QAudioFormat::checkAssignment()
     QAudioFormat    audioFormat0;
     QAudioFormat    audioFormat1;
 
-    audioFormat0.setSampleRate(8000);
-    audioFormat0.setChannelCount(1);
+    audioFormat0.setFrequency(8000);
+    audioFormat0.setChannels(1);
     audioFormat0.setSampleSize(8);
     audioFormat0.setCodec("audio/pcm");
     audioFormat0.setByteOrder(QAudioFormat::LittleEndian);