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:
@@ -3,7 +3,7 @@ using namespace std;
|
||||
|
||||
#include "../media/xuiscene_craftingpanel_2x2.h"
|
||||
#include "XUI_Ctrl_MinecraftSlot.h"
|
||||
#include "..\..\..\Minecraft.World\Recipy.h"
|
||||
#include "..\..\..\Minecraft.World\Recipy.h"
|
||||
#include "XUI_Ctrl_CraftIngredientSlot.h"
|
||||
#include "..\..\..\Minecraft.World\Item.h"
|
||||
#include "XUI_CustomMessages.h"
|
||||
@@ -137,7 +137,7 @@ public:
|
||||
|
||||
MAP_CONTROL(IDC_CraftingOutputRed,m_hCraftOutput)
|
||||
END_MAP_CHILD_CONTROLS()
|
||||
|
||||
|
||||
MAP_CONTROL(IDC_InventoryGrid, m_hGridInventory)
|
||||
BEGIN_MAP_CHILD_CONTROLS(m_hGridInventory)
|
||||
MAP_OVERRIDE(IDC_Inventory, m_inventoryControl)
|
||||
@@ -182,13 +182,13 @@ protected:
|
||||
virtual void hideAllHSlots();
|
||||
virtual void hideAllVSlots();
|
||||
virtual void hideAllIngredientsSlots();
|
||||
virtual void setCraftHSlotItem(int iPad, int iIndex, shared_ptr<ItemInstance> item, unsigned int uiAlpha);
|
||||
virtual void setCraftVSlotItem(int iPad, int iIndex, shared_ptr<ItemInstance> item, unsigned int uiAlpha);
|
||||
virtual void setCraftingOutputSlotItem(int iPad, shared_ptr<ItemInstance> item);
|
||||
virtual void setCraftHSlotItem(int iPad, int iIndex, std::shared_ptr<ItemInstance> item, unsigned int uiAlpha);
|
||||
virtual void setCraftVSlotItem(int iPad, int iIndex, std::shared_ptr<ItemInstance> item, unsigned int uiAlpha);
|
||||
virtual void setCraftingOutputSlotItem(int iPad, std::shared_ptr<ItemInstance> item);
|
||||
virtual void setCraftingOutputSlotRedBox(bool show);
|
||||
virtual void setIngredientSlotItem(int iPad, int index, shared_ptr<ItemInstance> item);
|
||||
virtual void setIngredientSlotItem(int iPad, int index, std::shared_ptr<ItemInstance> item);
|
||||
virtual void setIngredientSlotRedBox(int index, bool show);
|
||||
virtual void setIngredientDescriptionItem(int iPad, int index, shared_ptr<ItemInstance> item);
|
||||
virtual void setIngredientDescriptionItem(int iPad, int index, std::shared_ptr<ItemInstance> item);
|
||||
virtual void setIngredientDescriptionRedBox(int index, bool show);
|
||||
virtual void setIngredientDescriptionText(int index, LPCWSTR text);
|
||||
virtual void setShowCraftHSlot(int iIndex, bool show);
|
||||
@@ -200,6 +200,6 @@ protected:
|
||||
virtual void scrollDescriptionDown();
|
||||
virtual void updateHighlightAndScrollPositions();
|
||||
virtual void updateVSlotPositions(int iSlots, int i);
|
||||
|
||||
|
||||
virtual void UpdateMultiPanel();
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user