zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STYLE: check autoPtr as plain bool instead of valid()

Browse Source 
- cleaner code, more similarity with unique_ptr

  Now
      if (ptr)
      if (!ptr)

  instead
      if (ptr.valid())
      if (!ptr.valid())
This commit is contained in:
Mark Olesen
2020-07-15 08:50:57 +02:00
parent 9af3f85cf9
commit 12c91b9472
144 changed files with 483 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -144,7 +144,7 @@ Foam::functionObjects::codedFunctionObject::codedFunctionObject
Foam::functionObject&
Foam::functionObjects::codedFunctionObject::redirectFunctionObject() const
{
if (!redirectFunctionObjectPtr_.valid())
if (!redirectFunctionObjectPtr_)
{
dictionary constructDict(dict_);
constructDict.set("type", name_);

2
src/functionObjects/utilities/ensightWrite/ensightWrite.C
View File

@ -189,7 +189,7 @@ bool Foam::functionObjects::ensightWrite::execute()
bool Foam::functionObjects::ensightWrite::write()
{
if (!ensCase_.valid())
if (!ensCase_)
{
ensCase_.reset
(

10
src/functionObjects/utilities/ensightWrite/ensightWriteUpdate.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2018 OpenCFD Ltd.
Copyright (C) 2018-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -146,7 +146,7 @@ bool Foam::functionObjects::ensightWrite::update()
// ensMesh_.clear();
// meshSubset_.clear();
// }
// else if (ensMesh_.valid())
// else if (ensMesh_)
// {
// ensMesh_->expire();
// }
@ -157,13 +157,13 @@ bool Foam::functionObjects::ensightWrite::update()
meshState_ = polyMesh::UNCHANGED;
if (!ensMesh_.valid())
if (!ensMesh_)
{
ensMesh_.reset(new ensightMesh(meshSubset_.mesh(), writeOpts_));
}
else if (ensMesh_().needsUpdate())
else if (ensMesh_->needsUpdate())
{
ensMesh_().correct();
ensMesh_->correct();
}
return true;

6
src/functionObjects/utilities/vtkWrite/vtkWrite.C
View File

@ -521,7 +521,7 @@ bool Foam::functionObjects::vtkWrite::write()
// CellData
{
if (internalWriter.valid())
if (internalWriter)
{
// Optionally with cellID and procID fields
internalWriter->beginCellData
@ -580,7 +580,7 @@ bool Foam::functionObjects::vtkWrite::write()
if (interpolate_)
{
// Begin PointData
if (internalWriter.valid())
if (internalWriter)
{
internalWriter->beginPointData
(
@ -631,7 +631,7 @@ bool Foam::functionObjects::vtkWrite::write()
// Finish writers
if (internalWriter.valid())
if (internalWriter)
{
internalWriter->close();
}

2
src/functionObjects/utilities/vtkWrite/vtkWriteTemplates.C
View File

@ -54,7 +54,7 @@ Foam::label Foam::functionObjects::vtkWrite::writeVolFields
const auto& field = tfield();
// Internal
if (internalWriter.valid())
if (internalWriter)
{
ok = true;
internalWriter->write(field);