From edde5bd065b76eec01fe3d0a6478d6a1b18905a5 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 18 Dec 2015 17:00:31 +0100
Subject: [PATCH] Accept a ConstPtr in ContainerStore::stacks

---
 apps/openmw/mwworld/containerstore.cpp |  2 +-
 apps/openmw/mwworld/containerstore.hpp |  2 +-
 apps/openmw/mwworld/inventorystore.cpp |  2 +-
 apps/openmw/mwworld/inventorystore.hpp |  2 +-
 apps/openmw/mwworld/ptr.hpp            | 30 ++++++++++++++++++++++++++
 5 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 4b4c515478..6a0921013f 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -176,7 +176,7 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::restack(const MWWorld::
     return retval;
 }
 
-bool MWWorld::ContainerStore::stacks(const Ptr& ptr1, const Ptr& ptr2)
+bool MWWorld::ContainerStore::stacks(const ConstPtr& ptr1, const ConstPtr& ptr2)
 {
     const MWWorld::Class& cls1 = ptr1.getClass();
     const MWWorld::Class& cls2 = ptr2.getClass();
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index e103e16a1d..b01a793668 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -149,7 +149,7 @@ namespace MWWorld
 
         public:
 
-            virtual bool stacks (const Ptr& ptr1, const Ptr& ptr2);
+            virtual bool stacks (const ConstPtr& ptr1, const ConstPtr& ptr2);
             ///< @return true if the two specified objects can stack with each other
 
             void fill (const ESM::InventoryList& items, const std::string& owner);
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 8041be1eab..0f9b2380c6 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -450,7 +450,7 @@ void MWWorld::InventoryStore::flagAsModified()
     mRechargingItemsUpToDate = false;
 }
 
-bool MWWorld::InventoryStore::stacks(const Ptr& ptr1, const Ptr& ptr2)
+bool MWWorld::InventoryStore::stacks(const ConstPtr& ptr1, const ConstPtr& ptr2)
 {
     bool canStack = MWWorld::ContainerStore::stacks(ptr1, ptr2);
     if (!canStack)
diff --git a/apps/openmw/mwworld/inventorystore.hpp b/apps/openmw/mwworld/inventorystore.hpp
index 2c1be9b038..1e03746ffb 100644
--- a/apps/openmw/mwworld/inventorystore.hpp
+++ b/apps/openmw/mwworld/inventorystore.hpp
@@ -167,7 +167,7 @@ namespace MWWorld
             ///< \attention This function is internal to the world model and should not be called from
             /// outside.
 
-            virtual bool stacks (const Ptr& ptr1, const Ptr& ptr2);
+            virtual bool stacks (const ConstPtr& ptr1, const ConstPtr& ptr2);
             ///< @return true if the two specified objects can stack with each other
 
             virtual int remove(const Ptr& item, int count, const Ptr& actor);
diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index 9d370c4cbe..d34f516a79 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -195,6 +195,36 @@ namespace MWWorld
     {
         return !(left>right);
     }
+
+    inline bool operator== (const ConstPtr& left, const ConstPtr& right)
+    {
+        return left.mRef==right.mRef;
+    }
+
+    inline bool operator!= (const ConstPtr& left, const ConstPtr& right)
+    {
+        return !(left==right);
+    }
+
+    inline bool operator< (const ConstPtr& left, const ConstPtr& right)
+    {
+        return left.mRef<right.mRef;
+    }
+
+    inline bool operator>= (const ConstPtr& left, const ConstPtr& right)
+    {
+        return !(left<right);
+    }
+
+    inline bool operator> (const ConstPtr& left, const ConstPtr& right)
+    {
+        return right<left;
+    }
+
+    inline bool operator<= (const ConstPtr& left, const ConstPtr& right)
+    {
+        return !(left>right);
+    }
 }
 
 #endif