Merge branch 'istream_ptr' into 'master'

Move Files::IStreamPtr alias to a separate header

See merge request OpenMW/openmw!2142

apps/openmw/mwsound/ffmpeg_decoder.hpp

@@ -24,7 +24,7 @@ extern "C"
     #pragma warning (pop)
 #endif
 
-#include <components/files/constrainedfilestream.hpp>
+#include <components/files/istreamptr.hpp>
 
 #include <string>
 

components/bsa/bsa_file.cpp

@@ -23,6 +23,8 @@
 
 #include "bsa_file.hpp"
 
+#include <components/files/constrainedfilestream.hpp>
+
 #include <algorithm>
 #include <cassert>
 #include <cstring>
@@ -256,6 +258,11 @@ void Bsa::BSAFile::close()
     mIsLoaded = false;
 }
 
+Files::IStreamPtr Bsa::BSAFile::getFile(const FileStruct *file)
+{
+    return Files::openConstrainedFileStream(mFilename, file->offset, file->fileSize);
+}
+
 void Bsa::BSAFile::addFile(const std::string& filename, std::istream& file)
 {
     if (!mIsLoaded)

components/bsa/bsa_file.hpp

@@ -28,8 +28,7 @@
 #include <string>
 #include <vector>
 
-#include <components/files/constrainedfilestream.hpp>
-
+#include <components/files/istreamptr.hpp>
 
 namespace Bsa
 {
@@ -123,10 +122,7 @@ public:
     /** Open a file contained in the archive.
      * @note Thread safe.
     */
-    Files::IStreamPtr getFile(const FileStruct *file)
-    {
-        return Files::openConstrainedFileStream(mFilename, file->offset, file->fileSize);
-    }
+    Files::IStreamPtr getFile(const FileStruct *file);
 
     void addFile(const std::string& filename, std::istream& file);
 

components/bsa/compressedbsafile.cpp

@@ -47,6 +47,7 @@
 #include <boost/iostreams/device/array.hpp>
 #include <components/bsa/memorystream.hpp>
 #include <components/misc/stringops.hpp>
+#include <components/files/constrainedfilestream.hpp>
 
 namespace Bsa
 {

components/esm/reader.hpp

@@ -3,7 +3,6 @@
 
 #include <vector>
 
-#include <components/files/constrainedfilestream.hpp>
 #include <components/to_utf8/to_utf8.hpp>
 
 #include "common.hpp" // MasterData

components/esm4/reader.cpp

@@ -49,6 +49,7 @@
 
 #include <components/bsa/memorystream.hpp>
 #include <components/misc/stringops.hpp>
+#include <components/files/constrainedfilestream.hpp>
 
 #include "formid.hpp"
 
@@ -182,6 +183,16 @@ void Reader::open(Files::IStreamPtr&& stream, const std::string &filename)
     throw std::runtime_error("Unknown file format"); // can't yet use fail() as mCtx is not setup
 }
 
+void Reader::openRaw(const std::string& filename)
+{
+    openRaw(Files::openConstrainedFileStream(filename), filename);
+}
+
+void Reader::open(const std::string& filename)
+{
+    open(Files::openConstrainedFileStream(filename), filename);
+}
+
 void Reader::setRecHeaderSize(const std::size_t size)
 {
     mCtx.recHeaderSize = size;

components/esm4/reader.hpp

@@ -26,11 +26,14 @@
 #include <map>
 #include <cstddef>
 #include <memory>
+#include <istream>
 
 #include "common.hpp"
 #include "loadtes4.hpp"
 #include "../esm/reader.hpp"
 
+#include <components/files/istreamptr.hpp>
+
 namespace ESM4 {
     //                                                   bytes read from group, updated by
     //                                                   getRecordHeader() in advance
@@ -129,15 +132,9 @@ namespace ESM4 {
         ~Reader();
 
         // FIXME: should be private but ESMTool uses it
-        void openRaw(const std::string& filename)
-        {
-            openRaw(Files::openConstrainedFileStream(filename), filename);
-        }
+        void openRaw(const std::string& filename);
 
-        void open(const std::string& filename)
-        {
-            open(Files::openConstrainedFileStream(filename), filename);
-        }
+        void open(const std::string& filename);
 
         void close() final;
 

components/files/constrainedfilestream.hpp

@@ -3,9 +3,8 @@
 
 #include "constrainedfilestreambuf.hpp"
 #include "streamwithbuffer.hpp"
+#include "istreamptr.hpp"
 
-#include <iosfwd>
-#include <memory>
 #include <limits>
 #include <string>
 
@@ -15,8 +14,6 @@ namespace Files
 /// A file stream constrained to a specific region in the file, specified by the 'start' and 'length' parameters.
 using ConstrainedFileStream = StreamWithBuffer<ConstrainedFileStreamBuf>;
 
-typedef std::unique_ptr<std::istream> IStreamPtr;
-
 IStreamPtr openConstrainedFileStream(const std::string& filename, std::size_t start = 0,
     std::size_t length = std::numeric_limits<std::size_t>::max());
 

components/files/istreamptr.hpp

@@ -0,0 +1,12 @@
+#ifndef OPENMW_COMPONENTS_FILES_ISTREAMPTR_H
+#define OPENMW_COMPONENTS_FILES_ISTREAMPTR_H
+
+#include <iosfwd>
+#include <memory>
+
+namespace Files
+{
+    using IStreamPtr = std::unique_ptr<std::istream>;
+}
+
+#endif

components/nif/niffile.hpp

@@ -6,9 +6,10 @@
 #include <stdexcept>
 #include <vector>
 #include <atomic>
+#include <limits>
 
 #include <components/debug/debuglog.hpp>
-#include <components/files/constrainedfilestream.hpp>
+#include <components/files/istreamptr.hpp>
 
 #include "record.hpp"
 

components/nif/nifstream.hpp

@@ -9,8 +9,9 @@
 #include <vector>
 #include <typeinfo>
 #include <type_traits>
+#include <istream>
 
-#include <components/files/constrainedfilestream.hpp>
+#include <components/files/istreamptr.hpp>
 #include <components/misc/endianness.hpp>
 
 #include <osg/Vec3f>

components/vfs/archive.hpp

@@ -3,7 +3,7 @@
 
 #include <map>
 
-#include <components/files/constrainedfilestream.hpp>
+#include <components/files/istreamptr.hpp>
 
 namespace VFS
 {

components/vfs/bsaarchive.cpp

@@ -2,6 +2,7 @@
 
 #include <memory>
 #include <algorithm>
+#include <istream>
 
 namespace VFS
 {

components/vfs/filesystemarchive.cpp

@@ -5,6 +5,7 @@
 #include <filesystem>
 
 #include <components/debug/debuglog.hpp>
+#include <components/files/constrainedfilestream.hpp>
 
 namespace VFS
 {

components/vfs/filesystemarchive.hpp

@@ -3,6 +3,8 @@
 
 #include "archive.hpp"
 
+#include <string>
+
 namespace VFS
 {
 

components/vfs/manager.cpp

@@ -1,6 +1,7 @@
 #include "manager.hpp"
 
 #include <stdexcept>
+#include <istream>
 
 #include <components/misc/stringops.hpp>
 

components/vfs/manager.hpp

@@ -1,11 +1,12 @@
 #ifndef OPENMW_COMPONENTS_RESOURCEMANAGER_H
 #define OPENMW_COMPONENTS_RESOURCEMANAGER_H
 
-#include <components/files/constrainedfilestream.hpp>
+#include <components/files/istreamptr.hpp>
 
 #include <vector>
 #include <map>
 #include <memory>
+#include <string>
 
 namespace VFS
 {