From e35ac1bfb9b63bf1e49dafdcce2033ff42d7c205 Mon Sep 17 00:00:00 2001 From: Lukas Pioch Date: Sat, 20 May 2017 08:16:28 +0200 Subject: Clang 5.0 fixes - Added override keyword - Removed inherited member variables --- src/UI/ChestWindow.h | 2 +- src/UI/EnderChestWindow.h | 2 +- src/UI/MinecartWithChestWindow.h | 2 +- src/UI/SlotArea.h | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/UI') diff --git a/src/UI/ChestWindow.h b/src/UI/ChestWindow.h index bf8ef4f2f..8fe165920 100644 --- a/src/UI/ChestWindow.h +++ b/src/UI/ChestWindow.h @@ -25,7 +25,7 @@ public: cChestWindow(cChestEntity * a_PrimaryChest, cChestEntity * a_SecondaryChest); - ~cChestWindow(); + virtual ~cChestWindow() override; virtual bool ClosedByPlayer(cPlayer & a_Player, bool a_CanRefuse) override; diff --git a/src/UI/EnderChestWindow.h b/src/UI/EnderChestWindow.h index 006a490bf..05f8ca49f 100644 --- a/src/UI/EnderChestWindow.h +++ b/src/UI/EnderChestWindow.h @@ -24,7 +24,7 @@ class cEnderChestWindow : public: cEnderChestWindow(cEnderChestEntity * a_EnderChest); - ~cEnderChestWindow(); + virtual ~cEnderChestWindow() override; virtual void DistributeStack(cItem & a_ItemStack, int a_Slot, cPlayer & a_Player, cSlotArea * a_ClickedArea, bool a_ShouldApply) override; diff --git a/src/UI/MinecartWithChestWindow.h b/src/UI/MinecartWithChestWindow.h index 5e3c28512..2ce728399 100644 --- a/src/UI/MinecartWithChestWindow.h +++ b/src/UI/MinecartWithChestWindow.h @@ -53,7 +53,7 @@ public: } - ~cMinecartWithChestWindow() + virtual ~cMinecartWithChestWindow() override { m_ChestCart->GetWorld()->BroadcastSoundEffect("block.chest.close", m_ChestCart->GetPosX(), m_ChestCart->GetPosY(), m_ChestCart->GetPosZ(), 1, 1); } diff --git a/src/UI/SlotArea.h b/src/UI/SlotArea.h index a25de0319..005ba6e7f 100644 --- a/src/UI/SlotArea.h +++ b/src/UI/SlotArea.h @@ -178,7 +178,7 @@ class cSlotAreaItemGrid : public: cSlotAreaItemGrid(cItemGrid & a_ItemGrid, cWindow & a_ParentWindow); - virtual ~cSlotAreaItemGrid(); + virtual ~cSlotAreaItemGrid() override; virtual const cItem * GetSlot(int a_SlotNum, cPlayer & a_Player) const override; virtual void SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) override; @@ -324,7 +324,7 @@ class cSlotAreaBeacon : public: cSlotAreaBeacon(cBeaconEntity * a_Beacon, cWindow & a_ParentWindow); - virtual ~cSlotAreaBeacon(); + virtual ~cSlotAreaBeacon() override; static bool IsPlaceableItem(short a_ItemType); @@ -436,7 +436,7 @@ class cSlotAreaFurnace : public: cSlotAreaFurnace(cFurnaceEntity * a_Furnace, cWindow & a_ParentWindow); - virtual ~cSlotAreaFurnace(); + virtual ~cSlotAreaFurnace() override; virtual void Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) override; virtual void DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots, bool a_BackFill) override; @@ -466,7 +466,7 @@ class cSlotAreaBrewingstand : public: cSlotAreaBrewingstand(cBrewingstandEntity * a_Brewingstand, cWindow & a_ParentWindow); - virtual ~cSlotAreaBrewingstand(); + virtual ~cSlotAreaBrewingstand() override; virtual void Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) override; virtual void DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots, bool a_BackFill) override; -- cgit v1.2.3