STYLE: minor cleanup after merge

applications/test/FixedList/Test-FixedList.C

@@ -34,8 +34,7 @@ See also
 
 #include "argList.H"
 #include "FixedList.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "IPstream.H"
 #include "OPstream.H"
 

applications/test/primitivePatch/Test-PrimitivePatch.C

@@ -31,8 +31,7 @@ Description
 #include "Time.H"
 #include "polyMesh.H"
 #include "primitivePatch.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 
 using namespace Foam;
 

applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring.C

@@ -35,8 +35,7 @@ Description
 #include "joints.H"
 #include "rigidBodyRestraint.H"
 #include "rigidBodyModelState.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "constants.H"
 
 using namespace Foam;

applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C

@@ -35,8 +35,7 @@ Description
 #include "joints.H"
 #include "rigidBodyRestraint.H"
 #include "rigidBodyModelState.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 
 using namespace Foam;
 using namespace RBD;

applications/test/rigidBodyDynamics/spring/spring.C

@@ -35,8 +35,7 @@ Description
 #include "joints.H"
 #include "rigidBodyRestraint.H"
 #include "rigidBodyModelState.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 
 using namespace Foam;
 using namespace RBD;

applications/test/router/Test-processorRouter.C

@@ -28,8 +28,7 @@ Description
 #include "argList.H"
 #include "label.H"
 #include "labelList.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "point.H"
 #include "Time.H"
 #include "fvMesh.H"

applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C

@@ -38,9 +38,8 @@ Description
 #include "Time.H"
 #include "hexRef8.H"
 #include "cellSet.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "meshTools.H"
-#include "IFstream.H"
 #include "polyTopoChange.H"
 #include "mapPolyMesh.H"
 #include "volMesh.H"

applications/utilities/mesh/conversion/datToFoam/datToFoam.C

@@ -35,8 +35,7 @@ Description
 
 #include "argList.H"
 #include "Time.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "pointField.H"
 #include "unitConversion.H"
 

applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C

@@ -35,8 +35,7 @@ Description
 #include "argList.H"
 #include "Time.H"
 #include "polyMesh.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "cellShape.H"
 #include "cellModeller.H"
 #include "preservePatchTypes.H"

applications/utilities/mesh/manipulation/setSet/setSet.C

@@ -41,8 +41,7 @@ Description
 #include "faceSet.H"
 #include "pointSet.H"
 #include "topoSetSource.H"
-#include "OFstream.H"
-#include "IFstream.H"
+#include "Fstream.H"
 #include "demandDrivenData.H"
 #include "foamVtkWriteCellSetFaces.H"
 #include "foamVtkWriteFaceSet.H"

applications/utilities/miscellaneous/foamDictionary/foamDictionary.C

@@ -114,8 +114,7 @@ Usage
 #include "argList.H"
 #include "profiling.H"
 #include "Time.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "includeEntry.H"
 
 using namespace Foam;

applications/utilities/surface/surfaceAdd/surfaceAdd.C

@@ -38,8 +38,7 @@ Description
 #include "argList.H"
 #include "fileName.H"
 #include "triSurface.H"
-#include "OFstream.H"
-#include "IFstream.H"
+#include "Fstream.H"
 #include "triFace.H"
 #include "triFaceList.H"
 

applications/utilities/surface/surfaceSubset/surfaceSubset.C

@@ -36,8 +36,7 @@ Description
 #include "triSurface.H"
 #include "triSurfaceSearch.H"
 #include "argList.H"
-#include "OFstream.H"
-#include "IFstream.H"
+#include "Fstream.H"
 #include "Switch.H"
 #include "IOdictionary.H"
 #include "boundBox.H"

applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C

@@ -41,8 +41,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
-#include "OFstream.H"
-#include "IFstream.H"
+#include "Fstream.H"
 #include "boundBox.H"
 #include "transformField.H"
 #include "Pair.H"

src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C

@@ -27,9 +27,8 @@ License
 #include "OPstream.H"
 #include "IPstream.H"
 #include "PstreamBuffers.H"
-#include "OFstream.H"
-#include "IFstream.H"
-#include "IStringStream.H"
+#include "Fstream.H"
+#include "StringStream.H"
 #include "dictionary.H"
 #include <sys/time.h>
 #include "objectRegistry.H"

src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C

@@ -53,10 +53,11 @@ Foam::OFstreamAllocator::OFstreamAllocator
             InfoInFunction << "Cannot open null file " << endl;
         }
     }
-    ofstream::openmode mode(ofstream::out);
+
+    std::ios_base::openmode mode(std::ios_base::out);
     if (append)
     {
-        mode |= ofstream::app;
+        mode |= std::ios_base::app;
     }
 
     if (compression == IOstream::COMPRESSED)

src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H

@@ -35,7 +35,7 @@ SourceFiles
 #ifndef masterOFstream_H
 #define masterOFstream_H
 
-#include "OStringStream.H"
+#include "StringStream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/db/IOstreams/dummyISstream/dummyISstream.H

@@ -34,7 +34,7 @@ SourceFiles
 #ifndef dummyISstream_H
 #define dummyISstream_H
 
-#include "IStringStream.H"
+#include "StringStream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C

@@ -26,8 +26,7 @@ License
 #include "dynamicCode.H"
 #include "dynamicCodeContext.H"
 #include "stringOps.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "OSspecific.H"
 #include "etcFiles.H"
 #include "dictionary.H"

src/OpenFOAM/global/fileOperations/collatedFileOperation/threadedCollatedOFstream.H

@@ -35,7 +35,7 @@ SourceFiles
 #ifndef threadedCollatedOFstream_H
 #define threadedCollatedOFstream_H
 
-#include "OStringStream.H"
+#include "StringStream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //