STYLE: partial revert for 5cfa9762

src/meshTools/searchableSurface/searchableSurface.C

@@ -38,8 +38,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 
-Foam::autoPtr<Foam::searchableSurface>
-Foam::searchableSurface::New
+Foam::autoPtr<Foam::searchableSurface> Foam::searchableSurface::New
 (
     const word& searchableSurfaceType,
     const IOobject& io,
@@ -47,15 +46,14 @@ Foam::searchableSurface::New
 )
 {
     dictConstructorTable::iterator cstrIter =
-        dictConstructorTablePtr_
-            ->find(searchableSurfaceType);
+        dictConstructorTablePtr_->find(searchableSurfaceType);
 
     if (cstrIter == dictConstructorTablePtr_->end())
     {
         FatalErrorIn
         (
-            "searchableSurface::New(const word&, const word&"
-            ", const IOobject&, const dictionary&)"
+            "searchableSurface::New(const word&,"
+            " const IOobject&, const dictionary&)"
         )   << "Unknown searchableSurface type " << searchableSurfaceType
             << endl << endl
             << "Valid searchableSurface types : " << endl

src/meshTools/sets/topoSetSource/topoSetSource.C

@@ -66,8 +66,7 @@ const Foam::string Foam::topoSetSource::illegalSource_
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::topoSetSource>
-Foam::topoSetSource::New
+Foam::autoPtr<Foam::topoSetSource> Foam::topoSetSource::New
 (
     const word& topoSetSourceType,
     const polyMesh& mesh,
@@ -75,8 +74,7 @@ Foam::topoSetSource::New
 )
 {
     wordConstructorTable::iterator cstrIter =
-        wordConstructorTablePtr_
-            ->find(topoSetSourceType);
+        wordConstructorTablePtr_->find(topoSetSourceType);
 
     if (cstrIter == wordConstructorTablePtr_->end())
     {
@@ -95,8 +93,7 @@ Foam::topoSetSource::New
 }
 
 
-Foam::autoPtr<Foam::topoSetSource>
-Foam::topoSetSource::New
+Foam::autoPtr<Foam::topoSetSource> Foam::topoSetSource::New
 (
     const word& topoSetSourceType,
     const polyMesh& mesh,
@@ -104,8 +101,7 @@ Foam::topoSetSource::New
 )
 {
     istreamConstructorTable::iterator cstrIter =
-        istreamConstructorTablePtr_
-            ->find(topoSetSourceType);
+        istreamConstructorTablePtr_->find(topoSetSourceType);
 
     if (cstrIter == istreamConstructorTablePtr_->end())
     {

src/meshTools/sets/topoSets/topoSet.C

@@ -42,8 +42,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::topoSet>
-Foam::topoSet::New
+Foam::autoPtr<Foam::topoSet> Foam::topoSet::New
 (
     const word& setType,
     const polyMesh& mesh,
@@ -53,8 +52,7 @@ Foam::topoSet::New
 )
 {
     wordConstructorTable::iterator cstrIter =
-        wordConstructorTablePtr_
-            ->find(setType);
+        wordConstructorTablePtr_->find(setType);
 
     if (cstrIter == wordConstructorTablePtr_->end())
     {
@@ -73,8 +71,7 @@ Foam::topoSet::New
 }
 
 
-Foam::autoPtr<Foam::topoSet>
-Foam::topoSet::New
+Foam::autoPtr<Foam::topoSet> Foam::topoSet::New
 (
     const word& setType,
     const polyMesh& mesh,
@@ -84,8 +81,7 @@ Foam::topoSet::New
 )
 {
     sizeConstructorTable::iterator cstrIter =
-        sizeConstructorTablePtr_
-            ->find(setType);
+        sizeConstructorTablePtr_->find(setType);
 
     if (cstrIter == sizeConstructorTablePtr_->end())
     {
@@ -104,8 +100,7 @@ Foam::topoSet::New
 }
 
 
-Foam::autoPtr<Foam::topoSet>
-Foam::topoSet::New
+Foam::autoPtr<Foam::topoSet> Foam::topoSet::New
 (
     const word& setType,
     const polyMesh& mesh,
@@ -115,8 +110,7 @@ Foam::topoSet::New
 )
 {
     setConstructorTable::iterator cstrIter =
-        setConstructorTablePtr_
-            ->find(setType);
+        setConstructorTablePtr_->find(setType);
 
     if (cstrIter == setConstructorTablePtr_->end())
     {

src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C

@@ -42,16 +42,12 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::decompositionMethod>
-Foam::decompositionMethod::New
+Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
 (
     const dictionary& decompositionDict
 )
 {
-    const word methodType
-    (
-        decompositionDict.lookup("method")
-    );
+    const word methodType(decompositionDict.lookup("method"));
 
     Info<< "Selecting decompositionMethod " << methodType << endl;
 
@@ -75,17 +71,13 @@ Foam::decompositionMethod::New
 }
 
 
-Foam::autoPtr<Foam::decompositionMethod>
-Foam::decompositionMethod::New
+Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
 (
     const dictionary& decompositionDict,
     const polyMesh& mesh
 )
 {
-    const word methodType
-    (
-        decompositionDict.lookup("method")
-    );
+    const word methodType(decompositionDict.lookup("method"));
 
     Info<< "Selecting decompositionMethod " << methodType << endl;
 

src/postProcessing/foamCalcFunctions/calcType/calcTypeNew.C

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::calcType>
-Foam::calcType::New
+Foam::autoPtr<Foam::calcType> Foam::calcType::New
 (
     const word& calcTypeName
 )

src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C

@@ -39,7 +39,7 @@ Foam::sixDoFRigidBodyMotionRestraint::New(const dictionary& sDoFRBMRDict)
     //     << restraintType << endl;
 
     dictionaryConstructorTable::iterator cstrIter =
-    dictionaryConstructorTablePtr_->find(restraintType);
+        dictionaryConstructorTablePtr_->find(restraintType);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {

src/sampling/sampledSet/sampledSet/sampledSet.C

@@ -406,8 +406,7 @@ Foam::sampledSet::~sampledSet()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::sampledSet>
-Foam::sampledSet::New
+Foam::autoPtr<Foam::sampledSet> Foam::sampledSet::New
 (
     const word& name,
     const polyMesh& mesh,
@@ -415,10 +414,7 @@ Foam::sampledSet::New
     const dictionary& dict
 )
 {
-    const word sampleType
-    (
-        dict.lookup("type")
-    );
+    const word sampleType(dict.lookup("type"));
 
     wordConstructorTable::iterator cstrIter =
         wordConstructorTablePtr_->find(sampleType);

src/sampling/sampledSet/writers/writer.C

@@ -31,15 +31,13 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::autoPtr< Foam::writer<Type> >
-Foam::writer<Type>::New
+Foam::autoPtr< Foam::writer<Type> > Foam::writer<Type>::New
 (
     const word& writeType
 )
 {
     typename wordConstructorTable::iterator cstrIter =
-        wordConstructorTablePtr_
-            ->find(writeType);
+        wordConstructorTablePtr_->find(writeType);
 
     if (cstrIter == wordConstructorTablePtr_->end())
     {

src/sampling/sampledSurface/sampledSurface/sampledSurface.C

@@ -113,19 +113,15 @@ void Foam::sampledSurface::makeCf() const
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
-
-Foam::autoPtr<Foam::sampledSurface>
-Foam::sampledSurface::New
+Foam::autoPtr<Foam::sampledSurface> Foam::sampledSurface::New
 (
     const word& name,
     const polyMesh& mesh,
     const dictionary& dict
 )
 {
-    const word sampleType
-    (
-        dict.lookup("type")
-    );
+    const word sampleType(dict.lookup("type"));
+
     if (debug)
     {
         Info<< "Selecting sampledType " << sampleType << endl;
@@ -150,6 +146,7 @@ Foam::sampledSurface::New
     return autoPtr<sampledSurface>(cstrIter()(name, mesh, dict));
 }
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::sampledSurface::sampledSurface
@@ -168,7 +165,6 @@ Foam::sampledSurface::sampledSurface
 {}
 
 
-// Construct from dictionary
 Foam::sampledSurface::sampledSurface
 (
     const word& name,

src/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C

@@ -34,10 +34,7 @@ Foam::surfaceFilmModels::injectionModel::New
     const dictionary& dict
 )
 {
-    const word modelType
-    (
-        dict.lookup("injectionModel")
-    );
+    const word modelType(dict.lookup("injectionModel"));
 
     Info<< "    Selecting injectionModel " << modelType << endl;
 

src/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C

@@ -34,10 +34,7 @@ Foam::surfaceFilmModels::phaseChangeModel::New
     const dictionary& dict
 )
 {
-    const word modelType
-    (
-        dict.lookup("phaseChangeModel")
-    );
+    const word modelType(dict.lookup("phaseChangeModel"));
 
     Info<< "    Selecting phaseChangeModel " << modelType << endl;
 

src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermoNew.C

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::basicPsiThermo>
-Foam::basicPsiThermo::New
+Foam::autoPtr<Foam::basicPsiThermo> Foam::basicPsiThermo::New
 (
     const fvMesh& mesh
 )

src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermoNew.C

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::basicRhoThermo>
-Foam::basicRhoThermo::New
+Foam::autoPtr<Foam::basicRhoThermo> Foam::basicRhoThermo::New
 (
     const fvMesh& mesh
 )

src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelNew.C

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::psiChemistryModel>
-Foam::psiChemistryModel::New
+Foam::autoPtr<Foam::psiChemistryModel> Foam::psiChemistryModel::New
 (
     const fvMesh& mesh
 )

src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelNew.C

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::rhoChemistryModel>
-Foam::rhoChemistryModel::New
+Foam::autoPtr<Foam::rhoChemistryModel> Foam::rhoChemistryModel::New
 (
     const fvMesh& mesh
 )

src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolverNew.C

@@ -36,10 +36,7 @@ Foam::chemistrySolver<CompType, ThermoType>::New
     const word& thermoTypeName
 )
 {
-    const word modelName
-    (
-        model.lookup("chemistrySolver")
-    );
+    const word modelName(model.lookup("chemistrySolver"));
 
     const word chemistrySolverType =
         modelName + '<' + compTypeName + ',' + thermoTypeName + '>';

src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::laminarFlameSpeed>
-Foam::laminarFlameSpeed::New
+Foam::autoPtr<Foam::laminarFlameSpeed> Foam::laminarFlameSpeed::New
 (
     const hhuCombustionThermo& ct
 )
@@ -47,16 +46,12 @@ Foam::laminarFlameSpeed::New
         )
     );
 
-    const word laminarFlameSpeedType
-    (
-        propDict.lookup("laminarFlameSpeedCorrelation")
-    );
+    const word corrType(propDict.lookup("laminarFlameSpeedCorrelation"));
 
-    Info<< "Selecting laminar flame speed correlation "
-        << laminarFlameSpeedType << endl;
+    Info<< "Selecting laminar flame speed correlation " << corrType << endl;
 
     dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(laminarFlameSpeedType);
+        dictionaryConstructorTablePtr_->find(corrType);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
@@ -65,7 +60,7 @@ Foam::laminarFlameSpeed::New
             "laminarFlameSpeed::New(const hhuCombustionThermo&)",
             propDict
         )   << "Unknown laminarFlameSpeed type "
-            << laminarFlameSpeedType << nl << nl
+            << corrType << nl << nl
             << "Valid laminarFlameSpeed types are :" << endl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);

src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C

@@ -73,8 +73,7 @@ Foam::liquidMixture::liquidMixture
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::liquidMixture>
-Foam::liquidMixture::New
+Foam::autoPtr<Foam::liquidMixture> Foam::liquidMixture::New
 (
     const dictionary& thermophysicalProperties
 )

src/thermophysicalModels/liquids/liquid/liquid.C

@@ -39,14 +39,11 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::liquid>
-Foam::liquid::New(Istream& is)
+Foam::autoPtr<Foam::liquid> Foam::liquid::New(Istream& is)
 {
     if (debug)
     {
-        Info<< "liquid::New(Istream&) : "
-            << "constructing liquid"
-            << endl;
+        Info<< "liquid::New(Istream&) : " << "constructing liquid" << endl;
     }
 
     const word liquidType(is);

src/thermophysicalModels/pdfs/pdf/pdfNew.C

@@ -27,17 +27,13 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::pdfs::pdf>
-Foam::pdfs::pdf::New
+Foam::autoPtr<Foam::pdfs::pdf> Foam::pdfs::pdf::New
 (
     const dictionary& dict,
     Random& rndGen
 )
 {
-    const word modelType
-    (
-        dict.lookup("pdfType")
-    );
+    const word modelType(dict.lookup("pdfType"));
 
     Info<< "Selecting pdfType " << modelType << endl;