Fix align in constructors.

35 files changed, 41 insertions, 38 deletions

diff --git a/src/gui/popups/spellpopup.cpp b/src/gui/popups/spellpopup.cpp
index bf6ea1799..e8bfee72d 100644
--- a/src/gui/popups/spellpopup.cpp
+++ b/src/gui/popups/spellpopup.cpp
@@ -31,7 +31,7 @@
 
 #include "debug.h"
 
-SpellPopup::SpellPopup():
+SpellPopup::SpellPopup() :
     Popup("SpellPopup", "spellpopup.xml"),
     mItemName(new Label(this)),
     mItemComment(new Label(this))
diff --git a/src/gui/popups/textpopup.cpp b/src/gui/popups/textpopup.cpp
index c16c188ef..5eff7fd4a 100644
--- a/src/gui/popups/textpopup.cpp
+++ b/src/gui/popups/textpopup.cpp
@@ -29,7 +29,7 @@
 
 #include "debug.h"
 
-TextPopup::TextPopup():
+TextPopup::TextPopup() :
     Popup("TextPopup", "textpopup.xml"),
     mText()
 {
diff --git a/src/gui/skin.cpp b/src/gui/skin.cpp
index 5ef7ebd6b..626f1b53f 100644
--- a/src/gui/skin.cpp
+++ b/src/gui/skin.cpp
@@ -37,7 +37,7 @@ Skin::Skin(ImageRect *const restrict skin,
            const ImageRect *const restrict images,
            const std::string &filePath, const std::string &name,
            const int padding, const int titlePadding,
-           std::map<std::string, int> *restrict const options):
+           std::map<std::string, int> *restrict const options) :
     instances(1),
     mFilePath(filePath),
     mName(name),
diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp
index 6322d120b..a1211477a 100644
--- a/src/gui/userpalette.cpp
+++ b/src/gui/userpalette.cpp
@@ -97,8 +97,8 @@ std::string UserPalette::getConfigName(const std::string &typeName)
     return res;
 }
 
-UserPalette::UserPalette():
-        Palette(USER_COLOR_LAST)
+UserPalette::UserPalette() :
+    Palette(USER_COLOR_LAST)
 {
     mColors[BEING] = ColorElem();
     mColors[PC] = ColorElem();
diff --git a/src/gui/widgets/chatinput.h b/src/gui/widgets/chatinput.h
index 5ac95a928..57373657e 100644
--- a/src/gui/widgets/chatinput.h
+++ b/src/gui/widgets/chatinput.h
@@ -39,7 +39,7 @@
 class ChatInput final : public TextField
 {
     public:
-        explicit ChatInput(ChatWindow *const window):
+        explicit ChatInput(ChatWindow *const window) :
             TextField(window, "", false),
             mWindow(window),
             mFocusGaining(false)
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index dec4e88c6..86e79b504 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -61,7 +61,7 @@ DropDown::DropDown(const Widget2 *const widget,
                    const bool extended,
                    const bool modal,
                    ActionListener *const listener,
-                   const std::string &eventId):
+                   const std::string &eventId) :
     ActionListener(),
     BasicContainer(widget),
     KeyListener(),
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index b9ba2fdae..6e4e0d90c 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -42,7 +42,7 @@
 
 #include "debug.h"
 
-DropShortcutContainer::DropShortcutContainer(Widget2 *const widget):
+DropShortcutContainer::DropShortcutContainer(Widget2 *const widget) :
     ShortcutContainer(widget),
     mItemClicked(false),
     mItemPopup(new ItemPopup),
diff --git a/src/gui/widgets/layoutarray.cpp b/src/gui/widgets/layoutarray.cpp
index 57a8f5f26..c623c793d 100644
--- a/src/gui/widgets/layoutarray.cpp
+++ b/src/gui/widgets/layoutarray.cpp
@@ -32,7 +32,7 @@
 
 #include "debug.h"
 
-LayoutArray::LayoutArray():
+LayoutArray::LayoutArray() :
     mCells(),
     mSpacing(4)
 {
diff --git a/src/gui/widgets/layoutcell.h b/src/gui/widgets/layoutcell.h
index 25783558c..7761e021c 100644
--- a/src/gui/widgets/layoutcell.h
+++ b/src/gui/widgets/layoutcell.h
@@ -143,7 +143,7 @@ class LayoutCell
         };
 
     private:
-        LayoutCell():
+        LayoutCell() :
             mWidget(nullptr),
             mHPadding(0),
             mVPadding(0),
diff --git a/src/gui/widgets/passwordfield.cpp b/src/gui/widgets/passwordfield.cpp
index 27f0bc188..b85eff686 100644
--- a/src/gui/widgets/passwordfield.cpp
+++ b/src/gui/widgets/passwordfield.cpp
@@ -27,7 +27,7 @@
 #include "debug.h"
 
 PasswordField::PasswordField(const Widget2 *const widget,
-                             const std::string &text):
+                             const std::string &text) :
     TextField(widget, text),
     mPasswordChar(mSkin ? mSkin->getOption("passwordChar", 42) : 42)
 {
diff --git a/src/gui/widgets/popuplist.cpp b/src/gui/widgets/popuplist.cpp
index c203f59c6..e4a7dcf47 100644
--- a/src/gui/widgets/popuplist.cpp
+++ b/src/gui/widgets/popuplist.cpp
@@ -30,7 +30,7 @@
 
 PopupList::PopupList(DropDown *const widget,
                      ListModel *const listModel,
-                     bool extended, bool modal):
+                     bool extended, bool modal) :
     Popup("PopupList", "popuplist.xml"),
     FocusListener(),
     mListModel(listModel),
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 6823ca050..b9675af7f 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -43,7 +43,7 @@ ProgressBar::ProgressBar(const Widget2 *const widget,
                          const int height,
                          const int backColor,
                          const std::string &skin,
-                         const std::string &skinFill):
+                         const std::string &skinFill) :
     Widget(widget),
     WidgetListener(),
     mFillRect(),
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index d2d12f1c6..9074a8a0c 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -88,7 +88,7 @@ RadioButton::GroupMap RadioButton::mGroupMap;
 RadioButton::RadioButton(const Widget2 *const widget,
                          const std::string &restrict caption,
                          const std::string &restrict group,
-                         const bool marked):
+                         const bool marked) :
     Widget(widget),
     MouseListener(),
     KeyListener(),
diff --git a/src/gui/widgets/tabs/socialtab.h b/src/gui/widgets/tabs/socialtab.h
index 1514c56e5..31fb5d938 100644
--- a/src/gui/widgets/tabs/socialtab.h
+++ b/src/gui/widgets/tabs/socialtab.h
@@ -73,7 +73,7 @@ class SocialTab : public Tab
     protected:
         friend class SocialWindow;
 
-        explicit SocialTab(const Widget2 *const widget):
+        explicit SocialTab(const Widget2 *const widget) :
             Tab(widget),
             mInviteDialog(nullptr),
             mConfirmDialog(nullptr),
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 72ff8ea87..dc8b107c4 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -98,7 +98,7 @@ TextField::TextField(const Widget2 *restrict const widget,
                      const bool loseFocusOnTab,
                      ActionListener *restrict const listener,
                      const std::string &restrict eventId,
-                     const bool sendAlwaysEvents):
+                     const bool sendAlwaysEvents) :
     Widget(widget),
     FocusListener(),
     KeyListener(),
diff --git a/src/gui/windows/botcheckerwindow.cpp b/src/gui/windows/botcheckerwindow.cpp
index 8e4bdd047..292d18891 100644
--- a/src/gui/windows/botcheckerwindow.cpp
+++ b/src/gui/windows/botcheckerwindow.cpp
@@ -36,7 +36,7 @@
 
 #include "debug.h"
 
-BotCheckerWindow::BotCheckerWindow():
+BotCheckerWindow::BotCheckerWindow() :
     // TRANSLATORS: bot checker window header
     Window(_("Bot Checker"), false, nullptr, "botchecker.xml"),
     ActionListener(),
diff --git a/src/gui/windows/changeemaildialog.cpp b/src/gui/windows/changeemaildialog.cpp
index 33a55ef2b..f67a01584 100644
--- a/src/gui/windows/changeemaildialog.cpp
+++ b/src/gui/windows/changeemaildialog.cpp
@@ -44,7 +44,7 @@
 
 #include "debug.h"
 
-ChangeEmailDialog::ChangeEmailDialog(LoginData *const data):
+ChangeEmailDialog::ChangeEmailDialog(LoginData *const data) :
     // TRANSLATORS: change email dialog header
     Window(_("Change Email Address"), true, nullptr, "changeemail.xml"),
     ActionListener(),
diff --git a/src/gui/windows/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp
index d809c5efc..c2bb85c21 100644
--- a/src/gui/windows/changepassworddialog.cpp
+++ b/src/gui/windows/changepassworddialog.cpp
@@ -45,7 +45,7 @@
 
 #include "debug.h"
 
-ChangePasswordDialog::ChangePasswordDialog(LoginData *const data):
+ChangePasswordDialog::ChangePasswordDialog(LoginData *const data) :
     // TRANSLATORS: change password window name
     Window(_("Change Password"), true, nullptr, "changepassword.xml"),
     ActionListener(),
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index 167bd37f1..70d8cc4e1 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -55,7 +55,7 @@
 // Character slots per row in the dialog
 static const int SLOTS_PER_ROW = 5;
 
-CharSelectDialog::CharSelectDialog(LoginData *const data):
+CharSelectDialog::CharSelectDialog(LoginData *const data) :
     // TRANSLATORS: char select dialog name
     Window(strprintf(_("Account %s (last login time %s)"),
         data->username.c_str(), data->lastLogin.c_str()),
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index fe95b4e97..0ec192a89 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -85,7 +85,7 @@
 
 static const char *const ACTION_COLOR_PICKER = "color picker";
 
-ChatWindow::ChatWindow():
+ChatWindow::ChatWindow() :
     // TRANSLATORS: chat window name
     Window(_("Chat"), false, nullptr, "chat.xml"),
     ActionListener(),
diff --git a/src/gui/windows/confirmdialog.cpp b/src/gui/windows/confirmdialog.cpp
index f71d4e551..ee4844aa5 100644
--- a/src/gui/windows/confirmdialog.cpp
+++ b/src/gui/windows/confirmdialog.cpp
@@ -37,7 +37,7 @@ ConfirmDialog::ConfirmDialog(const std::string &restrict title,
                              const std::string &restrict msg,
                              const std::string &restrict soundEvent,
                              const bool ignore,
-                             const bool modal, Window *const parent):
+                             const bool modal, Window *const parent) :
     Window(title, modal, parent, "confirm.xml"),
     ActionListener(),
     mTextBox(new TextBox(this)),
diff --git a/src/gui/windows/connectiondialog.cpp b/src/gui/windows/connectiondialog.cpp
index 93b7f7e7b..3ea6d797a 100644
--- a/src/gui/windows/connectiondialog.cpp
+++ b/src/gui/windows/connectiondialog.cpp
@@ -36,7 +36,7 @@
 extern bool mStatsReUpdated;
 
 ConnectionDialog::ConnectionDialog(const std::string &text,
-                                   const State cancelState):
+                                   const State cancelState) :
     Window("", false, nullptr, "connection.xml"),
     ActionListener(),
     mCancelState(cancelState)
diff --git a/src/gui/windows/editdialog.cpp b/src/gui/windows/editdialog.cpp
index 55102acdb..e0fbbdc4e 100644
--- a/src/gui/windows/editdialog.cpp
+++ b/src/gui/windows/editdialog.cpp
@@ -30,8 +30,10 @@
 
 EditDialog::EditDialog(const std::string &restrict title,
                        const std::string &restrict msg,
-                       const std::string &restrict eventOk, const int width,
-                       Window *const parent, const bool modal):
+                       const std::string &restrict eventOk,
+                       const int width,
+                       Window *const parent,
+                       const bool modal) :
     Window(title, modal, parent, "edit.xml"),
     ActionListener(),
     mEventOk(eventOk),
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index 4d90899b5..3cd1cd92e 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -57,7 +57,7 @@ static const int BOX_COUNT = 13;
 
 EquipmentWindow::EquipmentWindow(Equipment *const equipment,
                                  Being *const being,
-                                 const bool foring):
+                                 const bool foring) :
     // TRANSLATORS: equipment window name
     Window(_("Equipment"), false, nullptr, "equipment.xml"),
     ActionListener(),
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 2049d2a12..43e5112a0 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -70,7 +70,7 @@
 
 InventoryWindow::WindowList InventoryWindow::invInstances;
 
-InventoryWindow::InventoryWindow(Inventory *const inventory):
+InventoryWindow::InventoryWindow(Inventory *const inventory) :
     Window("Inventory", false, nullptr, "inventory.xml"),
     ActionListener(),
     KeyListener(),
diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp
index 6cd9ecdf5..94059592b 100644
--- a/src/gui/windows/logindialog.cpp
+++ b/src/gui/windows/logindialog.cpp
@@ -60,8 +60,9 @@ namespace
     OpenUrlListener urlListener;
 }  // namespace
 
-LoginDialog::LoginDialog(LoginData *const data, std::string serverName,
-                         std::string *const updateHost):
+LoginDialog::LoginDialog(LoginData *const data,
+                         std::string serverName,
+                         std::string *const updateHost) :
     // TRANSLATORS: login dialog name
     Window(_("Login"), false, nullptr, "login.xml"),
     ActionListener(),
diff --git a/src/gui/windows/npcpostdialog.cpp b/src/gui/windows/npcpostdialog.cpp
index 3fdb42cb7..327fcbf3f 100644
--- a/src/gui/windows/npcpostdialog.cpp
+++ b/src/gui/windows/npcpostdialog.cpp
@@ -39,7 +39,7 @@
 
 NpcPostDialog::DialogList NpcPostDialog::instances;
 
-NpcPostDialog::NpcPostDialog(const int npcId):
+NpcPostDialog::NpcPostDialog(const int npcId) :
     // TRANSLATORS: npc post dialog caption
     Window(_("NPC"), false, nullptr, "npcpost.xml"),
     ActionListener(),
diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp
index f9ac83ada..60030fbd3 100644
--- a/src/gui/windows/outfitwindow.cpp
+++ b/src/gui/windows/outfitwindow.cpp
@@ -49,7 +49,7 @@
 
 #include "debug.h"
 
-OutfitWindow::OutfitWindow():
+OutfitWindow::OutfitWindow() :
     // TRANSLATORS: outfits window name
     Window(_("Outfits"), false, nullptr, "outfits.xml"),
     ActionListener(),
diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp
index 9d0b72295..20c194360 100644
--- a/src/gui/windows/quitdialog.cpp
+++ b/src/gui/windows/quitdialog.cpp
@@ -50,7 +50,7 @@
 
 #include "debug.h"
 
-QuitDialog::QuitDialog(QuitDialog **const pointerToMe):
+QuitDialog::QuitDialog(QuitDialog **const pointerToMe) :
     // TRANSLATORS: quit dialog name
     Window(_("Quit"), true, nullptr, "quit.xml"),
     ActionListener(),
diff --git a/src/gui/windows/selldialog.cpp b/src/gui/windows/selldialog.cpp
index 691624e06..18d993c91 100644
--- a/src/gui/windows/selldialog.cpp
+++ b/src/gui/windows/selldialog.cpp
@@ -68,7 +68,7 @@ SellDialog::SellDialog(const int npcId) :
     init();
 }
 
-SellDialog::SellDialog(const std::string &nick):
+SellDialog::SellDialog(const std::string &nick) :
     // TRANSLATORS: sell dialog name
     Window(_("Sell"), false, nullptr, "sell.xml"),
     ActionListener(),
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 903a21a57..2d13cf23f 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -74,7 +74,7 @@
 extern std::string tradePartnerName;
 ShopWindow::DialogList ShopWindow::instances;
 
-ShopWindow::ShopWindow():
+ShopWindow::ShopWindow() :
     // TRANSLATORS: shop window name
     Window(_("Personal Shop"), false, nullptr, "shop.xml"),
     ActionListener(),
diff --git a/src/gui/windows/textdialog.cpp b/src/gui/windows/textdialog.cpp
index 3aa3211ad..314f8d6a0 100644
--- a/src/gui/windows/textdialog.cpp
+++ b/src/gui/windows/textdialog.cpp
@@ -39,7 +39,7 @@ int TextDialog::instances = 0;
 TextDialog::TextDialog(const std::string &restrict title,
                        const std::string &restrict msg,
                        Window *const parent,
-                       const bool isPassword):
+                       const bool isPassword) :
     Window(title, true, parent, "textdialog.xml"),
     ActionListener(),
     mTextField(nullptr),
diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp
index 5827ca8a0..eaef2026b 100644
--- a/src/gui/windows/tradewindow.cpp
+++ b/src/gui/windows/tradewindow.cpp
@@ -67,7 +67,7 @@
 // TRANSLATORS: trade window button
 #define CAPTION_ACCEPTED _("Agreed. Waiting...")
 
-TradeWindow::TradeWindow():
+TradeWindow::TradeWindow() :
     // TRANSLATORS: trade window caption
     Window(_("Trade: You"), false, nullptr, "trade.xml"),
     ActionListener(),
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 9835279cc..b38f19943 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -162,7 +162,7 @@ static std::vector<UpdateFile> loadTxtFile(const std::string &fileName)
 UpdaterWindow::UpdaterWindow(const std::string &restrict updateHost,
                              const std::string &restrict updatesDir,
                              const bool applyUpdates,
-                             const int updateType):
+                             const int updateType) :
     // TRANSLATORS: updater window name
     Window(_("Updating..."), false, nullptr, "update.xml"),
     ActionListener(),
diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp
index 6a3dfb7a1..da7e29585 100644
--- a/src/gui/windows/worldselectdialog.cpp
+++ b/src/gui/windows/worldselectdialog.cpp
@@ -43,7 +43,7 @@
 
 extern WorldInfo **server_info;
 
-WorldSelectDialog::WorldSelectDialog(Worlds worlds):
+WorldSelectDialog::WorldSelectDialog(Worlds worlds) :
     // TRANSLATORS: world select dialog name
     Window(_("Select World"), false, nullptr, "world.xml"),
     ActionListener(),