diff --git a/src/runner/gamefeatureswrappers.cpp b/src/runner/gamefeatureswrappers.cpp index 936bf7f..cbfa5cc 100644 --- a/src/runner/gamefeatureswrappers.cpp +++ b/src/runner/gamefeatureswrappers.cpp @@ -1,7 +1,6 @@ #include "gamefeatureswrappers.h" -#include - +#include #include #include @@ -213,7 +212,7 @@ QStringList UnmanagedModsWrapper::secondaryFiles(const QString & modName) const game_features_map_from_python::game_features_map_from_python() { - boost::python::converter::registry::push_back(&convertible, &construct, boost::python::type_id>()); + boost::python::converter::registry::push_back(&convertible, &construct, boost::python::type_id>()); } void * game_features_map_from_python::convertible(PyObject * objPtr) @@ -222,15 +221,15 @@ void * game_features_map_from_python::convertible(PyObject * objPtr) } template -void insertGameFeature(std::map& map, const boost::python::object& pyObject) +void insertGameFeature(std::map& map, const boost::python::object& pyObject) { map[std::type_index(typeid(T))] = boost::python::extract(pyObject)(); } void game_features_map_from_python::construct(PyObject * objPtr, boost::python::converter::rvalue_from_python_stage1_data * data) { - void *storage = ((boost::python::converter::rvalue_from_python_storage>*)data)->storage.bytes; - std::map *result = new (storage) std::map(); + void *storage = ((boost::python::converter::rvalue_from_python_storage>*)data)->storage.bytes; + std::map *result = new (storage) std::map(); boost::python::dict source(boost::python::handle<>(boost::python::borrowed(objPtr))); boost::python::list keys = source.keys(); int len = boost::python::len(keys); diff --git a/src/runner/proxypluginwrappers.cpp b/src/runner/proxypluginwrappers.cpp index e89a7cc..52f1c3b 100644 --- a/src/runner/proxypluginwrappers.cpp +++ b/src/runner/proxypluginwrappers.cpp @@ -303,9 +303,9 @@ QString IPluginGameWrapper::getLauncherName() const COMMON_I_PLUGIN_WRAPPER_DEFINITIONS_IMPL(IPluginGameWrapper, 0) -std::map IPluginGameWrapper::featureList() const +std::map IPluginGameWrapper::featureList() const { - return basicWrapperFunctionImplementation>(this, "_featureList"); + return basicWrapperFunctionImplementation>(this, "_featureList"); } /// end IPluginGame Wrapper ///////////////////////////////////// diff --git a/src/runner/proxypluginwrappers.h b/src/runner/proxypluginwrappers.h index ccc20b0..ccf18b7 100644 --- a/src/runner/proxypluginwrappers.h +++ b/src/runner/proxypluginwrappers.h @@ -14,6 +14,7 @@ #ifndef Q_MOC_RUN #include +#include #endif // The wrapper for IPluginGame cannot override requirements or enabledByDefault since they're final, @@ -138,7 +139,7 @@ public: protected: // Apparently, Python developers interpret an underscore in a function name as it being protected - virtual std::map featureList() const override; + virtual std::map featureList() const override; // Thankfully, the default implementation of the templated 'T *feature()' function should allow us to get away without overriding it. };