Merge branch 'ref_id_class' into 'master'

Convert RefId to class

See merge request OpenMW/openmw!2739

apps/opencs/model/world/collectionbase.hpp

@@ -13,7 +13,7 @@ class QVariant;
 
 namespace ESM
 {
-    struct RefId;
+    class RefId;
 }
 
 namespace CSMWorld

apps/openmw/mwbase/dialoguemanager.hpp

@@ -17,7 +17,7 @@ namespace ESM
 {
     class ESMReader;
     class ESMWriter;
-    struct RefId;
+    class RefId;
 }
 
 namespace MWWorld

apps/openmw/mwbase/mechanicsmanager.hpp

@@ -21,7 +21,7 @@ namespace osg
 namespace ESM
 {
     struct Class;
-    struct RefId;
+    class RefId;
     class ESMReader;
     class ESMWriter;
 }

apps/openmw/mwbase/scriptmanager.hpp

@@ -10,7 +10,7 @@ namespace Interpreter
 
 namespace ESM
 {
-    struct RefId;
+    class RefId;
 }
 
 namespace Compiler

apps/openmw/mwbase/soundmanager.hpp

@@ -16,7 +16,7 @@ namespace MWWorld
 
 namespace ESM
 {
-    struct RefId;
+    class RefId;
 }
 
 namespace MWSound

apps/openmw/mwbase/windowmanager.hpp

@@ -16,7 +16,7 @@
 
 namespace ESM
 {
-    struct RefId;
+    class RefId;
 }
 
 namespace Loading

apps/openmw/mwbase/world.hpp

@@ -57,7 +57,7 @@ namespace ESM
     struct CreatureLevList;
     struct ItemLevList;
     struct TimeStamp;
-    struct RefId;
+    class RefId;
 }
 
 namespace MWPhysics

apps/openmw/mwclass/lockpick.hpp

@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    struct RefId;
+    class RefId;
 }
 
 namespace MWClass

apps/openmw/mwdialogue/filter.hpp

@@ -9,7 +9,7 @@ namespace ESM
 {
     struct DialInfo;
     struct Dialogue;
-    struct RefId;
+    class RefId;
 }
 
 namespace MWDialogue

apps/openmw/mwmechanics/summoning.hpp

@@ -5,7 +5,7 @@
 #include <utility>
 namespace ESM
 {
-    struct RefId;
+    class RefId;
 }
 namespace MWWorld
 {

apps/openmw/mwscript/compilercontext.hpp

@@ -5,7 +5,7 @@
 
 namespace ESM
 {
-    struct RefId;
+    class RefId;
 }
 
 namespace MWScript

apps/openmw/mwscript/locals.hpp

@@ -12,7 +12,7 @@ namespace ESM
 {
     class Script;
     struct Locals;
-    struct RefId;
+    class RefId;
 }
 
 namespace MWScript

apps/openmw/mwworld/worldimp.hpp

@@ -45,7 +45,7 @@ namespace SceneUtil
 namespace ESM
 {
     struct Position;
-    struct RefId;
+    class RefId;
 }
 
 namespace Files

components/compiler/context.hpp

@@ -4,7 +4,7 @@
 #include <string>
 namespace ESM
 {
-    struct RefId;
+    class RefId;
 }
 
 namespace Compiler

components/detournavigator/navigator.hpp

@@ -16,7 +16,7 @@ namespace ESM
 {
     struct Cell;
     struct Pathgrid;
-    struct RefId;
+    class RefId;
 }
 
 namespace Loading

components/esm/esmbridge.hpp

@@ -16,7 +16,7 @@ namespace ESM
 {
     struct Cell;
     struct CellId;
-    struct RefId;
+    class RefId;
 
     class CellVariant
     {

components/esm/refid.hpp

@@ -13,8 +13,9 @@ namespace ESM
     // RefId is used to represent an Id that identifies an ESM record. These Ids can then be used in
     // ESM::Stores to find the actual record. These Ids can be serialized/de-serialized, stored on disk and remain
     // valid. They are used by ESM files, by records to reference other ESM records.
-    struct RefId
+    class RefId
     {
+    public:
         const static RefId sEmpty;
 
         bool empty() const { return mId.empty(); }
@@ -32,17 +33,16 @@ namespace ESM
         static RefId formIdRefId(const ESM4::FormId id);
         const std::string& getRefIdString() const { return mId; }
 
-    private:
-        std::string mId;
-
-        bool operator==(std::string_view rhs) const;
-
-    public:
         template <std::size_t size>
         bool operator==(const char (&rhs)[size]) const
         {
             return *this == std::string_view(rhs);
         }
+
+    private:
+        std::string mId;
+
+        bool operator==(std::string_view rhs) const;
     };
 }
 

components/esm3/spellstate.hpp

@@ -13,7 +13,7 @@ namespace ESM
 {
     class ESMReader;
     class ESMWriter;
-    struct RefId;
+    class RefId;
 
     // NOTE: spell ids must be lower case
     struct SpellState

components/esmloader/esmdata.hpp

@@ -16,7 +16,7 @@ namespace ESM
     struct Land;
     struct Static;
     class Variant;
-    struct RefId;
+    class RefId;
 }
 
 namespace EsmLoader

components/misc/resourcehelpers.hpp

@@ -11,7 +11,7 @@ namespace VFS
 
 namespace ESM
 {
-    struct RefId;
+    class RefId;
 }
 
 namespace Misc