From ac6703215ba5e152379173ba503f5ba3bd7e8a85 Mon Sep 17 00:00:00 2001 From: Thomas Braxton Date: Wed, 11 Jun 2014 08:40:44 -0500 Subject: Simple Cleanups - use Q_NULLPTR instead of 0 or NULL - simplify some foreach loops - use QStringLiteral in a few places - added a few consts REVIEW: 118666 --- autotests/kconfig_compiler/kconfigcompiler_test.cpp | 4 ++-- autotests/kconfigloadertest.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'autotests') diff --git a/autotests/kconfig_compiler/kconfigcompiler_test.cpp b/autotests/kconfig_compiler/kconfigcompiler_test.cpp index 40173ee7..cfe86e05 100644 --- a/autotests/kconfig_compiler/kconfigcompiler_test.cpp +++ b/autotests/kconfig_compiler/kconfigcompiler_test.cpp @@ -45,7 +45,7 @@ static CompilerTestSet testCases = { "test12.h", "test12.cpp", "test_dpointer.cpp", "test_dpointer.h", "test_signal.cpp", "test_signal.h", - NULL + Q_NULLPTR }; static CompilerTestSet testCasesToRun = { @@ -64,7 +64,7 @@ static CompilerTestSet testCasesToRun = { "test12", "test_dpointer", "test_signal", - 0 + Q_NULLPTR }; #if 0 diff --git a/autotests/kconfigloadertest.cpp b/autotests/kconfigloadertest.cpp index 451d636e..d52f5cbf 100644 --- a/autotests/kconfigloadertest.cpp +++ b/autotests/kconfigloadertest.cpp @@ -30,11 +30,11 @@ Q_DECLARE_METATYPE(QList) #define GET_CONFIG_ITEM_VALUE(type, configName) \ KConfigSkeletonItem* item = cl->findItem(TEST_NAME, configName); \ /* Check if we got back a valid item. */ \ - QVERIFY(item != 0); \ + QVERIFY(item != Q_NULLPTR); \ /* Cast the item to the given type. */ \ type typeItem = dynamic_cast(item); \ /* Make sure the cast was successful. */ \ - QVERIFY(typeItem != 0); + QVERIFY(typeItem != Q_NULLPTR); void ConfigLoaderTest::init() { -- cgit v1.2.1