fix style in gui directory.

33 files changed, 121 insertions, 44 deletions

diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 4ac0a3632..35cd2aa32 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -49,6 +49,10 @@ BrowserBox::BrowserBox(const Widget2 *const widget, const unsigned int mode,
     gcn::Widget(),
     Widget2(widget),
     gcn::MouseListener(),
+    mTextRows(),
+    mTextRowLinksCount(),
+    mLineParts(),
+    mLinks(),
     mLinkHandler(nullptr),
     mMode(mode),
     mHighMode(UNDERLINE | BACKGROUND),
@@ -148,7 +152,7 @@ void BrowserBox::addRow(const std::string &row, const bool atTop)
     // Use links and user defined colors
     if (mUseLinksAndUserColors)
     {
-        BROWSER_LINK bLink;
+        BrowserLink bLink;
 
         // Check for links in format "@@link|Caption@@"
         idx1 = tmp.find("@@");
@@ -340,7 +344,7 @@ struct MouseOverLink
         mX(x), mY(y)
     { }
 
-    bool operator() (const BROWSER_LINK &link) const
+    bool operator() (const BrowserLink &link) const
     {
         return (mX >= link.x1 && mX < link.x2 &&
                 mY >= link.y1 && mY < link.y2);
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 304fa1e6c..739b5a18c 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -38,9 +38,22 @@ class Image;
 class Resource;
 class LinkHandler;
 
-struct BROWSER_LINK final
+struct BrowserLink final
 {
-    int x1, x2, y1, y2;     /**< Where link is placed */
+    BrowserLink() :
+        x1(0),
+        x2(0),
+        y1(0),
+        y2(0),
+        link(),
+        caption()
+    {
+    }
+
+    int x1;
+    int x2;
+    int y1;
+    int y2;
     std::string link;
     std::string caption;
 };
@@ -68,8 +81,10 @@ class LinePart final
             mY(y),
             mColor(color),
             mColor2(color2),
+            mText(),
             mType(1),
-            mImage(image), mBold(false)
+            mImage(image),
+            mBold(false)
         {
         }
 
@@ -227,7 +242,7 @@ class BrowserBox final : public gcn::Widget,
         typedef LinePartList::const_iterator LinePartCIter;
         LinePartList mLineParts;
 
-        typedef std::vector<BROWSER_LINK> Links;
+        typedef std::vector<BrowserLink> Links;
         typedef Links::iterator LinkIterator;
         Links mLinks;
 
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index ec0215206..1ae22aabe 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -70,6 +70,10 @@ Button::Button(const Widget2 *const widget) :
     mMode(0),
     mXOffset(0),
     mYOffset(0),
+    mEnabledColor(getThemeColor(Theme::BUTTON)),
+    mDisabledColor(getThemeColor(Theme::BUTTON_DISABLED)),
+    mHighlightedColor(getThemeColor(Theme::BUTTON_HIGHLIGHTED)),
+    mPressedColor(getThemeColor(Theme::BUTTON_PRESSED)),
     mImages(nullptr),
     mImageSet(nullptr),
     mImageWidth(0),
@@ -95,6 +99,10 @@ Button::Button(const Widget2 *const widget,
     mMode(0),
     mXOffset(0),
     mYOffset(0),
+    mEnabledColor(getThemeColor(Theme::BUTTON)),
+    mDisabledColor(getThemeColor(Theme::BUTTON_DISABLED)),
+    mHighlightedColor(getThemeColor(Theme::BUTTON_HIGHLIGHTED)),
+    mPressedColor(getThemeColor(Theme::BUTTON_PRESSED)),
     mImages(nullptr),
     mImageSet(nullptr),
     mImageWidth(0),
@@ -126,6 +134,10 @@ Button::Button(const Widget2 *const widget,
     mMode(0),
     mXOffset(0),
     mYOffset(0),
+    mEnabledColor(getThemeColor(Theme::BUTTON)),
+    mDisabledColor(getThemeColor(Theme::BUTTON_DISABLED)),
+    mHighlightedColor(getThemeColor(Theme::BUTTON_HIGHLIGHTED)),
+    mPressedColor(getThemeColor(Theme::BUTTON_PRESSED)),
     mImages(nullptr),
     mImageSet(nullptr),
     mImageWidth(imageWidth),
@@ -157,6 +169,10 @@ Button::Button(const Widget2 *const widget, const std::string &imageName,
     mMode(0),
     mXOffset(0),
     mYOffset(0),
+    mEnabledColor(getThemeColor(Theme::BUTTON)),
+    mDisabledColor(getThemeColor(Theme::BUTTON_DISABLED)),
+    mHighlightedColor(getThemeColor(Theme::BUTTON_HIGHLIGHTED)),
+    mPressedColor(getThemeColor(Theme::BUTTON_PRESSED)),
     mImages(nullptr),
     mImageSet(nullptr),
     mImageWidth(imageWidth),
@@ -192,10 +208,6 @@ void Button::init()
 
         updateAlpha();
     }
-    mEnabledColor = getThemeColor(Theme::BUTTON);
-    mDisabledColor = getThemeColor(Theme::BUTTON_DISABLED);
-    mHighlightedColor = getThemeColor(Theme::BUTTON_HIGHLIGHTED);
-    mPressedColor = getThemeColor(Theme::BUTTON_PRESSED);
 
     mInstances++;
 }
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 68a056077..56450cd1f 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -37,6 +37,7 @@ Desktop::Desktop(const Widget2 *const widget) :
     Container(widget),
     gcn::WidgetListener(),
     mWallpaper(nullptr),
+    mVersionLabel(nullptr),
     mBackgroundColor(getThemeColor(Theme::BACKGROUND, 128)),
     mBackgroundGrayColor(getThemeColor(Theme::BACKGROUND_GRAY))
 {
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 31a41307c..f05f40b62 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -76,10 +76,12 @@ DropDown::DropDown(const Widget2 *const widget,
     mHighlightColor(getThemeColor(Theme::HIGHLIGHT)),
     mPadding(1),
     mImagePadding(2),
+    mSpacing(0),
     mDroppedDown(false),
     mPushed(false),
     mFoldedUpHeight(0),
-    mIsDragged(false)
+    mIsDragged(false),
+    mSelectionListeners()
 {
     mFrameSize = 2;
 
@@ -156,10 +158,10 @@ DropDown::DropDown(const Widget2 *const widget,
 
     if (mSkin)
     {
+        mSpacing = mSkin->getOption("spacing");
         mFrameSize = mSkin->getOption("frameSize");
         mPadding = mSkin->getPadding();
         mImagePadding = mSkin->getOption("imagePadding");
-        mSpacing = mSkin->getOption("spacing");
     }
     adjustHeight();
 }
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 8be6a4197..9366a9e36 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -47,6 +47,7 @@ static const int MAX_ITEMS = 48;
 
 EmoteShortcutContainer::EmoteShortcutContainer():
     ShortcutContainer(),
+    mEmoteImg(),
     mEmoteClicked(false),
     mEmoteMoved(0),
     mEmotePopup(new TextPopup)
diff --git a/src/gui/widgets/extendednamesmodel.cpp b/src/gui/widgets/extendednamesmodel.cpp
index 90deb999c..4b9eabdae 100644
--- a/src/gui/widgets/extendednamesmodel.cpp
+++ b/src/gui/widgets/extendednamesmodel.cpp
@@ -26,7 +26,9 @@
 
 #include "debug.h"
 
-ExtendedNamesModel::ExtendedNamesModel()
+ExtendedNamesModel::ExtendedNamesModel() :
+    mNames(),
+    mImages()
 {
 }
 
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 5a53a27b4..7cb5698c3 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -103,10 +103,11 @@ GuiTable::GuiTable(const Widget2 *const widget,
     mModel(nullptr),
     mSelectedRow(0),
     mSelectedColumn(0),
-    mTopWidget(nullptr)
+    mTopWidget(nullptr),
+    mActionListeners(),
+    mBackgroundColor(getThemeColor(Theme::BACKGROUND)),
+    mHighlightColor(getThemeColor(Theme::HIGHLIGHT))
 {
-    mBackgroundColor = getThemeColor(Theme::BACKGROUND);
-    mHighlightColor = getThemeColor(Theme::HIGHLIGHT);
     setModel(initial_model);
     setFocusable(true);
 
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index 08e319588..3dfc23f1c 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -174,11 +174,6 @@ private:
 
     static float mAlpha;
 
-    /**
-     * Holds the background color of the table.
-     */
-    gcn::Color mBackgroundColor;
-
     TableModel *mModel;
 
     int mSelectedRow;
@@ -190,6 +185,11 @@ private:
     /** Vector for compactness; used as a list in practice. */
     std::vector<GuiTableActionListener *> mActionListeners;
 
+    /**
+     * Holds the background color of the table.
+     */
+    gcn::Color mBackgroundColor;
+
     gcn::Color mHighlightColor;
 };
 
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 50ab7dfca..bbdaf0d20 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -172,6 +172,7 @@ ItemContainer::ItemContainer(const Widget2 *const widget,
     mDragPosY(0),
     mTag(0),
     mSortType(0),
+    mName(),
     mItemPopup(new ItemPopup),
     mShowMatrix(nullptr),
     mClicks(1),
@@ -183,6 +184,7 @@ ItemContainer::ItemContainer(const Widget2 *const widget,
                          "equippedTextPadding", 29) : 29),
     mPaddingItemX(mSkin ? mSkin->getOption("paddingItemX", 0) : 0),
     mPaddingItemY(mSkin ? mSkin->getOption("paddingItemY", 0) : 0),
+    mSelectionListeners(),
     mEquipedColor(getThemeColor(Theme::ITEM_EQUIPPED)),
     mUnEquipedColor(getThemeColor(Theme::ITEM_NOT_EQUIPPED))
 {
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index 76a1aeaaf..78652b4af 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -42,6 +42,13 @@
 
 struct OpenUrlListener : public gcn::ActionListener
 {
+    OpenUrlListener() :
+        url()
+    {
+    }
+
+    A_DELETE_COPY(OpenUrlListener)
+
     void action(const gcn::ActionEvent &event)
     {
         if (event.getId() == "yes")
diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp
index 932f8dfe5..9f0f761cd 100644
--- a/src/gui/widgets/layout.cpp
+++ b/src/gui/widgets/layout.cpp
@@ -108,7 +108,9 @@ void LayoutCell::computeSizes()
     mSize[1] = mArray->getSize(1);
 }
 
-LayoutArray::LayoutArray(): mSpacing(4)
+LayoutArray::LayoutArray():
+    mCells(),
+    mSpacing(4)
 {
 }
 
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index 267e8da6e..7dbb61384 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -189,7 +189,7 @@ class LayoutCell
             mSize[1] = 0;
         }
 
-        ~LayoutCell();
+        virtual ~LayoutCell();
 
         /**
          * Sets the padding around the cell content.
diff --git a/src/gui/widgets/layouthelper.cpp b/src/gui/widgets/layouthelper.cpp
index b95c6f93f..196b60415 100644
--- a/src/gui/widgets/layouthelper.cpp
+++ b/src/gui/widgets/layouthelper.cpp
@@ -26,6 +26,7 @@
 
 LayoutHelper::LayoutHelper(gcn::Container *const container) :
     gcn::WidgetListener(),
+    mLayout(),
     mContainer(container)
 {
     mContainer->addWidgetListener(this);
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index 7be2c15c3..2e84bb1a2 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -48,7 +48,8 @@ ListBox::ListBox(const Widget2 *const widget,
     mForegroundSelectedColor(getThemeColor(Theme::LISTBOX_SELECTED)),
     mDistributeMousePressed(true),
     mOldSelected(-1),
-    mPadding(0)
+    mPadding(0),
+    mSkin(nullptr)
 {
     mForegroundColor = getThemeColor(Theme::LISTBOX);
 
diff --git a/src/gui/widgets/namesmodel.cpp b/src/gui/widgets/namesmodel.cpp
index 05c12599c..bac8ee0b7 100644
--- a/src/gui/widgets/namesmodel.cpp
+++ b/src/gui/widgets/namesmodel.cpp
@@ -29,7 +29,8 @@
 
 #include "debug.h"
 
-NamesModel::NamesModel()
+NamesModel::NamesModel() :
+    mNames()
 {
 }
 
diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index b713365b6..98c0adc42 100644
--- a/src/gui/widgets/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -38,6 +38,7 @@ PlayerBox::PlayerBox(Being *const being, const std::string &skin) :
     ScrollArea(),
     mBeing(being),
     mAlpha(1.0),
+    mBackground(),
     mSkin(nullptr),
     mDrawBackground(false),
     mOffsetX(-16),
@@ -50,6 +51,7 @@ PlayerBox::PlayerBox(std::string skin) :
     ScrollArea(),
     mBeing(nullptr),
     mAlpha(1.0),
+    mBackground(),
     mSkin(nullptr),
     mDrawBackground(false),
     mOffsetX(-16),
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index 20b4c3ca1..c2e39fdb2 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -38,6 +38,8 @@ Popup::Popup(const std::string &name,
     Container(nullptr),
     gcn::MouseListener(),
     gcn::WidgetListener(),
+    mPadding(3),
+    mSkin(nullptr),
     mPopupName(name),
     mMinWidth(100),
     mMinHeight(40),
@@ -53,8 +55,6 @@ Popup::Popup(const std::string &name,
 
     addWidgetListener(this);
 
-    setPadding(3);
-
     if (skin == "")
         skin = "popup.xml";
 
@@ -68,10 +68,6 @@ Popup::Popup(const std::string &name,
             setPalette(mSkin->getOption("palette"));
         }
     }
-    else
-    {
-        mSkin = nullptr;
-    }
 
     // Add this window to the window container
     windowContainer->add(this);
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index de5543680..175bb7318 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -44,11 +44,15 @@ ProgressBar::ProgressBar(const Widget2 *const widget, float progress,
     gcn::Widget(),
     Widget2(widget),
     gcn::WidgetListener(),
+    mSkin(nullptr),
     mProgress(progress),
     mProgressToGo(progress),
     mSmoothProgress(true),
     mProgressPalette(color),
+    mColor(Theme::getProgressColor(color >= 0 ? color : 0, mProgress)),
+    mColorToGo(mColor),
     mSmoothColorChange(true),
+    mText(),
     mVertexes(new ImageCollection),
     mRedraw(true),
     mPadding(2),
@@ -60,8 +64,6 @@ ProgressBar::ProgressBar(const Widget2 *const widget, float progress,
         mProgress = 1.0f;
 
     mForegroundColor = getThemeColor(Theme::PROGRESS_BAR);
-    mColor = Theme::getProgressColor(color >= 0 ? color : 0, mProgress);
-    mColorToGo = mColor;
     addWidgetListener(this);
     setSize(width, height);
 
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index e44ec74a7..ed99061fc 100644
--- a/src/gui/widgets/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -61,6 +61,7 @@ SetupItem::SetupItem(std::string text, std::string description,
     mValue(""),
     mDefault(""),
     mWidget(nullptr),
+    mTempWidgets(),
     mValueType(VBOOL)
 {
 }
@@ -81,6 +82,7 @@ SetupItem::SetupItem(std::string text, std::string description,
     mValue(""),
     mDefault(def),
     mWidget(nullptr),
+    mTempWidgets(),
     mValueType(VBOOL)
 {
 }
@@ -190,7 +192,8 @@ SetupItemCheckBox::SetupItemCheckBox(std::string text, std::string description,
                                      SetupTabScroll *const parent,
                                      std::string eventName,
                                      const bool mainConfig) :
-    SetupItem(text, description, keyName, parent, eventName, mainConfig)
+    SetupItem(text, description, keyName, parent, eventName, mainConfig),
+    mCheckBox(nullptr)
 {
     createControls();
 }
@@ -200,7 +203,8 @@ SetupItemCheckBox::SetupItemCheckBox(std::string text, std::string description,
                                      SetupTabScroll *const parent,
                                      std::string eventName, std::string def,
                                      const bool mainConfig) :
-    SetupItem(text, description, keyName, parent, eventName, def, mainConfig)
+    SetupItem(text, description, keyName, parent, eventName, def, mainConfig),
+    mCheckBox(nullptr)
 {
     createControls();
 }
diff --git a/src/gui/widgets/setuptab.cpp b/src/gui/widgets/setuptab.cpp
index 9aeec73dc..68246cd0a 100644
--- a/src/gui/widgets/setuptab.cpp
+++ b/src/gui/widgets/setuptab.cpp
@@ -27,7 +27,8 @@
 SetupTab::SetupTab(const Widget2 *const widget) :
     Container(widget),
     gcn::ActionListener(),
-    gcn::WidgetListener()
+    gcn::WidgetListener(),
+    mName()
 {
     setOpaque(false);
     addWidgetListener(this);
diff --git a/src/gui/widgets/setuptabscroll.cpp b/src/gui/widgets/setuptabscroll.cpp
index ec8f36eba..f407cce3b 100644
--- a/src/gui/widgets/setuptabscroll.cpp
+++ b/src/gui/widgets/setuptabscroll.cpp
@@ -31,6 +31,8 @@ SetupTabScroll::SetupTabScroll(const Widget2 *const widget) :
     SetupTab(widget),
     mContainer(new VertContainer(this, 25, false, 8)),
     mScroll(new ScrollArea(mContainer, false)),
+    mItems(),
+    mAllItems(),
     mPreferredFirstItemSize(200)
 {
     mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
diff --git a/src/gui/widgets/setuptouchitem.cpp b/src/gui/widgets/setuptouchitem.cpp
index 5d1ddfadc..aa731504f 100644
--- a/src/gui/widgets/setuptouchitem.cpp
+++ b/src/gui/widgets/setuptouchitem.cpp
@@ -40,7 +40,9 @@ static class SortTouchActionFunctor final
 } touchActionSorter;
 
 TouchActionsModel::TouchActionsModel() :
-    NamesModel()
+    NamesModel(),
+    mActionId(),
+    mActionToSelection()
 {
     std::vector<SetupActionData*> data;
 
diff --git a/src/gui/widgets/shopitems.cpp b/src/gui/widgets/shopitems.cpp
index 74cb6a716..2f8d31111 100644
--- a/src/gui/widgets/shopitems.cpp
+++ b/src/gui/widgets/shopitems.cpp
@@ -29,6 +29,7 @@
 #include "debug.h"
 
 ShopItems::ShopItems(const bool mergeDuplicates) :
+    mShopItems(),
     mMergeDuplicates(mergeDuplicates)
 {
 }
diff --git a/src/gui/widgets/sliderlist.cpp b/src/gui/widgets/sliderlist.cpp
index 70734b707..c90be3629 100644
--- a/src/gui/widgets/sliderlist.cpp
+++ b/src/gui/widgets/sliderlist.cpp
@@ -47,12 +47,11 @@ SliderList::SliderList(const Widget2 *const widget,
     gcn::MouseListener(),
     mLabel(new Label(this)),
     mListModel(listModel),
+    mPrevEventId(eventId + "_prev"),
+    mNextEventId(eventId + "_next"),
     mOldWidth(0),
     mSelectedIndex(0)
 {
-    mPrevEventId = eventId + "_prev";
-    mNextEventId = eventId + "_next";
-
     setHeight(sliderHeight);
 
     mButtons[0] = new Button(this, "<", mPrevEventId, this);
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index ae7d426a8..ed9436c11 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -74,6 +74,7 @@ Tab::Tab(const Widget2 *const widget) :
     mFlashOutlineColor(&getThemeColor(Theme::TAB_FLASH_OUTLINE)),
     mPlayerFlashColor(&getThemeColor(Theme::TAB_PLAYER_FLASH)),
     mPlayerFlashOutlineColor(&getThemeColor(Theme::TAB_PLAYER_FLASH_OUTLINE)),
+    mFlash(0),
     mVertexes(new ImageCollection),
     mRedraw(true),
     mMode(0)
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 3eb09a113..75be5bf6f 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -42,6 +42,8 @@ TabbedArea::TabbedArea(const Widget2 *const widget) :
     mSelectedTab(nullptr),
     mTabContainer(new gcn::Container()),
     mWidgetContainer(new gcn::Container()),
+    mTabsToDelete(),
+    mTabs(),
     mOpaque(false),
     mTabsWidth(0),
     mVisibleTabsWidth(0),
diff --git a/src/gui/widgets/tablemodel.cpp b/src/gui/widgets/tablemodel.cpp
index 543c50ebd..3b0c3e854 100644
--- a/src/gui/widgets/tablemodel.cpp
+++ b/src/gui/widgets/tablemodel.cpp
@@ -67,7 +67,9 @@ StaticTableModel::StaticTableModel(const int row, const int column) :
     TableModel(),
     mRows(row),
     mColumns(column),
-    mHeight(1)
+    mHeight(1),
+    mTableModel(),
+    mWidths()
 {
     mTableModel.resize(row * column, nullptr);
     mWidths.resize(column, 1);
diff --git a/src/gui/widgets/tablemodel.h b/src/gui/widgets/tablemodel.h
index 7e061efb1..dace35a14 100644
--- a/src/gui/widgets/tablemodel.h
+++ b/src/gui/widgets/tablemodel.h
@@ -57,6 +57,10 @@ public:
 class TableModel
 {
 public:
+    TableModel() :
+        listeners()
+    {
+    }
     virtual ~TableModel()
     { }
 
diff --git a/src/gui/widgets/vertcontainer.cpp b/src/gui/widgets/vertcontainer.cpp
index c8bc862ee..ea7bb4e30 100644
--- a/src/gui/widgets/vertcontainer.cpp
+++ b/src/gui/widgets/vertcontainer.cpp
@@ -28,6 +28,7 @@ VertContainer::VertContainer(const Widget2 *const widget,
                              const int leftSpacing) :
     Container(widget),
     gcn::WidgetListener(),
+    mResizableWidgets(),
     mVerticalItemSize(verticalItemSize),
     mCount(0),
     mNextY(0),
diff --git a/src/gui/widgets/widget2.h b/src/gui/widgets/widget2.h
index 053b1560f..d657567ad 100644
--- a/src/gui/widgets/widget2.h
+++ b/src/gui/widgets/widget2.h
@@ -29,12 +29,14 @@ class Widget2
 {
     public:
         Widget2() :
-            mPaletteOffset(0)
+            mPaletteOffset(0),
+            mForegroundColor2()
         {
         }
 
         explicit Widget2(const Widget2 *const widget) :
-            mPaletteOffset(widget ? widget->mPaletteOffset : 0)
+            mPaletteOffset(widget ? widget->mPaletteOffset : 0),
+            mForegroundColor2()
         {
             checkPalette();
         }
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 4d16937e2..053c60875 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -60,6 +60,9 @@ Window::Window(const std::string &caption, const bool modal,
     mGrip(nullptr),
     mParent(parent),
     mLayout(nullptr),
+    mCloseRect(),
+    mStickyRect(),
+    mGripRect(),
     mWindowName("window"),
     mShowTitle(true),
     mModal(modal),
diff --git a/src/gui/widgets/windowcontainer.cpp b/src/gui/widgets/windowcontainer.cpp
index bb43a6261..cba565cc4 100644
--- a/src/gui/widgets/windowcontainer.cpp
+++ b/src/gui/widgets/windowcontainer.cpp
@@ -31,7 +31,8 @@
 WindowContainer *windowContainer = nullptr;
 
 WindowContainer::WindowContainer(const Widget2 *const widget) :
-    Container(widget)
+    Container(widget),
+    mDeathList()
 {
 }