mostly cosmetic fixes, mainly discovered by 'clang --analyze'

reordering of Resource-related stuff was because of

   "error: explicit specialization of 'getString' after instantiation"

complaints.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/IconButton.cc b/src/IconButton.cc
index 320918c..0a50661 100644
--- a/src/IconButton.cc
+++ b/src/IconButton.cc
@@ -189,8 +189,10 @@ void IconButton::refreshEverything(bool setup) {
         unsigned int w = width();
         unsigned int h = height();
         FbTk::translateSize(orientation(), w, h);
-        int iconx = 1, icony = 1;
-        unsigned int neww = w, newh = h;
+        int iconx = 1;
+        int icony = 1;
+        unsigned int neww;
+        unsigned int newh = h;
         if (newh > 2*static_cast<unsigned>(icony))
             newh -= 2*icony;
         else