STYLE: favour include word.H instead of string.H

- in many places the string.H include is redundant anyhow.
  May wish to change to foamString.H (or equiv) in the future

applications/test/cplusplus1/Test-cpluplus1.C

@@ -28,7 +28,6 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "string.H"
 #include "macros.H"
 #include "IOstreams.H"
 #include "List.H"

applications/test/delete/Test-delete.C

@@ -29,7 +29,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "string.H"
+#include "word.H"
 #include "IOstreams.H"
 
 using namespace Foam;

applications/test/limits/Test-limits.C

@@ -32,8 +32,8 @@ Description
 #include <limits>
 #include "int.H"
 #include "uint.H"
-#include "string.H"
 #include "scalar.H"
+#include "word.H"
 #include "IOstreams.H"
 
 using namespace Foam;

applications/test/sizeof/Test-sizeof.C

@@ -31,7 +31,6 @@ Description
 
 #include "bool.H"
 #include "Switch.H"
-#include "string.H"
 #include "dictionary.H"
 #include "zero.H"
 #include "IOstreams.H"

applications/test/string/Test-string.C

@@ -29,12 +29,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "string.H"
+#include "fieldExprFwd.H"
-#include "stringOps.H"
-#include "dictionary.H"
-#include "IOstreams.H"
-#include "OSspecific.H"
-
 #include "int.H"
 #include "uint.H"
 #include "scalar.H"
@@ -42,6 +37,10 @@ Description
 #include "fileName.H"
 #include "stringList.H"
 #include "stringOps.H"
+#include "dictionary.H"
+#include "IOstreams.H"
+#include "OSspecific.H"
+
 
 using namespace Foam;
 

applications/test/string2/Test-string2.C

@@ -28,12 +28,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "string.H"
+#include "fieldExprFwd.H"
-#include "stringOps.H"
-#include "dictionary.H"
-#include "IOstreams.H"
-#include "OSspecific.H"
-
 #include "int.H"
 #include "uint.H"
 #include "scalar.H"
@@ -41,7 +36,10 @@ Description
 #include "fileName.H"
 #include "stringList.H"
 #include "stringOps.H"
-#include "fieldExprFwd.H"
+#include "dictionary.H"
+#include "IOstreams.H"
+#include "OSspecific.H"
+
 
 using namespace Foam;
 

applications/utilities/preProcessing/PDR/pdrFields/PDRpatchDef.H

@@ -38,7 +38,7 @@ SourceFiles
 #ifndef PDRpatchDef_H
 #define PDRpatchDef_H
 
-#include "string.H"
+#include "word.H"
 #include "scalar.H"
 #include "Enum.H"
 

applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C

@@ -58,7 +58,6 @@ Usage
 #include "volFields.H"
 #include "pointFields.H"
 #include "surfaceFields.H"
-#include "string.H"
 
 using namespace Foam;
 

src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H

@@ -40,10 +40,10 @@ SourceFiles
 #ifndef Foam_UPstream_H
 #define Foam_UPstream_H
 
+#include "wordList.H"
 #include "labelList.H"
 #include "DynamicList.H"
 #include "HashTable.H"
-#include "string.H"
 #include "Enum.H"
 #include "ListOps.H"
 

src/OpenFOAM/expressions/exprString/exprString.H

@@ -43,7 +43,7 @@ SeeAlso
 #ifndef Foam_expressions_exprString_H
 #define Foam_expressions_exprString_H
 
-#include "string.H"
+#include "word.H"
 #include "dictionary.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/OpenFOAM/global/profiling/profilingInformation.H

@@ -38,9 +38,9 @@ SourceFiles
 #ifndef Foam_profilingInformation_H
 #define Foam_profilingInformation_H
 
-#include "label.H"
+#include "labelFwd.H"
-#include "scalar.H"
+#include "scalarFwd.H"
-#include "string.H"
+#include "word.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -130,45 +130,21 @@ public:
 
     // Access
 
-        label id() const
+        label id() const noexcept { return id_; }
-        {
-            return id_;
-        }
 
-        const string& description() const
+        const string& description() const noexcept { return description_; }
-        {
-            return description_;
-        }
 
-        profilingInformation& parent() const
+        profilingInformation& parent() const noexcept { return *parent_; }
-        {
-            return *parent_;
-        }
 
-        label calls() const
+        label calls() const noexcept { return calls_; }
-        {
-            return calls_;
-        }
 
-        scalar totalTime() const
+        scalar totalTime() const noexcept { return totalTime_; }
-        {
-            return totalTime_;
-        }
 
-        scalar childTime() const
+        scalar childTime() const noexcept { return childTime_; }
-        {
-            return childTime_;
-        }
 
-        int maxMem() const
+        int maxMem() const noexcept { return maxMem_; }
-        {
-            return maxMem_;
-        }
 
-        bool active() const
+        bool active() const noexcept { return active_; }
-        {
-            return active_;
-        }
 
 
     // Edit

src/OpenFOAM/global/profiling/profilingTrigger.H

@@ -38,7 +38,7 @@ SourceFiles
 #ifndef Foam_profilingTrigger_H
 #define Foam_profilingTrigger_H
 
-#include "string.H"
+#include "word.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.C

@@ -26,10 +26,10 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "scalarRange.H"
-#include "string.H"
 #include "Switch.H"
 #include "MinMax.H"
 #include "error.H"
+#include "word.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

src/OpenFOAM/primitives/strings/lists/stringList.H

@@ -43,10 +43,10 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef stringList_H
+#ifndef Foam_stringList_H
-#define stringList_H
+#define Foam_stringList_H
 
-#include "string.H"
+#include "word.H"
 #include "List.H"
 #include "SubList.H"
 

src/OpenFOAM/primitives/strings/lists/wordList.H

@@ -43,8 +43,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef wordList_H
+#ifndef Foam_wordList_H
-#define wordList_H
+#define Foam_wordList_H
 
 #include "word.H"
 #include "List.H"

src/OpenFOAM/primitives/strings/parsing/genericRagelLemonDriver.C

@@ -26,8 +26,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "genericRagelLemonDriver.H"
-#include "string.H"
 #include "error.H"
+#include "word.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 

src/OpenFOAM/primitives/strings/stringOps/stringOps.H

@@ -40,13 +40,12 @@ SourceFiles
 #define Foam_stringOps_H
 
 #include "scalar.H"
-#include "string.H"
 #include "SubStrings.H"
-#include "word.H"
 #include "dictionary.H"
 #include "HashTable.H"
 #include "stringOpsSort.H"
 #include "stringOpsEvaluate.H"
+#include "word.H"
 #include "wordRes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/OpenFOAM/primitives/strings/stringOps/stringOpsEvaluate.H

@@ -31,8 +31,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef stringOpsEvaluate_H
+#ifndef Foam_stringOpsEvaluate_H
-#define stringOpsEvaluate_H
+#define Foam_stringOpsEvaluate_H
 
 #include "labelFwd.H"
 #include "string.H"

src/fileFormats/gltf/foamGltfAccessor.H

@@ -44,7 +44,7 @@ SourceFiles
 #include "foamGltfBase.H"
 #include "Field.H"
 #include "label.H"
-#include "string.H"
+#include "word.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/fileFormats/vtk/output/foamVtkOutputOptions.H

@@ -44,7 +44,7 @@ SourceFiles
 #define Foam_vtk_outputOptions_H
 
 #include "foamVtkOutput.H"
-#include "string.H"
+#include "word.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/meshTools/graph/curve.H

@@ -37,9 +37,10 @@ SourceFiles
 #ifndef Foam_curve_H
 #define Foam_curve_H
 
-#include "string.H"
-#include "primitiveFields.H"
 #include "autoPtr.H"
+#include "point.H"
+#include "primitiveFields.H"
+#include "word.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/meshTools/graph/graph.H

@@ -38,8 +38,6 @@ SourceFiles
 #ifndef Foam_graph_H
 #define Foam_graph_H
 
-#include "string.H"
-#include "point.H"
 #include "curve.H"
 #include "HashPtrTable.H"