From bdb8bc2c982dee6334cdeb28d2e7f4a83b1a24e8 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Fri, 6 Nov 2009 19:27:53 +0100
Subject: [PATCH] move PlacementIndex into namespace session

---
 src/proc/mobject/placement-ref.hpp              | 17 +++++++++--------
 .../mobject/{ => session}/placement-index.cpp   |  5 +++--
 .../mobject/{ => session}/placement-index.hpp   |  9 ++++++---
 src/proc/mobject/session/session-impl.hpp       |  2 +-
 .../handling-pattern-standard-impl-test.cpp     |  2 +-
 .../proc/mobject/mobject-ref-test.cpp           |  4 +++-
 .../proc/mobject/placement-ref-test.cpp         |  2 +-
 .../proc/mobject/placement-scope-test.cpp       |  2 +-
 .../proc/mobject/query-focus-test.cpp           |  2 +-
 .../components/proc/mobject/scope-path-test.cpp |  2 +-
 .../{ => session}/placement-index-test.cpp      |  5 +++--
 .../proc/mobject/session/test-scopes.hpp        |  2 +-
 12 files changed, 31 insertions(+), 23 deletions(-)
 rename src/proc/mobject/{ => session}/placement-index.cpp (97%)
 rename src/proc/mobject/{ => session}/placement-index.hpp (97%)
 rename tests/components/proc/mobject/{ => session}/placement-index-test.cpp (96%)

diff --git a/src/proc/mobject/placement-ref.hpp b/src/proc/mobject/placement-ref.hpp
index 5677aeac4..73af653e8 100644
--- a/src/proc/mobject/placement-ref.hpp
+++ b/src/proc/mobject/placement-ref.hpp
@@ -60,12 +60,13 @@ namespace mobject {
   
   class MObject;
   
-  // see placement-index.cpp 
-  Placement<MObject> &
-  fetch_PlacementIndex(Placement<MObject>::ID const&) ;
-  
-  bool
-  checkContains_PlacementIndex (Placement<MObject>::ID const& pID) ;
+  namespace session {
+    
+    // see placement-index.cpp 
+    Placement<MObject> & fetch_PlacementIndex(Placement<MObject>::ID const&) ;
+    bool checkContains_PlacementIndex (Placement<MObject>::ID const& pID) ;
+    
+  }
   
   
   LUMIERA_ERROR_DECLARE (INVALID_PLACEMENTREF);  ///< unresolvable placement reference, or of incompatible type
@@ -205,7 +206,7 @@ namespace mobject {
       bool
       checkValidity ()  const
         {
-          return checkContains_PlacementIndex(this->id_);
+          return session::checkContains_PlacementIndex(this->id_);
         }
       
       static void
@@ -235,7 +236,7 @@ namespace mobject {
       static PlacementMO&
       access (_Id const& placementID)
         {
-          Placement<MObject> & pla (fetch_PlacementIndex (placementID));  // may throw
+          Placement<MObject> & pla (session::fetch_PlacementIndex (placementID));  // may throw
           REQUIRE (pla.isValid());
           ASSERT (pla.isCompatible<MO>());
           return static_cast<PlacementMO&> (pla);
diff --git a/src/proc/mobject/placement-index.cpp b/src/proc/mobject/session/placement-index.cpp
similarity index 97%
rename from src/proc/mobject/placement-index.cpp
rename to src/proc/mobject/session/placement-index.cpp
index 6b01eeeaa..069de7012 100644
--- a/src/proc/mobject/placement-index.cpp
+++ b/src/proc/mobject/session/placement-index.cpp
@@ -33,13 +33,14 @@
  */
 
 
-#include "proc/mobject/placement-index.hpp"
+#include "proc/mobject/session/placement-index.hpp"
 #include "proc/mobject/session/session-impl.hpp"
 
 //#include <boost/format.hpp>
 //using boost::str;
 
 namespace mobject {
+namespace session {
 
 
   class PlacementIndex::Table 
@@ -204,4 +205,4 @@ namespace mobject {
   }
 
 
-} // namespace mobject
+}} // namespace mobject::session
diff --git a/src/proc/mobject/placement-index.hpp b/src/proc/mobject/session/placement-index.hpp
similarity index 97%
rename from src/proc/mobject/placement-index.hpp
rename to src/proc/mobject/session/placement-index.hpp
index 1bc193cbe..4ad794227 100644
--- a/src/proc/mobject/placement-index.hpp
+++ b/src/proc/mobject/session/placement-index.hpp
@@ -48,14 +48,17 @@
 #include <vector>
 
 
-namespace mobject { ///////////////////////////////////////////TODO: shouldn't this go into namespace session ?
+namespace mobject {
+
+  class MObject;
+  
+namespace session {
   
   using lib::factory::RefcountFac;
   using std::tr1::shared_ptr;
   using boost::scoped_ptr;
   using std::vector;
   
-  class MObject;
   
   
   /**
@@ -205,5 +208,5 @@ namespace mobject { ///////////////////////////////////////////TODO: shouldn't t
   
   
   
-} // namespace mobject
+}} // namespace mobject::session
 #endif
diff --git a/src/proc/mobject/session/session-impl.hpp b/src/proc/mobject/session/session-impl.hpp
index 0ddc63381..4e4d90731 100644
--- a/src/proc/mobject/session/session-impl.hpp
+++ b/src/proc/mobject/session/session-impl.hpp
@@ -39,7 +39,7 @@
 #include "proc/mobject/session.hpp"
 #include "proc/mobject/session/edl.hpp"
 #include "proc/mobject/session/fixture.hpp"
-#include "proc/mobject/placement-index.hpp"
+#include "proc/mobject/session/placement-index.hpp"
 
 #include <boost/scoped_ptr.hpp>
 #include <vector>
diff --git a/tests/components/proc/control/handling-pattern-standard-impl-test.cpp b/tests/components/proc/control/handling-pattern-standard-impl-test.cpp
index f9fdf0058..a83eed6d7 100644
--- a/tests/components/proc/control/handling-pattern-standard-impl-test.cpp
+++ b/tests/components/proc/control/handling-pattern-standard-impl-test.cpp
@@ -30,7 +30,7 @@
 //#include "proc/mobject/test-dummy-mobject.hpp"
 //#include "lib/p.hpp"
 //#include "proc/mobject/placement.hpp"
-//#include "proc/mobject/placement-index.hpp"
+//#include "proc/mobject/session/placement-index.hpp"
 //#include "proc/mobject/explicitplacement.hpp"
 #include "proc/control/command.hpp"
 #include "proc/control/command-impl.hpp"
diff --git a/tests/components/proc/mobject/mobject-ref-test.cpp b/tests/components/proc/mobject/mobject-ref-test.cpp
index f851b4b06..b679df1d8 100644
--- a/tests/components/proc/mobject/mobject-ref-test.cpp
+++ b/tests/components/proc/mobject/mobject-ref-test.cpp
@@ -28,7 +28,7 @@
 #include "proc/mobject/mobject-ref.hpp"
 #include "proc/mobject/placement.hpp"
 #include "proc/mobject/placement-ref.hpp"
-#include "proc/mobject/placement-index.hpp"
+#include "proc/mobject/session/placement-index.hpp"
 #include "proc/mobject/session/clip.hpp"
 #include "proc/mobject/explicitplacement.hpp"
 #include "proc/mobject/test-dummy-mobject.hpp"
@@ -46,6 +46,8 @@ namespace test    {
   
   using lumiera::Time;
   using session::Clip;
+  
+  using session::reset_PlacementIndex;
 
   
   /***************************************************************************
diff --git a/tests/components/proc/mobject/placement-ref-test.cpp b/tests/components/proc/mobject/placement-ref-test.cpp
index 9bbe17109..de2f7e5bb 100644
--- a/tests/components/proc/mobject/placement-ref-test.cpp
+++ b/tests/components/proc/mobject/placement-ref-test.cpp
@@ -25,7 +25,7 @@
 #include "lib/lumitime.hpp"
 #include "proc/mobject/placement.hpp"
 #include "proc/mobject/placement-ref.hpp"
-#include "proc/mobject/placement-index.hpp"
+#include "proc/mobject/session/placement-index.hpp"
 #include "proc/mobject/explicitplacement.hpp"
 #include "proc/mobject/test-dummy-mobject.hpp"
 #include "lib/util.hpp"
diff --git a/tests/components/proc/mobject/placement-scope-test.cpp b/tests/components/proc/mobject/placement-scope-test.cpp
index 87ba1a1bf..72f0c5aff 100644
--- a/tests/components/proc/mobject/placement-scope-test.cpp
+++ b/tests/components/proc/mobject/placement-scope-test.cpp
@@ -27,7 +27,7 @@
 #include "proc/mobject/session/test-scopes.hpp"
 //#include "lib/lumitime.hpp"
 //#include "proc/mobject/placement-ref.hpp"
-//#include "proc/mobject/placement-index.hpp"
+//#include "proc/mobject/session/placement-index.hpp"
 //#include "proc/mobject/test-dummy-mobject.hpp"
 #include "lib/util.hpp"
 
diff --git a/tests/components/proc/mobject/query-focus-test.cpp b/tests/components/proc/mobject/query-focus-test.cpp
index 589dec521..e74b8e218 100644
--- a/tests/components/proc/mobject/query-focus-test.cpp
+++ b/tests/components/proc/mobject/query-focus-test.cpp
@@ -25,7 +25,7 @@
 //#include "lib/lumitime.hpp"
 //#include "proc/mobject/placement-ref.hpp"
 #include "proc/mobject/session/test-scopes.hpp"
-#include "proc/mobject/placement-index.hpp"
+#include "proc/mobject/session/placement-index.hpp"
 #include "proc/mobject/session/query-focus.hpp"
 #include "proc/mobject/session/scope.hpp"
 //#include "lib/util.hpp"
diff --git a/tests/components/proc/mobject/scope-path-test.cpp b/tests/components/proc/mobject/scope-path-test.cpp
index 9adcfb03d..5681e61df 100644
--- a/tests/components/proc/mobject/scope-path-test.cpp
+++ b/tests/components/proc/mobject/scope-path-test.cpp
@@ -27,7 +27,7 @@
 #include "proc/mobject/session/scope-path.hpp"
 //#include "lib/lumitime.hpp"
 //#include "proc/mobject/placement-ref.hpp"
-//#include "proc/mobject/placement-index.hpp"
+//#include "proc/mobject/session/placement-index.hpp"
 //#include "proc/mobject/test-dummy-mobject.hpp"
 #include "lib/util.hpp"
 
diff --git a/tests/components/proc/mobject/placement-index-test.cpp b/tests/components/proc/mobject/session/placement-index-test.cpp
similarity index 96%
rename from tests/components/proc/mobject/placement-index-test.cpp
rename to tests/components/proc/mobject/session/placement-index-test.cpp
index b9b003ede..080cb3461 100644
--- a/tests/components/proc/mobject/placement-index-test.cpp
+++ b/tests/components/proc/mobject/session/placement-index-test.cpp
@@ -25,9 +25,9 @@
 //#include "proc/asset/media.hpp"
 //#include "proc/mobject/session.hpp"
 //#include "proc/mobject/session/edl.hpp"
+#include "proc/mobject/session/placement-index.hpp"
 #include "proc/mobject/session/testclip.hpp"
 #include "proc/mobject/placement.hpp"
-#include "proc/mobject/placement-index.hpp"
 //#include "proc/mobject/explicitplacement.hpp"
 //#include "lib/util.hpp"
 
@@ -42,6 +42,7 @@ using std::string;
 
 
 namespace mobject {
+namespace session {
 namespace test    {
       
   using asset::VIDEO;
@@ -96,4 +97,4 @@ namespace test    {
   LAUNCHER (PlacementIndex_test, "unit session");
       
       
-}} // namespace mobject::test
+}}} // namespace mobject::session::test
diff --git a/tests/components/proc/mobject/session/test-scopes.hpp b/tests/components/proc/mobject/session/test-scopes.hpp
index bb9690902..31d9d7a9f 100644
--- a/tests/components/proc/mobject/session/test-scopes.hpp
+++ b/tests/components/proc/mobject/session/test-scopes.hpp
@@ -29,7 +29,7 @@
 //#include "proc/mobject/placement-ref.hpp"
 #include "proc/mobject/session/test-scopes.hpp"
 #include "proc/mobject/test-dummy-mobject.hpp"
-#include "proc/mobject/placement-index.hpp"
+#include "proc/mobject/session/placement-index.hpp"
 //#include "lib/util.hpp"
 
 #include <tr1/memory>