From bba28afe559837321a2083b3ce046ab774a7ef6b Mon Sep 17 00:00:00 2001
From: Michael Goddard <michael.goddard@nokia.com>
Date: Wed, 20 Jun 2012 16:04:57 +1000
Subject: Rename a few controls.

The encoder controls could be confused with actual encoding, so make
clear they are just settings.  Also, the end point selector controls
were not named very well.

Change-Id: I27f8bf9c865c5f295abad97c01ef98752af42613
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
---
 tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h')

diff --git a/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h b/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h
index 7fb83e396..ffe1800b9 100644
--- a/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h
@@ -42,14 +42,14 @@
 #ifndef MOCKAUDIOENCODERCONTROL_H
 #define MOCKAUDIOENCODERCONTROL_H
 
-#include "qaudioencodercontrol.h"
+#include "qaudioencodersettingscontrol.h"
 
-class MockAudioEncoderControl : public QAudioEncoderControl
+class MockAudioEncoderControl : public QAudioEncoderSettingsControl
 {
     Q_OBJECT
 public:
     MockAudioEncoderControl(QObject *parent):
-        QAudioEncoderControl(parent)
+        QAudioEncoderSettingsControl(parent)
     {
         m_codecs << "audio/pcm" << "audio/mpeg";
         m_descriptions << "Pulse Code Modulation" << "mp3 format";
-- 
cgit v1.2.3