diff options
author | Kevin Funk <kfunk@kde.org> | 2017-01-16 18:17:34 +0100 |
---|---|---|
committer | Kevin Funk <kfunk@kde.org> | 2017-01-16 18:17:34 +0100 |
commit | 2034e3ce7593f04d251b634bfe2d71b30f15ea3a (patch) | |
tree | 9f96f54eca16f8a552f09f130ac248c8e35557b7 /autotests/kconfig_compiler | |
parent | f83b4b191d627b010192e0715536cb57c25519fb (diff) | |
download | kconfig-2034e3ce7593f04d251b634bfe2d71b30f15ea3a.tar.gz kconfig-2034e3ce7593f04d251b634bfe2d71b30f15ea3a.tar.bz2 |
Prefer nullptr over Q_NULLPTR
Diffstat (limited to 'autotests/kconfig_compiler')
-rw-r--r-- | autotests/kconfig_compiler/kconfigcompiler_test.cpp | 4 | ||||
-rw-r--r-- | autotests/kconfig_compiler/kconfigcompiler_test_signals.cpp | 2 |
2 files changed, 3 insertions, 3 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 |