Change namespace entity -> entityx.

diff --git a/entityx/Components.h b/entityx/Components.h
index 8c96fa74cbf88bb8f13da20a822ceec38fb55ace..cbc74d9abe2a3260c6be5d9ee94f771802b7c348 100644 (file)
--- a/entityx/Components.h
+++ b/entityx/Components.h
@@ -14,7 +14,7 @@
 #include <boost/unordered_set.hpp>
 #include "entityx/Entity.h"
 
-namespace entity {
+namespace entityx {
 
 /**
  * Allow entities to be tagged with strings.

diff --git a/entityx/Components_test.cc b/entityx/Components_test.cc
index e32fb46dc227f6656b49ca211418a21ee8707abf..bb9ae5deb279727d2d0813a875115e88156beee8 100644 (file)
--- a/entityx/Components_test.cc
+++ b/entityx/Components_test.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace boost;
-using namespace entity;
+using namespace entityx;
 
 
 struct Position : public Component<Position> {};

diff --git a/entityx/Entity.cc b/entityx/Entity.cc
index fefc1cde24ee0caa8af689a5a9b5b1db27ebaa8a..89a83f7dbfbdf007775a20071408ebc0877dfe85 100644 (file)
--- a/entityx/Entity.cc
+++ b/entityx/Entity.cc
@@ -11,7 +11,7 @@
 #include <algorithm>
 #include "entityx/Entity.h"
 
-namespace entity {
+namespace entityx {
 
 BaseComponent::Family BaseComponent::family_counter_ = 0;
 

diff --git a/entityx/Entity.h b/entityx/Entity.h
index 013830e4dfcd6c79f923ceb72d9d6f2e80167dc1..b90abe772fdcde50cfcb21ac64aa550027d922a3 100644 (file)
--- a/entityx/Entity.h
+++ b/entityx/Entity.h
@@ -25,7 +25,7 @@
 #include <glog/logging.h>
 #include "entityx/Event.h"
 
-namespace entity {
+namespace entityx {
 
 /**
  * Entity handle.

diff --git a/entityx/Entity_test.cc b/entityx/Entity_test.cc
index 805a3d3f423c733c7959308b9392c46b2ae87546..1433b26e709760bc8d4c2bb51a9dad3ce37b1a2b 100644 (file)
--- a/entityx/Entity_test.cc
+++ b/entityx/Entity_test.cc
@@ -18,7 +18,7 @@
 
 using namespace std;
 using namespace boost;
-using namespace entity;
+using namespace entityx;
 
 
 template <typename T>

diff --git a/entityx/Event.cc b/entityx/Event.cc
index 484a17c2685213fdbd41103eed882351cd5ed630..aac7145391262b9859355f34c4b887111bb1ffcf 100644 (file)
--- a/entityx/Event.cc
+++ b/entityx/Event.cc
@@ -10,7 +10,7 @@
 
 #include "entityx/Event.h"
 
-namespace entity {
+namespace entityx {
 
 BaseEvent::Family BaseEvent::family_counter_ = 0;
 

diff --git a/entityx/Event.h b/entityx/Event.h
index ac6a632c0bf0fba4cb16425d4e10341f0e2ca82f..a599b9052c12af77a5871839259ea959fac25af8 100644 (file)
--- a/entityx/Event.h
+++ b/entityx/Event.h
@@ -19,7 +19,7 @@
 #include <boost/unordered_map.hpp>
 
 
-namespace entity {
+namespace entityx {
 
 
 /// Used internally by the EventManager.

diff --git a/entityx/Event_test.cc b/entityx/Event_test.cc
index 63b05295c91edbed5d4535eaaabba2b5c44b4510..91bdd169462a14b5761d5bcbb152151a31dfca33 100644 (file)
--- a/entityx/Event_test.cc
+++ b/entityx/Event_test.cc
@@ -14,7 +14,7 @@
 #include <gtest/gtest.h>
 #include "entityx/Event.h"
 
-using namespace entity;
+using namespace entityx;
 using namespace boost;
 
 struct Explosion : public Event<Explosion> {

diff --git a/entityx/Manager.cc b/entityx/Manager.cc
index 012e06f35d74f7082bdb0ee744951fc044979d9c..22bf6ba7ef3302ec8fb7c340f7ee293890edf0af 100644 (file)
--- a/entityx/Manager.cc
+++ b/entityx/Manager.cc
@@ -10,7 +10,7 @@
 
 #include "Manager.h"
 
-namespace entity {
+namespace entityx {
 
 void Manager::start() {
   configure();

diff --git a/entityx/Manager.h b/entityx/Manager.h
index 66ace3ff8ef1e5bf25c8531b757bf3e1e0e4a2c3..cca3ff141de566053b8d471186e1c9b5e7d5bc91 100644 (file)
--- a/entityx/Manager.h
+++ b/entityx/Manager.h
@@ -15,7 +15,7 @@
 #include "entityx/Event.h"
 #include "entityx/System.h"
 
-namespace entity {
+namespace entityx {
 
 class Manager {
  public:

diff --git a/entityx/System.cc b/entityx/System.cc
index 4c05f2b9341687c62b19eabcec4e78902901dbaa..399371ccaf09876ddca228b5289ee206f0d13226 100644 (file)
--- a/entityx/System.cc
+++ b/entityx/System.cc
@@ -10,7 +10,7 @@
 
 #include "entityx/System.h"
 
-namespace entity {
+namespace entityx {
 
 BaseSystem::Family BaseSystem::family_counter_;
 

diff --git a/entityx/System.h b/entityx/System.h
index a754352991f49fbe7f341e30716947abc8590d1e..c7da41db94000abee40e2c5ec84c34837377256f 100644 (file)
--- a/entityx/System.h
+++ b/entityx/System.h
@@ -20,7 +20,7 @@
 #include "entityx/Event.h"
 
 
-namespace entity {
+namespace entityx {
 
 /**
  * Base System class. Generally should not be directly used, instead see System<Derived>.

diff --git a/entityx/System_test.cc b/entityx/System_test.cc
index 2dad4d90d99147912b5c15bd694870d465278a51..42312d39068bf772551a0105f4f4c9935e0f4201 100644 (file)
--- a/entityx/System_test.cc
+++ b/entityx/System_test.cc
@@ -18,7 +18,7 @@
 
 using namespace std;
 using namespace boost;
-using namespace entity;
+using namespace entityx;
 
 struct Position : Component<Position> {
   Position(float x = 0.0f, float y = 0.0f) : x(x), y(y) {}
@@ -52,7 +52,7 @@ class MovementSystem : public System<MovementSystem> {
 };
 
 
-class TestManager : public entity::Manager {
+class TestManager : public entityx::Manager {
  public:
   std::vector<Entity> entities;