summaryrefslogtreecommitdiff
path: root/vcl/qa/cppunit/lifecycle.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:28:29 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:32:00 +0100
commitd3b6cb7ec2da4afb5687c9d28b2be2f96e6aa7b1 (patch)
treee9d209d6d5f06cacd8e0df78c7f6b8ad45d74be5 /vcl/qa/cppunit/lifecycle.cxx
parent45979047abbd9da7a29401f298e8ef9ab58ad337 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I05e89f9896170d4df3d1377549ea074f06b884a0
Diffstat (limited to 'vcl/qa/cppunit/lifecycle.cxx')
-rw-r--r--vcl/qa/cppunit/lifecycle.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx
index 58b61880ae1d..748f603d3b6d 100644
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@@ -81,12 +81,12 @@ void LifecycleTest::testVirtualDevice()
void LifecycleTest::testMultiDispose()
{
VclPtrInstance<WorkWindow> xWin(nullptr, WB_APP|WB_STDWORK);
- CPPUNIT_ASSERT(xWin.get() != NULL);
+ CPPUNIT_ASSERT(xWin.get() != nullptr);
xWin->disposeOnce();
xWin->disposeOnce();
xWin->disposeOnce();
- CPPUNIT_ASSERT(xWin->GetWindow(GetWindowType::Parent) == NULL);
- CPPUNIT_ASSERT(xWin->GetChild(0) == NULL);
+ CPPUNIT_ASSERT(xWin->GetWindow(GetWindowType::Parent) == nullptr);
+ CPPUNIT_ASSERT(xWin->GetChild(0) == nullptr);
CPPUNIT_ASSERT(xWin->GetChildCount() == 0);
}
@@ -109,13 +109,13 @@ void LifecycleTest::testWidgets(vcl::Window *pParent)
void LifecycleTest::testIsolatedWidgets()
{
- testWidgets(NULL);
+ testWidgets(nullptr);
}
void LifecycleTest::testParentedWidgets()
{
ScopedVclPtrInstance<WorkWindow> xWin(nullptr, WB_APP|WB_STDWORK);
- CPPUNIT_ASSERT(xWin.get() != NULL);
+ CPPUNIT_ASSERT(xWin.get() != nullptr);
xWin->Show();
testWidgets(xWin);
}
@@ -133,7 +133,7 @@ public:
void LifecycleTest::testChildDispose()
{
VclPtrInstance<WorkWindow> xWin(nullptr, WB_APP|WB_STDWORK);
- CPPUNIT_ASSERT(xWin.get() != NULL);
+ CPPUNIT_ASSERT(xWin.get() != nullptr);
VclPtrInstance< DisposableChild > xChild( xWin.get() );
xWin->Show();
xChild->disposeOnce();
@@ -217,7 +217,7 @@ class LeakTestObject
void *mpRef;
LeakTestObject()
: mbDeleted(false)
- , mpRef(NULL)
+ , mpRef(nullptr)
{
}
public: