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, 3 insertions, 11 deletions

diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index 5edd88bc..5925752e 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -21,17 +21,9 @@
 
 #include "gui/widgets/shortcutcontainer.h"
 
-#include "configuration.h"
-
-#include "resources/image.h"
-
-#include "utils/stringutils.h"
-
 float ShortcutContainer::mAlpha = 1.0;
 
-ShortcutContainer::ShortcutContainer():
-    mGridWidth(1),
-    mGridHeight(1)
+ShortcutContainer::ShortcutContainer()
 {
 }
 
@@ -52,8 +44,8 @@ void ShortcutContainer::widgetResized(const gcn::Event &event)
 
 int ShortcutContainer::getIndexFromGrid(int pointX, int pointY) const
 {
-    const gcn::Rectangle tRect = gcn::Rectangle(0, 0, mGridWidth * mBoxWidth,
-                                                mGridHeight * mBoxHeight);
+    const gcn::Rectangle tRect(0, 0, mGridWidth * mBoxWidth,
+                               mGridHeight * mBoxHeight);
 
     int index = ((pointY / mBoxHeight) * mGridWidth) + pointX / mBoxWidth;