shared_ptr -> std::shared_ptr
This is one of the first commits in a plan to remove all `using namespace std;` lines in the entire codebase as it is considered anti-pattern today.
This commit is contained in:
@@ -5,22 +5,22 @@
|
||||
class ResultSlot : public Slot
|
||||
{
|
||||
private:
|
||||
shared_ptr<Container> craftSlots;
|
||||
Player *player; // This can't be a shared_ptr, as we create a result slot in the inventorymenu in the Player ctor
|
||||
std::shared_ptr<Container> craftSlots;
|
||||
Player *player; // This can't be a std::shared_ptr, as we create a result slot in the inventorymenu in the Player ctor
|
||||
int removeCount;
|
||||
|
||||
public:
|
||||
ResultSlot(Player *player, shared_ptr<Container> craftSlots, shared_ptr<Container> container, int id, int x, int y);
|
||||
ResultSlot(Player *player, std::shared_ptr<Container> craftSlots, std::shared_ptr<Container> container, int id, int x, int y);
|
||||
virtual ~ResultSlot() {}
|
||||
|
||||
virtual bool mayPlace(shared_ptr<ItemInstance> item);
|
||||
virtual shared_ptr<ItemInstance> remove(int c);
|
||||
virtual bool mayPlace(std::shared_ptr<ItemInstance> item);
|
||||
virtual std::shared_ptr<ItemInstance> remove(int c);
|
||||
|
||||
protected:
|
||||
virtual void onQuickCraft(shared_ptr<ItemInstance> picked, int count);
|
||||
virtual void checkTakeAchievements(shared_ptr<ItemInstance> carried);
|
||||
virtual void onQuickCraft(std::shared_ptr<ItemInstance> picked, int count);
|
||||
virtual void checkTakeAchievements(std::shared_ptr<ItemInstance> carried);
|
||||
|
||||
public:
|
||||
virtual void onTake(shared_ptr<Player> player, shared_ptr<ItemInstance> carried);
|
||||
virtual bool mayCombine(shared_ptr<ItemInstance> item); // 4J Added
|
||||
virtual void onTake(std::shared_ptr<Player> player, std::shared_ptr<ItemInstance> carried);
|
||||
virtual bool mayCombine(std::shared_ptr<ItemInstance> item); // 4J Added
|
||||
};
|
||||
Reference in New Issue
Block a user