Revert "Frequency to SampleRate and channels to channelCount."

This reverts commit 80d4a4945d3273a4b2ce91e34597533f661af320.

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, 2 insertions, 2 deletions

diff --git a/tests/auto/qaudioinput/tst_qaudioinput.cpp b/tests/auto/qaudioinput/tst_qaudioinput.cpp
index d17a12a4f1..40b7fbb654 100644
--- a/tests/auto/qaudioinput/tst_qaudioinput.cpp
+++ b/tests/auto/qaudioinput/tst_qaudioinput.cpp
@@ -94,8 +94,8 @@ void tst_QAudioInput::settings()
         // Confirm the setting we added in the init function.
         QAudioFormat f = audio->format();
 
-        QVERIFY(format.channelCount() == f.channelCount());
-        QVERIFY(format.sampleRate() == f.sampleRate());
+        QVERIFY(format.channels() == f.channels());
+        QVERIFY(format.frequency() == f.frequency());
         QVERIFY(format.sampleSize() == f.sampleSize());
         QVERIFY(format.codec() == f.codec());
         QVERIFY(format.byteOrder() == f.byteOrder());