diff options
Diffstat (limited to 'autotests')
| -rw-r--r-- | autotests/kconfig_compiler/kconfigcompiler_test.cpp | 4 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/kconfigcompiler_test_signals.cpp | 2 | ||||
| -rw-r--r-- | autotests/kconfigloadertest.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/autotests/kconfig_compiler/kconfigcompiler_test.cpp b/autotests/kconfig_compiler/kconfigcompiler_test.cpp index 01efd602..74bb7288 100644 --- a/autotests/kconfig_compiler/kconfigcompiler_test.cpp +++ b/autotests/kconfig_compiler/kconfigcompiler_test.cpp @@ -51,7 +51,7 @@ static CompilerTestSet testCases = { "test_translation_kde.cpp", "test_translation_kde.h", "test_translation_kde_domain.cpp", "test_translation_kde_domain.h", "test_translation_qt.cpp", "test_translation_qt.h", - Q_NULLPTR + nullptr }; static CompilerTestSet testCasesToRun = { @@ -75,7 +75,7 @@ static CompilerTestSet testCasesToRun = { "test_translation_kde", "test_translation_kde_domain", "test_translation_qt", - Q_NULLPTR + nullptr }; #if 0 diff --git a/autotests/kconfig_compiler/kconfigcompiler_test_signals.cpp b/autotests/kconfig_compiler/kconfigcompiler_test_signals.cpp index b0c545fc..2a26c155 100644 --- a/autotests/kconfig_compiler/kconfigcompiler_test_signals.cpp +++ b/autotests/kconfig_compiler/kconfigcompiler_test_signals.cpp @@ -79,7 +79,7 @@ void KConfigCompiler_Test_Signals::cleanupTestCase() struct TestSettersArg { // default constructor required for Q_DECLARE_METATYPE - TestSettersArg() : obj(Q_NULLPTR) {} + TestSettersArg() : obj(nullptr) {} template<typename T> TestSettersArg(T* object) : obj(object) { // we can also call static methods using object->foo() so this works for all four cases diff --git a/autotests/kconfigloadertest.cpp b/autotests/kconfigloadertest.cpp index d52f5cbf..ef3ac30e 100644 --- a/autotests/kconfigloadertest.cpp +++ b/autotests/kconfigloadertest.cpp @@ -30,11 +30,11 @@ Q_DECLARE_METATYPE(QList<int>) #define GET_CONFIG_ITEM_VALUE(type, configName) \ KConfigSkeletonItem* item = cl->findItem(TEST_NAME, configName); \ /* Check if we got back a valid item. */ \ - QVERIFY(item != Q_NULLPTR); \ + QVERIFY(item != nullptr); \ /* Cast the item to the given type. */ \ type typeItem = dynamic_cast<type>(item); \ /* Make sure the cast was successful. */ \ - QVERIFY(typeItem != Q_NULLPTR); + QVERIFY(typeItem != nullptr); void ConfigLoaderTest::init() { |