Remove boost::noncopyable references (#96).

OpenXRay · Jan 14, 2016 · 8440c41 · 8440c41
1 parent 3da7a47
commit 8440c41
Show file tree

Hide file tree

Showing 90 changed files with 177 additions and 164 deletions.
diff --git a/src/Common/Noncopyable.hpp b/src/Common/Noncopyable.hpp
@@ -0,0 +1,9 @@
+#pragma once
+
+class Noncopyable
+{
+public:
+    Noncopyable() = default;
+    Noncopyable(Noncopyable &) = delete;
+    Noncopyable &operator=(Noncopyable &) = delete;
+};
diff --git a/src/xrCore/xrCore.vcxproj b/src/xrCore/xrCore.vcxproj
@@ -294,6 +294,7 @@
   <ItemGroup>
     <ClInclude Include="..\common\GUID.hpp" />
     <ClInclude Include="..\common\LevelStructure.hpp" />
+    <ClInclude Include="..\Common\Noncopyable.hpp" />
     <ClInclude Include="..\common\object_broker.h" />
     <ClInclude Include="..\common\object_cloner.h" />
     <ClInclude Include="..\common\object_comparer.h" />

diff --git a/src/xrCore/xrCore.vcxproj.filters b/src/xrCore/xrCore.vcxproj.filters
@@ -785,6 +785,9 @@
     <ClInclude Include="Debug\SymbolEngine.h">
       <Filter>Debug core</Filter>
     </ClInclude>
+    <ClInclude Include="..\Common\Noncopyable.hpp">
+      <Filter>Common</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="xrCore.rc">

diff --git a/src/xrEngine/edit_actions.h b/src/xrEngine/edit_actions.h
@@ -8,15 +8,15 @@
 #ifndef EDIT_ACTIONS_H_INCLUDED
 #define EDIT_ACTIONS_H_INCLUDED
 
-#include <boost/noncopyable.hpp>
+#include "Common/Noncopyable.hpp"
 
 namespace text_editor
 {
 
 enum key_state;
 class line_edit_control;
 
-class base : private boost::noncopyable
+class base : private Noncopyable
 {
 public:
     base();

diff --git a/src/xrEngine/editor_environment_ambients_ambient.hpp b/src/xrEngine/editor_environment_ambients_ambient.hpp
@@ -11,7 +11,7 @@
 
 #ifdef INGAME_EDITOR
 
-#include <boost/noncopyable.hpp>
+#include "Common/Noncopyable.hpp"
 #include "Include/editor/property_holder.hpp"
 #include "property_collection_forward.hpp"
 #include "Environment.h"
@@ -41,7 +41,7 @@ class sound_id;
 class ambient :
     public CEnvAmbient,
     public editor::property_holder_holder,
-    private boost::noncopyable
+    private Noncopyable
 {
 private:
     typedef CEnvAmbient inherited;

diff --git a/src/xrEngine/editor_environment_ambients_effect_id.hpp b/src/xrEngine/editor_environment_ambients_effect_id.hpp
@@ -11,7 +11,7 @@
 
 #ifdef INGAME_EDITOR
 
-#include <boost/noncopyable.hpp>
+#include "Common/Noncopyable.hpp"
 #include "Include/editor/property_holder.hpp"
 
 namespace editor
@@ -31,7 +31,7 @@ namespace ambients
 
 class effect_id :
     public editor::property_holder_holder,
-    private boost::noncopyable
+    private Noncopyable
 {
 public:
     effect_id(effects::manager const& manager, shared_str const& id);

diff --git a/src/xrEngine/editor_environment_ambients_manager.hpp b/src/xrEngine/editor_environment_ambients_manager.hpp
@@ -11,7 +11,7 @@
 
 #ifdef INGAME_EDITOR
 
-#include <boost/noncopyable.hpp>
+#include "Common/Noncopyable.hpp"
 #include "property_collection_forward.hpp"
 
 namespace editor
@@ -39,7 +39,7 @@ namespace ambients
 
 class ambient;
 
-class manager : private boost::noncopyable
+class manager : private Noncopyable
 {
 public:
     manager(::editor::environment::manager const& manager);

diff --git a/src/xrEngine/editor_environment_ambients_sound_id.hpp b/src/xrEngine/editor_environment_ambients_sound_id.hpp
@@ -11,7 +11,7 @@
 
 #ifdef INGAME_EDITOR
 
-#include <boost/noncopyable.hpp>
+#include "Common/Noncopyable.hpp"
 #include "Include/editor/property_holder.hpp"
 
 namespace editor
@@ -31,7 +31,7 @@ namespace ambients
 
 class sound_id :
     public editor::property_holder_holder,
-    private boost::noncopyable
+    private Noncopyable
 {
 public:
     sound_id(sound_channels::manager const& manager, shared_str const& sound);

diff --git a/src/xrEngine/editor_environment_effects_effect.hpp b/src/xrEngine/editor_environment_effects_effect.hpp
@@ -11,7 +11,7 @@
 
 #ifdef INGAME_EDITOR
 
-#include <boost/noncopyable.hpp>
+#include "Common/Noncopyable.hpp"
 #include "Include/editor/property_holder.hpp"
 #include "Environment.h"
 
@@ -30,7 +30,7 @@ class manager;
 class effect :
     public CEnvAmbient::SEffect,
     public editor::property_holder_holder,
-    private boost::noncopyable
+    private Noncopyable
 {
 public:
     effect(manager const& manager, shared_str const& id);

diff --git a/src/xrEngine/editor_environment_effects_manager.hpp b/src/xrEngine/editor_environment_effects_manager.hpp
@@ -11,7 +11,7 @@
 
 #ifdef INGAME_EDITOR
 
-#include <boost/noncopyable.hpp>
+#include "Common/Noncopyable.hpp"
 #include "property_collection_forward.hpp"
 
 namespace editor
@@ -29,7 +29,7 @@ namespace effects
 
 class effect;
 
-class manager : private boost::noncopyable
+class manager : private Noncopyable
 {
 public:
     manager(::editor::environment::manager* environment);

diff --git a/src/xrEngine/editor_environment_levels_manager.hpp b/src/xrEngine/editor_environment_levels_manager.hpp
@@ -11,7 +11,7 @@
 
 #ifdef INGAME_EDITOR
 
-#include <boost/noncopyable.hpp>
+#include "Common/Noncopyable.hpp"
 #include "xrCore/Containers/AssociativeVector.hpp"
 
 namespace editor
@@ -30,7 +30,7 @@ class manager;
 namespace levels
 {
 
-class manager : private boost::noncopyable
+class manager : private Noncopyable
 {
 public:
     manager(::editor::environment::weathers::manager* environment);

diff --git a/src/xrEngine/editor_environment_sound_channels_channel.hpp b/src/xrEngine/editor_environment_sound_channels_channel.hpp
@@ -11,7 +11,7 @@
 
 #ifdef INGAME_EDITOR
 
-#include <boost/noncopyable.hpp>
+#include "Common/Noncopyable.hpp"
 #include "Include/editor/property_holder.hpp"
 #include "property_collection_forward.hpp"
 #include "Environment.h"
@@ -32,7 +32,7 @@ class manager;
 class channel :
     public CEnvAmbient::SSndChannel,
     public editor::property_holder_holder,
-    private boost::noncopyable
+    private Noncopyable
 {
 private:
     typedef CEnvAmbient::SSndChannel inherited;

diff --git a/src/xrEngine/editor_environment_sound_channels_manager.hpp b/src/xrEngine/editor_environment_sound_channels_manager.hpp
@@ -11,7 +11,7 @@
 
 #ifdef INGAME_EDITOR
 
-#include <boost/noncopyable.hpp>
+#include "Common/Noncopyable.hpp"
 #include "property_collection_forward.hpp"
 
 namespace editor
@@ -26,7 +26,7 @@ namespace sound_channels
 
 class channel;
 
-class manager : private boost::noncopyable
+class manager : private Noncopyable
 {
 public:
     manager();

diff --git a/src/xrEngine/editor_environment_sound_channels_source.hpp b/src/xrEngine/editor_environment_sound_channels_source.hpp
@@ -11,7 +11,7 @@
 
 #ifdef INGAME_EDITOR
 
-#include <boost/noncopyable.hpp>
+#include "Common/Noncopyable.hpp"
 #include "Include/editor/property_holder.hpp"
 
 namespace editor
@@ -26,7 +26,7 @@ namespace sound_channels
 
 class source :
     public editor::property_holder_holder,
-    private boost::noncopyable
+    private Noncopyable
 {
 public:
     source(shared_str const& source);

diff --git a/src/xrEngine/editor_environment_suns_blend.hpp b/src/xrEngine/editor_environment_suns_blend.hpp
@@ -11,7 +11,7 @@
 
 #ifdef INGAME_EDITOR
 
-#include <boost/noncopyable.hpp>
+#include "Common/Noncopyable.hpp"
 
 namespace editor
 {
@@ -26,7 +26,7 @@ namespace suns
 
 class manager;
 
-class blend : private boost::noncopyable
+class blend : private Noncopyable
 {
 public:
     blend();

diff --git a/src/xrEngine/editor_environment_suns_flare.hpp b/src/xrEngine/editor_environment_suns_flare.hpp
@@ -11,7 +11,7 @@
 
 #ifdef INGAME_EDITOR
 
-#include <boost/noncopyable.hpp>
+#include "Common/Noncopyable.hpp"
 #include "Include/editor/property_holder.hpp"
 
 namespace editor
@@ -23,7 +23,7 @@ namespace suns
 
 class flare :
     public editor::property_holder_holder,
-    private boost::noncopyable
+    private Noncopyable
 {
 public:
     flare();

diff --git a/src/xrEngine/editor_environment_suns_flares.hpp b/src/xrEngine/editor_environment_suns_flares.hpp
@@ -11,7 +11,7 @@
 
 #ifdef INGAME_EDITOR
 
-#include <boost/noncopyable.hpp>
+#include "Common/Noncopyable.hpp"
 #include "property_collection_forward.hpp"
 
 namespace editor
@@ -28,7 +28,7 @@ namespace suns
 class manager;
 class flare;
 
-class flares : private boost::noncopyable
+class flares : private Noncopyable
 {
 public:
     flares();

diff --git a/src/xrEngine/editor_environment_suns_gradient.hpp b/src/xrEngine/editor_environment_suns_gradient.hpp
@@ -11,7 +11,7 @@
 
 #ifdef INGAME_EDITOR
 
-#include <boost/noncopyable.hpp>
+#include "Common/Noncopyable.hpp"
 
 namespace editor
 {
@@ -26,7 +26,7 @@ namespace suns
 
 class manager;
 
-class gradient : private boost::noncopyable
+class gradient : private Noncopyable
 {
 public:
     gradient();

diff --git a/src/xrEngine/editor_environment_suns_manager.hpp b/src/xrEngine/editor_environment_suns_manager.hpp
@@ -11,7 +11,7 @@
 
 #ifdef INGAME_EDITOR
 
-#include <boost/noncopyable.hpp>
+#include "Common/Noncopyable.hpp"
 #include "property_collection_forward.hpp"
 
 class CLensFlareDescriptor;
@@ -31,7 +31,7 @@ namespace suns
 
 class sun;
 
-class manager : private boost::noncopyable
+class manager : private Noncopyable
 {
 public:
     manager(environment::manager* environment);

diff --git a/src/xrEngine/editor_environment_suns_sun.hpp b/src/xrEngine/editor_environment_suns_sun.hpp
@@ -11,7 +11,7 @@
 
 #ifdef INGAME_EDITOR
 
-#include <boost/noncopyable.hpp>
+#include "Common/Noncopyable.hpp"
 #include "Include/editor/property_holder.hpp"
 #include "xr_efflensflare.h"
 
@@ -32,7 +32,7 @@ class manager;
 class sun :
     public CLensFlare,
     public editor::property_holder_holder,
-    private boost::noncopyable
+    private Noncopyable
 {
 public:
     sun(manager const& manager, shared_str const& section);

diff --git a/src/xrEngine/editor_environment_thunderbolts_collection.hpp b/src/xrEngine/editor_environment_thunderbolts_collection.hpp
@@ -11,7 +11,7 @@
 
 #ifdef INGAME_EDITOR
 
-#include <boost/noncopyable.hpp>
+#include "Common/Noncopyable.hpp"
 #include "Include/editor/property_holder.hpp"
 #include "property_collection_forward.hpp"
 #include "thunderbolt.h"
@@ -32,7 +32,7 @@ class thunderbolt_id;
 class collection :
     public SThunderboltCollection,
     public editor::property_holder_holder,
-    private boost::noncopyable
+    private Noncopyable
 {
 public:
     collection(manager const& manager, shared_str const& id);

diff --git a/src/xrEngine/editor_environment_thunderbolts_gradient.hpp b/src/xrEngine/editor_environment_thunderbolts_gradient.hpp
@@ -11,7 +11,7 @@
 
 #ifdef INGAME_EDITOR
 
-#include <boost/noncopyable.hpp>
+#include "Common/Noncopyable.hpp"
 #include "Include/editor/property_holder.hpp"
 #include "thunderbolt.h"
 
@@ -30,7 +30,7 @@ namespace thunderbolts
 
 class gradient :
     public SThunderboltDesc::SFlare,
-    private boost::noncopyable
+    private Noncopyable
 {
 public:
     gradient();

diff --git a/src/xrEngine/editor_environment_thunderbolts_manager.hpp b/src/xrEngine/editor_environment_thunderbolts_manager.hpp
@@ -11,7 +11,7 @@
 
 #ifdef INGAME_EDITOR
 
-#include <boost/noncopyable.hpp>
+#include "Common/Noncopyable.hpp"
 #include "property_collection_forward.hpp"
 
 struct SThunderboltDesc;
@@ -34,7 +34,7 @@ class thunderbolt;
 class thunderbolt_id;
 class collection;
 
-class manager : private boost::noncopyable
+class manager : private Noncopyable
 {
 public:
     manager(::editor::environment::manager* environment);