Merge branch 'esm_rm_redundant_include' into 'master'

Remove redundant include from esm3/esmreader.hpp See merge request OpenMW/openmw!1761
3 years ago · 03806eb75e
parent cf1764f255 db44f91fd5
commit 03806eb75e
10 changed files with 12 additions and 1 deletions
--- a/apps/essimporter/converter.hpp
+++ b/apps/essimporter/converter.hpp
@ -2,6 +2,7 @@
 #define OPENMW_ESSIMPORT_CONVERTER_H

 #include <limits>
+#include <sstream>

 #include <osg/Image>
 #include <osg/ref_ptr>
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@ -1,5 +1,7 @@
 #include "savingstages.hpp"

+#include <sstream>
+
 #include <boost/filesystem.hpp>

 #include <components/esm3/loaddial.hpp>
--- a/apps/opencs/model/world/regionmap.cpp
+++ b/apps/opencs/model/world/regionmap.cpp
@ -2,6 +2,7 @@

 #include <cmath>
 #include <algorithm>
+#include <sstream>

 #include <QBrush>

--- a/apps/opencs/view/filter/editwidget.cpp
+++ b/apps/opencs/view/filter/editwidget.cpp
@ -1,5 +1,7 @@
 #include "editwidget.hpp"

+#include <sstream>
+
 #include <QAbstractItemModel>
 #include <QAction>
 #include <QContextMenuEvent>
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@ -10,6 +10,7 @@

 #include <iterator>
 #include <stdexcept>
+#include <sstream>

 namespace MWWorld
 {
--- a/components/esm3/esmreader.cpp
+++ b/components/esm3/esmreader.cpp
@ -4,6 +4,7 @@
 #include <components/misc/stringops.hpp>

 #include <stdexcept>
+#include <sstream>

 namespace ESM
 {
--- a/components/esm3/esmreader.hpp
+++ b/components/esm3/esmreader.hpp
@ -3,7 +3,6 @@

 #include <cstdint>
 #include <vector>
-#include <sstream>

 #include <components/files/constrainedfilestream.hpp>

--- a/components/esm3/loadscpt.cpp
+++ b/components/esm3/loadscpt.cpp
@ -1,5 +1,7 @@
 #include "loadscpt.hpp"

+#include <sstream>
+
 #include <components/debug/debuglog.hpp>

 #include "esmreader.hpp"
--- a/components/esm3/variantimp.cpp
+++ b/components/esm3/variantimp.cpp
@ -2,6 +2,7 @@

 #include <stdexcept>
 #include <cmath>
+#include <sstream>

 #include "esmreader.hpp"
 #include "esmwriter.hpp"
--- a/components/esmloader/load.cpp
+++ b/components/esmloader/load.cpp
@ -28,6 +28,7 @@
 #include <type_traits>
 #include <utility>
 #include <vector>
+#include <sstream>

 namespace EsmLoader
 {