Merge with branch1.2

1 files changed, 11 insertions, 12 deletions

diff --git a/src/editexecutablesdialog.cpp b/src/editexecutablesdialog.cpp
index da3cc8c4..da207f93 100644
--- a/src/editexecutablesdialog.cpp
+++ b/src/editexecutablesdialog.cpp
@@ -31,7 +31,7 @@ using namespace MOShared;
 
 EditExecutablesDialog::EditExecutablesDialog(const ExecutablesList &executablesList, QWidget *parent)
   : TutorableDialog("EditExecutables", parent),
-  ui(new Ui::EditExecutablesDialog), m_CurrentItem(NULL), m_ExecutablesList(executablesList)
+  ui(new Ui::EditExecutablesDialog), m_CurrentItem(nullptr), m_ExecutablesList(executablesList)
 {
   ui->setupUi(this);
 
@@ -54,9 +54,7 @@ ExecutablesList EditExecutablesDialog::getExecutablesList() const
 
 void EditExecutablesDialog::refreshExecutablesWidget()
 {
-  QListWidget *executablesWidget = findChild<QListWidget*>("executablesListBox");
-
-  executablesWidget->clear();
+  ui->executablesListBox->clear();
   std::vector<Executable>::const_iterator current, end;
   m_ExecutablesList.getExecutables(current, end);
 
@@ -66,7 +64,7 @@ void EditExecutablesDialog::refreshExecutablesWidget()
     temp.setValue(*current);
     newItem->setData(Qt::UserRole, temp);
     newItem->setTextColor(current->m_Custom ? QColor(Qt::black) : QColor(Qt::darkGray));
-    executablesWidget->addItem(newItem);
+    ui->executablesListBox->addItem(newItem);
   }
 
   ui->addButton->setEnabled(false);
@@ -89,7 +87,7 @@ void EditExecutablesDialog::resetInput()
   ui->appIDOverwriteEdit->clear();
   ui->overwriteAppIDBox->setChecked(false);
   ui->closeCheckBox->setChecked(false);
-  m_CurrentItem = NULL;
+  m_CurrentItem = nullptr;
 }
 
 
@@ -97,7 +95,8 @@ void EditExecutablesDialog::saveExecutable()
 {
   m_ExecutablesList.addExecutable(ui->titleEdit->text(), QDir::fromNativeSeparators(ui->binaryEdit->text()),
         ui->argumentsEdit->text(), QDir::fromNativeSeparators(ui->workingDirEdit->text()),
-        (ui->closeCheckBox->checkState() == Qt::Checked) ? DEFAULT_CLOSE : DEFAULT_STAY,
+        (ui->closeCheckBox->checkState() == Qt::Checked) ? ExecutableInfo::CloseMOStyle::DEFAULT_CLOSE
+                                                         : ExecutableInfo::CloseMOStyle::DEFAULT_STAY,
         ui->overwriteAppIDBox->isChecked() ? ui->appIDOverwriteEdit->text() : "",
         true, false);
 }
@@ -130,7 +129,7 @@ void EditExecutablesDialog::on_browseButton_clicked()
     { // try to find java automatically
       std::wstring binaryNameW = ToWString(binaryName);
       WCHAR buffer[MAX_PATH];
-      if (::FindExecutableW(binaryNameW.c_str(), NULL, buffer) > (HINSTANCE)32) {
+      if (::FindExecutableW(binaryNameW.c_str(), nullptr, buffer) > (HINSTANCE)32) {
         DWORD binaryType = 0UL;
         if (!::GetBinaryTypeW(binaryNameW.c_str(), &binaryType)) {
           qDebug("failed to determine binary type of \"%ls\": %lu", binaryNameW.c_str(), ::GetLastError());
@@ -206,14 +205,14 @@ void EditExecutablesDialog::on_titleEdit_textChanged(const QString &arg1)
 
 bool EditExecutablesDialog::executableChanged()
 {
-  if (m_CurrentItem != NULL) {
+  if (m_CurrentItem != nullptr) {
     const Executable &selectedExecutable = m_CurrentItem->data(Qt::UserRole).value<Executable>();
 
     return selectedExecutable.m_Arguments != ui->argumentsEdit->text()
         || selectedExecutable.m_SteamAppID != ui->appIDOverwriteEdit->text()
         || selectedExecutable.m_WorkingDirectory != QDir::fromNativeSeparators(ui->workingDirEdit->text())
         || selectedExecutable.m_BinaryInfo.absoluteFilePath() != QDir::fromNativeSeparators(ui->binaryEdit->text())
-        || (selectedExecutable.m_CloseMO == DEFAULT_CLOSE) != ui->closeCheckBox->isChecked();
+        || (selectedExecutable.m_CloseMO == ExecutableInfo::CloseMOStyle::DEFAULT_CLOSE) != ui->closeCheckBox->isChecked();
   } else {
     return false;
   }
@@ -276,8 +275,8 @@ void EditExecutablesDialog::on_executablesListBox_clicked(const QModelIndex &cur
     ui->binaryEdit->setText(QDir::toNativeSeparators(selectedExecutable.m_BinaryInfo.absoluteFilePath()));
     ui->argumentsEdit->setText(selectedExecutable.m_Arguments);
     ui->workingDirEdit->setText(QDir::toNativeSeparators(selectedExecutable.m_WorkingDirectory));
-    ui->closeCheckBox->setChecked(selectedExecutable.m_CloseMO == DEFAULT_CLOSE);
-    if (selectedExecutable.m_CloseMO == NEVER_CLOSE) {
+    ui->closeCheckBox->setChecked(selectedExecutable.m_CloseMO == ExecutableInfo::CloseMOStyle::DEFAULT_CLOSE);
+    if (selectedExecutable.m_CloseMO == ExecutableInfo::CloseMOStyle::NEVER_CLOSE) {
       ui->closeCheckBox->setEnabled(false);
       ui->closeCheckBox->setToolTip(tr("MO must be kept running or this application will not work correctly."));
     } else {