liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply modernize-use-nullptr

Browse Source 
Setup:
- `mkdir tidy; cd tidy`
- `cmake .. -DCMAKE_BUILD_TYPE=debug -DPROC_TARGET_NUMBER=1 -DCACHE_NAME_SUFFIX=4 -DBINDIR=. -DDATADIR=. -DBUILD_BUNDLE=ON -DWITH_LTO=OFF -DOPTION_OMP=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=ON`
- `cd ..`
- `find -name '*.cc' -exec clang-tidy-3.8 -header-filter=.* -p=tidy -fix-errors -checks=modernize-use-nullptr {} \;`
This commit is contained in:
Flössie
2016-10-12 17:48:40 +02:00
parent 29d5329f3f
commit 0731975ff0
218 changed files with 2406 additions and 2406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rtengine/pipettebuffer.cc
View File

@@ -23,7 +23,7 @@ namespace rtengine
{
PipetteBuffer::PipetteBuffer(::EditDataProvider *dataProvider) :
dataProvider(dataProvider), imgFloatBuffer(NULL), LabBuffer(NULL), singlePlaneBuffer(), ready(false) {}
dataProvider(dataProvider), imgFloatBuffer(nullptr), LabBuffer(nullptr), singlePlaneBuffer(), ready(false) {}
PipetteBuffer::~PipetteBuffer()
{
@@ -46,12 +46,12 @@ void PipetteBuffer::flush()
{
if (imgFloatBuffer) {
delete imgFloatBuffer;
imgFloatBuffer = NULL;
imgFloatBuffer = nullptr;
}
if (LabBuffer) {
delete LabBuffer;
LabBuffer = NULL;
LabBuffer = nullptr;
}
singlePlaneBuffer.flushData();
@@ -69,7 +69,7 @@ EditUniqueID PipetteBuffer::getEditID()
void PipetteBuffer::resize(int newWidth, int newHeight)
{
resize(newWidth, newHeight, dataProvider ? dataProvider->getCurrSubscriber() : NULL);
resize(newWidth, newHeight, dataProvider ? dataProvider->getCurrSubscriber() : nullptr);
}
// Resize buffers if they already exist
@@ -85,13 +85,13 @@ void PipetteBuffer::resize(int newWidth, int newHeight, EditSubscriber* newSubsc
}
} else if (imgFloatBuffer) {
delete imgFloatBuffer;
imgFloatBuffer = NULL;
imgFloatBuffer = nullptr;
}
if (newSubscriber->getPipetteBufferType() == BT_LABIMAGE) {
if (LabBuffer && (LabBuffer->W != newWidth && LabBuffer->H != newHeight)) {
delete LabBuffer;
LabBuffer = NULL;
LabBuffer = nullptr;
}
if (!LabBuffer) {
@@ -99,7 +99,7 @@ void PipetteBuffer::resize(int newWidth, int newHeight, EditSubscriber* newSubsc
}
} else if (LabBuffer) {
delete LabBuffer;
LabBuffer = NULL;
LabBuffer = nullptr;
}
if (newSubscriber->getPipetteBufferType() == BT_SINGLEPLANE_FLOAT) {
@@ -124,11 +124,11 @@ bool PipetteBuffer::bufferCreated()
if (subscriber->getEditingType() == ET_PIPETTE) {
switch (dataProvider->getCurrSubscriber()->getPipetteBufferType()) {
case (BT_IMAGEFLOAT):
return imgFloatBuffer != NULL;
return imgFloatBuffer != nullptr;
case (BT_LABIMAGE):
return LabBuffer != NULL;
return LabBuffer != nullptr;
case (BT_SINGLEPLANE_FLOAT):
return singlePlaneBuffer.data != NULL;
return singlePlaneBuffer.data != nullptr;
}
} else {
return false;
@@ -159,7 +159,7 @@ void PipetteBuffer::getPipetteData(float* v, int x, int y, int squareSize)
break;
case (BT_SINGLEPLANE_FLOAT):
if (singlePlaneBuffer.data != NULL) {
if (singlePlaneBuffer.data != nullptr) {
singlePlaneBuffer.getPipetteData(v[0], x, y, squareSize, 0);
v[1] = v[2] = -1.f;
return;