Merge pull request #2800 from elsid/rm_unused

Remove unused code

apps/openmw/mwgui/itemmodel.cpp

@@ -32,26 +32,6 @@ namespace MWGui
     {
     }
 
-    bool ItemStack::stacks(const ItemStack &other)
-    {
-        if(mBase == other.mBase)
-            return true;
-
-        // If one of the items is in an inventory and currently equipped, we need to check stacking both ways to be sure
-        if (mBase.getContainerStore() && other.mBase.getContainerStore())
-            return mBase.getContainerStore()->stacks(mBase, other.mBase)
-                    && other.mBase.getContainerStore()->stacks(mBase, other.mBase);
-
-        if (mBase.getContainerStore())
-            return mBase.getContainerStore()->stacks(mBase, other.mBase);
-        if (other.mBase.getContainerStore())
-            return other.mBase.getContainerStore()->stacks(mBase, other.mBase);
-
-        MWWorld::ContainerStore store;
-        return store.stacks(mBase, other.mBase);
-
-    }
-
     bool operator == (const ItemStack& left, const ItemStack& right)
     {
         if (left.mType != right.mType)

apps/openmw/mwgui/itemmodel.hpp

@@ -13,7 +13,6 @@ namespace MWGui
     {
         ItemStack (const MWWorld::Ptr& base, ItemModel* creator, size_t count);
         ItemStack();
-        bool stacks (const ItemStack& other);
         ///< like operator==, only without checking mType
 
         enum Type

components/sceneutil/detourdebugdraw.cpp

@@ -7,9 +7,6 @@
 #include <osg/Group>
 #include <osg/LineWidth>
 
-#define OPENMW_TO_STRING(X) #X
-#define OPENMW_LINE_STRING OPENMW_TO_STRING(__LINE__)
-
 namespace
 {
     using DetourNavigator::operator<<;
@@ -121,6 +118,3 @@ namespace SceneUtil
         mColors->push_back(value);
     }
 }
-
-#undef OPENMW_TO_STRING
-#undef OPENMW_LINE_STRING