#5426: Fix compilation against pybind11 2.6+

codereader · Nov 22, 2020 · 3e480af · 3e480af
1 parent 455dd46
commit 3e480af
Show file tree

Hide file tree

Showing 26 changed files with 53 additions and 21 deletions.
diff --git a/include/iscript.h b/include/iscript.h
@@ -3,10 +3,6 @@
 #include "imodule.h"
 #include <sigc++/signal.h>
 
-// Forward-declare the stuff in <pybind11/pybind11.h>
-namespace pybind11 { class module; class dict; }
-namespace py = pybind11;
-
 namespace script
 {
 
@@ -20,19 +16,8 @@ struct ExecutionResult
 };
 typedef std::shared_ptr<ExecutionResult> ExecutionResultPtr;
 
-} // namespace script
-
-class IScriptInterface
-{
-public:
-    virtual ~IScriptInterface() {}
-
-	/**
-	* This method is called by the Scripting System to let this class
-	* add its objects to the Python context.
-	*/
-	virtual void registerInterface(py::module& scope, py::dict& globals) = 0;
-};
+// Declared in iscriptinterface.h
+class IScriptInterface;
 typedef std::shared_ptr<IScriptInterface> IScriptInterfacePtr;
 
 // Represents a named, executable .py script file
@@ -86,12 +71,14 @@ class IScriptingSystem :
 };
 typedef std::shared_ptr<IScriptingSystem> IScriptingSystemPtr;
 
+} // namespace script
+
 // String identifier for the script module
 const char* const MODULE_SCRIPTING_SYSTEM("ScriptingSystem");
 
 // This is the accessor for the scripting system
-inline IScriptingSystem& GlobalScriptingSystem()
+inline script::IScriptingSystem& GlobalScriptingSystem()
 {
-	static module::InstanceReference<IScriptingSystem> _reference(MODULE_SCRIPTING_SYSTEM);
+	static module::InstanceReference<script::IScriptingSystem> _reference(MODULE_SCRIPTING_SYSTEM);
 	return _reference;
 }
diff --git a/include/iscriptinterface.h b/include/iscriptinterface.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include <memory>
+#include <pybind11/pybind11.h>
+namespace py = pybind11;
+
+namespace script
+{
+
+class IScriptInterface
+{
+public:
+    virtual ~IScriptInterface() {}
+
+	/**
+	* This method is called by the Scripting System to let this class
+	* add its objects to the Python context.
+	*/
+	virtual void registerInterface(py::module& scope, py::dict& globals) = 0;
+};
+typedef std::shared_ptr<IScriptInterface> IScriptInterfacePtr;
+
+}
diff --git a/plugins/script/ScriptingSystem.h b/plugins/script/ScriptingSystem.h
@@ -5,6 +5,7 @@
 #include <pybind11/pybind11.h>
 
 #include "iscript.h"
+#include "iscriptinterface.h"
 #include "PythonConsoleWriter.h"
 #include "icommandsystem.h"
 

diff --git a/plugins/script/interfaces/BrushInterface.h b/plugins/script/interfaces/BrushInterface.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "iscript.h"
+#include "iscriptinterface.h"
 #include "ibrush.h"
 
 #include "SceneGraphInterface.h"

diff --git a/plugins/script/interfaces/CameraInterface.h b/plugins/script/interfaces/CameraInterface.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "iscript.h"
+#include "iscriptinterface.h"
 #include "icameraview.h"
 
 #include "MathInterface.h"

diff --git a/plugins/script/interfaces/CommandSystemInterface.h b/plugins/script/interfaces/CommandSystemInterface.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "iscript.h"
+#include "iscriptinterface.h"
 
 namespace script
 {

diff --git a/plugins/script/interfaces/DialogInterface.h b/plugins/script/interfaces/DialogInterface.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "iscript.h"
+#include "iscriptinterface.h"
 #include "idialogmanager.h"
 
 namespace script

diff --git a/plugins/script/interfaces/EClassInterface.h b/plugins/script/interfaces/EClassInterface.h
@@ -2,6 +2,7 @@
 
 #include "ieclass.h"
 #include "iscript.h"
+#include "iscriptinterface.h"
 
 #include <pybind11/pybind11.h>
 

diff --git a/plugins/script/interfaces/EntityInterface.h b/plugins/script/interfaces/EntityInterface.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "iscript.h"
+#include "iscriptinterface.h"
 
 #include "ientity.h"
 

diff --git a/plugins/script/interfaces/FileSystemInterface.h b/plugins/script/interfaces/FileSystemInterface.h
@@ -3,6 +3,7 @@
 #include <pybind11/pybind11.h>
 
 #include "iscript.h"
+#include "iscriptinterface.h"
 #include "ifilesystem.h"
 
 namespace script

diff --git a/plugins/script/interfaces/GameInterface.h b/plugins/script/interfaces/GameInterface.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "iscript.h"
-
+#include "iscriptinterface.h"
 #include "igame.h"
 #include <vector>
 

diff --git a/plugins/script/interfaces/GridInterface.h b/plugins/script/interfaces/GridInterface.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "iscript.h"
+#include "iscriptinterface.h"
 
 namespace script 
 {

diff --git a/plugins/script/interfaces/MapInterface.h b/plugins/script/interfaces/MapInterface.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "iscript.h"
+#include "iscriptinterface.h"
 
 #include "SceneGraphInterface.h"
 

diff --git a/plugins/script/interfaces/MathInterface.h b/plugins/script/interfaces/MathInterface.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "iscript.h"
+#include "iscriptinterface.h"
 
 namespace script 
 {

diff --git a/plugins/script/interfaces/ModelInterface.h b/plugins/script/interfaces/ModelInterface.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "iscript.h"
+#include "iscriptinterface.h"
 
 #include "imodel.h"
 #include "SceneGraphInterface.h"

diff --git a/plugins/script/interfaces/PatchInterface.h b/plugins/script/interfaces/PatchInterface.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "iscript.h"
+#include "iscriptinterface.h"
 #include "ipatch.h"
 
 #include "SceneGraphInterface.h"

diff --git a/plugins/script/interfaces/RadiantInterface.h b/plugins/script/interfaces/RadiantInterface.h
@@ -2,6 +2,7 @@
 
 #include "iradiant.h"
 #include "iscript.h"
+#include "iscriptinterface.h"
 
 #include "EntityInterface.h"
 

diff --git a/plugins/script/interfaces/RegistryInterface.h b/plugins/script/interfaces/RegistryInterface.h
@@ -2,6 +2,7 @@
 
 #include "iregistry.h"
 #include "iscript.h"
+#include "iscriptinterface.h"
 #include <pybind11/pybind11.h>
 
 namespace script

diff --git a/plugins/script/interfaces/SceneGraphInterface.h b/plugins/script/interfaces/SceneGraphInterface.h
@@ -2,6 +2,7 @@
 
 #include "inode.h"
 #include "iscript.h"
+#include "iscriptinterface.h"
 #include "iscenegraph.h"
 #include "math/AABB.h"
 

diff --git a/plugins/script/interfaces/SelectionGroupInterface.h b/plugins/script/interfaces/SelectionGroupInterface.h
@@ -3,6 +3,7 @@
 #include <pybind11/pybind11.h>
 
 #include "iscript.h"
+#include "iscriptinterface.h"
 #include "iselectiongroup.h"
 
 #include "SceneGraphInterface.h"

diff --git a/plugins/script/interfaces/SelectionInterface.h b/plugins/script/interfaces/SelectionInterface.h
@@ -3,6 +3,7 @@
 #include <pybind11/pybind11.h>
 
 #include "iscript.h"
+#include "iscriptinterface.h"
 #include "selectionlib.h"
 #include <map>
 

diff --git a/plugins/script/interfaces/SelectionSetInterface.h b/plugins/script/interfaces/SelectionSetInterface.h
@@ -3,6 +3,7 @@
 #include <pybind11/pybind11.h>
 
 #include "iscript.h"
+#include "iscriptinterface.h"
 #include "iselectionset.h"
 
 namespace script

diff --git a/plugins/script/interfaces/ShaderSystemInterface.h b/plugins/script/interfaces/ShaderSystemInterface.h
@@ -4,6 +4,7 @@
 
 #include "ishaders.h"
 #include "iscript.h"
+#include "iscriptinterface.h"
 
 namespace script
 {

diff --git a/plugins/script/interfaces/SkinInterface.h b/plugins/script/interfaces/SkinInterface.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "iscript.h"
+#include "iscriptinterface.h"
 
 #include "modelskin.h"
 

diff --git a/plugins/script/interfaces/SoundInterface.h b/plugins/script/interfaces/SoundInterface.h
@@ -2,6 +2,7 @@
 
 #include "isound.h"
 #include "iscript.h"
+#include "iscriptinterface.h"
 
 namespace script
 {

diff --git a/radiant/ui/script/ScriptMenu.cpp b/radiant/ui/script/ScriptMenu.cpp
@@ -31,7 +31,7 @@ ScriptMenu::ScriptMenu()
 	typedef std::multimap<std::string, std::string> SortedCommands;
 	SortedCommands sortedCommands;
 
-	GlobalScriptingSystem().foreachScriptCommand([&](const IScriptCommand& cmd)
+	GlobalScriptingSystem().foreachScriptCommand([&](const script::IScriptCommand& cmd)
 	{
 		sortedCommands.insert(std::make_pair(cmd.getDisplayName(), cmd.getName()));
 	});