Merge branch 'boost_program_options' into 'master'

Reduce number of includes for boost/program_options

See merge request OpenMW/openmw!2051

apps/launcher/maindialog.cpp

@@ -10,6 +10,9 @@
 #include <QCloseEvent>
 #include <QTextCodec>
 
+#include <boost/program_options/options_description.hpp>
+#include <boost/program_options/variables_map.hpp>
+
 #include "playpage.hpp"
 #include "graphicspage.hpp"
 #include "datafilespage.hpp"

apps/opencs/editor.cpp

@@ -5,6 +5,8 @@
 #include <QLocalSocket>
 #include <QMessageBox>
 
+#include <boost/program_options/options_description.hpp>
+
 #include <components/debug/debugging.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/fallback/validate.hpp>

apps/opencs/editor.hpp

@@ -3,6 +3,7 @@
 
 #include <boost/interprocess/sync/file_lock.hpp>
 #include <boost/filesystem/fstream.hpp>
+#include <boost/program_options/variables_map.hpp>
 
 #include <QObject>
 #include <QString>

apps/openmw/main.cpp

@@ -11,6 +11,8 @@
 #include "engine.hpp"
 #include "options.hpp"
 
+#include <boost/program_options/variables_map.hpp>
+
 #if defined(_WIN32)
 #include <components/windows.hpp>
 // makes __argc and __argv available on windows

apps/openmw_test_suite/mwworld/test_store.cpp

@@ -2,6 +2,9 @@
 
 #include <fstream>
 
+#include <boost/program_options/options_description.hpp>
+#include <boost/program_options/variables_map.hpp>
+
 #include <components/files/configurationmanager.hpp>
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>

apps/openmw_test_suite/openmw/options.cpp

@@ -4,6 +4,9 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
+#include <boost/program_options/options_description.hpp>
+#include <boost/program_options/variables_map.hpp>
+
 #include <array>
 #include <algorithm>
 #include <string>

components/fallback/validate.cpp

@@ -1,5 +1,8 @@
 #include "validate.hpp"
 
+#include <boost/any.hpp>
+#include <boost/program_options/errors.hpp>
+
 void Fallback::validate(boost::any& v, std::vector<std::string> const& tokens, FallbackMap*, int)
 {
     if (v.empty())

components/fallback/validate.hpp

@@ -1,12 +1,19 @@
 #ifndef OPENMW_COMPONENTS_FALLBACK_VALIDATE_H
 #define OPENMW_COMPONENTS_FALLBACK_VALIDATE_H
 
-#include <boost/program_options.hpp>
+#include <map>
+#include <string>
+#include <vector>
 
 // Parses and validates a fallback map from boost program_options.
 // Note: for boost to pick up the validate function, you need to pull in the namespace e.g.
 // by using namespace Fallback;
 
+namespace boost
+{
+    class any;
+}
+
 namespace Fallback
 {
 

components/files/configurationmanager.cpp

@@ -5,6 +5,9 @@
 #include <components/fallback/validate.hpp>
 
 #include <boost/filesystem/fstream.hpp>
+#include <boost/program_options/variables_map.hpp>
+#include <boost/program_options/options_description.hpp>
+
 /**
  * \namespace Files
  */

components/files/configurationmanager.hpp

@@ -5,11 +5,15 @@
 #include <optional>
 #include <stack>
 
-#include <boost/program_options.hpp>
-
 #include <components/files/fixedpath.hpp>
 #include <components/files/collections.hpp>
 
+namespace boost::program_options
+{
+    class options_description;
+    class variables_map;
+}
+
 /**
  * \namespace Files
  */