1 files changed, 113 insertions, 113 deletions
diff --git a/Swift/QtUI/QtAdHocCommandWindow.cpp b/Swift/QtUI/QtAdHocCommandWindow.cpp
index ef397f4..65dac91 100644
--- a/Swift/QtUI/QtAdHocCommandWindow.cpp
+++ b/Swift/QtUI/QtAdHocCommandWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -19,156 +19,156 @@
 const int FormLayoutIndex = 1;
 
 namespace Swift {
-QtAdHocCommandWindow::QtAdHocCommandWindow(boost::shared_ptr<OutgoingAdHocCommandSession> command) : command_(command) {
-	formWidget_ = NULL;
-
-	setAttribute(Qt::WA_DeleteOnClose);
-	command->onNextStageReceived.connect(boost::bind(&QtAdHocCommandWindow::handleNextStageReceived, this, _1));
-	command->onError.connect(boost::bind(&QtAdHocCommandWindow::handleError, this, _1));
-	command->start();
-
-	layout_ = new QBoxLayout(QBoxLayout::TopToBottom, this);
-	layout_->setContentsMargins(0,0,0,0);
-	layout_->setSpacing(2);
-	label_ = new QLabel(this);
-	label_->setTextFormat(Qt::PlainText);
-	layout_->addWidget(label_);
-
-	errorLabel_ = new QLabel(this);
-	errorLabel_->setText(QString("<b>%1</b>").arg(tr("Unable to complete the command because you have been disconnected")));
-	errorLabel_->setVisible(false);
-	errorLabel_->setFrameStyle(QFrame::Box|QFrame::Sunken);
-	layout_->addWidget(errorLabel_);
-
-	dialogButtons_ = new QDialogButtonBox(this);
-	layout_->addWidget(dialogButtons_);
-
-	dialogButtons_->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
-	okButton_ = dialogButtons_->button(QDialogButtonBox::Ok);
-	connect(okButton_, SIGNAL(clicked()), this, SLOT(close()));
-	cancelButton_ = dialogButtons_->button(QDialogButtonBox::Cancel);
-	connect(cancelButton_, SIGNAL(clicked()), this, SLOT(handleCancelClicked()));
-	// Buttons appear next to the Ok button, right of Cancel with YesRole
-	completeButton_ = dialogButtons_->addButton(tr("Complete"), QDialogButtonBox::YesRole);
-	connect(completeButton_, SIGNAL(clicked()), this, SLOT(handleCompleteClicked()));
-	nextButton_ = dialogButtons_->addButton(tr("Next"), QDialogButtonBox::YesRole);
-	connect(nextButton_, SIGNAL(clicked()), this, SLOT(handleNextClicked()));
-	backButton_ = dialogButtons_->addButton(tr("Back"), QDialogButtonBox::YesRole);
-	connect(backButton_, SIGNAL(clicked()), this, SLOT(handlePrevClicked()));
-
-	okButton_->setEnabled(false);
-	okButton_->hide();
-
-	nextButton_->setEnabled(false);
-	backButton_->setEnabled(false);
-	completeButton_->setEnabled(false);
-
-	actions_[Command::Next] = nextButton_;
-	actions_[Command::Prev] = backButton_;
-	actions_[Command::Complete] = completeButton_;
-	actions_[Command::Cancel] = cancelButton_;
+QtAdHocCommandWindow::QtAdHocCommandWindow(std::shared_ptr<OutgoingAdHocCommandSession> command) : command_(command) {
+    formWidget_ = nullptr;
+
+    setAttribute(Qt::WA_DeleteOnClose);
+    command->onNextStageReceived.connect(boost::bind(&QtAdHocCommandWindow::handleNextStageReceived, this, _1));
+    command->onError.connect(boost::bind(&QtAdHocCommandWindow::handleError, this, _1));
+    command->start();
+
+    layout_ = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    layout_->setContentsMargins(0,0,0,0);
+    layout_->setSpacing(2);
+    label_ = new QLabel(this);
+    label_->setTextFormat(Qt::PlainText);
+    layout_->addWidget(label_);
+
+    errorLabel_ = new QLabel(this);
+    errorLabel_->setText(QString("<b>%1</b>").arg(tr("Unable to complete the command because you have been disconnected")));
+    errorLabel_->setVisible(false);
+    errorLabel_->setFrameStyle(QFrame::Box|QFrame::Sunken);
+    layout_->addWidget(errorLabel_);
+
+    dialogButtons_ = new QDialogButtonBox(this);
+    layout_->addWidget(dialogButtons_);
+
+    dialogButtons_->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
+    okButton_ = dialogButtons_->button(QDialogButtonBox::Ok);
+    connect(okButton_, SIGNAL(clicked()), this, SLOT(close()));
+    cancelButton_ = dialogButtons_->button(QDialogButtonBox::Cancel);
+    connect(cancelButton_, SIGNAL(clicked()), this, SLOT(handleCancelClicked()));
+    // Buttons appear next to the Ok button, right of Cancel with YesRole
+    completeButton_ = dialogButtons_->addButton(tr("Complete"), QDialogButtonBox::YesRole);
+    connect(completeButton_, SIGNAL(clicked()), this, SLOT(handleCompleteClicked()));
+    nextButton_ = dialogButtons_->addButton(tr("Next"), QDialogButtonBox::YesRole);
+    connect(nextButton_, SIGNAL(clicked()), this, SLOT(handleNextClicked()));
+    backButton_ = dialogButtons_->addButton(tr("Back"), QDialogButtonBox::YesRole);
+    connect(backButton_, SIGNAL(clicked()), this, SLOT(handlePrevClicked()));
+
+    okButton_->setEnabled(false);
+    okButton_->hide();
+
+    nextButton_->setEnabled(false);
+    backButton_->setEnabled(false);
+    completeButton_->setEnabled(false);
+
+    actions_[Command::Next] = nextButton_;
+    actions_[Command::Prev] = backButton_;
+    actions_[Command::Complete] = completeButton_;
+    actions_[Command::Cancel] = cancelButton_;
 }
 
 QtAdHocCommandWindow::~QtAdHocCommandWindow() {
 }
 
 void QtAdHocCommandWindow::setOnline(bool online) {
-	if (!online) {
-		nextButton_->setEnabled(false);
-		backButton_->setEnabled(false);
-		completeButton_->setEnabled(false);
-		errorLabel_->setVisible(true);
-	}
+    if (!online) {
+        nextButton_->setEnabled(false);
+        backButton_->setEnabled(false);
+        completeButton_->setEnabled(false);
+        errorLabel_->setVisible(true);
+    }
 }
 
 void QtAdHocCommandWindow::closeEvent(QCloseEvent*) {
-	onClosing();
+    onClosing();
 }
 
 void QtAdHocCommandWindow::handleCancelClicked() {
-	command_->cancel();
-	close();
+    command_->cancel();
+    close();
 }
 
 void QtAdHocCommandWindow::handlePrevClicked() {
-	command_->goBack();
+    command_->goBack();
 }
 
 void QtAdHocCommandWindow::handleNextClicked() {
-	command_->goNext(formWidget_ ? formWidget_->getCompletedForm() : Form::ref());
+    command_->goNext(formWidget_ ? formWidget_->getCompletedForm() : Form::ref());
 }
 
 void QtAdHocCommandWindow::handleCompleteClicked() {
-	command_->complete(formWidget_ ? formWidget_->getCompletedForm() : Form::ref());
+    command_->complete(formWidget_ ? formWidget_->getCompletedForm() : Form::ref());
 }
 
 void QtAdHocCommandWindow::handleNextStageReceived(Command::ref command) {
-	QString notes;
-	foreach (Command::Note note, command->getNotes()) {
-		if (!notes.isEmpty()) {
-			notes += "\n";
-		}
-		QString qNote(P2QSTRING(note.note));
-		switch (note.type) {
-			case Command::Note::Error: notes += tr("Error: %1").arg(qNote); break;
-			case Command::Note::Warn: notes += tr("Warning: %1").arg(qNote); break;
-			case Command::Note::Info: notes += qNote; break;
-		}
-	}
-	label_->setText(notes);
-	if (command->getForm()) {
-		setForm(command->getForm());
-	} else {
-		setNoForm(notes.isEmpty());
-	}
-	setAvailableActions(command);
+    QString notes;
+    for (const auto& note : command->getNotes()) {
+        if (!notes.isEmpty()) {
+            notes += "\n";
+        }
+        QString qNote(P2QSTRING(note.note));
+        switch (note.type) {
+            case Command::Note::Error: notes += tr("Error: %1").arg(qNote); break;
+            case Command::Note::Warn: notes += tr("Warning: %1").arg(qNote); break;
+            case Command::Note::Info: notes += qNote; break;
+        }
+    }
+    label_->setText(notes);
+    if (command->getForm()) {
+        setForm(command->getForm());
+    } else {
+        setNoForm(notes.isEmpty());
+    }
+    setAvailableActions(command);
 }
 
 void QtAdHocCommandWindow::handleError(ErrorPayload::ref /*error*/) {
-	nextButton_->setEnabled(false);
-	backButton_->setEnabled(false);
-	completeButton_->setEnabled(false);
-	label_->setText(tr("Error executing command"));
+    nextButton_->setEnabled(false);
+    backButton_->setEnabled(false);
+    completeButton_->setEnabled(false);
+    label_->setText(tr("Error executing command"));
 }
 
 void QtAdHocCommandWindow::setForm(Form::ref form) {
-	form_ = form;
-	delete formWidget_;
-	formWidget_ = new QtFormWidget(form, this);
-	layout_->insertWidget(FormLayoutIndex, formWidget_);
-	show();
+    form_ = form;
+    delete formWidget_;
+    formWidget_ = new QtFormWidget(form, this);
+    layout_->insertWidget(FormLayoutIndex, formWidget_);
+    show();
 }
 
 void QtAdHocCommandWindow::setNoForm(bool andHide) {
-	form_.reset();
-	delete formWidget_;
-	formWidget_ = NULL;
-	resize(minimumSize());
-	setVisible(!andHide);
+    form_.reset();
+    delete formWidget_;
+    formWidget_ = nullptr;
+    resize(minimumSize());
+    setVisible(!andHide);
 }
 
 typedef std::pair<Command::Action, QPushButton*> ActionButton;
 
 void QtAdHocCommandWindow::setAvailableActions(Command::ref /*commandResult*/) {
-	okButton_->show();
-	okButton_->setEnabled(true);
-	foreach (ActionButton pair, actions_) {
-		OutgoingAdHocCommandSession::ActionState state = command_->getActionState(pair.first);
-		if (state & OutgoingAdHocCommandSession::Present) {
-			okButton_->hide();
-			okButton_->setEnabled(false);
-			pair.second->show();
-		}
-		else {
-			pair.second->hide();
-		}
-		if (state & OutgoingAdHocCommandSession::Enabled) {
-			pair.second->setEnabled(true);
-		}
-		else {
-			pair.second->setEnabled(false);
-		}
-	}
+    okButton_->show();
+    okButton_->setEnabled(true);
+    for (auto&& pair : actions_) {
+        OutgoingAdHocCommandSession::ActionState state = command_->getActionState(pair.first);
+        if (state & OutgoingAdHocCommandSession::Present) {
+            okButton_->hide();
+            okButton_->setEnabled(false);
+            pair.second->show();
+        }
+        else {
+            pair.second->hide();
+        }
+        if (state & OutgoingAdHocCommandSession::Enabled) {
+            pair.second->setEnabled(true);
+        }
+        else {
+            pair.second->setEnabled(false);
+        }
+    }
 }
 
 }