diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-12-23 10:03:12 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-21 19:55:52 +0000 |
commit | 1175c3b5405015a27bc28d836e96582f02d3ce00 (patch) | |
tree | 9d466f156414b29b4264acf748860283ec96c499 /tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp | |
parent | 083d12af7be12a6076e1be779452909f37262a61 (diff) |
Modernize code base
Run clang-tidy over the code base with some code modernization
options.
Change-Id: I9e74d1225bce333e74224e3b92c02c7e9884d8f5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
Diffstat (limited to 'tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp')
-rw-r--r-- | tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp b/tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp index a7123cfe0..edac16b55 100644 --- a/tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp +++ b/tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp @@ -61,7 +61,7 @@ public: mockMetaDataControl = new MockMetaDataWriterControl(parent); //Creating the object for MetaData } - QMediaControl* requestControl(const char *name) + QMediaControl* requestControl(const char *name) override { if (hasControls && qstrcmp(name,QMediaRecorderControl_iid) == 0) return mockControl; @@ -70,10 +70,10 @@ public: if (hasControls && qstrcmp(name, QMetaDataWriterControl_iid) == 0) return mockMetaDataControl; - return 0; + return nullptr; } - void releaseControl(QMediaControl*) {} + void releaseControl(QMediaControl*) override {} //Initialising the objects for the media QMediaControl *mockControl; QMediaContainerControl *mockContainerControl; @@ -97,26 +97,26 @@ private slots: void testMediaObject() //Verifying the mediaobject api { - MockMediaRecorderControl recorderControl(0); - TestBindableService service(0, &recorderControl); + MockMediaRecorderControl recorderControl(nullptr); + TestBindableService service(nullptr, &recorderControl); service.mockMetaDataControl->populateMetaData(); - MockMediaObject object(0, &service); + MockMediaObject object(nullptr, &service); QMediaRecorder recorder(&object); QMediaObject *obj = recorder.mediaObject(); - QVERIFY(obj != NULL); + QVERIFY(obj != nullptr); QVERIFY(obj->isAvailable()); } void testDestructor() //Invoking the destructor { - MockMediaRecorderControl recorderControl(0); - TestBindableService service(0, &recorderControl); + MockMediaRecorderControl recorderControl(nullptr); + TestBindableService service(nullptr, &recorderControl); service.mockMetaDataControl->populateMetaData(); - MockMediaObject object(0, &service); + MockMediaObject object(nullptr, &service); QMediaRecorder *recorder = new QMediaRecorder(&object); QVERIFY(recorder->isAvailable()); delete recorder; - recorder = NULL; + recorder = nullptr; } }; |