1 files changed, 34 insertions, 32 deletions
diff --git a/Swift/QtUI/QtMUCConfigurationWindow.cpp b/Swift/QtUI/QtMUCConfigurationWindow.cpp
index 8e8cc0b..e07b8c6 100644
--- a/Swift/QtUI/QtMUCConfigurationWindow.cpp
+++ b/Swift/QtUI/QtMUCConfigurationWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -7,37 +7,39 @@
 #include <Swift/QtUI/QtMUCConfigurationWindow.h>
 
 #include <boost/bind.hpp>
+
 #include <QBoxLayout>
 #include <QCloseEvent>
+
 #include <Swift/QtUI/QtFormWidget.h>
 
 namespace Swift {
 QtMUCConfigurationWindow::QtMUCConfigurationWindow(Form::ref form) : closed_(false) {
 
-	setAttribute(Qt::WA_DeleteOnClose);
-
-	QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-	layout->setContentsMargins(0,0,0,0);
-	layout->setSpacing(2);
-	//QLabel* label = new QLabel(this);
-	//label->setText(tr("Room configuration"));
-	//layout->addWidget(label);
-
-	formWidget_ = NULL;
-	formWidget_ = new QtFormWidget(form, this);
-	layout->addWidget(formWidget_);
-
-	QWidget* buttonsWidget = new QWidget(this);
-	layout->addWidget(buttonsWidget);
-
-	QBoxLayout* buttonsLayout = new QBoxLayout(QBoxLayout::LeftToRight, buttonsWidget);
-	cancelButton_ = new QPushButton(tr("Cancel"), buttonsWidget);
-	buttonsLayout->addWidget(cancelButton_);
-	connect(cancelButton_, SIGNAL(clicked()), this, SLOT(handleCancelClicked()));
-	okButton_ = new QPushButton(tr("OK"), buttonsWidget);
-	buttonsLayout->addWidget(okButton_);
-	connect(okButton_, SIGNAL(clicked()), this, SLOT(handleOKClicked()));
-	show();
+    setAttribute(Qt::WA_DeleteOnClose);
+
+    QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    layout->setContentsMargins(0,0,0,0);
+    layout->setSpacing(2);
+    //QLabel* label = new QLabel(this);
+    //label->setText(tr("Room configuration"));
+    //layout->addWidget(label);
+
+    formWidget_ = nullptr;
+    formWidget_ = new QtFormWidget(form, this);
+    layout->addWidget(formWidget_);
+
+    QWidget* buttonsWidget = new QWidget(this);
+    layout->addWidget(buttonsWidget);
+
+    QBoxLayout* buttonsLayout = new QBoxLayout(QBoxLayout::LeftToRight, buttonsWidget);
+    cancelButton_ = new QPushButton(tr("Cancel"), buttonsWidget);
+    buttonsLayout->addWidget(cancelButton_);
+    connect(cancelButton_, SIGNAL(clicked()), this, SLOT(handleCancelClicked()));
+    okButton_ = new QPushButton(tr("OK"), buttonsWidget);
+    buttonsLayout->addWidget(okButton_);
+    connect(okButton_, SIGNAL(clicked()), this, SLOT(handleOKClicked()));
+    show();
 }
 
 QtMUCConfigurationWindow::~QtMUCConfigurationWindow() {
@@ -45,19 +47,19 @@ QtMUCConfigurationWindow::~QtMUCConfigurationWindow() {
 }
 
 void QtMUCConfigurationWindow::closeEvent(QCloseEvent* /*event*/) {
-	if (!closed_) {
-		onFormCancelled();
-	}
+    if (!closed_) {
+        onFormCancelled();
+    }
 }
 
 void QtMUCConfigurationWindow::handleCancelClicked() {
-	close();
+    close();
 }
 
 void QtMUCConfigurationWindow::handleOKClicked() {
-	onFormComplete(formWidget_->getCompletedForm());
-	closed_ = true;
-	close();
+    onFormComplete(formWidget_->getCompletedForm());
+    closed_ = true;
+    close();
 }