Skip to content

Commit b469d31

Browse files
ktfsawenzel
ktf
authored and
sawenzel
committed
Fix all the modernize-use-nullptr errors reported by clang-tidy
Description of the check can be found at: https://clang.llvm.org/extra/clang-tidy/checks/modernize-use-nullptr.html
1 parent c68b981 commit b469d31

58 files changed

Lines changed: 731 additions & 731 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Common/Field/src/MagFieldContFact.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ FairParSet* MagFieldContFact::createContainer(FairContainer* c)
3636
// calls the constructor of the corresponding parameter container.
3737
const char* name = c->GetName();
3838
FairLogger::GetLogger()->Info(MESSAGE_ORIGIN, "Creating mag.field container %s",name);
39-
FairParSet* p = NULL;
39+
FairParSet* p = nullptr;
4040
if (strcmp(name, "MagFieldParam") == 0) {
4141
p = new MagFieldParam(c->getConcatName().Data(), c->GetTitle(), c->getContext());
4242
}

‎Common/Field/src/MagFieldFact.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ static MagFieldFact gMagFieldFact;
2020

2121
MagFieldFact::MagFieldFact()
2222
:FairFieldFactory(),
23-
mFieldPar(NULL)
23+
mFieldPar(nullptr)
2424
{
2525
fCreator=this;
2626
}
@@ -37,11 +37,11 @@ void MagFieldFact::SetParm()
3737

3838
FairField* MagFieldFact::createFairField()
3939
{
40-
FairField *fMagneticField=0;
40+
FairField *fMagneticField=nullptr;
4141

4242
if ( !mFieldPar ) {
4343
FairLogger::GetLogger()->Error(MESSAGE_ORIGIN, "No field parameters available");
44-
return 0;
44+
return nullptr;
4545
}
4646
// since we have just 1 field class, we don't need to consider fFieldPar->GetType()
4747
fMagneticField = new MagneticField(*mFieldPar);

‎Common/Field/src/MagneticField.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ void MagneticField::CreateField()
149149
FairLogger::GetLogger()->Info(MESSAGE_ORIGIN, "Maximim possible beam energy for requested beam is assumed");
150150
}
151151

152-
const char *parname = 0;
152+
const char *parname = nullptr;
153153

154154
if (mMapType == MagFieldParam::k2kG) {
155155
parname = mDipoleOnOffFlag ? "Sol12_Dip0_Hole" : "Sol12_Dip6_Hole";

0 commit comments

Comments
 (0)