convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs a…

…nd updated by Bret Curtis

apps/opencs/editor.hpp

@@ -47,7 +47,7 @@ namespace CS
             Q_OBJECT
 
             // FIXME: should be moved to document, so we can have different resources for each opened project
-            std::auto_ptr<VFS::Manager> mVFS;
+            std::unique_ptr<VFS::Manager> mVFS;
 
             Files::ConfigurationManager mCfgMgr;
             CSMPrefs::State mSettingsState;

apps/opencs/model/doc/document.cpp

@@ -415,9 +415,9 @@ void CSMDoc::Document::runSearch (const CSMWorld::UniversalId& searchId, const C
     emit stateChanged (getState(), this);
 }
 
-void CSMDoc::Document::runMerge (std::auto_ptr<CSMDoc::Document> target)
+void CSMDoc::Document::runMerge (std::unique_ptr<CSMDoc::Document> target)
 {
-    mTools.runMerge (target);
+    mTools.runMerge (std::move(target));
     emit stateChanged (getState(), this);
 }
 

apps/opencs/model/doc/document.hpp

@@ -137,7 +137,7 @@ namespace CSMDoc
 
             void runSearch (const CSMWorld::UniversalId& searchId, const CSMTools::Search& search);
 
-            void runMerge (std::auto_ptr<CSMDoc::Document> target);
+            void runMerge (std::unique_ptr<CSMDoc::Document> target);
 
             void abortOperation (int type);
 

apps/opencs/model/tools/mergeoperation.cpp

@@ -45,9 +45,9 @@ CSMTools::MergeOperation::MergeOperation (CSMDoc::Document& document, ToUTF8::Fr
     appendStage (new FinishMergedDocumentStage (mState, encoding));
 }
 
-void CSMTools::MergeOperation::setTarget (std::auto_ptr<CSMDoc::Document> document)
+void CSMTools::MergeOperation::setTarget (std::unique_ptr<CSMDoc::Document> document)
 {
-    mState.mTarget = document;
+    mState.mTarget = std::move(document);
 }
 
 void CSMTools::MergeOperation::operationDone()

apps/opencs/model/tools/mergeoperation.hpp

@@ -27,7 +27,7 @@ namespace CSMTools
             MergeOperation (CSMDoc::Document& document, ToUTF8::FromType encoding);
 
             /// \attention Do not call this function while a merge is running.
-            void setTarget (std::auto_ptr<CSMDoc::Document> document);
+            void setTarget (std::unique_ptr<CSMDoc::Document> document);
 
         protected slots:
 

apps/opencs/model/tools/mergestate.hpp

@@ -12,7 +12,7 @@ namespace CSMTools
 {
     struct MergeState
     {
-        std::auto_ptr<CSMDoc::Document> mTarget;
+        std::unique_ptr<CSMDoc::Document> mTarget;
         CSMDoc::Document& mSource;
         bool mCompleted;
         std::map<std::pair<uint16_t, int>, int> mTextureIndices; // (texture, content file) -> new texture

apps/opencs/model/tools/tools.cpp

@@ -216,7 +216,7 @@ void CSMTools::Tools::runSearch (const CSMWorld::UniversalId& searchId, const Se
     mSearch.start();
 }
 
-void CSMTools::Tools::runMerge (std::auto_ptr<CSMDoc::Document> target)
+void CSMTools::Tools::runMerge (std::unique_ptr<CSMDoc::Document> target)
 {
     // not setting an active report, because merge does not produce messages
 
@@ -230,7 +230,7 @@ void CSMTools::Tools::runMerge (std::auto_ptr<CSMDoc::Document> target)
 
     target->flagAsDirty();
 
-    mMergeOperation->setTarget (target);
+    mMergeOperation->setTarget (std::move(target));
 
     mMerge.start();
 }

apps/opencs/model/tools/tools.hpp

@@ -77,7 +77,7 @@ namespace CSMTools
 
             void runSearch (const CSMWorld::UniversalId& searchId, const Search& search);
 
-            void runMerge (std::auto_ptr<CSMDoc::Document> target);
+            void runMerge (std::unique_ptr<CSMDoc::Document> target);
 
             void abortOperation (int type);
             ///< \attention The operation is not aborted immediately.

apps/opencs/model/world/commanddispatcher.cpp

@@ -138,7 +138,7 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, cons
     if (mLocked)
         return;
 
-    std::auto_ptr<CSMWorld::UpdateCellCommand> modifyCell;
+    std::unique_ptr<CSMWorld::UpdateCellCommand> modifyCell;
 
     int columnId = model->data (index, ColumnBase::Role_ColumnId).toInt();
 
@@ -167,7 +167,7 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, cons
         }
     }
 
-    std::auto_ptr<CSMWorld::ModifyCommand> modifyData (
+    std::unique_ptr<CSMWorld::ModifyCommand> modifyData (
         new CSMWorld::ModifyCommand (*model, index, new_));
 
     if (modifyCell.get())

apps/opencs/model/world/refidcollection.cpp

@@ -808,7 +808,7 @@ void CSMWorld::RefIdCollection::cloneRecord(const std::string& origin,
                                      const std::string& destination,
                                      const CSMWorld::UniversalId::Type type)
 {
-        std::auto_ptr<RecordBase> newRecord(mData.getRecord(mData.searchId(origin)).modifiedCopy());
+        std::unique_ptr<RecordBase> newRecord(mData.getRecord(mData.searchId(origin)).modifiedCopy());
         mAdapters.find(type)->second->setId(*newRecord, destination);
         mData.insertRecord(*newRecord, type, destination);
 }

apps/opencs/model/world/refiddata.cpp

@@ -389,7 +389,7 @@ void CSMWorld::RefIdData::copyTo (int index, RefIdData& target) const
 
     std::string id = source->getId (localIndex.first);
 
-    std::auto_ptr<CSMWorld::RecordBase> newRecord (source->getRecord (localIndex.first).modifiedCopy());
+    std::unique_ptr<CSMWorld::RecordBase> newRecord (source->getRecord (localIndex.first).modifiedCopy());
 
     target.insertRecord (*newRecord, localIndex.second, id);
 }

apps/opencs/view/render/cell.cpp

@@ -62,7 +62,7 @@ bool CSVRender::Cell::addObjects (int start, int end)
         {
             std::string id = Misc::StringUtils::lowerCase (collection.getRecord (i).get().mId);
 
-            std::auto_ptr<Object> object (new Object (mData, mCellNode, id, false));
+            std::unique_ptr<Object> object (new Object (mData, mCellNode, id, false));
 
             if (mSubModeElementMask & Mask_Reference)
                 object->setSubMode (mSubMode);

apps/opencs/view/render/cell.hpp

@@ -47,13 +47,13 @@ namespace CSVRender
             std::string mId;
             osg::ref_ptr<osg::Group> mCellNode;
             std::map<std::string, Object *> mObjects;
-            std::auto_ptr<Terrain::TerrainGrid> mTerrain;
+            std::unique_ptr<Terrain::TerrainGrid> mTerrain;
             CSMWorld::CellCoordinates mCoordinates;
-            std::auto_ptr<CellArrow> mCellArrows[4];
-            std::auto_ptr<CellMarker> mCellMarker;
-            std::auto_ptr<CellBorder> mCellBorder;
-            std::auto_ptr<CellWater> mCellWater;
-            std::auto_ptr<Pathgrid> mPathgrid;
+            std::unique_ptr<CellArrow> mCellArrows[4];
+            std::unique_ptr<CellMarker> mCellMarker;
+            std::unique_ptr<CellBorder> mCellBorder;
+            std::unique_ptr<CellWater> mCellWater;
+            std::unique_ptr<Pathgrid> mPathgrid;
             bool mDeleted;
             int mSubMode;
             unsigned int mSubModeElementMask;

apps/opencs/view/render/instancemode.cpp

@@ -559,7 +559,7 @@ void CSVRender::InstanceMode::dropEvent (QDropEvent* event)
 
             if (mode=="Create cell and insert")
             {
-                std::auto_ptr<CSMWorld::CreateCommand> createCommand (
+                std::unique_ptr<CSMWorld::CreateCommand> createCommand (
                     new CSMWorld::CreateCommand (cellTable, cellId));
 
                 int parentIndex = cellTable.findColumnIndex (CSMWorld::Columns::ColumnId_Cell);
@@ -610,7 +610,7 @@ void CSVRender::InstanceMode::dropEvent (QDropEvent* event)
             if (mime->isReferencable (iter->getType()))
             {
                 // create reference
-                std::auto_ptr<CSMWorld::CreateCommand> createCommand (
+                std::unique_ptr<CSMWorld::CreateCommand> createCommand (
                     new CSMWorld::CreateCommand (
                     referencesTable, document.getData().getReferences().getNewId()));
 

apps/opencs/view/render/pagedworldspacewidget.cpp

@@ -54,7 +54,7 @@ bool CSVRender::PagedWorldspaceWidget::adjustCells()
                 {
                     modified = true;
 
-                    std::auto_ptr<Cell> cell (new Cell (mDocument.getData(), mRootNode,
+                    std::unique_ptr<Cell> cell (new Cell (mDocument.getData(), mRootNode,
                         iter->first.getId (mWorldspace), deleted));
 
                     delete iter->second;
@@ -378,7 +378,7 @@ void CSVRender::PagedWorldspaceWidget::addCellToScene (
     bool deleted = index==-1 ||
         cells.getRecord (index).mState==CSMWorld::RecordBase::State_Deleted;
 
-    std::auto_ptr<Cell> cell (
+    std::unique_ptr<Cell> cell (
         new Cell (mDocument.getData(), mRootNode, coordinates.getId (mWorldspace),
         deleted));
     EditMode *editMode = getEditMode();

apps/opencs/view/render/unpagedworldspacewidget.hpp

@@ -29,7 +29,7 @@ namespace CSVRender
             std::string mCellId;
             CSMWorld::IdTable *mCellsModel;
             CSMWorld::IdTable *mReferenceablesModel;
-            std::auto_ptr<Cell> mCell;
+            std::unique_ptr<Cell> mCell;
 
             void update();
 

apps/opencs/view/tools/merge.cpp

@@ -127,10 +127,10 @@ void CSVTools::Merge::accept()
     {
         std::vector< boost::filesystem::path > files (1, mAdjuster->getPath());
 
-        std::auto_ptr<CSMDoc::Document> target (
+        std::unique_ptr<CSMDoc::Document> target (
             mDocumentManager.makeDocument (files, files[0], true));
 
-        mDocument->runMerge (target);
+        mDocument->runMerge (std::move(target));
 
         hide();
     }

apps/opencs/view/world/creator.hpp

@@ -91,7 +91,7 @@ namespace CSVWorld
     Creator *CreatorFactory<CreatorT, scope>::makeCreator (CSMDoc::Document& document,
                                                            const CSMWorld::UniversalId& id) const
     {
-        std::auto_ptr<CreatorT> creator (new CreatorT (document.getData(), document.getUndoStack(), id));
+        std::unique_ptr<CreatorT> creator (new CreatorT (document.getData(), document.getUndoStack(), id));
 
         creator->setScope (scope);
 

apps/opencs/view/world/dialoguesubview.cpp

@@ -120,7 +120,7 @@ mIndex(index)
 CSVWorld::DialogueDelegateDispatcherProxy::DialogueDelegateDispatcherProxy(QWidget* editor, CSMWorld::ColumnBase::Display display) :
 mEditor(editor),
 mDisplay(display),
-mIndexWrapper(NULL)
+mIndexWrapper(nullptr)
 {
 }
 

apps/opencs/view/world/dialoguesubview.hpp

@@ -84,7 +84,7 @@ namespace CSVWorld
 
         CSMWorld::ColumnBase::Display mDisplay;
 
-        std::auto_ptr<refWrapper> mIndexWrapper;
+        std::unique_ptr<refWrapper> mIndexWrapper;
 
     public:
         DialogueDelegateDispatcherProxy(QWidget* editor,

apps/opencs/view/world/genericcreator.cpp

@@ -63,7 +63,7 @@ std::string CSVWorld::GenericCreator::getIdValidatorResult() const
 
 void CSVWorld::GenericCreator::configureCreateCommand (CSMWorld::CreateCommand& command) const {}
 
-void CSVWorld::GenericCreator::pushCommand (std::auto_ptr<CSMWorld::CreateCommand> command,
+void CSVWorld::GenericCreator::pushCommand (std::unique_ptr<CSMWorld::CreateCommand> command,
     const std::string& id)
 {
     mUndoStack.push (command.release());
@@ -224,7 +224,7 @@ void CSVWorld::GenericCreator::create()
     {
         std::string id = getId();
 
-        std::auto_ptr<CSMWorld::CreateCommand> command;
+        std::unique_ptr<CSMWorld::CreateCommand> command;
 
         if (mCloneMode)
         {
@@ -239,7 +239,7 @@ void CSVWorld::GenericCreator::create()
         }
 
         configureCreateCommand (*command);
-        pushCommand (command, id);
+        pushCommand (std::move(command), id);
 
         emit done();
         emit requestFocus(id);

apps/opencs/view/world/genericcreator.hpp

@@ -71,7 +71,7 @@ namespace CSVWorld
 
             /// Allow subclasses to wrap the create command together with additional commands
             /// into a macro.
-            virtual void pushCommand (std::auto_ptr<CSMWorld::CreateCommand> command,
+            virtual void pushCommand (std::unique_ptr<CSMWorld::CreateCommand> command,
                 const std::string& id);
 
             CSMWorld::Data& getData() const;

apps/openmw/engine.hpp

@@ -71,8 +71,8 @@ namespace OMW
     class Engine
     {
             SDL_Window* mWindow;
-            std::auto_ptr<VFS::Manager> mVFS;
-            std::auto_ptr<Resource::ResourceSystem> mResourceSystem;
+            std::unique_ptr<VFS::Manager> mVFS;
+            std::unique_ptr<Resource::ResourceSystem> mResourceSystem;
             osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
             MWBase::Environment mEnvironment;
             ToUTF8::FromType mEncoding;

apps/openmw/main.cpp

@@ -310,7 +310,7 @@ int main(int argc, char**argv)
 
     boost::filesystem::ofstream logfile;
 
-    std::auto_ptr<OMW::Engine> engine;
+    std::unique_ptr<OMW::Engine> engine;
 
     int ret = 0;
     try

apps/openmw/mwclass/container.cpp

@@ -52,7 +52,7 @@ namespace MWClass
     {
         if (!ptr.getRefData().getCustomData())
         {
-            std::auto_ptr<ContainerCustomData> data (new ContainerCustomData);
+            std::unique_ptr<ContainerCustomData> data (new ContainerCustomData);
 
             MWWorld::LiveCellRef<ESM::Container> *ref =
                 ptr.get<ESM::Container>();
@@ -308,7 +308,7 @@ namespace MWClass
         if (!ptr.getRefData().getCustomData())
         {
             // Create a CustomData, but don't fill it from ESM records (not needed)
-            std::auto_ptr<ContainerCustomData> data (new ContainerCustomData);
+            std::unique_ptr<ContainerCustomData> data (new ContainerCustomData);
             ptr.getRefData().setCustomData (data.release());
         }
 

apps/openmw/mwclass/creature.cpp

@@ -108,7 +108,7 @@ namespace MWClass
     {
         if (!ptr.getRefData().getCustomData())
         {
-            std::auto_ptr<CreatureCustomData> data (new CreatureCustomData);
+            std::unique_ptr<CreatureCustomData> data (new CreatureCustomData);
 
             MWWorld::LiveCellRef<ESM::Creature> *ref = ptr.get<ESM::Creature>();
 
@@ -742,7 +742,7 @@ namespace MWClass
             if (!ptr.getRefData().getCustomData())
             {
                 // Create a CustomData, but don't fill it from ESM records (not needed)
-                std::auto_ptr<CreatureCustomData> data (new CreatureCustomData);
+                std::unique_ptr<CreatureCustomData> data (new CreatureCustomData);
 
                 if (hasInventoryStore(ptr))
                     data->mContainerStore = new MWWorld::InventoryStore();

apps/openmw/mwclass/creaturelevlist.cpp

@@ -132,7 +132,7 @@ namespace MWClass
     {
         if (!ptr.getRefData().getCustomData())
         {
-            std::auto_ptr<CreatureLevListCustomData> data (new CreatureLevListCustomData);
+            std::unique_ptr<CreatureLevListCustomData> data (new CreatureLevListCustomData);
             data->mSpawnActorId = -1;
             data->mSpawn = true;
 

apps/openmw/mwclass/door.cpp

@@ -350,7 +350,7 @@ namespace MWClass
     {
         if (!ptr.getRefData().getCustomData())
         {
-            std::auto_ptr<DoorCustomData> data(new DoorCustomData);
+            std::unique_ptr<DoorCustomData> data(new DoorCustomData);
 
             data->mDoorState = 0;
             ptr.getRefData().setCustomData(data.release());

apps/openmw/mwclass/npc.cpp

@@ -303,7 +303,7 @@ namespace MWClass
     {
         if (!ptr.getRefData().getCustomData())
         {
-            std::auto_ptr<NpcCustomData> data(new NpcCustomData);
+            std::unique_ptr<NpcCustomData> data(new NpcCustomData);
 
             MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
 
@@ -1259,7 +1259,7 @@ namespace MWClass
             if (!ptr.getRefData().getCustomData())
             {
                 // Create a CustomData, but don't fill it from ESM records (not needed)
-                std::auto_ptr<NpcCustomData> data (new NpcCustomData);
+                std::unique_ptr<NpcCustomData> data (new NpcCustomData);
                 ptr.getRefData().setCustomData (data.release());
             }
         }

apps/openmw/mwgui/alchemywindow.hpp

@@ -3,6 +3,8 @@
 
 #include <vector>
 
+#include "../mwmechanics/alchemy.hpp"
+
 #include "widgets.hpp"
 #include "windowbase.hpp"
 
@@ -48,7 +50,7 @@ namespace MWGui
 
         void update();
 
-        std::auto_ptr<MWMechanics::Alchemy> mAlchemy;
+        std::unique_ptr<MWMechanics::Alchemy> mAlchemy;
 
         std::vector<ItemWidget*> mApparatus;
         std::vector<ItemWidget*> mIngredients;