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>

1 files changed, 9 insertions, 9 deletions

diff --git a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
index 99ea5d7b5..10409038d 100644
--- a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
+++ b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
@@ -49,10 +49,10 @@
 #include <qmediarecordercontrol.h>
 #include <qmediarecorder.h>
 #include <qmetadatawritercontrol.h>
-#include <qaudioendpointselector.h>
-#include <qaudioencodercontrol.h>
+#include <qaudioendpointselectorcontrol.h>
+#include <qaudioencodersettingscontrol.h>
 #include <qmediacontainercontrol.h>
-#include <qvideoencodercontrol.h>
+#include <qvideoencodersettingscontrol.h>
 #include <qaudioformat.h>
 
 #include "mockmediarecorderservice.h"
@@ -114,13 +114,13 @@ private slots:
     void testVideoSettingsDestructor();
 
 private:
-    QAudioEncoderControl* encode;
-    QAudioEndpointSelector* audio;
+    QAudioEncoderSettingsControl* encode;
+    QAudioEndpointSelectorControl* audio;
     MockMediaObject *object;
     MockMediaRecorderService*service;
     MockMediaRecorderControl *mock;
     QMediaRecorder *capture;
-    QVideoEncoderControl* videoEncode;
+    QVideoEncoderSettingsControl* videoEncode;
 };
 
 void tst_QMediaRecorder::initTestCase()
@@ -133,9 +133,9 @@ void tst_QMediaRecorder::initTestCase()
     object = new MockMediaObject(this, service);
     capture = new QMediaRecorder(object);
 
-    audio = qobject_cast<QAudioEndpointSelector*>(service->requestControl(QAudioEndpointSelector_iid));
-    encode = qobject_cast<QAudioEncoderControl*>(service->requestControl(QAudioEncoderControl_iid));
-    videoEncode = qobject_cast<QVideoEncoderControl*>(service->requestControl(QVideoEncoderControl_iid));
+    audio = qobject_cast<QAudioEndpointSelectorControl*>(service->requestControl(QAudioEndpointSelectorControl_iid));
+    encode = qobject_cast<QAudioEncoderSettingsControl*>(service->requestControl(QAudioEncoderSettingsControl_iid));
+    videoEncode = qobject_cast<QVideoEncoderSettingsControl*>(service->requestControl(QVideoEncoderSettingsControl_iid));
 }
 
 void tst_QMediaRecorder::cleanupTestCase()