diff options
author | Katja Marttila <katja.marttila@qt.io> | 2019-03-19 11:55:02 +0200 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2019-03-19 11:55:02 +0200 |
commit | 8c448f77a00d01e24e4d083d9684c275b3efdd04 (patch) | |
tree | c75af0ceed6555249c6a2413dc5c0ff0aec928bb /tests/auto/installer/settingsoperation/tst_settingsoperation.cpp | |
parent | 2beb45ea0317d0bed9d6085bd927f5a55dff25d5 (diff) | |
parent | 407b19ff904244e287d62c7d02ca2a0779fc7b09 (diff) |
Merge branch '3.1' into master
Change-Id: I2ac4e385ee771892369d98495ceceb09c481c018
Diffstat (limited to 'tests/auto/installer/settingsoperation/tst_settingsoperation.cpp')
-rw-r--r-- | tests/auto/installer/settingsoperation/tst_settingsoperation.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
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<QString, SettingsOperation*> 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<QString, SettingsOperation*>::iterator i = testSettingsOperationMap.begin(); while (i != testSettingsOperationMap.end()) { @@ -256,9 +256,9 @@ private slots: testFile.close(); QMap<QString, SettingsOperation*> 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<QString, SettingsOperation*>::iterator i = testSettingsOperationMap.begin(); while (i != testSettingsOperationMap.end()) { |