aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--autotests/kconfig_compiler/test10.cpp.ref4
-rw-r--r--autotests/kconfig_compiler/test4.cpp.ref4
-rw-r--r--autotests/kconfig_compiler/test5.cpp.ref4
-rw-r--r--autotests/kconfig_compiler/test8b.cpp.ref4
-rw-r--r--autotests/kconfig_compiler/test_dpointer.cpp.ref4
-rw-r--r--autotests/kconfig_compiler/test_signal.cpp.ref4
-rw-r--r--src/kconfig_compiler/kconfig_compiler.cpp4
7 files changed, 14 insertions, 14 deletions
diff --git a/autotests/kconfig_compiler/test10.cpp.ref b/autotests/kconfig_compiler/test10.cpp.ref
index a84bee30..971697d5 100644
--- a/autotests/kconfig_compiler/test10.cpp.ref
+++ b/autotests/kconfig_compiler/test10.cpp.ref
@@ -9,7 +9,7 @@
class Test10Helper
{
public:
- Test10Helper() : q(0) {}
+ Test10Helper() : q(nullptr) {}
~Test10Helper() { delete q; }
Test10 *q;
};
@@ -41,6 +41,6 @@ Test10::Test10( )
Test10::~Test10()
{
- s_globalTest10()->q = 0;
+ s_globalTest10()->q = nullptr;
}
diff --git a/autotests/kconfig_compiler/test4.cpp.ref b/autotests/kconfig_compiler/test4.cpp.ref
index f6b4486f..9c0da454 100644
--- a/autotests/kconfig_compiler/test4.cpp.ref
+++ b/autotests/kconfig_compiler/test4.cpp.ref
@@ -9,7 +9,7 @@
class Test4Helper
{
public:
- Test4Helper() : q(0) {}
+ Test4Helper() : q(nullptr) {}
~Test4Helper() { delete q; }
Test4 *q;
};
@@ -173,6 +173,6 @@ QColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
Test4::~Test4()
{
- s_globalTest4()->q = 0;
+ s_globalTest4()->q = nullptr;
}
diff --git a/autotests/kconfig_compiler/test5.cpp.ref b/autotests/kconfig_compiler/test5.cpp.ref
index fefe8e8c..a27bd770 100644
--- a/autotests/kconfig_compiler/test5.cpp.ref
+++ b/autotests/kconfig_compiler/test5.cpp.ref
@@ -9,7 +9,7 @@
class Test5Helper
{
public:
- Test5Helper() : q(0) {}
+ Test5Helper() : q(nullptr) {}
~Test5Helper() { delete q; }
Test5 *q;
};
@@ -83,6 +83,6 @@ QColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
Test5::~Test5()
{
- s_globalTest5()->q = 0;
+ s_globalTest5()->q = nullptr;
}
diff --git a/autotests/kconfig_compiler/test8b.cpp.ref b/autotests/kconfig_compiler/test8b.cpp.ref
index 5c369a62..378aef73 100644
--- a/autotests/kconfig_compiler/test8b.cpp.ref
+++ b/autotests/kconfig_compiler/test8b.cpp.ref
@@ -9,7 +9,7 @@
class Test8bHelper
{
public:
- Test8bHelper() : q(0) {}
+ Test8bHelper() : q(nullptr) {}
~Test8bHelper() { delete q; }
Test8b *q;
};
@@ -47,6 +47,6 @@ Test8b::Test8b( )
Test8b::~Test8b()
{
- s_globalTest8b()->q = 0;
+ s_globalTest8b()->q = nullptr;
}
diff --git a/autotests/kconfig_compiler/test_dpointer.cpp.ref b/autotests/kconfig_compiler/test_dpointer.cpp.ref
index 17ed2091..dd2a4c04 100644
--- a/autotests/kconfig_compiler/test_dpointer.cpp.ref
+++ b/autotests/kconfig_compiler/test_dpointer.cpp.ref
@@ -48,7 +48,7 @@ class TestDPointerPrivate
class TestDPointerHelper
{
public:
- TestDPointerHelper() : q(0) {}
+ TestDPointerHelper() : q(nullptr) {}
~TestDPointerHelper() { delete q; }
TestDPointer *q;
};
@@ -343,6 +343,6 @@ KConfigSkeleton::ItemFont *TestDPointer::timeBarFontItem()
TestDPointer::~TestDPointer()
{
delete d;
- s_globalTestDPointer()->q = 0;
+ s_globalTestDPointer()->q = nullptr;
}
diff --git a/autotests/kconfig_compiler/test_signal.cpp.ref b/autotests/kconfig_compiler/test_signal.cpp.ref
index 8afd6741..103bfcf3 100644
--- a/autotests/kconfig_compiler/test_signal.cpp.ref
+++ b/autotests/kconfig_compiler/test_signal.cpp.ref
@@ -9,7 +9,7 @@
class TestSignalHelper
{
public:
- TestSignalHelper() : q(0) {}
+ TestSignalHelper() : q(nullptr) {}
~TestSignalHelper() { delete q; }
TestSignal *q;
};
@@ -53,7 +53,7 @@ TestSignal::TestSignal( )
TestSignal::~TestSignal()
{
- s_globalTestSignal()->q = 0;
+ s_globalTestSignal()->q = nullptr;
}
bool TestSignal::usrSave()
diff --git a/src/kconfig_compiler/kconfig_compiler.cpp b/src/kconfig_compiler/kconfig_compiler.cpp
index 121bea4f..5c3f478f 100644
--- a/src/kconfig_compiler/kconfig_compiler.cpp
+++ b/src/kconfig_compiler/kconfig_compiler.cpp
@@ -2298,7 +2298,7 @@ int main(int argc, char **argv)
cpp << "class " << cfg.className << "Helper" << endl;
cpp << '{' << endl;
cpp << " public:" << endl;
- cpp << " " << cfg.className << "Helper() : q(0) {}" << endl;
+ cpp << " " << cfg.className << "Helper() : q(nullptr) {}" << endl;
cpp << " ~" << cfg.className << "Helper() { delete q; }" << endl;
cpp << " " << cfg.className << " *q;" << endl;
cpp << "};" << endl;
@@ -2599,7 +2599,7 @@ int main(int argc, char **argv)
cpp << " delete d;" << endl;
}
if (cfg.singleton) {
- cpp << " s_global" << cfg.className << "()->q = 0;" << endl;
+ cpp << " s_global" << cfg.className << "()->q = nullptr;" << endl;
}
cpp << "}" << endl << endl;