General code cleanups

* Removing unused includes
* Use member initialization
* Use range-based for loops
* Use nullptr
* Removed no longer used aliases
* Use override
* Don't use else after return
* Use '= delete' to remove implicit members
* Use std::string::empty instead of comparing to ""

1 files changed, 11 insertions, 11 deletions

diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index fe5b73e5..51807aba 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -176,14 +176,17 @@ class ItemContainer : public gcn::Widget,
         Item *getItemAt(int) const;
 
         Inventory *mInventory;
-        int mGridColumns, mGridRows;
+        int mGridColumns = 1;
+        int mGridRows = 1;
         Image *mSelImg;
-        int mSelectedIndex, mHighlightedIndex;
-        int mLastUsedSlot;
-        SelectionState mSelectionStatus;
-        bool mSwapItems;
-        bool mDescItems;
-        int mDragPosX, mDragPosY;
+        int mSelectedIndex = -1;
+        int mHighlightedIndex = -1;
+        int mLastUsedSlot = -1;
+        SelectionState mSelectionStatus = SEL_NONE;
+        bool mSwapItems = false;
+        bool mDescItems = false;
+        int mDragPosX = 0;
+        int mDragPosY = 0;
 
         std::map<int, Item*> mFilteredMap;
 
@@ -191,10 +194,7 @@ class ItemContainer : public gcn::Widget,
 
         ItemPopup *mItemPopup;
 
-        using SelectionListenerList = std::list<gcn::SelectionListener *>;
-        using SelectionListenerIterator = SelectionListenerList::iterator;
-
-        SelectionListenerList mSelectionListeners;
+        std::list<gcn::SelectionListener *> mSelectionListeners;
 };
 
 #endif // ITEMCONTAINER_H