From beb8805a12a0b53a972f46db9e10f30f80e89714 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 18 Dec 2015 15:53:47 +0100
Subject: [PATCH] Accept a ConstPtr in getInventoryIcon

---
 apps/openmw/mwclass/apparatus.cpp  | 5 ++---
 apps/openmw/mwclass/apparatus.hpp  | 2 +-
 apps/openmw/mwclass/armor.cpp      | 5 ++---
 apps/openmw/mwclass/armor.hpp      | 2 +-
 apps/openmw/mwclass/book.cpp       | 5 ++---
 apps/openmw/mwclass/book.hpp       | 2 +-
 apps/openmw/mwclass/clothing.cpp   | 5 ++---
 apps/openmw/mwclass/clothing.hpp   | 2 +-
 apps/openmw/mwclass/ingredient.cpp | 5 ++---
 apps/openmw/mwclass/ingredient.hpp | 2 +-
 apps/openmw/mwclass/light.cpp      | 5 ++---
 apps/openmw/mwclass/light.hpp      | 2 +-
 apps/openmw/mwclass/lockpick.cpp   | 5 ++---
 apps/openmw/mwclass/lockpick.hpp   | 2 +-
 apps/openmw/mwclass/misc.cpp       | 5 ++---
 apps/openmw/mwclass/misc.hpp       | 2 +-
 apps/openmw/mwclass/potion.cpp     | 5 ++---
 apps/openmw/mwclass/potion.hpp     | 2 +-
 apps/openmw/mwclass/probe.cpp      | 5 ++---
 apps/openmw/mwclass/probe.hpp      | 2 +-
 apps/openmw/mwclass/repair.cpp     | 5 ++---
 apps/openmw/mwclass/repair.hpp     | 2 +-
 apps/openmw/mwclass/weapon.cpp     | 5 ++---
 apps/openmw/mwclass/weapon.hpp     | 2 +-
 apps/openmw/mwworld/class.cpp      | 2 +-
 apps/openmw/mwworld/class.hpp      | 2 +-
 26 files changed, 38 insertions(+), 50 deletions(-)

diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 6a64b88c2..323ebfa63 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -92,10 +92,9 @@ namespace MWClass
         return std::string("Item Apparatus Down");
     }
 
-    std::string Apparatus::getInventoryIcon (const MWWorld::Ptr& ptr) const
+    std::string Apparatus::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
     {
-          MWWorld::LiveCellRef<ESM::Apparatus> *ref =
-            ptr.get<ESM::Apparatus>();
+        const MWWorld::LiveCellRef<ESM::Apparatus> *ref = ptr.get<ESM::Apparatus>();
 
         return ref->mBase->mIcon;
     }
diff --git a/apps/openmw/mwclass/apparatus.hpp b/apps/openmw/mwclass/apparatus.hpp
index fbbe676eb..82dff46ff 100644
--- a/apps/openmw/mwclass/apparatus.hpp
+++ b/apps/openmw/mwclass/apparatus.hpp
@@ -51,7 +51,7 @@ namespace MWClass
             virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
             ///< Return the put down sound Id
 
-            virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
+            virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
             ///< Return name of inventory icon.
 
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index a4206a0be..e366ed591 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -199,10 +199,9 @@ namespace MWClass
             return std::string("Item Armor Heavy Down");
     }
 
-    std::string Armor::getInventoryIcon (const MWWorld::Ptr& ptr) const
+    std::string Armor::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
     {
-          MWWorld::LiveCellRef<ESM::Armor> *ref =
-            ptr.get<ESM::Armor>();
+        const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
 
         return ref->mBase->mIcon;
     }
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index a2dd0adc7..5857c01a1 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -64,7 +64,7 @@ namespace MWClass
             virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
             ///< Return the put down sound Id
 
-            virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
+            virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
             ///< Return name of inventory icon.
 
             virtual std::string getEnchantment (const MWWorld::Ptr& ptr) const;
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index f0e69eabf..6ce07b50d 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -106,10 +106,9 @@ namespace MWClass
         return std::string("Item Book Down");
     }
 
-    std::string Book::getInventoryIcon (const MWWorld::Ptr& ptr) const
+    std::string Book::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
     {
-          MWWorld::LiveCellRef<ESM::Book> *ref =
-            ptr.get<ESM::Book>();
+        const MWWorld::LiveCellRef<ESM::Book> *ref = ptr.get<ESM::Book>();
 
         return ref->mBase->mIcon;
     }
diff --git a/apps/openmw/mwclass/book.hpp b/apps/openmw/mwclass/book.hpp
index 38dc0ae7b..14a41b210 100644
--- a/apps/openmw/mwclass/book.hpp
+++ b/apps/openmw/mwclass/book.hpp
@@ -48,7 +48,7 @@ namespace MWClass
             virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
             ///< Return the put down sound Id
 
-            virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
+            virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
             ///< Return name of inventory icon.
 
             virtual std::string getEnchantment (const MWWorld::Ptr& ptr) const;
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index ee75676bd..0cec71d05 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -158,10 +158,9 @@ namespace MWClass
         return std::string("Item Clothes Down");
     }
 
-    std::string Clothing::getInventoryIcon (const MWWorld::Ptr& ptr) const
+    std::string Clothing::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
     {
-          MWWorld::LiveCellRef<ESM::Clothing> *ref =
-            ptr.get<ESM::Clothing>();
+        const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
 
         return ref->mBase->mIcon;
     }
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index 655a38742..fc2fa800b 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -56,7 +56,7 @@ namespace MWClass
             virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
             ///< Return the put down sound Id
 
-            virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
+            virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
             ///< Return name of inventory icon.
 
             virtual std::string getEnchantment (const MWWorld::Ptr& ptr) const;
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index f871095c7..3a2cdfc15 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -108,10 +108,9 @@ namespace MWClass
         return std::string("Item Ingredient Down");
     }
 
-    std::string Ingredient::getInventoryIcon (const MWWorld::Ptr& ptr) const
+    std::string Ingredient::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
     {
-          MWWorld::LiveCellRef<ESM::Ingredient> *ref =
-            ptr.get<ESM::Ingredient>();
+        const MWWorld::LiveCellRef<ESM::Ingredient> *ref = ptr.get<ESM::Ingredient>();
 
         return ref->mBase->mIcon;
     }
diff --git a/apps/openmw/mwclass/ingredient.hpp b/apps/openmw/mwclass/ingredient.hpp
index 7f1e53ca6..309917c44 100644
--- a/apps/openmw/mwclass/ingredient.hpp
+++ b/apps/openmw/mwclass/ingredient.hpp
@@ -52,7 +52,7 @@ namespace MWClass
             virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
             ///< Return the put down sound Id
 
-            virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
+            virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
             ///< Return name of inventory icon.
 
             virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 8c0a05b96..fc3f4e5c5 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -138,10 +138,9 @@ namespace MWClass
     }
 
 
-    std::string Light::getInventoryIcon (const MWWorld::Ptr& ptr) const
+    std::string Light::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
     {
-          MWWorld::LiveCellRef<ESM::Light> *ref =
-            ptr.get<ESM::Light>();
+        const MWWorld::LiveCellRef<ESM::Light> *ref = ptr.get<ESM::Light>();
 
         return ref->mBase->mIcon;
     }
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index 3cc005429..68529e2d0 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -52,7 +52,7 @@ namespace MWClass
             virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
             ///< Return the put down sound Id
 
-            virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
+            virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
             ///< Return name of inventory icon.
 
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index 53bcb9707..d26585ed3 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -102,10 +102,9 @@ namespace MWClass
         return std::string("Item Lockpick Down");
     }
 
-    std::string Lockpick::getInventoryIcon (const MWWorld::Ptr& ptr) const
+    std::string Lockpick::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
     {
-          MWWorld::LiveCellRef<ESM::Lockpick> *ref =
-            ptr.get<ESM::Lockpick>();
+        const MWWorld::LiveCellRef<ESM::Lockpick> *ref = ptr.get<ESM::Lockpick>();
 
         return ref->mBase->mIcon;
     }
diff --git a/apps/openmw/mwclass/lockpick.hpp b/apps/openmw/mwclass/lockpick.hpp
index 565477b8b..fa24c0c00 100644
--- a/apps/openmw/mwclass/lockpick.hpp
+++ b/apps/openmw/mwclass/lockpick.hpp
@@ -52,7 +52,7 @@ namespace MWClass
             virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
             ///< Return the put down sound Id
 
-            virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
+            virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
             ///< Return name of inventory icon.
 
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index da8f48c38..a29142f07 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -120,10 +120,9 @@ namespace MWClass
         return std::string("Item Misc Down");
     }
 
-    std::string Miscellaneous::getInventoryIcon (const MWWorld::Ptr& ptr) const
+    std::string Miscellaneous::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
     {
-          MWWorld::LiveCellRef<ESM::Miscellaneous> *ref =
-            ptr.get<ESM::Miscellaneous>();
+        const MWWorld::LiveCellRef<ESM::Miscellaneous> *ref = ptr.get<ESM::Miscellaneous>();
 
         return ref->mBase->mIcon;
     }
diff --git a/apps/openmw/mwclass/misc.hpp b/apps/openmw/mwclass/misc.hpp
index b2c7b5c76..9583ce2da 100644
--- a/apps/openmw/mwclass/misc.hpp
+++ b/apps/openmw/mwclass/misc.hpp
@@ -48,7 +48,7 @@ namespace MWClass
             virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
             ///< Return the put down sound Id
 
-            virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
+            virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
             ///< Return name of inventory icon.
 
             virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 7c499c7bc..cf83089d2 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -97,10 +97,9 @@ namespace MWClass
         return std::string("Item Potion Down");
     }
 
-    std::string Potion::getInventoryIcon (const MWWorld::Ptr& ptr) const
+    std::string Potion::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
     {
-          MWWorld::LiveCellRef<ESM::Potion> *ref =
-            ptr.get<ESM::Potion>();
+        const MWWorld::LiveCellRef<ESM::Potion> *ref = ptr.get<ESM::Potion>();
 
         return ref->mBase->mIcon;
     }
diff --git a/apps/openmw/mwclass/potion.hpp b/apps/openmw/mwclass/potion.hpp
index d884277ce..e0cc2722b 100644
--- a/apps/openmw/mwclass/potion.hpp
+++ b/apps/openmw/mwclass/potion.hpp
@@ -51,7 +51,7 @@ namespace MWClass
             virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
             ///< Return the put down sound Id
 
-            virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
+            virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
             ///< Return name of inventory icon.
 
             virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index 24d64c613..53403e10a 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -102,10 +102,9 @@ namespace MWClass
         return std::string("Item Probe Down");
     }
 
-    std::string Probe::getInventoryIcon (const MWWorld::Ptr& ptr) const
+    std::string Probe::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
     {
-          MWWorld::LiveCellRef<ESM::Probe> *ref =
-            ptr.get<ESM::Probe>();
+        const MWWorld::LiveCellRef<ESM::Probe> *ref = ptr.get<ESM::Probe>();
 
         return ref->mBase->mIcon;
     }
diff --git a/apps/openmw/mwclass/probe.hpp b/apps/openmw/mwclass/probe.hpp
index 9a8c67789..fccb94ebb 100644
--- a/apps/openmw/mwclass/probe.hpp
+++ b/apps/openmw/mwclass/probe.hpp
@@ -52,7 +52,7 @@ namespace MWClass
             virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
             ///< Return the put down sound Id
 
-            virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
+            virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
             ///< Return name of inventory icon.
 
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index 038162c92..5e8cbad53 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -93,10 +93,9 @@ namespace MWClass
         return std::string("Item Repair Down");
     }
 
-    std::string Repair::getInventoryIcon (const MWWorld::Ptr& ptr) const
+    std::string Repair::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
     {
-          MWWorld::LiveCellRef<ESM::Repair> *ref =
-            ptr.get<ESM::Repair>();
+        const MWWorld::LiveCellRef<ESM::Repair> *ref = ptr.get<ESM::Repair>();
 
         return ref->mBase->mIcon;
     }
diff --git a/apps/openmw/mwclass/repair.hpp b/apps/openmw/mwclass/repair.hpp
index b52677d68..06ccf8c35 100644
--- a/apps/openmw/mwclass/repair.hpp
+++ b/apps/openmw/mwclass/repair.hpp
@@ -48,7 +48,7 @@ namespace MWClass
             virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
             ///< Return the put down sound Id
 
-            virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
+            virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
             ///< Return name of inventory icon.
 
             virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 438497024..8752d0b33 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -245,10 +245,9 @@ namespace MWClass
         return std::string("Item Misc Down");
     }
 
-    std::string Weapon::getInventoryIcon (const MWWorld::Ptr& ptr) const
+    std::string Weapon::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
     {
-          MWWorld::LiveCellRef<ESM::Weapon> *ref =
-            ptr.get<ESM::Weapon>();
+        const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
 
         return ref->mBase->mIcon;
     }
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index 877de41d3..73e4aa2de 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -62,7 +62,7 @@ namespace MWClass
             virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
             ///< Return the put down sound Id
 
-            virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
+            virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
             ///< Return name of inventory icon.
 
             virtual std::string getEnchantment (const MWWorld::Ptr& ptr) const;
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 2e6b74abc..e7c86f65d 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -267,7 +267,7 @@ namespace MWWorld
         throw std::runtime_error("class does not support soundgen look up");
     }
 
-    std::string Class::getInventoryIcon (const MWWorld::Ptr& ptr) const
+    std::string Class::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
     {
         throw std::runtime_error ("class does not have any inventory icon");
     }
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 9d1190a04..321f64615 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -248,7 +248,7 @@ namespace MWWorld
             virtual float getArmorRating (const MWWorld::Ptr& ptr) const;
             ///< @return combined armor rating of this actor
 
-            virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
+            virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
             ///< Return name of inventory icon.
 
             virtual std::string getEnchantment (const MWWorld::Ptr& ptr) const;