Merge branch 'rm_stream_include' into 'master'

Remove redundant ostream, istream, iostream and sstream includes See merge request OpenMW/openmw!2097
3 years ago · f451b09f10
parent 1fa25f48db bef15edf0b
commit f451b09f10
47 changed files with 85 additions and 82 deletions
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@ -5,7 +5,6 @@

 #include <algorithm>
 #include <random>
-#include <iostream>

 namespace
 {
--- a/apps/essimporter/converter.hpp
+++ b/apps/essimporter/converter.hpp
@ -2,7 +2,6 @@
 #define OPENMW_ESSIMPORT_CONVERTER_H

 #include <limits>
-#include <sstream>

 #include <osg/Image>
 #include <osg/ref_ptr>
@ -544,9 +543,7 @@ public:
        }
        else
        {
-            std::stringstream error;
-            error << "Invalid weather ID:" << weatherID << std::endl;
-            throw std::runtime_error(error.str());
+            throw std::runtime_error("Invalid weather ID: " + std::to_string(weatherID));
        }
    }

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

-#include <sstream>
-
 CSMFilter::AndNode::AndNode (const std::vector<std::shared_ptr<Node> >& nodes)
 : NAryNode (nodes, "and")
 {}
--- a/apps/opencs/model/filter/ornode.cpp
+++ b/apps/opencs/model/filter/ornode.cpp
@ -1,7 +1,5 @@
 #include "ornode.hpp"

-#include <sstream>
-
 CSMFilter::OrNode::OrNode (const std::vector<std::shared_ptr<Node> >& nodes)
 : NAryNode (nodes, "or")
 {}
--- a/apps/opencs/model/tools/mergestages.cpp
+++ b/apps/opencs/model/tools/mergestages.cpp
@ -1,8 +1,5 @@
-
 #include "mergestages.hpp"

-#include <sstream>
-
 #include <components/misc/stringops.hpp>

 #include "mergestate.hpp"
--- a/apps/opencs/model/tools/scriptcheck.cpp
+++ b/apps/opencs/model/tools/scriptcheck.cpp
@ -1,5 +1,7 @@
 #include "scriptcheck.hpp"

+#include <sstream>
+
 #include <components/compiler/tokenloc.hpp>
 #include <components/compiler/scanner.hpp>
 #include <components/compiler/fileparser.hpp>
--- a/apps/opencs/model/world/scriptcontext.cpp
+++ b/apps/opencs/model/world/scriptcontext.cpp
@ -1,6 +1,7 @@
 #include "scriptcontext.hpp"

 #include <algorithm>
+#include <sstream>

 #include <components/misc/stringops.hpp>

--- a/apps/opencs/model/world/universalid.cpp
+++ b/apps/opencs/model/world/universalid.cpp
@ -1,6 +1,5 @@
 #include "universalid.hpp"

-#include <ostream>
 #include <stdexcept>
 #include <sstream>
 #include <iostream>
@ -405,8 +404,3 @@ bool CSMWorld::operator< (const UniversalId& left, const UniversalId& right)
 {
    return left.isLess (right);
 }
-
-std::ostream& CSMWorld::operator< (std::ostream& stream, const CSMWorld::UniversalId& universalId)
-{
-    return stream << universalId.toString();
-}
--- a/apps/opencs/model/world/universalid.hpp
+++ b/apps/opencs/model/world/universalid.hpp
@ -2,7 +2,6 @@
 #define CSM_WOLRD_UNIVERSALID_H

 #include <string>
-#include <iosfwd>
 #include <vector>

 #include <QMetaType>
@ -199,8 +198,6 @@ namespace CSMWorld
    bool operator!= (const UniversalId& left, const UniversalId& right);

    bool operator< (const UniversalId& left, const UniversalId& right);
-
-    std::ostream& operator< (std::ostream& stream, const UniversalId& universalId);
 }

 Q_DECLARE_METATYPE (CSMWorld::UniversalId)
--- a/apps/opencs/view/render/terraintexturemode.cpp
+++ b/apps/opencs/view/render/terraintexturemode.cpp
@ -1,7 +1,6 @@
 #include "terraintexturemode.hpp"

 #include <string>
-#include <sstream>

 #include <QWidget>
 #include <QIcon>
--- a/apps/opencs/view/world/scripterrortable.cpp
+++ b/apps/opencs/view/world/scripterrortable.cpp
@ -1,5 +1,7 @@
 #include "scripterrortable.hpp"

+#include <sstream>
+
 #include <QHeaderView>

 #include <components/compiler/tokenloc.hpp>
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@ -2,6 +2,7 @@

 #include <algorithm>
 #include <list>
+#include <sstream>

 #include <components/debug/debuglog.hpp>

--- a/apps/openmw/mwdialogue/scripttest.cpp
+++ b/apps/openmw/mwdialogue/scripttest.cpp
@ -19,6 +19,8 @@

 #include "filter.hpp"

+#include <sstream>
+
 namespace
 {

--- a/apps/openmw/mwgui/journalviewmodel.cpp
+++ b/apps/openmw/mwgui/journalviewmodel.cpp
@ -1,7 +1,6 @@
 #include "journalviewmodel.hpp"

 #include <map>
-#include <sstream>

 #include <MyGUI_LanguageManager.h>

--- a/apps/openmw/mwgui/statswatcher.cpp
+++ b/apps/openmw/mwgui/statswatcher.cpp
@ -11,6 +11,8 @@
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"

+#include <string>
+
 namespace MWGui
 {
    // mWatchedTimeToStartDrowning = -1 for correct drowning state check,
@ -36,11 +38,8 @@ namespace MWGui
        {
            if (stats.getAttribute(i) != mWatchedAttributes[i] || mWatchedStatsEmpty)
            {
-                std::stringstream attrname;
-                attrname << "AttribVal"<<(i+1);
-
                mWatchedAttributes[i] = stats.getAttribute(i);
-                setValue(attrname.str(), stats.getAttribute(i));
+                setValue("AttribVal" + std::to_string(i + 1), stats.getAttribute(i));
            }
        }

--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@ -19,7 +19,7 @@

 #include "character.hpp"

-#include <iostream>
+#include <sstream>

 #include <components/misc/mathutil.hpp>
 #include <components/misc/rng.hpp>
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@ -1,6 +1,7 @@
 #include "npcstats.hpp"

 #include <iomanip>
+#include <sstream>

 #include <components/esm3/loadclas.hpp>
 #include <components/esm3/loadgmst.hpp>
--- a/apps/openmw/mwrender/ripplesimulation.cpp
+++ b/apps/openmw/mwrender/ripplesimulation.cpp
@ -1,6 +1,7 @@
 #include "ripplesimulation.hpp"

 #include <iomanip>
+#include <sstream>

 #include <osg/PolygonOffset>
 #include <osg/Texture2D>
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@ -3,6 +3,7 @@
 #include <cstdlib>
 #include <iomanip>
 #include <chrono>
+#include <sstream>

 #include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
--- a/apps/openmw/mwsound/ffmpeg_decoder.hpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp
@ -27,7 +27,6 @@ extern "C"
 #include <components/files/constrainedfilestream.hpp>

 #include <string>
-#include <istream>

 #include "sound_decoder.hpp"

--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@ -3,6 +3,7 @@
 #include <algorithm>
 #include <map>
 #include <numeric>
+#include <sstream>

 #include <osg/Matrixf>

--- a/apps/openmw/mwworld/actionequip.cpp
+++ b/apps/openmw/mwworld/actionequip.cpp
@ -65,11 +65,7 @@ namespace MWWorld
        }

        if (it == invStore.end())
-        {
-            std::stringstream error;
-            error << "ActionEquip can't find item " << object.getCellRef().getRefId();
-            throw std::runtime_error(error.str());
-        }
+            throw std::runtime_error("ActionEquip can't find item " + object.getCellRef().getRefId());

        // equip the item in the first free slot
        std::vector<int>::const_iterator slot=slots_.first.begin();
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@ -2,7 +2,6 @@
 #define OPENMW_MWWORLD_ESMSTORE_H

 #include <memory>
-#include <sstream>
 #include <stdexcept>
 #include <unordered_map>

--- a/apps/openmw/mwworld/livecellref.cpp
+++ b/apps/openmw/mwworld/livecellref.cpp
@ -1,5 +1,7 @@
 #include "livecellref.hpp"

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

@ -78,3 +80,20 @@ unsigned int MWWorld::LiveCellRefBase::getType() const
 {
    return mClass->getType();
 }
+
+namespace MWWorld
+{
+    std::string makeDynamicCastErrorMessage(const LiveCellRefBase* value, std::string_view recordType)
+    {
+        std::stringstream message;
+
+        message << "Bad LiveCellRef cast to " << recordType << " from ";
+
+        if (value != nullptr)
+            message << value->getTypeDescription();
+        else
+            message << "an empty object";
+
+        return message.str();
+    }
+}
--- a/apps/openmw/mwworld/livecellref.hpp
+++ b/apps/openmw/mwworld/livecellref.hpp
@ -5,6 +5,8 @@

 #include "refdata.hpp"

+#include <stdexcept>
+
 namespace ESM
 {
    struct ObjectState;
@ -16,6 +18,9 @@ namespace MWWorld
    class ESMStore;
    class Class;

+    template <typename X>
+    struct LiveCellRef;
+
    /// Used to create pointers to hold any type of LiveCellRef<> object.
    struct LiveCellRefBase
    {
@ -46,6 +51,12 @@ namespace MWWorld
        unsigned int getType() const;
        ///< @see MWWorld::Class::getType

+        template <class T>
+        static const LiveCellRef<T>* dynamicCast(const LiveCellRefBase* value);
+
+        template <class T>
+        static LiveCellRef<T>* dynamicCast(LiveCellRefBase* value);
+
        protected:

            void loadImp (const ESM::ObjectState& state);
@ -70,6 +81,24 @@ namespace MWWorld
        return cellRef.mRef.getRefNum()==refNum;
    }

+    std::string makeDynamicCastErrorMessage(const LiveCellRefBase* value, std::string_view recordType);
+
+    template <class T>
+    const LiveCellRef<T>* LiveCellRefBase::dynamicCast(const LiveCellRefBase* value)
+    {
+        if (const LiveCellRef<T>* ref = dynamic_cast<const LiveCellRef<T>*>(value))
+            return ref;
+        throw std::runtime_error(makeDynamicCastErrorMessage(value, T::getRecordType()));
+    }
+
+    template <class T>
+    LiveCellRef<T>* LiveCellRefBase::dynamicCast(LiveCellRefBase* value)
+    {
+        if (LiveCellRef<T>* ref = dynamic_cast<LiveCellRef<T>*>(value))
+            return ref;
+        throw std::runtime_error(makeDynamicCastErrorMessage(value, T::getRecordType()));
+    }
+
    /// A reference to one object (of any type) in a cell.
    ///
    /// Constructing this with a CellRef instance in the constructor means that
@ -125,7 +154,6 @@ namespace MWWorld
    {
        return checkStateImp (state);
    }
-
 }

 #endif
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@ -1,9 +1,10 @@
 #include "projectilemanager.hpp"

 #include <iomanip>
-
+#include <sstream>
 #include <memory>
 #include <optional>
+
 #include <osg/PositionAttitudeTransform>

 #include <components/debug/debuglog.hpp>
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@ -5,7 +5,6 @@
 #include <type_traits>
 #include <string>
 #include <string_view>
-#include <sstream>

 #include "livecellref.hpp"

@ -76,19 +75,8 @@ namespace MWWorld
                throw std::runtime_error("Cannot get class of an empty object");
            }

-            template<typename T>
-            TypeTransform<MWWorld::LiveCellRef<T>> *get() const
-            {
-                TypeTransform<MWWorld::LiveCellRef<T>> *ref = dynamic_cast<TypeTransform<MWWorld::LiveCellRef<T>>*>(mRef);
-                if(ref) return ref;
-
-                std::stringstream str;
-                str<< "Bad LiveCellRef cast to "<<T::getRecordType()<<" from ";
-                if(mRef != nullptr) str<< getTypeDescription();
-                else str<< "an empty object";
-
-                throw std::runtime_error(str.str());
-            }
+            template <class T>
+            auto* get() const { return LiveCellRefBase::dynamicCast<T>(mRef); }

            LiveCellRefBaseType *getBase() const
            {
--- a/apps/openmw_test_suite/detournavigator/operators.hpp
+++ b/apps/openmw_test_suite/detournavigator/operators.hpp
@ -6,9 +6,7 @@

 #include <deque>
 #include <iomanip>
-#include <iostream>
 #include <limits>
-#include <sstream>

 #include <gtest/gtest.h>

--- a/components/bsa/memorystream.hpp
+++ b/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
--- a/components/compiler/scanner.cpp
+++ b/components/compiler/scanner.cpp
@ -1,6 +1,7 @@
 #include "scanner.hpp"

 #include <cassert>
+#include <sstream>

 #include "exception.hpp"
 #include "errorhandler.hpp"
--- a/components/compiler/scanner.hpp
+++ b/components/compiler/scanner.hpp
@ -5,7 +5,7 @@
 #include <string>
 #include <iosfwd>
 #include <vector>
-#include <sstream>
+#include <istream>

 #include "tokenloc.hpp"

--- a/components/compiler/streamerrorhandler.hpp
+++ b/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
--- a/components/crashcatcher/windows_crashcatcher.cpp
+++ b/components/crashcatcher/windows_crashcatcher.cpp
@ -2,7 +2,6 @@

 #include <cassert>
 #include <cwchar>
-#include <iostream>
 #include <sstream>
 #include <thread>

--- a/components/crashcatcher/windows_crashmonitor.cpp
+++ b/components/crashcatcher/windows_crashmonitor.cpp
@ -5,9 +5,7 @@

 #include <DbgHelp.h>

-#include <iostream>
 #include <memory>
-#include <sstream>
 #include <thread>

 #include <SDL_messagebox.h>
--- a/components/esm/format.cpp
+++ b/components/esm/format.cpp
@ -2,6 +2,9 @@

 #include <components/esm/esmcommon.hpp>

+#include <istream>
+#include <stdexcept>
+
 namespace ESM
 {
    namespace
--- a/components/esm/format.hpp
+++ b/components/esm/format.hpp
@ -4,7 +4,7 @@
 #include "defs.hpp"

 #include <cstdint>
-#include <istream>
+#include <iosfwd>
 #include <string_view>

 namespace ESM
--- a/components/files/constrainedfilestream.hpp
+++ b/components/files/constrainedfilestream.hpp
@ -4,7 +4,7 @@
 #include "constrainedfilestreambuf.hpp"
 #include "streamwithbuffer.hpp"

-#include <istream>
+#include <iosfwd>
 #include <memory>
 #include <limits>
 #include <string>
--- a/components/files/hash.hpp
+++ b/components/files/hash.hpp
@ -3,7 +3,7 @@

 #include <array>
 #include <cstdint>
-#include <istream>
+#include <iosfwd>
 #include <string>

 namespace Files
--- a/components/fx/pass.hpp
+++ b/components/fx/pass.hpp
@ -3,7 +3,6 @@

 #include <array>
 #include <string>
-#include <sstream>
 #include <cstdint>
 #include <unordered_set>
 #include <optional>
--- a/components/nif/nifkey.hpp
+++ b/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))
--- a/components/nif/node.hpp
+++ b/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));
            }
        }
    }
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/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>
--- a/components/shader/shadermanager.cpp
+++ b/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>
--- a/components/stereo/frustum.cpp
+++ b/components/stereo/frustum.cpp
@ -13,7 +13,6 @@
 #include <osgViewer/Renderer>
 #include <osgViewer/Viewer>

-#include <iostream>
 #include <map>
 #include <string>

--- a/components/stereo/stereomanager.cpp
+++ b/components/stereo/stereomanager.cpp
@ -14,7 +14,6 @@
 #include <osgViewer/Renderer>
 #include <osgViewer/Viewer>

-#include <iostream>
 #include <map>
 #include <string>

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

-#include <sstream>
-
 #include <osg/Texture2D>
 #include <osg/Material>

--- a/components/vfs/registerarchives.cpp
+++ b/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");
            }
        }