From 268277552bd65119a72c75c9eb792cd0a70859bd Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Fri, 5 Aug 2016 14:18:01 +0200 Subject: tst_QAudioDeviceInfo: don't do implicit cast from NULL to char* Use QString::isNull() rather than QString() == NULL. Task-number: QTBUG-55154 Change-Id: I3860caa504ed3abda6c525b93e9d232a708b7f0b Reviewed-by: Liang Qi --- tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp b/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp index abc0b934b..9d44dc16f 100644 --- a/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp +++ b/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp @@ -190,7 +190,7 @@ void tst_QAudioDeviceInfo::supportedSampleRates() void tst_QAudioDeviceInfo::assignOperator() { QAudioDeviceInfo dev; - QVERIFY(dev.deviceName() == NULL); + QVERIFY(dev.deviceName().isNull()); QVERIFY(dev.isNull() == true); QList devices = QAudioDeviceInfo::availableDevices(QAudio::AudioOutput); @@ -204,7 +204,7 @@ void tst_QAudioDeviceInfo::assignOperator() // Returns human readable name of audio device void tst_QAudioDeviceInfo::deviceName() { - QVERIFY(device->deviceName() != NULL); + QVERIFY(!device->deviceName().isNull()); QVERIFY(device->deviceName() == QAudioDeviceInfo::availableDevices(QAudio::AudioOutput).at(0).deviceName()); } @@ -213,7 +213,7 @@ void tst_QAudioDeviceInfo::defaultConstructor() { QAudioDeviceInfo dev; QVERIFY(dev.isNull() == true); - QVERIFY(dev.deviceName() == NULL); + QVERIFY(dev.deviceName().isNull()); } void tst_QAudioDeviceInfo::equalityOperator() -- cgit v1.2.3