diff --git a/components/bgsm/reader.cpp b/components/bgsm/reader.cpp index facdee9fb2..eefc8b48b5 100644 --- a/components/bgsm/reader.cpp +++ b/components/bgsm/reader.cpp @@ -4,7 +4,6 @@ #include #include -#include "file.hpp" #include "stream.hpp" namespace Bgsm diff --git a/components/bgsm/reader.hpp b/components/bgsm/reader.hpp index 2d8a0ed481..48508c9143 100644 --- a/components/bgsm/reader.hpp +++ b/components/bgsm/reader.hpp @@ -1,10 +1,7 @@ #ifndef OPENMW_COMPONENTS_BGSM_READER_HPP #define OPENMW_COMPONENTS_BGSM_READER_HPP -#include -#include #include -#include #include @@ -19,7 +16,7 @@ namespace Bgsm public: void parse(Files::IStreamPtr&& stream); - std::unique_ptr& getFile() { return mFile; } + std::unique_ptr getFile() { return std::move(mFile); } }; } #endif diff --git a/components/resource/bgsmfilemanager.cpp b/components/resource/bgsmfilemanager.cpp index 7f749e9453..2d439ccc8a 100644 --- a/components/resource/bgsmfilemanager.cpp +++ b/components/resource/bgsmfilemanager.cpp @@ -43,7 +43,7 @@ namespace Resource { Bgsm::Reader reader; reader.parse(mVFS->get(name)); - Bgsm::MaterialFilePtr file = std::move(reader.getFile()); + Bgsm::MaterialFilePtr file = reader.getFile(); obj = new BgsmFileHolder(file); mCache->addEntryToObjectCache(name.value(), obj); return file;