Merge branch 'rm_stream_include' into 'master'

Remove redundant ostream, istream, iostream and sstream includes

See merge request OpenMW/openmw!2097

components/bsa/memorystream.hpp

@@ -27,7 +27,7 @@
 #define BSA_MEMORY_STREAM_H
 
 #include <vector>
-#include <iostream>
+#include <istream>
 #include <components/files/memorystream.hpp>
 
 namespace Bsa

components/compiler/scanner.cpp

@@ -1,6 +1,7 @@
 #include "scanner.hpp"
 
 #include <cassert>
+#include <sstream>
 
 #include "exception.hpp"
 #include "errorhandler.hpp"

components/compiler/scanner.hpp

@@ -5,7 +5,7 @@
 #include <string>
 #include <iosfwd>
 #include <vector>
-#include <sstream>
+#include <istream>
 
 #include "tokenloc.hpp"
 

components/compiler/streamerrorhandler.hpp

@@ -1,8 +1,6 @@
 #ifndef COMPILER_STREAMERRORHANDLER_H_INCLUDED
 #define COMPILER_STREAMERRORHANDLER_H_INCLUDED
 
-#include <ostream>
-
 #include "errorhandler.hpp"
 
 namespace Compiler

components/crashcatcher/windows_crashcatcher.cpp

@@ -2,7 +2,6 @@
 
 #include <cassert>
 #include <cwchar>
-#include <iostream>
 #include <sstream>
 #include <thread>
 

components/crashcatcher/windows_crashmonitor.cpp

@@ -5,9 +5,7 @@
 
 #include <DbgHelp.h>
 
-#include <iostream>
 #include <memory>
-#include <sstream>
 #include <thread>
 
 #include <SDL_messagebox.h>

components/esm/format.cpp

@@ -2,6 +2,9 @@
 
 #include <components/esm/esmcommon.hpp>
 
+#include <istream>
+#include <stdexcept>
+
 namespace ESM
 {
     namespace

components/esm/format.hpp

@@ -4,7 +4,7 @@
 #include "defs.hpp"
 
 #include <cstdint>
-#include <istream>
+#include <iosfwd>
 #include <string_view>
 
 namespace ESM

components/files/constrainedfilestream.hpp

@@ -4,7 +4,7 @@
 #include "constrainedfilestreambuf.hpp"
 #include "streamwithbuffer.hpp"
 
-#include <istream>
+#include <iosfwd>
 #include <memory>
 #include <limits>
 #include <string>

components/files/hash.hpp

@@ -3,7 +3,7 @@
 
 #include <array>
 #include <cstdint>
-#include <istream>
+#include <iosfwd>
 #include <string>
 
 namespace Files

components/fx/pass.hpp

@@ -3,7 +3,6 @@
 
 #include <array>
 #include <string>
-#include <sstream>
 #include <cstdint>
 #include <unordered_set>
 #include <optional>

components/nif/nifkey.hpp

@@ -5,7 +5,6 @@
 
 #include "nifstream.hpp"
 
-#include <sstream>
 #include <map>
 
 #include "niffile.hpp"
@@ -103,9 +102,7 @@ struct KeyMapT {
         }
         else if (count != 0)
         {
-            std::stringstream error;
-            error << "Unhandled interpolation type: " << mInterpolationType;
-            nif->file->fail(error.str());
+            nif->file->fail("Unhandled interpolation type: " + std::to_string(mInterpolationType));
         }
 
         if (morph && nif->getVersion() > NIFStream::generateVersion(10,1,0,0))

components/nif/node.hpp

@@ -130,9 +130,7 @@ struct NiBoundingVolume
             }
             default:
             {
-                std::stringstream error;
-                error << "Unhandled NiBoundingVolume type: " << type;
-                nif->file->fail(error.str());
+                nif->file->fail("Unhandled NiBoundingVolume type: " + std::to_string(type));
             }
         }
     }

components/nifbullet/bulletnifloader.cpp

@@ -3,6 +3,7 @@
 #include <cassert>
 #include <vector>
 #include <variant>
+#include <sstream>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionShapes/btTriangleMesh.h>

components/shader/shadermanager.cpp

@@ -4,12 +4,10 @@
 #include <algorithm>
 #include <sstream>
 #include <regex>
+#include <filesystem>
 
 #include <osg/Program>
 
-#include <filesystem>
-#include <fstream>
-
 #include <components/debug/debuglog.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/settings/settings.hpp>

components/stereo/frustum.cpp

@@ -13,7 +13,6 @@
 #include <osgViewer/Renderer>
 #include <osgViewer/Viewer>
 
-#include <iostream>
 #include <map>
 #include <string>
 

components/stereo/stereomanager.cpp

@@ -14,7 +14,6 @@
 #include <osgViewer/Renderer>
 #include <osgViewer/Viewer>
 
-#include <iostream>
 #include <map>
 #include <string>
 

components/terrain/chunkmanager.cpp

@@ -1,7 +1,5 @@
 #include "chunkmanager.hpp"
 
-#include <sstream>
-
 #include <osg/Texture2D>
 #include <osg/Material>
 

components/vfs/registerarchives.cpp

@@ -1,8 +1,8 @@
 #include "registerarchives.hpp"
 
 #include <set>
-#include <sstream>
 #include <filesystem>
+#include <stdexcept>
 
 #include <components/debug/debuglog.hpp>
 
@@ -33,9 +33,7 @@ namespace VFS
             }
             else
             {
-                std::stringstream message;
-                message << "Archive '" << *archive << "' not found";
-                throw std::runtime_error(message.str());
+                throw std::runtime_error("Archive '" + *archive + "' not found");
             }
         }