Fix Linux compilation

codereader · Mar 18, 2020 · 487cce7 · 487cce7
1 parent c70f664
commit 487cce7
Show file tree

Hide file tree

Showing 17 changed files with 50 additions and 16 deletions.
diff --git a/radiant/layers/LayerModule.cpp b/radiant/layers/LayerModule.cpp
@@ -1,4 +1,5 @@
 #include "ilayer.h"
+#include "i18n.h"
 #include "ieventmanager.h"
 #include "icommandsystem.h"
 #include "itextstream.h"

diff --git a/radiant/map/EditingStopwatch.cpp b/radiant/map/EditingStopwatch.cpp
@@ -11,6 +11,7 @@
 #include "imapinfofile.h"
 
 #include <fmt/format.h>
+#include "string/convert.h"
 #include "modulesystem/StaticModule.h"
 #include "EditingStopwatchInfoFileModule.h"
 

diff --git a/radiant/map/Map.h b/radiant/map/Map.h
@@ -11,6 +11,8 @@
 #include "math/Vector3.h"
 
 #include "model/ScaledModelExporter.h"
+#include "StartupMapLoader.h"
+#include "MapPositionManager.h"
 
 #include <sigc++/signal.h>
 #include <wx/stopwatch.h>
@@ -20,9 +22,6 @@ class TextInputStream;
 namespace map
 {
 
-class MapPositionManager;
-class StartupMapLoader;
-
 class Map :
 	public IMap,
 	public scene::Graph::Observer

diff --git a/radiant/map/algorithm/Import.cpp b/radiant/map/algorithm/Import.cpp
@@ -3,6 +3,7 @@
 #include <map>
 #include <limits>
 
+#include "i18n.h"
 #include "imap.h"
 #include "imapformat.h"
 #include "inamespace.h"

diff --git a/radiant/map/algorithm/Import.h b/radiant/map/algorithm/Import.h
@@ -2,6 +2,7 @@
 
 #include <istream>
 #include <string>
+#include <memory>
 
 namespace scene
 {

diff --git a/radiant/map/format/portable/PortableMapFormat.cpp b/radiant/map/format/portable/PortableMapFormat.cpp
@@ -1,5 +1,12 @@
 #include "PortableMapFormat.h"
 
+#include "ifiletypes.h"
+#include "ieclass.h"
+#include "ibrush.h"
+#include "ipatch.h"
+#include "imapformat.h"
+#include "iregistry.h"
+
 #include "PortableMapReader.h"
 #include "PortableMapWriter.h"
 
@@ -9,8 +16,8 @@ namespace map
 namespace format
 {
 
-std::size_t PortableMapFormat::VERSION = 1;
-const char* PortableMapFormat::NAME = "Portable";
+std::size_t PortableMapFormat::Version = 1;
+const char* PortableMapFormat::Name = "Portable";
 
 // RegisterableModule implementation
 const std::string& PortableMapFormat::getName() const
@@ -55,7 +62,7 @@ void PortableMapFormat::shutdownModule()
 
 const std::string& PortableMapFormat::getMapFormatName() const
 {
-	static std::string _name = NAME;
+	static std::string _name = Name;
 	return _name;
 }
 

diff --git a/radiant/map/format/portable/PortableMapFormat.h b/radiant/map/format/portable/PortableMapFormat.h
@@ -14,8 +14,8 @@ class PortableMapFormat :
 {
 public:
 	// Format version, will be exported as <map> tag attribute
-	static std::size_t VERSION;
-	static const char* NAME;
+	static std::size_t Version;
+	static const char* Name;
 
 	typedef std::shared_ptr<PortableMapFormat> Ptr;
 

diff --git a/radiant/map/format/portable/PortableMapReader.cpp b/radiant/map/format/portable/PortableMapReader.cpp
@@ -6,9 +6,14 @@
 #include "iselectiongroup.h"
 #include "ilayer.h"
 #include "ibrush.h"
+#include "ieclass.h"
+#include "ientity.h"
+
 #include "PortableMapFormat.h"
 #include "Constants.h"
+
 #include "scenelib.h"
+#include "string/convert.h"
 #include "xmlutil/Document.h"
 #include "selection/group/SelectionGroupManager.h"
 
@@ -55,7 +60,7 @@ void PortableMapReader::readFromStream(std::istream& stream)
 
 	auto mapNode = doc.getTopLevelNode();
 
-	if (string::convert<std::size_t>(mapNode.getAttributeValue(ATTR_VERSION)) != PortableMapFormat::VERSION)
+	if (string::convert<std::size_t>(mapNode.getAttributeValue(ATTR_VERSION)) != PortableMapFormat::Version)
 	{
 		throw FailureException("Unsupported format version.");
 	}
@@ -482,7 +487,7 @@ bool PortableMapReader::CanLoad(std::istream& stream)
 			std::smatch results;
 
 			if (std::regex_search(buffer, results, versionPattern) &&
-				string::convert<std::size_t>(results[1].str()) <= PortableMapFormat::VERSION)
+				string::convert<std::size_t>(results[1].str()) <= PortableMapFormat::Version)
 			{
 				return true;
 			}

diff --git a/radiant/map/format/portable/PortableMapReader.h b/radiant/map/format/portable/PortableMapReader.h
@@ -6,6 +6,8 @@
 #include "iselectionset.h"
 #include "parser/DefTokeniser.h"
 
+namespace xml { class Node; }
+
 namespace map 
 {
 

diff --git a/radiant/map/format/portable/PortableMapWriter.cpp b/radiant/map/format/portable/PortableMapWriter.cpp
@@ -2,11 +2,16 @@
 
 #include "igame.h"
 #include "ientity.h"
+#include "ipatch.h"
+#include "imap.h"
+#include "ibrush.h"
 #include "ilayer.h"
 #include "iselectiongroup.h"
 #include "iselectionset.h"
 
-#include "string/string.h"
+#include "math/Plane3.h"
+#include "math/Matrix4.h"
+#include "string/convert.h"
 #include "selection/group/SelectionGroupManager.h"
 #include "PortableMapFormat.h"
 #include "Constants.h"
@@ -53,7 +58,7 @@ PortableMapWriter::PortableMapWriter() :
 	_curEntityPrimitives(nullptr)
 {
 	// Export name and version tag
-	_map.setAttributeValue(ATTR_VERSION, string::to_string(PortableMapFormat::VERSION));
+	_map.setAttributeValue(ATTR_VERSION, string::to_string(PortableMapFormat::Version));
 	_map.setAttributeValue(ATTR_FORMAT, ATTR_FORMAT_VALUE);
 }
 

diff --git a/radiant/selection/algorithm/Group.h b/radiant/selection/algorithm/Group.h
@@ -6,8 +6,13 @@
 #include <list>
 #include "CommandNotAvailableException.h"
 
-namespace selection {
-	namespace algorithm {
+namespace selection 
+{
+
+class ISelectionGroupManager;
+
+namespace algorithm 
+{
 
 	class ParentPrimitivesToEntityWalker :
 		public SelectionSystem::Visitor,
@@ -172,5 +177,5 @@ namespace selection {
 	void groupSelectedCmd(const cmd::ArgumentList& args);
 	void ungroupSelectedCmd(const cmd::ArgumentList& args);
 
-	} // namespace algorithm
+} // namespace algorithm
 } // namespace selection
diff --git a/radiant/selection/clipboard/Clipboard.cpp b/radiant/selection/clipboard/Clipboard.cpp
@@ -29,7 +29,7 @@ void copy(const cmd::ArgumentList& args)
 	if (FaceInstance::Selection().empty())
     {
 		// When exporting to the system clipboard, use the portable format
-		auto format = GlobalMapFormatManager().getMapFormatByName(map::format::PortableMapFormat::NAME);
+		auto format = GlobalMapFormatManager().getMapFormatByName(map::format::PortableMapFormat::Name);
 
         // Stream selected objects into a stringstream
         std::stringstream out;

diff --git a/radiant/selection/group/SelectionGroupModule.cpp b/radiant/selection/group/SelectionGroupModule.cpp
@@ -1,6 +1,7 @@
 #include <functional>
 
 #include "iselectiongroup.h"
+#include "i18n.h"
 #include "icommandsystem.h"
 #include "ieventmanager.h"
 #include "imap.h"

diff --git a/radiant/selection/selectionset/SelectionSetManager.h b/radiant/selection/selectionset/SelectionSetManager.h
@@ -8,6 +8,8 @@
 #include <map>
 #include "SelectionSet.h"
 
+#include <wx/event.h>
+
 namespace selection
 {
 

diff --git a/radiant/selection/selectionset/SelectionSetToolmenu.cpp b/radiant/selection/selectionset/SelectionSetToolmenu.cpp
@@ -13,6 +13,8 @@
 #include <wx/combobox.h>
 #include <wx/toolbar.h>
 #include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/artprov.h>
 
 namespace selection
 {

diff --git a/radiant/selection/selectionset/SelectionSetToolmenu.h b/radiant/selection/selectionset/SelectionSetToolmenu.h
@@ -8,6 +8,7 @@
 class wxToolBar;
 class wxComboBox;
 class wxCommandEvent;
+class wxToolBarToolBase;
 
 namespace selection
 {

diff --git a/radiant/ui/mapinfo/LayerInfoTab.cpp b/radiant/ui/mapinfo/LayerInfoTab.cpp
@@ -4,6 +4,7 @@
 #include "i18n.h"
 #include "iradiant.h"
 #include "icounter.h"
+#include "imap.h"
 
 #include "string/convert.h"