From 643a50ad5a6f6851db63ece41a399d9783dc5acd Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Sun, 2 Aug 2015 20:09:56 +0200
Subject: - changed the way flags on executables are stored in memory - some
 coding style fixes

---
 src/organizercore.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'src/organizercore.cpp')

diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 852abba3..1a81d33b 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -330,21 +330,19 @@ void OrganizerCore::updateExecutablesList(QSettings &settings)
     ExecutableInfo::CloseMOStyle closeMO =
         settings.value("closeOnStart").toBool() ? ExecutableInfo::CloseMOStyle::DEFAULT_CLOSE
                                                 : ExecutableInfo::CloseMOStyle::DEFAULT_STAY;
-    Executable::Type type =
-        settings.value("custom", true).toBool() ? Executable::Type::Custom : Executable::Type::Game;
-    Executable::Toolbar toolbar =
-        settings.value("toolbar", false).toBool() ? Executable::Toolbar::Enabled : Executable::Toolbar::Disabled;
-    Executable::Icon icon =
-        settings.value("ownicon", false).toBool() ? Executable::Icon::Application : Executable::Icon::MO;
+
+    Executable::Flags flags;
+    if (settings.value("custom", true).toBool())   flags |= Executable::CustomExecutable;
+    if (settings.value("toolbar", false).toBool()) flags |= Executable::ShowInToolbar;
+    if (settings.value("ownicon", false).toBool()) flags |= Executable::UseApplicationIcon;
+
     m_ExecutablesList.addExecutable(settings.value("title").toString(),
                                     settings.value("binary").toString(),
                                     settings.value("arguments").toString(),
                                     settings.value("workingDirectory", "").toString(),
                                     closeMO,
                                     settings.value("steamAppID", "").toString(),
-                                    type,
-                                    toolbar,
-                                    icon);
+                                    flags);
   }
 
   settings.endArray();
-- 
cgit v1.3.1