Various cleanups and refactorisations.

1 files changed, 14 insertions, 9 deletions

diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp
index 012bf444..3cff4abd 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.cpp
@@ -41,18 +41,23 @@ ConnectionDialog::ConnectionDialog():
     Window("Info"), mProgress(0), mStatus(NET_CONNECTING)
 {
     setContentSize(200, 100);
-    mCancelButton = new Button("Cancel");
-    mCancelButton->setPosition(5, 100 - 5 - mCancelButton->getHeight());
-    mCancelButton->setEventId("cancel");
-    mCancelButton->addActionListener(this);
-    mProgressBar = new ProgressBar(0.0, 5, mCancelButton->getY() - 25,
+
+    Button *cancelButton;
+    cancelButton = new Button("Cancel");
+    cancelButton->setPosition(5, 100 - 5 - cancelButton->getHeight());
+    cancelButton->setEventId("cancel");
+    cancelButton->addActionListener(this);
+
+    mProgressBar = new ProgressBar(0.0, 5, cancelButton->getY() - 25,
                                    200 - 10, 20, 128, 128, 128);
-    mLabel = new gcn::Label("Connecting...");
-    mLabel->setPosition(5, mProgressBar->getY() - 25);
+    gcn::Label *label;
+    label = new gcn::Label("Connecting...");
+    label->setPosition(5, mProgressBar->getY() - 25);
 
-    add(mLabel);
-    add(mCancelButton);
+    add(label);
+    add(cancelButton);
     add(mProgressBar);
+
     setLocationRelativeTo(getParent());
 
     const char *host = iptostring(map_address);