From 31a112acaa32a1aeb6c1a77e36e510c396945174 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Mon, 5 Jan 2009 16:17:17 +0100 Subject: [PATCH] some typos --- src/proc/asset/proc.hpp | 6 +++--- src/proc/asset/struct.cpp | 5 ++--- src/proc/asset/struct.hpp | 6 +++--- src/proc/asset/structfactoryimpl.hpp | 2 +- src/proc/assetmanager.cpp | 23 +++++++++++++---------- src/proc/mobject/session/defsmanager.cpp | 14 +++++++------- 6 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/proc/asset/proc.hpp b/src/proc/asset/proc.hpp index 5ab69dfc9..9b744f2e1 100644 --- a/src/proc/asset/proc.hpp +++ b/src/proc/asset/proc.hpp @@ -42,8 +42,8 @@ -namespace asset - { +namespace asset { + class Proc; class ProcFactory; @@ -92,7 +92,7 @@ namespace asset /** - * Factory specialized for createing Processor Asset objects. + * Factory specialised for creating Processor Asset objects. */ class ProcFactory : public lumiera::Factory { diff --git a/src/proc/asset/struct.cpp b/src/proc/asset/struct.cpp index 71ffa995f..e92fa0bb9 100644 --- a/src/proc/asset/struct.cpp +++ b/src/proc/asset/struct.cpp @@ -82,7 +82,7 @@ namespace asset /** Factory method for Structural Asset instances. - * First tries to relove the asset by issuing an capability query. + * First tries to resolve the asset by issuing an capability query. * If unsuccessful, use some internally specialised ctor call. * @todo work out the struct asset naming scheme! * @return an Struct smart ptr linked to the internally registered smart ptr @@ -144,8 +144,7 @@ namespace asset #include "proc/asset/pipe.hpp" -namespace asset - { +namespace asset { template P StructFactory::operator() (const Query& query); template P StructFactory::operator() (const Query& query); diff --git a/src/proc/asset/struct.hpp b/src/proc/asset/struct.hpp index a7a1df437..07efca7e0 100644 --- a/src/proc/asset/struct.hpp +++ b/src/proc/asset/struct.hpp @@ -49,8 +49,8 @@ -namespace asset - { +namespace asset { + using std::string; using std::wstring; using boost::scoped_ptr; @@ -108,7 +108,7 @@ namespace asset /** - * Factory specialized for createing Structural Asset objects. + * Factory specialised for creating Structural Asset objects. */ class StructFactory : public lumiera::Factory { diff --git a/src/proc/asset/structfactoryimpl.hpp b/src/proc/asset/structfactoryimpl.hpp index 497f84791..f39d41b05 100644 --- a/src/proc/asset/structfactoryimpl.hpp +++ b/src/proc/asset/structfactoryimpl.hpp @@ -79,7 +79,7 @@ namespace asset /** - * Implementation deatils, esp. concerning how configuration + * Implementation details, especially concerning how configuration * queries are resolved and when to create new objects automatically. * @todo better use a general struct traits class, esp.for creating the Ident */ diff --git a/src/proc/assetmanager.cpp b/src/proc/assetmanager.cpp index 0aaa26c0e..6c46e9b6a 100644 --- a/src/proc/assetmanager.cpp +++ b/src/proc/assetmanager.cpp @@ -183,16 +183,19 @@ namespace asset { } - void - recursive_call (AssetManager* instance, PAsset& pA) - { - instance->remove (pA->getID()); - } - - function - detach_child_recursively () ///< @return a functor recursively invoking remove(child) - { - return bind( &recursive_call, &AssetManager::instance(), _1 ); + namespace { // details implementing AssetManager::remove + + void + recursive_call (AssetManager* instance, PAsset& pA) + { + instance->remove (pA->getID()); + } + + function + detach_child_recursively () ///< @return a functor recursively invoking remove(child) + { + return bind( &recursive_call, &AssetManager::instance(), _1 ); + } } /** diff --git a/src/proc/mobject/session/defsmanager.cpp b/src/proc/mobject/session/defsmanager.cpp index f7a40de13..38509c981 100644 --- a/src/proc/mobject/session/defsmanager.cpp +++ b/src/proc/mobject/session/defsmanager.cpp @@ -42,7 +42,7 @@ namespace mobject { - /** initialize the most basic internal defaults. */ + /** initialise the most basic internal defaults. */ DefsManager::DefsManager () throw() : defsRegistry(new DefsRegistry) { @@ -142,11 +142,10 @@ namespace mobject { #include "proc/asset/track.hpp" #include "proc/mobject/session/track.hpp" -namespace mobject - { - namespace session - { - +namespace mobject { + namespace session { + + using asset::Pipe; using asset::PPipe; using asset::ProcPatt; @@ -164,7 +163,8 @@ namespace mobject template bool DefsManager::define (const PPipe&, const Query&); template bool DefsManager::forget (const PPipe&); - + + } // namespace mobject::session } // namespace mobject