mirror of
https://github.com/vcmi/vcmi.git
synced 2025-12-01 23:12:49 +02:00
Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared
Long time ago it's was used without prefix to make future switch from boost to std version easier. I discusses this with Ivan and decide to drop these using from Global.h now. This change wouldn't break anything because there was already code with prefix for each of three cases.
This commit is contained in:
@@ -144,10 +144,10 @@ public:
|
||||
const CMapOperation * peekRedo() const;
|
||||
const CMapOperation * peekUndo() const;
|
||||
|
||||
void addOperation(unique_ptr<CMapOperation> && operation); /// Client code does not need to call this method.
|
||||
void addOperation(std::unique_ptr<CMapOperation> && operation); /// Client code does not need to call this method.
|
||||
|
||||
private:
|
||||
typedef std::list<unique_ptr<CMapOperation> > TStack;
|
||||
typedef std::list<std::unique_ptr<CMapOperation> > TStack;
|
||||
|
||||
void doOperation(TStack & fromStack, TStack & toStack, bool doUndo);
|
||||
const CMapOperation * peek(const TStack & stack) const;
|
||||
@@ -182,7 +182,7 @@ public:
|
||||
CMapUndoManager & getUndoManager();
|
||||
|
||||
private:
|
||||
void execute(unique_ptr<CMapOperation> && operation);
|
||||
void execute(std::unique_ptr<CMapOperation> && operation);
|
||||
|
||||
CMap * map;
|
||||
CMapUndoManager undoManager;
|
||||
@@ -205,10 +205,10 @@ public:
|
||||
void undo() override;
|
||||
void redo() override;
|
||||
|
||||
void addOperation(unique_ptr<CMapOperation> && operation);
|
||||
void addOperation(std::unique_ptr<CMapOperation> && operation);
|
||||
|
||||
private:
|
||||
std::list<unique_ptr<CMapOperation> > operations;
|
||||
std::list<std::unique_ptr<CMapOperation> > operations;
|
||||
};
|
||||
|
||||
namespace ETerrainGroup
|
||||
|
||||
Reference in New Issue
Block a user