From ea6292168a6acd4c263913f0ccd7dd64daf4f5cf Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Fri, 23 Feb 2018 01:45:58 +0100 Subject: Revert "Applied clang-format on source" This reverts commit 5e5c9c07291f6b09623d31c92b1fb61c4ede576e. --- src/waitingonclosedialog.cpp | 61 +++++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 24 deletions(-) (limited to 'src/waitingonclosedialog.cpp') diff --git a/src/waitingonclosedialog.cpp b/src/waitingonclosedialog.cpp index 6ab328b8..565d0a36 100644 --- a/src/waitingonclosedialog.cpp +++ b/src/waitingonclosedialog.cpp @@ -23,36 +23,49 @@ along with Mod Organizer. If not, see . #include #include #include -#include // for Qt::FramelessWindowHint, etc - -WaitingOnCloseDialog::WaitingOnCloseDialog(QWidget* parent) - : LockedDialogBase(parent, true), ui(new Ui::WaitingOnCloseDialog) { - ui->setupUi(this); - - // Supposedly the Qt::CustomizeWindowHint should use a customized window - // allowing us to select if there is a close button. In practice this doesn't - // seem to work. We will ignore pressing the close button if unlockByButton == true - Qt::WindowFlags flags = - this->windowFlags() | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint; - if (m_allowClose) - flags |= Qt::WindowCloseButtonHint; - this->setWindowFlags(flags); +#include // for Qt::FramelessWindowHint, etc + +WaitingOnCloseDialog::WaitingOnCloseDialog(QWidget *parent) + : LockedDialogBase(parent,true) + , ui(new Ui::WaitingOnCloseDialog) +{ + ui->setupUi(this); + + // Supposedly the Qt::CustomizeWindowHint should use a customized window + // allowing us to select if there is a close button. In practice this doesn't + // seem to work. We will ignore pressing the close button if unlockByButton == true + Qt::WindowFlags flags = + this->windowFlags() | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint; + if (m_allowClose) + flags |= Qt::WindowCloseButtonHint; + this->setWindowFlags(flags); +} + +WaitingOnCloseDialog::~WaitingOnCloseDialog() +{ + delete ui; } -WaitingOnCloseDialog::~WaitingOnCloseDialog() { delete ui; } -void WaitingOnCloseDialog::setProcessName(const QString& name) { ui->processLabel->setText(name); } +void WaitingOnCloseDialog::setProcessName(const QString &name) +{ + ui->processLabel->setText(name); +} -void WaitingOnCloseDialog::on_closeButton_clicked() { unlock(); } +void WaitingOnCloseDialog::on_closeButton_clicked() +{ + unlock(); +} -void WaitingOnCloseDialog::on_cancelButton_clicked() { - cancel(); - unlock(); +void WaitingOnCloseDialog::on_cancelButton_clicked() +{ + cancel(); + unlock(); } void WaitingOnCloseDialog::unlock() { - LockedDialogBase::unlock(); - ui->label->setText("unlocking may take a few seconds"); - ui->closeButton->setEnabled(false); - ui->cancelButton->setEnabled(false); + LockedDialogBase::unlock(); + ui->label->setText("unlocking may take a few seconds"); + ui->closeButton->setEnabled(false); + ui->cancelButton->setEnabled(false); } -- cgit v1.3.1