Rename for clarity

apps/openmw/mwworld/cellstore.cpp

@@ -184,7 +184,7 @@ namespace MWWorld
             LiveRef liveCellRef (ref, ptr);
 
             if (deleted)
-                liveCellRef.mData.setDeleted(true);
+                liveCellRef.mData.setDeletedByContentFile(true);
 
             if (iter != mList.end())
                 *iter = liveCellRef;

apps/openmw/mwworld/refdata.cpp

@@ -18,7 +18,7 @@ namespace MWWorld
         mCount = refData.mCount;
         mPosition = refData.mPosition;
         mChanged = refData.mChanged;
-        mDeleted = refData.mDeleted;
+        mDeletedByContentFile = refData.mDeletedByContentFile;
 
         mCustomData = refData.mCustomData ? refData.mCustomData->clone() : 0;
     }
@@ -32,7 +32,7 @@ namespace MWWorld
     }
 
     RefData::RefData()
-    : mBaseNode(0), mDeleted(false), mEnabled (true), mCount (1), mCustomData (0), mChanged(false)
+    : mBaseNode(0), mDeletedByContentFile(false), mEnabled (true), mCount (1), mCustomData (0), mChanged(false)
     {
         for (int i=0; i<3; ++i)
         {
@@ -42,15 +42,15 @@ namespace MWWorld
     }
 
     RefData::RefData (const ESM::CellRef& cellRef)
-    : mBaseNode(0), mDeleted(false), mEnabled (true),
+    : mBaseNode(0), mDeletedByContentFile(false), mEnabled (true),
       mCount (1), mPosition (cellRef.mPos),
       mCustomData (0),
       mChanged(false) // Loading from ESM/ESP files -> assume unchanged
     {
     }
 
-    RefData::RefData (const ESM::ObjectState& objectState, bool deleted)
-    : mBaseNode(0), mDeleted(deleted),
+    RefData::RefData (const ESM::ObjectState& objectState, bool deletedByContentFile)
+    : mBaseNode(0), mDeletedByContentFile(deletedByContentFile),
       mEnabled (objectState.mEnabled != 0),
       mCount (objectState.mCount),
       mPosition (objectState.mPosition),
@@ -139,19 +139,19 @@ namespace MWWorld
         mCount = count;
     }
 
-    void RefData::setDeleted(bool deleted)
+    void RefData::setDeletedByContentFile(bool deleted)
     {
-        mDeleted = deleted;
+        mDeletedByContentFile = deleted;
     }
 
     bool RefData::isDeleted() const
     {
-        return mDeleted || mCount == 0;
+        return mDeletedByContentFile || mCount == 0;
     }
 
     bool RefData::isDeletedByContentFile() const
     {
-        return mDeleted;
+        return mDeletedByContentFile;
     }
 
     MWScript::Locals& RefData::getLocals()

apps/openmw/mwworld/refdata.hpp

@@ -32,7 +32,7 @@ namespace MWWorld
 
             /// separate delete flag used for deletion by a content file
             /// @note not stored in the save game file.
-            bool mDeleted;
+            bool mDeletedByContentFile;
 
             bool mEnabled;
 
@@ -58,7 +58,7 @@ namespace MWWorld
             /// to reset the position as the original data is still held in the CellRef
             RefData (const ESM::CellRef& cellRef);
 
-            RefData (const ESM::ObjectState& objectState, bool deleted);
+            RefData (const ESM::ObjectState& objectState, bool deletedByContentFile);
             ///< Ignores local variables and custom data (not enough context available here to
             /// perform these operations).
 
@@ -91,7 +91,7 @@ namespace MWWorld
 
             /// This flag is only used for content stack loading and will not be stored in the savegame.
             /// If the object was deleted by gameplay, then use setCount(0) instead.
-            void setDeleted(bool deleted);
+            void setDeletedByContentFile(bool deleted);
 
             /// Returns true if the object was either deleted by the content file or by gameplay.
             bool isDeleted() const;