diff options
author | Yoann Lopes <yoann.lopes@qt.io> | 2016-08-05 14:18:01 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-05 12:28:10 +0000 |
commit | 268277552bd65119a72c75c9eb792cd0a70859bd (patch) | |
tree | 75032059b15bad1bb7a699e00d10c91553085aee /tests | |
parent | f979916804fdcea14e2a560336f31f4046fbe84a (diff) | |
download | qtmultimedia-268277552bd65119a72c75c9eb792cd0a70859bd.tar.gz |
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 <liang.qi@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<QAudioDeviceInfo> 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() |