STYLE: partial revert for 5cfa9762

src/OpenFOAM/db/functionObjects/functionObject/functionObject.C

@@ -43,8 +43,7 @@ Foam::functionObject::functionObject(const word& name)
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::functionObject>
-Foam::functionObject::New
+Foam::autoPtr<Foam::functionObject> Foam::functionObject::New
 (
     const word& name,
     const Time& t,

src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C

@@ -26,8 +26,7 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::autoPtr< Foam::pointPatchField<Type> >
-Foam::pointPatchField<Type>::New
+Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
 (
     const word& patchFieldType,
     const word& actualPatchType,
@@ -96,8 +95,7 @@ Foam::pointPatchField<Type>::New
 
 
 template<class Type>
-Foam::autoPtr< Foam::pointPatchField<Type> >
-Foam::pointPatchField<Type>::New
+Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
 (
     const word& patchFieldType,
     const pointPatch& p,
@@ -109,8 +107,7 @@ Foam::pointPatchField<Type>::New
 
 
 template<class Type>
-Foam::autoPtr< Foam::pointPatchField<Type> >
-Foam::pointPatchField<Type>::New
+Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
@@ -196,8 +193,7 @@ Foam::pointPatchField<Type>::New
 // Return a pointer to a new patch created on freestore from
 // a given pointPatchField<Type> mapped onto a new patch
 template<class Type>
-Foam::autoPtr< Foam::pointPatchField<Type> >
-Foam::pointPatchField<Type>::New
+Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
 (
     const pointPatchField<Type>& ptf,
     const pointPatch& p,

src/OpenFOAM/graph/graph.C

@@ -143,8 +143,10 @@ Foam::scalarField& Foam::graph::y()
 }
 
 
-Foam::autoPtr<Foam::graph::writer>
-Foam::graph::writer::New(const word& graphFormat)
+Foam::autoPtr<Foam::graph::writer> Foam::graph::writer::New
+(
+    const word& graphFormat
+)
 {
     if (!wordConstructorTablePtr_)
     {

src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C

@@ -36,8 +36,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::word
-Foam::lduMatrix::preconditioner::getName
+Foam::word Foam::lduMatrix::preconditioner::getName
 (
     const dictionary& solverControls
 )

src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C

@@ -58,8 +58,7 @@ Foam::lduMatrix::smoother::getName
 }
 
 
-Foam::autoPtr<Foam::lduMatrix::smoother>
-Foam::lduMatrix::smoother::New
+Foam::autoPtr<Foam::lduMatrix::smoother> Foam::lduMatrix::smoother::New
 (
     const word& fieldName,
     const lduMatrix& matrix,

src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C

@@ -37,8 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::lduMatrix::solver>
-Foam::lduMatrix::solver::New
+Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
 (
     const word& fieldName,
     const lduMatrix& matrix,

src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceFieldNew.C

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::GAMGInterfaceField>
-Foam::GAMGInterfaceField::New
+Foam::autoPtr<Foam::GAMGInterfaceField> Foam::GAMGInterfaceField::New
 (
     const GAMGInterface& GAMGCp,
     const lduInterfaceField& fineInterface

src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C

@@ -29,8 +29,7 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::GAMGInterface>
-Foam::GAMGInterface::New
+Foam::autoPtr<Foam::GAMGInterface> Foam::GAMGInterface::New
 (
     const lduInterface& fineInterface,
     const labelField& localRestrictAddressing,

src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::facePointPatch>
-Foam::facePointPatch::New
+Foam::autoPtr<Foam::facePointPatch> Foam::facePointPatch::New
 (
     const polyPatch& patch,
     const pointBoundaryMesh& bm

src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C

@@ -28,8 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::polyPatch>
-Foam::polyPatch::New
+Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
 (
     const word& patchType,
     const word& name,
@@ -67,8 +66,7 @@ Foam::polyPatch::New
 }
 
 
-Foam::autoPtr<Foam::polyPatch>
-Foam::polyPatch::New
+Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
 (
     const word& name,
     const dictionary& dict,

src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C

@@ -28,8 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::cellZone>
-Foam::cellZone::New
+Foam::autoPtr<Foam::cellZone> Foam::cellZone::New
 (
     const word& name,
     const dictionary& dict,
@@ -44,10 +43,7 @@ Foam::cellZone::New
             << endl;
     }
 
-    const word zoneType
-    (
-        dict.lookup("type")
-    );
+    const word zoneType(dict.lookup("type"));
 
     dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(zoneType);

src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C

@@ -28,8 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::faceZone>
-Foam::faceZone::New
+Foam::autoPtr<Foam::faceZone> Foam::faceZone::New
 (
     const word& name,
     const dictionary& dict,
@@ -44,10 +43,7 @@ Foam::faceZone::New
             << endl;
     }
 
-    const word zoneType
-    (
-        dict.lookup("type")
-    );
+    const word zoneType(dict.lookup("type"));
 
     dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(zoneType);

src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C

@@ -28,8 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::pointZone>
-Foam::pointZone::New
+Foam::autoPtr<Foam::pointZone> Foam::pointZone::New
 (
     const word& name,
     const dictionary& dict,
@@ -44,10 +43,7 @@ Foam::pointZone::New
             << endl;
     }
 
-    const word zoneType
-    (
-        dict.lookup("type")
-    );
+    const word zoneType(dict.lookup("type"));
 
     dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(zoneType);

src/conversion/ensight/part/ensightPart.C

@@ -126,8 +126,7 @@ Foam::ensightPart::ensightPart(const ensightPart& part)
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::ensightPart>
-Foam::ensightPart::New(Istream& is)
+Foam::autoPtr<Foam::ensightPart> Foam::ensightPart::New(Istream& is)
 {
     const word partType(is);
 

src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C

@@ -29,8 +29,7 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::dynamicFvMesh>
-Foam::dynamicFvMesh::New(const IOobject& io)
+Foam::autoPtr<Foam::dynamicFvMesh> Foam::dynamicFvMesh::New(const IOobject& io)
 {
     // do not register the dictionary
     IOdictionary dict

src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C

@@ -1078,9 +1078,9 @@ bool Foam::dynamicRefineFvMesh::update()
                 << exit(FatalError);
         }
 
-        word field(refineDict.lookup("field"));
+        const word fieldName(refineDict.lookup("field"));
 
-        const volScalarField& vFld = lookupObject<volScalarField>(field);
+        const volScalarField& vFld = lookupObject<volScalarField>(fieldName);
 
         const scalar lowerRefineLevel =
             readScalar(refineDict.lookup("lowerRefineLevel"));

src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C

@@ -27,17 +27,13 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::solidBodyMotionFunction>
-Foam::solidBodyMotionFunction::New
+Foam::autoPtr<Foam::solidBodyMotionFunction> Foam::solidBodyMotionFunction::New
 (
     const dictionary& SBMFCoeffs,
     const Time& runTime
 )
 {
-    const word motionType
-    (
-        SBMFCoeffs.lookup("solidBodyMotionFunction")
-    );
+    const word motionType(SBMFCoeffs.lookup("solidBodyMotionFunction"));
 
     Info<< "Selecting solid-body motion function " << motionType << endl;
 

src/dynamicMesh/meshCut/cellLooper/cellLooper.C

@@ -39,8 +39,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::cellLooper>
-Foam::cellLooper::New
+Foam::autoPtr<Foam::cellLooper> Foam::cellLooper::New
 (
     const word& type,
     const polyMesh& mesh

src/dynamicMesh/motionSolver/motionSolver.C

@@ -58,8 +58,7 @@ Foam::motionSolver::motionSolver(const polyMesh& mesh)
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::motionSolver>
-Foam::motionSolver::New(const polyMesh& mesh)
+Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::New(const polyMesh& mesh)
 {
     IOdictionary solverDict
     (

src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C

@@ -28,8 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::polyMeshModifier>
-Foam::polyMeshModifier::New
+Foam::autoPtr<Foam::polyMeshModifier> Foam::polyMeshModifier::New
 (
     const word& name,
     const dictionary& dict,