From f6bead88a989a617eb7dccd52d53e7c93fbd81a2 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sun, 25 Oct 2020 00:58:44 +0200
Subject: [PATCH] purge boost/optional.hpp headers

---
 apps/openmw/mwsound/regionsoundselector.hpp                | 3 +--
 apps/openmw_test_suite/detournavigator/navigator.cpp       | 3 ---
 components/detournavigator/asyncnavmeshupdater.hpp         | 2 --
 components/detournavigator/cachedrecastmeshmanager.hpp     | 2 --
 components/detournavigator/findrandompointaroundcircle.hpp | 3 +--
 components/detournavigator/findsmoothpath.hpp              | 2 --
 components/detournavigator/recastmeshmanager.hpp           | 2 --
 components/detournavigator/settings.hpp                    | 5 ++---
 8 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/apps/openmw/mwsound/regionsoundselector.hpp b/apps/openmw/mwsound/regionsoundselector.hpp
index 0dce5a7aa..ede42c294 100644
--- a/apps/openmw/mwsound/regionsoundselector.hpp
+++ b/apps/openmw/mwsound/regionsoundselector.hpp
@@ -1,8 +1,7 @@
 #ifndef GAME_SOUND_REGIONSOUNDSELECTOR_H
 #define GAME_SOUND_REGIONSOUNDSELECTOR_H
 
-#include <boost/optional.hpp>
-
+#include <optional>
 #include <string>
 
 namespace MWBase
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index 5a92d5d28..ae345d187 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -8,12 +8,9 @@
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
 
-#include <boost/optional/optional_io.hpp>
-
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include <iterator>
 #include <deque>
 
 MATCHER_P3(Vec3fEq, x, y, z, "")
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index fcdc0f21a..53e7fd7c1 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -9,8 +9,6 @@
 
 #include <osg/Vec3f>
 
-#include <boost/optional.hpp>
-
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
diff --git a/components/detournavigator/cachedrecastmeshmanager.hpp b/components/detournavigator/cachedrecastmeshmanager.hpp
index 8ce2e48c2..54574aa99 100644
--- a/components/detournavigator/cachedrecastmeshmanager.hpp
+++ b/components/detournavigator/cachedrecastmeshmanager.hpp
@@ -3,8 +3,6 @@
 
 #include "recastmeshmanager.hpp"
 
-#include <boost/optional.hpp>
-
 namespace DetourNavigator
 {
     class CachedRecastMeshManager
diff --git a/components/detournavigator/findrandompointaroundcircle.hpp b/components/detournavigator/findrandompointaroundcircle.hpp
index fb0b5c5ba..d0dc2bbbc 100644
--- a/components/detournavigator/findrandompointaroundcircle.hpp
+++ b/components/detournavigator/findrandompointaroundcircle.hpp
@@ -3,8 +3,7 @@
 
 #include "flags.hpp"
 
-#include <boost/optional.hpp>
-
+#include <optional>
 #include <osg/Vec3f>
 
 class dtNavMesh;
diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index 23609ab09..2fc39d63f 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -18,8 +18,6 @@
 
 #include <components/misc/convert.hpp>
 
-#include <boost/optional.hpp>
-
 #include <osg/Vec3f>
 
 #include <vector>
diff --git a/components/detournavigator/recastmeshmanager.hpp b/components/detournavigator/recastmeshmanager.hpp
index 47f5f5190..3e9b2b1c3 100644
--- a/components/detournavigator/recastmeshmanager.hpp
+++ b/components/detournavigator/recastmeshmanager.hpp
@@ -9,8 +9,6 @@
 
 #include <osg/Vec2i>
 
-#include <boost/optional.hpp>
-
 #include <map>
 #include <unordered_map>
 #include <list>
diff --git a/components/detournavigator/settings.hpp b/components/detournavigator/settings.hpp
index 290e763a9..d73087b21 100644
--- a/components/detournavigator/settings.hpp
+++ b/components/detournavigator/settings.hpp
@@ -1,10 +1,9 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SETTINGS_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_SETTINGS_H
 
-#include <boost/optional.hpp>
-
-#include <string>
 #include <chrono>
+#include <optional>
+#include <string>
 
 namespace DetourNavigator
 {