From 9dacee18f9b7211699164bc70dd17f9934a15f50 Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Thu, 1 Nov 2018 10:38:13 +0200 Subject: Replace 0 with nullptr Prevents a lot of warnings seen in QtCreator Change-Id: I63bf95aca68a04fc9fd0eecbe29c63e9b9c47efd Reviewed-by: Iikka Eklund --- .../settingsoperation/tst_settingsoperation.cpp | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'tests/auto/installer/settingsoperation/tst_settingsoperation.cpp') diff --git a/tests/auto/installer/settingsoperation/tst_settingsoperation.cpp b/tests/auto/installer/settingsoperation/tst_settingsoperation.cpp index 7530910b6..ced0e6f36 100644 --- a/tests/auto/installer/settingsoperation/tst_settingsoperation.cpp +++ b/tests/auto/installer/settingsoperation/tst_settingsoperation.cpp @@ -60,7 +60,7 @@ private slots: void testWrongArguments() { - SettingsOperation noArgumentsOperation(0); + SettingsOperation noArgumentsOperation(nullptr); QVERIFY(noArgumentsOperation.testOperation()); @@ -76,7 +76,7 @@ private slots: // same for undo QCOMPARE(noArgumentsOperation.undoOperation(), false); - SettingsOperation wrongMethodArgumentOperation(0); + SettingsOperation wrongMethodArgumentOperation(nullptr); wrongMethodArgumentOperation.setArguments(QStringList() << "path=first" << "method=second" << "key=third" << "value=fourth"); @@ -109,7 +109,7 @@ private slots: testSettings.setValue(key, value); } - SettingsOperation settingsOperation(0); + SettingsOperation settingsOperation(nullptr); settingsOperation.setArguments(QStringList() << QString("path=%1").arg(testFilePath) << "method=set" << QString("key=%1").arg(key) << QString("value=%1").arg(value)); settingsOperation.backup(); @@ -127,7 +127,7 @@ private slots: const QString key = "key"; const QString value = "value"; - SettingsOperation settingsOperation(0); + SettingsOperation settingsOperation(nullptr); settingsOperation.setArguments(QStringList() << QString("path=%1").arg(testFilePath) << "method=set" << QString("key=%1").arg(key) << QString("value=%1").arg(value)); settingsOperation.backup(); @@ -154,7 +154,7 @@ private slots: } QCOMPARE(testValueString.isEmpty(), false); - SettingsOperation settingsOperation(0); + SettingsOperation settingsOperation(nullptr); settingsOperation.setArguments(QStringList() << QString("path=%1").arg(testFilePath) << "method=remove" << QString("key=%1").arg(key)); settingsOperation.backup(); @@ -189,10 +189,10 @@ private slots: testFile.close(); QMap testSettingsOperationMap; - testSettingsOperationMap["testcategory/categoryarrayvalue1"] = new SettingsOperation(0); - testSettingsOperationMap["testcategory/categoryarrayvalue2"] = new SettingsOperation(0); - testSettingsOperationMap["testcategory/categoryarrayvalue3"] = new SettingsOperation(0); - testSettingsOperationMap["testcategory/categoryarrayvalue4"] = new SettingsOperation(0); + testSettingsOperationMap["testcategory/categoryarrayvalue1"] = new SettingsOperation(nullptr); + testSettingsOperationMap["testcategory/categoryarrayvalue2"] = new SettingsOperation(nullptr); + testSettingsOperationMap["testcategory/categoryarrayvalue3"] = new SettingsOperation(nullptr); + testSettingsOperationMap["testcategory/categoryarrayvalue4"] = new SettingsOperation(nullptr); QMap::iterator i = testSettingsOperationMap.begin(); while (i != testSettingsOperationMap.end()) { @@ -256,9 +256,9 @@ private slots: testFile.close(); QMap testSettingsOperationMap; - testSettingsOperationMap["testcategory/categoryarrayvalue1"] = new SettingsOperation(0); - testSettingsOperationMap["testcategory/categoryarrayvalue2"] = new SettingsOperation(0); - testSettingsOperationMap["testcategory/categoryarrayvalue3"] = new SettingsOperation(0); + testSettingsOperationMap["testcategory/categoryarrayvalue1"] = new SettingsOperation(nullptr); + testSettingsOperationMap["testcategory/categoryarrayvalue2"] = new SettingsOperation(nullptr); + testSettingsOperationMap["testcategory/categoryarrayvalue3"] = new SettingsOperation(nullptr); QMap::iterator i = testSettingsOperationMap.begin(); while (i != testSettingsOperationMap.end()) { -- cgit v1.2.3