From 1bb26f6ce151cc8ae680a885869b8cc4f700a323 Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <oliver.hamlet@gmail.com>
Date: Thu, 19 Oct 2017 18:10:44 +0100
Subject: [PATCH] Don't expose windows encoding helpers

LOOT now uses its own code for this, and it doesn't belong as part of
the API.
---
 CMakeLists.txt                                                | 4 ++--
 src/api/helpers/version.cpp                                   | 2 +-
 .../loot => src/api/helpers}/windows_encoding_converters.h    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename {include/loot => src/api/helpers}/windows_encoding_converters.h (95%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29d5913e..80d7a8e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,7 +211,6 @@ set (LOOT_API_HEADERS "${CMAKE_SOURCE_DIR}/include/loot/api.h"
                       "${CMAKE_SOURCE_DIR}/include/loot/plugin_interface.h"
                       "${CMAKE_SOURCE_DIR}/include/loot/struct/masterlist_info.h"
                       "${CMAKE_SOURCE_DIR}/include/loot/struct/simple_message.h"
-                      "${CMAKE_SOURCE_DIR}/include/loot/windows_encoding_converters.h"
                       "${CMAKE_SOURCE_DIR}/src/api/api_database.h"
                       "${CMAKE_SOURCE_DIR}/src/api/metadata/condition_evaluator.h"
                       "${CMAKE_SOURCE_DIR}/src/api/metadata/condition_grammar.h"
@@ -224,7 +223,8 @@ set (LOOT_API_HEADERS "${CMAKE_SOURCE_DIR}/include/loot/api.h"
                       "${CMAKE_SOURCE_DIR}/src/api/plugin/plugin_sorter.h"
                       "${CMAKE_SOURCE_DIR}/src/api/helpers/git_helper.h"
                       "${CMAKE_SOURCE_DIR}/src/api/helpers/crc.h"
-                      "${CMAKE_SOURCE_DIR}/src/api/helpers/version.h")
+                      "${CMAKE_SOURCE_DIR}/src/api/helpers/version.h"
+                      "${CMAKE_SOURCE_DIR}/src/api/helpers/windows_encoding_converters.h")
 
 set (LOOT_TESTS_SRC "${CMAKE_SOURCE_DIR}/src/tests/api/internals/main.cpp")
 
diff --git a/src/api/helpers/version.cpp b/src/api/helpers/version.cpp
index 0c23a3c0..cfa899ea 100644
--- a/src/api/helpers/version.cpp
+++ b/src/api/helpers/version.cpp
@@ -28,7 +28,7 @@
 #include <boost/algorithm/string.hpp>
 #include <pseudosem.h>
 
-#include "loot/windows_encoding_converters.h"
+#include "api/helpers/windows_encoding_converters.h"
 
 #ifdef _WIN32
 #   ifndef UNICODE
diff --git a/include/loot/windows_encoding_converters.h b/src/api/helpers/windows_encoding_converters.h
similarity index 95%
rename from include/loot/windows_encoding_converters.h
rename to src/api/helpers/windows_encoding_converters.h
index 0ae15873..f14256fa 100644
--- a/include/loot/windows_encoding_converters.h
+++ b/src/api/helpers/windows_encoding_converters.h
@@ -22,8 +22,8 @@
     <https://www.gnu.org/licenses/>.
     */
 
-#ifndef LOOT_WINDOWS_ENCODING_CONVERTERS
-#define LOOT_WINDOWS_ENCODING_CONVERTERS
+#ifndef LOOT_API_HELPERS_WINDOWS_ENCODING_CONVERTERS
+#define LOOT_API_HELPERS_WINDOWS_ENCODING_CONVERTERS
 
 #ifdef _WIN32