Improve constructors in some classes.

1 files changed, 8 insertions, 7 deletions

diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 829d45d14..6a4de9432 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -132,23 +132,24 @@ class CharacterDisplay : public Container
 
 CharSelectDialog::CharSelectDialog(LoginData *const data):
     Window(_("Account and Character Management"), false, nullptr, "char.xml"),
+    ActionListener(),
+    KeyListener(),
     mLocked(false),
+    mLoginData(data),
+    mAccountNameLabel(new Label(mLoginData->username)),
+    mLastLoginLabel(new Label(mLoginData->lastLogin)),
+    mSwitchLoginButton(new Button(_("Switch Login"), "switch", this)),
+    mChangePasswordButton(new Button(_("Change Password"),
+                          "change_password", this)),
     mUnregisterButton(nullptr),
     mChangeEmailButton(nullptr),
     mCharacterEntries(0),
-    mLoginData(data),
     mCharHandler(Net::getCharHandler()),
     mDeleteDialog(nullptr),
     mDeleteIndex(-1)
 {
     setCloseButton(false);
 
-    mAccountNameLabel = new Label(mLoginData->username);
-    mLastLoginLabel = new Label(mLoginData->lastLogin);
-    mSwitchLoginButton = new Button(_("Switch Login"), "switch", this);
-    mChangePasswordButton = new Button(_("Change Password"), "change_password",
-                                       this);
-
     const int optionalActions = Net::getLoginHandler()
         ->supportedOptionalActions();