From 67d5caa9156456c5b889df32768a9cb1df37f0c3 Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <oliver.hamlet@gmail.com>
Date: Sat, 5 Nov 2016 13:17:25 +0000
Subject: [PATCH] Remove unused methods

---
 src/backend/game/game.cpp               |  5 ++-
 src/backend/game/game.h                 |  1 -
 src/backend/game/load_order_handler.cpp | 45 ++++++++++---------------
 src/backend/game/load_order_handler.h   |  2 --
 4 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/src/backend/game/game.cpp b/src/backend/game/game.cpp
index 4ffbda0e..04749695 100644
--- a/src/backend/game/game.cpp
+++ b/src/backend/game/game.cpp
@@ -224,17 +224,16 @@ short Game::GetActiveLoadOrderIndex(const std::string & pluginName) const {
 
   return -1;
 }
+
 std::vector<std::string> Game::GetLoadOrder() const {
   if (loadOrder_.empty())
     loadOrder_ = LoadOrderHandler::GetLoadOrder();
 
   return loadOrder_;
 }
+
 void Game::SetLoadOrder(const std::vector<std::string>& loadOrder) const {
   LoadOrderHandler::SetLoadOrder(loadOrder);
   loadOrder_ = loadOrder;
 }
-void Game::SetLoadOrder(const char * const * const loadOrder, const size_t numPlugins) const {
-  LoadOrderHandler::SetLoadOrder(loadOrder, numPlugins);
-}
 }
diff --git a/src/backend/game/game.h b/src/backend/game/game.h
index 80d23495..a56b78c1 100644
--- a/src/backend/game/game.h
+++ b/src/backend/game/game.h
@@ -54,7 +54,6 @@ public:
 
   std::vector<std::string> GetLoadOrder() const;
   void SetLoadOrder(const std::vector<std::string>& loadOrder) const;
-  void SetLoadOrder(const char * const * const loadOrder, const size_t numPlugins) const;
 private:
   bool pluginsFullyLoaded_;
   mutable std::vector<std::string> loadOrder_;
diff --git a/src/backend/game/load_order_handler.cpp b/src/backend/game/load_order_handler.cpp
index 2def80ed..dc36a3be 100644
--- a/src/backend/game/load_order_handler.cpp
+++ b/src/backend/game/load_order_handler.cpp
@@ -141,26 +141,6 @@ std::vector<std::string> LoadOrderHandler::GetLoadOrder() const {
   return loadOrder;
 }
 
-void LoadOrderHandler::SetLoadOrder(const char * const * const loadOrder, const size_t numPlugins) const {
-  BOOST_LOG_TRIVIAL(debug) << "Setting load order.";
-
-  unsigned int ret = lo_set_load_order(gh_, loadOrder, numPlugins);
-  if (ret != LIBLO_OK && ret != LIBLO_WARN_BAD_FILENAME && ret != LIBLO_WARN_INVALID_LIST && ret != LIBLO_WARN_LO_MISMATCH) {
-    const char * e = nullptr;
-    string err;
-    lo_get_error_message(&e);
-    if (e == nullptr) {
-      BOOST_LOG_TRIVIAL(error) << "libloadorder failed to set the load order. Details could not be fetched.";
-      err = translate("libloadorder failed to set the load order. Details could not be fetched.").str();
-    } else {
-      BOOST_LOG_TRIVIAL(error) << "libloadorder failed to set the load order. Details: " << e;
-      err = translate("libloadorder failed to set the load order. Details:").str() + " " + e;
-    }
-    lo_cleanup();
-    throw std::system_error(ret, libloadorder_category(), err);
-  }
-}
-
 void LoadOrderHandler::SetLoadOrder(const std::vector<std::string>& loadOrder) const {
   BOOST_LOG_TRIVIAL(info) << "Setting load order.";
   size_t pluginArrSize = loadOrder.size();
@@ -173,17 +153,26 @@ void LoadOrderHandler::SetLoadOrder(const std::vector<std::string>& loadOrder) c
     ++i;
   }
 
-  try {
-    SetLoadOrder(pluginArr, pluginArrSize);
-  } catch (std::exception& /*e*/) {
-    for (size_t i = 0; i < pluginArrSize; i++)
-      delete[] pluginArr[i];
-    delete[] pluginArr;
-    throw;
-  }
+  unsigned int ret = lo_set_load_order(gh_, pluginArr, pluginArrSize);
 
   for (size_t i = 0; i < pluginArrSize; i++)
     delete[] pluginArr[i];
   delete[] pluginArr;
+
+  if (ret != LIBLO_OK && ret != LIBLO_WARN_BAD_FILENAME && ret != LIBLO_WARN_INVALID_LIST && ret != LIBLO_WARN_LO_MISMATCH) {
+    const char * e = nullptr;
+    string err;
+    lo_get_error_message(&e);
+    if (e == nullptr) {
+      BOOST_LOG_TRIVIAL(error) << "libloadorder failed to set the load order. Details could not be fetched.";
+      err = translate("libloadorder failed to set the load order. Details could not be fetched.").str();
+    } else {
+      BOOST_LOG_TRIVIAL(error) << "libloadorder failed to set the load order. Details: " << e;
+      err = translate("libloadorder failed to set the load order. Details:").str() + " " + e;
+    }
+    lo_cleanup();
+
+    throw std::system_error(ret, libloadorder_category(), err);
+  }
 }
 }
diff --git a/src/backend/game/load_order_handler.h b/src/backend/game/load_order_handler.h
index e94f9a24..e2640d4b 100644
--- a/src/backend/game/load_order_handler.h
+++ b/src/backend/game/load_order_handler.h
@@ -46,8 +46,6 @@ public:
 
   bool IsPluginActive(const std::string& pluginName) const;
 
-  //These modify game load order, even though const.
-  void SetLoadOrder(const char * const * const loadOrder, const size_t numPlugins) const;  // For API.
   void SetLoadOrder(const std::vector<std::string>& loadOrder) const;
 private:
   lo_game_handle gh_;