From 617a6005451aba1d45f13228f13f1cc150a78bb4 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Fri, 7 Jun 2019 18:24:41 -0400
Subject: ExecutablesList:  - merged addExecutable(), updateExecutable() and
 addExecutableInternal() into a new setExecutable()  - setExecutable() adds
 the executable to the list if not found, or forwards to
 Executable::mergeFrom()  - mergeFrom() handles merging from/to plugin
 executables

---
 src/editexecutablesdialog.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/editexecutablesdialog.cpp')

diff --git a/src/editexecutablesdialog.cpp b/src/editexecutablesdialog.cpp
index 9dbc6bae..83756ac8 100644
--- a/src/editexecutablesdialog.cpp
+++ b/src/editexecutablesdialog.cpp
@@ -69,7 +69,7 @@ ExecutablesList EditExecutablesDialog::getExecutablesList() const
       continue;
     }
 
-    newList.addExecutable(*itor);
+    newList.setExecutable(*itor);
   }
 
   return newList;
@@ -138,17 +138,17 @@ void EditExecutablesDialog::resetInput()
 
 void EditExecutablesDialog::saveExecutable()
 {
-  m_ExecutablesList.updateExecutable(
-        ui->titleEdit->text(),
-        QDir::fromNativeSeparators(ui->binaryEdit->text()),
-        ui->argumentsEdit->text(),
-        QDir::fromNativeSeparators(ui->workingDirEdit->text()),
-        ui->overwriteAppIDBox->isChecked() ?
-          ui->appIDOverwriteEdit->text() : "",
-        Executable::UseApplicationIcon | Executable::CustomExecutable,
-        (ui->useAppIconCheckBox->isChecked() ?
-           Executable::UseApplicationIcon : Executable::Flags())
-        | Executable::CustomExecutable);
+  Executable::Flags flags = Executable::CustomExecutable;
+  if (ui->useAppIconCheckBox->isChecked())
+    flags |= Executable::UseApplicationIcon;
+
+  m_ExecutablesList.setExecutable({
+    ui->titleEdit->text(),
+    QDir::fromNativeSeparators(ui->binaryEdit->text()),
+    ui->argumentsEdit->text(),
+    QDir::fromNativeSeparators(ui->workingDirEdit->text()),
+    ui->overwriteAppIDBox->isChecked() ? ui->appIDOverwriteEdit->text() : "",
+    flags});
 
   if (ui->newFilesModCheckBox->isChecked()) {
     m_Profile->storeSetting("custom_overwrites", ui->titleEdit->text(),
-- 
cgit v1.3.1