Replace boost::noncopyable.

codereader · Oct 17, 2017 · a25a3fb · a25a3fb
1 parent 05da8f8
commit a25a3fb
Show file tree

Hide file tree

Showing 19 changed files with 53 additions and 28 deletions.
diff --git a/include/precompiled_boost.h b/include/precompiled_boost.h
@@ -11,4 +11,4 @@
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
-#include <boost/noncopyable.hpp>
+#include "util/Noncopyable.h"
diff --git a/libs/RGBAImage.h b/libs/RGBAImage.h
@@ -4,7 +4,7 @@
 #include "iimage.h"
 #include "BasicTexture2D.h"
 #include <memory>
-#include <boost/noncopyable.hpp>
+#include "util/Noncopyable.h"
 
 struct RGBAPixel
 {
@@ -18,7 +18,7 @@ struct RGBAPixel
  */
 class RGBAImage :
 	public Image,
-	public boost::noncopyable
+	public util::Noncopyable
 {
 public:
 	RGBAPixel* pixels;

diff --git a/libs/SurfaceShader.h b/libs/SurfaceShader.h
@@ -3,7 +3,7 @@
 #include <string>
 #include "debugging/debugging.h"
 #include "moduleobservers.h"
-#include <boost/noncopyable.hpp>
+#include "util/Noncopyable.h"
 #include "irender.h"
 #include "shaderlib.h"
 
@@ -15,7 +15,7 @@
  */
 class SurfaceShader :
     public ModuleObserver,
-    public boost::noncopyable
+    public util::Noncopyable
 {
 public:
     // Observer classes can be attached to SurfaceShader to get notified

diff --git a/libs/registry/registry.h b/libs/registry/registry.h
@@ -3,7 +3,7 @@
 #include "iregistry.h"
 #include "string/convert.h"
 
-#include <boost/noncopyable.hpp>
+#include "util/Noncopyable.h"
 
 /// Convenience methods and types for interacting with the XML registry
 namespace registry
@@ -47,7 +47,7 @@ template<typename T> T getValue(const std::string& key, T defaultVal = T())
  */
 template<typename T>
 class ScopedKeyChanger
-: boost::noncopyable
+: util::Noncopyable
 {
     std::string _key;
     T _origVal;

diff --git a/libs/scene/TraversableNodeSet.h b/libs/scene/TraversableNodeSet.h
@@ -3,7 +3,7 @@
 #include "inode.h"
 #include "iundo.h"
 #include <list>
-#include <boost/noncopyable.hpp>
+#include "util/Noncopyable.h"
 #include <sigc++/connection.h>
 #include <sigc++/trackable.h>
 
@@ -25,7 +25,7 @@ class Node;
  */
 class TraversableNodeSet :
 	public IUndoable,
-	public boost::noncopyable,
+	public util::Noncopyable,
 	public sigc::trackable
 {
 public:

diff --git a/libs/util/Noncopyable.h b/libs/util/Noncopyable.h
@@ -0,0 +1,21 @@
+#pragma once
+
+namespace util
+{
+
+/**
+ * Classes deriving from this one will end up as noncopyable
+ * since the copy-constructor and assignment operators are marked
+ * as deleted. Modeled after boost::noncopyable.
+ */
+class Noncopyable
+{
+public:
+	constexpr Noncopyable() = default;
+
+protected:
+	Noncopyable(const Noncopyable&) = delete;
+	Noncopyable& operator=(const Noncopyable&) = delete;
+};
+
+}
diff --git a/libs/wxutil/TreeModel.cpp b/libs/wxutil/TreeModel.cpp
@@ -27,7 +27,7 @@ wxString TreeModel::Column::getWxType() const
 
 // TreeModel nodes form a directed acyclic graph
 class TreeModel::Node :
-	public boost::noncopyable
+	public util::Noncopyable
 {
 public:
 	Node* parent; // NULL for the root node

diff --git a/libs/wxutil/TreeModel.h b/libs/wxutil/TreeModel.h
@@ -4,7 +4,7 @@
 #include <functional>
 #include <vector>
 #include <memory>
-#include <boost/noncopyable.hpp>
+#include "util/Noncopyable.h"
 
 namespace wxutil
 {
@@ -79,7 +79,7 @@ class TreeModel :
 	 * Subclasses should call Add() for each of their Column members.
 	 */
 	class ColumnRecord :
-		public boost::noncopyable
+		public util::Noncopyable
 	{
 	public:
 		// A list of column references, these point to members of subclasses

diff --git a/libs/wxutil/menu/PopupMenu.h b/libs/wxutil/menu/PopupMenu.h
@@ -4,7 +4,7 @@
 
 #include <functional>
 #include <memory>
-#include <boost/noncopyable.hpp>
+#include "util/Noncopyable.h"
 #include <list>
 
 #include <wx/menu.h>

diff --git a/plugins/dm.gui/gui/GuiManager.h b/plugins/dm.gui/gui/GuiManager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <boost/noncopyable.hpp>
+#include "util/Noncopyable.h"
 #include <memory>
 #include <map>
 #include "ifilesystem.h"
@@ -36,7 +36,7 @@ typedef std::shared_ptr<Gui> GuiPtr;
  * including parsing the .gui files on demand.
  */
 class GuiManager :
-	public boost::noncopyable
+	public util::Noncopyable
 {
 public:
 	typedef std::vector<std::string> StringList;

diff --git a/plugins/dm.gui/gui/GuiRenderer.h b/plugins/dm.gui/gui/GuiRenderer.h
@@ -2,7 +2,7 @@
 #define GuiRenderer_h__
 
 #include "math/Vector2.h"
-#include <boost/noncopyable.hpp>
+#include "util/Noncopyable.h"
 
 #include "Gui.h"
 #include <vector>
@@ -11,7 +11,7 @@ namespace gui
 {
 
 class GuiRenderer :
-	public boost::noncopyable
+	public util::Noncopyable
 {
 private:
 	GuiPtr _gui;

diff --git a/plugins/entity/NamespaceManager.h b/plugins/entity/NamespaceManager.h
@@ -10,14 +10,14 @@
 #include "NameKeyObserver.h"
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/classification.hpp>
-#include <boost/noncopyable.hpp>
+#include "util/Noncopyable.h"
 
 namespace entity {
 
 class NamespaceManager :
 	public Entity::Observer,
 	public Namespaced,
-	public boost::noncopyable
+	public util::Noncopyable
 {
 	INamespace* _namespace;
 

diff --git a/plugins/image/DDSImage.h b/plugins/image/DDSImage.h
@@ -4,11 +4,11 @@
 #include "igl.h"
 
 #include "RGBAImage.h"
-#include <boost/noncopyable.hpp>
+#include "util/Noncopyable.h"
 
 class DDSImage :
 	public Image,
-	public boost::noncopyable
+	public util::Noncopyable
 {
 public:
 

diff --git a/radiant/brush/Brush.h b/radiant/brush/Brush.h
@@ -8,7 +8,7 @@
 #include "Translatable.h"
 
 #include <sigc++/signal.h>
-#include <boost/noncopyable.hpp>
+#include "util/Noncopyable.h"
 
 class RenderableCollector;
 class Ray;
@@ -88,7 +88,7 @@ class Brush :
 	public Snappable,
 	public IUndoable,
 	public Translatable,
-	public boost::noncopyable
+	public util::Noncopyable
 {
 private:
 	BrushNode& _owner;

diff --git a/radiant/brush/Face.h b/radiant/brush/Face.h
@@ -12,7 +12,7 @@
 #include "PlanePoints.h"
 #include "FacePlane.h"
 #include <memory>
-#include <boost/noncopyable.hpp>
+#include "util/Noncopyable.h"
 #include <sigc++/signal.h>
 #include "selection/algorithm/Shader.h"
 
@@ -27,7 +27,7 @@ class Face :
 	public IFace,
 	public IUndoable,
 	public SurfaceShader::Observer,
-	public boost::noncopyable
+	public util::Noncopyable
 {
 private:
     // The structure which is saved to the undo stack

diff --git a/radiant/camera/CamWnd.h b/radiant/camera/CamWnd.h
@@ -21,7 +21,7 @@
 
 #include "selection/Rectangle.h"
 #include <memory>
-#include <boost/noncopyable.hpp>
+#include "util/Noncopyable.h"
 #include <sigc++/connection.h>
 #include "tools/CameraMouseToolEvent.h"
 
@@ -36,7 +36,7 @@ namespace ui
 class CamWnd :
     public ICameraView,
 	public scene::Graph::Observer,
-	public boost::noncopyable,
+	public util::Noncopyable,
     public sigc::trackable,
 	private wxutil::XmlResourceBasedWidget,
 	public wxEvtHandler,

diff --git a/radiant/map/MapResource.h b/radiant/map/MapResource.h
@@ -14,7 +14,7 @@ namespace map
 
 class MapResource :
 	public IMapResource,
-	public boost::noncopyable
+	public util::Noncopyable
 {
 private:
     RootNodePtr _mapRoot;

diff --git a/tools/msvc/libs.vcxproj b/tools/msvc/libs.vcxproj
@@ -207,6 +207,7 @@
     <ClInclude Include="..\..\libs\Transformable.h" />
     <ClInclude Include="..\..\libs\transformlib.h" />
     <ClInclude Include="..\..\libs\UndoFileChangeTracker.h" />
+    <ClInclude Include="..\..\libs\util\Noncopyable.h" />
     <ClInclude Include="..\..\libs\util\ScopedBoolLock.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/tools/msvc/libs.vcxproj.filters b/tools/msvc/libs.vcxproj.filters
@@ -157,6 +157,9 @@
     <ClInclude Include="..\..\libs\stream\utils.h">
       <Filter>stream</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\libs\util\Noncopyable.h">
+      <Filter>util</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="util">