diff --git a/src/common/query/defs-manager.hpp b/src/common/query/defs-manager.hpp index e9bed6904..1338f3a91 100644 --- a/src/common/query/defs-manager.hpp +++ b/src/common/query/defs-manager.hpp @@ -37,7 +37,6 @@ namespace lumiera{ namespace query { - using lib::P; using lumiera::Query; using boost::scoped_ptr; @@ -73,14 +72,14 @@ namespace query { * is considered \e misconfiguration. */ template - P operator() (Query const&); + lib::P operator() (Query const&); /** search through the registered defaults, never create anything. * @return object fulfilling the query, \c empty ptr if not found. */ template - P search (Query const&); + lib::P search (Query const&); /** retrieve an object fulfilling the query and register it as default. * The resolution is delegated to the ConfigQuery system (which may cause @@ -88,7 +87,7 @@ namespace query { * @return object fulfilling the query, \c empty ptr if no solution. */ template - P create (Query const&); + lib::P create (Query const&); /** register the given object as default, after ensuring it fulfils the * query. The latter may cause some properties of the object to be set, @@ -97,13 +96,13 @@ namespace query { * @note only a weak ref to the object is stored */ template - bool define (P const&, Query const& =Query()); + bool define (lib::P const&, Query const& =Query()); /** remove the defaults registration of the given object, if there was such * @return false if nothing has been changed because the object wasn't registered */ template - bool forget (P const&); + bool forget (lib::P const&); /** @internal for session lifecycle */ diff --git a/src/include/play-facade.h b/src/include/play-facade.h index d3acd467d..fced03316 100644 --- a/src/include/play-facade.h +++ b/src/include/play-facade.h @@ -121,13 +121,13 @@ namespace lumiera { }; - typedef lib::IterSource::iterator ModelPorts; - typedef lib::IterSource::iterator Pipes; - typedef proc::play::POutputManager Output; - typedef proc::mobject::session::PClipMO Clip; - typedef proc::mobject::PFork Fork; - typedef proc::asset::PTimeline Timeline; - typedef proc::asset::PViewer Viewer; + using ModelPorts = lib::IterSource::iterator; + using Pipes = lib::IterSource::iterator; + using Output = proc::play::POutputManager; + using Clip = proc::mobject::session::PClip; + using Fork = proc::mobject::PFork; + using Timeline = proc::asset::PTimeline; + using Viewer = proc::asset::PViewer; /* ==== convenience shortcuts for common use cases ==== */ diff --git a/src/proc/asset.hpp b/src/proc/asset.hpp index 0a86ae5f7..bc7071eeb 100644 --- a/src/proc/asset.hpp +++ b/src/proc/asset.hpp @@ -87,7 +87,6 @@ namespace asset { using std::static_pointer_cast; using lib::HashVal; - using lib::P; @@ -119,8 +118,8 @@ namespace asset { class Asset; class AssetManager; typedef const ID& IDA; - typedef P PAsset; - typedef P PcAsset; + typedef lib::P PAsset; + typedef lib::P PcAsset; diff --git a/src/proc/asset/buildinstruct.hpp b/src/proc/asset/buildinstruct.hpp index e274cdf7a..a1661476d 100644 --- a/src/proc/asset/buildinstruct.hpp +++ b/src/proc/asset/buildinstruct.hpp @@ -44,15 +44,14 @@ using std::string; namespace proc { namespace asset { - using lib::P; using lib::Symbol; using lib::Literal; class Proc; class ProcPatt; - typedef P PProc; - typedef P PProcPatt; + using PProc = lib::P; + using PProcPatt = lib::P; static Symbol CURRENT = "current"; diff --git a/src/proc/asset/clip.cpp b/src/proc/asset/clip.cpp index d57eec762..49483214e 100644 --- a/src/proc/asset/clip.cpp +++ b/src/proc/asset/clip.cpp @@ -49,7 +49,7 @@ namespace asset { mediaref.ident.version ); } - Media::PClipMO + Media::PClip createClipMO (const Clip& thisClipAsset, const Media& mediaChannel) { return mobject::MObject::create (thisClipAsset,mediaChannel); @@ -64,9 +64,9 @@ namespace asset { mediaref.getLength()) , source_ (mediaref) , clipMO_ (createClipMO (*this, source_)) - { - this->defineDependency (mediaref); - } + { + this->defineDependency (mediaref); + } /** Specialisation of the asset::Media interface method, @@ -76,7 +76,7 @@ namespace asset { * Placements or no placement at all (meaning it need not * be placed within the session) */ - Media::PClipMO + Media::PClip Clip::createClip () const { return clipMO_; @@ -87,7 +87,7 @@ namespace asset { /** return this wrapped into a shared ptr, * because it's already the desired asset::Clip */ - Media::PClip + Media::PClipAsset Clip::getClipAsset () { return AssetManager::wrap (*this); diff --git a/src/proc/asset/clip.hpp b/src/proc/asset/clip.hpp index 1fcf34e3e..6117a58c4 100644 --- a/src/proc/asset/clip.hpp +++ b/src/proc/asset/clip.hpp @@ -42,21 +42,21 @@ namespace asset { const Media& source_; /** the corresponding (dependent) clip-MO */ - PClipMO clipMO_; + PClip clipMO_; public: - virtual PClipMO createClip () const; + virtual PClip createClip () const; protected: Clip (Media& mediaref); friend class MediaFactory; - virtual PClip getClipAsset (); + virtual PClipAsset getClipAsset (); virtual PMedia checkCompound () const; }; - typedef P PClipAsset; + typedef lib::P PClipAsset; const string CLIP_SUBFOLDER = "clips"; // TODO: handling of hard-wired constants.... diff --git a/src/proc/asset/db.hpp b/src/proc/asset/db.hpp index caccab03e..3da42bfde 100644 --- a/src/proc/asset/db.hpp +++ b/src/proc/asset/db.hpp @@ -107,7 +107,7 @@ namespace asset { public: template - P + lib::P get (ID hash) const { return dynamic_pointer_cast (find (hash)); @@ -115,7 +115,7 @@ namespace asset { template void - put (ID hash, P& ptr) + put (ID hash, lib::P& ptr) { table[hash] = static_pointer_cast (ptr); } diff --git a/src/proc/asset/inventory.hpp b/src/proc/asset/inventory.hpp index c3224ecb7..1c86f7c9a 100644 --- a/src/proc/asset/inventory.hpp +++ b/src/proc/asset/inventory.hpp @@ -41,7 +41,7 @@ namespace asset { {}; - typedef P PInv; + typedef lib::P PInv; }} // namespace proc::asset diff --git a/src/proc/asset/media.cpp b/src/proc/asset/media.cpp index 844a597fd..e4ec97b74 100644 --- a/src/proc/asset/media.cpp +++ b/src/proc/asset/media.cpp @@ -75,11 +75,11 @@ namespace asset { - Media::PClipMO + Media::PClip Media::createClip () { - PClip clipAsset (getClipAsset()); - PClipMO clipMO = clipAsset->createClip(); + PClipAsset clipAsset (getClipAsset()); + PClip clipMO = clipAsset->createClip(); ENSURE (clipMO->isValid()); return clipMO; @@ -90,7 +90,7 @@ namespace asset { * or to get the right reference to some already existing asset::Clip, * especially when this media is part of a compound (multichannel) media. */ - Media::PClip + Media::PClipAsset Media::getClipAsset () { if (PMedia parent = this->checkCompound()) @@ -228,7 +228,7 @@ namespace asset { * @throw Invalid if the given media asset is not top-level, * but rather part or a multichannel (compound) media */ - P + lib::P MediaFactory::operator() (Media& mediaref) { if (mediaref.checkCompound()) diff --git a/src/proc/asset/media.hpp b/src/proc/asset/media.hpp index ed0a42071..9f3e61729 100644 --- a/src/proc/asset/media.hpp +++ b/src/proc/asset/media.hpp @@ -75,10 +75,10 @@ namespace asset { const Duration len_; public: - typedef P PMedia; - typedef P PClip; - typedef P PProcPatt; - typedef proc::mobject::session::PClipMO PClipMO; + using PMedia = lib::P; + using PClipAsset = lib::P; + using PProcPatt = lib::P; + using PClip = mobject::Placement; static MediaFactory create; @@ -103,7 +103,7 @@ namespace asset { * it can be regenerated from the corresponding asset::Clip * @return a Placement smart ptr owning the new Clip MObject */ - PClipMO createClip (); + PClip createClip (); /** @return the overall length of the media represented by this asset */ virtual Duration getLength () const; @@ -116,7 +116,7 @@ namespace asset { /** get or create the correct asset::Clip * corresponding to this media */ - virtual PClip getClipAsset (); + virtual PClipAsset getClipAsset (); /** predicate to decide if this asset::Media * is part of a compound (multichannel) media. @@ -144,7 +144,7 @@ namespace asset { : boost::noncopyable { public: - typedef P PType; + typedef lib::P PType; PType operator() (Asset::Ident& key, const string& file=""); PType operator() (const string& file, const Category& cat); @@ -154,7 +154,7 @@ namespace asset { PType operator() (const char* file, const Category& cat); PType operator() (const char* file, asset::Kind); - P + lib::P operator() (Media& mediaref); }; diff --git a/src/proc/asset/meta.hpp b/src/proc/asset/meta.hpp index fbd6d1937..0af580a18 100644 --- a/src/proc/asset/meta.hpp +++ b/src/proc/asset/meta.hpp @@ -139,7 +139,7 @@ namespace asset { inline ID::ID(HashVal id) : ID (id) {}; inline ID::ID(const Meta& meta) : ID (meta.getID()) {}; - typedef P PMeta; + typedef lib::P PMeta; @@ -150,7 +150,7 @@ namespace asset { : boost::noncopyable { public: - typedef P PType; + typedef lib::P PType; template meta::Builder operator() (lib::idi::EntryID elementIdentity); diff --git a/src/proc/asset/meta/time-grid.cpp b/src/proc/asset/meta/time-grid.cpp index 107ee0765..409282f67 100644 --- a/src/proc/asset/meta/time-grid.cpp +++ b/src/proc/asset/meta/time-grid.cpp @@ -135,7 +135,7 @@ namespace meta { * Later on the intention is that in such cases, instead of creating a new grid * we'll silently return the already registered existing and equivalent grid. */ - P + lib::P Builder::commit() { if (predecessor_) diff --git a/src/proc/asset/meta/time-grid.hpp b/src/proc/asset/meta/time-grid.hpp index b52faea7f..d45fe78bc 100644 --- a/src/proc/asset/meta/time-grid.hpp +++ b/src/proc/asset/meta/time-grid.hpp @@ -113,7 +113,7 @@ namespace meta { * the origin of this (local) grid. * @todo currently not supported (as of 12/2010) */ - P predecessor_; + lib::P predecessor_; /** * initialise to blank (zero). @@ -130,7 +130,7 @@ namespace meta { /** create a time grid * based on settings within this builder */ - P commit(); + lib::P commit(); }; diff --git a/src/proc/asset/pipe.hpp b/src/proc/asset/pipe.hpp index 90de5cb23..082aa7164 100644 --- a/src/proc/asset/pipe.hpp +++ b/src/proc/asset/pipe.hpp @@ -40,7 +40,7 @@ namespace asset { using std::string; class Pipe; - typedef P PPipe; + typedef lib::P PPipe; template<> diff --git a/src/proc/asset/proc.hpp b/src/proc/asset/proc.hpp index 13dfa8439..796fd730b 100644 --- a/src/proc/asset/proc.hpp +++ b/src/proc/asset/proc.hpp @@ -50,7 +50,7 @@ namespace asset { class Proc; class ProcFactory; - typedef P PProc; + typedef lib::P PProc; @@ -121,7 +121,7 @@ namespace asset { : boost::noncopyable { public: - typedef P PType; + typedef lib::P PType; PType operator() (Asset::Ident& key); ////////////TODO define actual operation diff --git a/src/proc/asset/procpatt.cpp b/src/proc/asset/procpatt.cpp index a40b398c0..38bcc2275 100644 --- a/src/proc/asset/procpatt.cpp +++ b/src/proc/asset/procpatt.cpp @@ -65,7 +65,7 @@ namespace asset { * some ProcPatt as a template for creating more * specialised patterns. */ - P + lib::P ProcPatt::newCopy (string newID) const { TODO ("implement the Pattern-ID within the propDescriptor!"); diff --git a/src/proc/asset/procpatt.hpp b/src/proc/asset/procpatt.hpp index 4797badda..7f61e0751 100644 --- a/src/proc/asset/procpatt.hpp +++ b/src/proc/asset/procpatt.hpp @@ -40,8 +40,8 @@ namespace asset { class Proc; class ProcPatt; class BuildInstruct; - typedef P PProc; - typedef P PProcPatt; + typedef lib::P PProc; + typedef lib::P PProcPatt; typedef vector InstructionSequence; @@ -64,7 +64,7 @@ namespace asset { friend class StructFactoryImpl; public: - P newCopy (string newID) const; + lib::P newCopy (string newID) const; ProcPatt& attach (Symbol where, PProc& node); ProcPatt& operator+= (PProcPatt& toReuse); diff --git a/src/proc/asset/sequence.hpp b/src/proc/asset/sequence.hpp index 2efe61720..803995819 100644 --- a/src/proc/asset/sequence.hpp +++ b/src/proc/asset/sequence.hpp @@ -78,7 +78,7 @@ namespace asset { class Sequence; - typedef P PSequence; + typedef lib::P PSequence; @@ -103,7 +103,6 @@ namespace asset { }; - typedef P PSequence; ///////////////////////////TODO currently just fleshing the API diff --git a/src/proc/asset/struct.cpp b/src/proc/asset/struct.cpp index be8e970ff..a46d768c1 100644 --- a/src/proc/asset/struct.cpp +++ b/src/proc/asset/struct.cpp @@ -76,7 +76,7 @@ namespace asset { * asset is a code smell ////////////////////////////TICKET #691 */ template - P + lib::P StructFactory::newInstance (Symbol nameID) { Query desired_name (isnil(nameID)? "" : "id("+nameID+")"); @@ -103,10 +103,10 @@ namespace asset { * created as a side effect of calling the concrete Struct subclass ctor. */ template - P + lib::P StructFactory::operator() (Query const& capabilities) { - P res; + lib::P res; QueryHandler& typeHandler = ConfigResolver::instance(); typeHandler.resolve (res, capabilities); @@ -131,7 +131,7 @@ namespace asset { * re-invoking the ConfigRules.... */ template - P + lib::P StructFactory::made4fake (Query const& query) { STRU* pS = impl_->fabricate(query); @@ -149,7 +149,7 @@ namespace asset { * @see ProcPatt * @see DefaultsManager */ - P + lib::P StructFactory::newPipe (string pipeID, string streamID) { normaliseID (pipeID); @@ -178,18 +178,19 @@ namespace asset { namespace proc { namespace asset { + using PPipe = lib::P; - template P StructFactory::operator() (Query const&); + template PPipe StructFactory::operator() (Query const&); template PProcPatt StructFactory::operator() (Query const&); template PTimeline StructFactory::operator() (Query const&); template PSequence StructFactory::operator() (Queryconst&); - template P StructFactory::newInstance (Symbol); + template PPipe StructFactory::newInstance (Symbol); template PProcPatt StructFactory::newInstance (Symbol); template PTimeline StructFactory::newInstance (Symbol); template PSequence StructFactory::newInstance (Symbol); - template P StructFactory::made4fake (Query const&); + template PPipe StructFactory::made4fake (Query const&); template PProcPatt StructFactory::made4fake (Query const&); template PTimeline StructFactory::made4fake (Query const&); template PSequence StructFactory::made4fake (Queryconst&); diff --git a/src/proc/asset/struct.hpp b/src/proc/asset/struct.hpp index e8b6cea02..02bf26129 100644 --- a/src/proc/asset/struct.hpp +++ b/src/proc/asset/struct.hpp @@ -151,17 +151,17 @@ namespace asset { public: template - P operator() (Query const& query); + lib::P operator() (Query const& query); -// P operator() (MORef); ///////////TODO doesn't this create circular includes?? Any better idea how to refer to an existing binding? +// lib::P operator() (MORef); ///////////TODO doesn't this create circular includes?? Any better idea how to refer to an existing binding? template - P newInstance (Symbol nameID =""); + lib::P newInstance (Symbol nameID =""); template - P made4fake (Query const& query); ///< @warning to be removed in Alpha when using a real resolution engine /////TICKET #710 + lib::P made4fake (Query const& query); ///< @warning to be removed in Alpha when using a real resolution engine /////TICKET #710 - P newPipe (string pipeID, string streamID); + lib::P newPipe (string pipeID, string streamID); }; diff --git a/src/proc/asset/timeline.hpp b/src/proc/asset/timeline.hpp index 42ec739c0..6f862f147 100644 --- a/src/proc/asset/timeline.hpp +++ b/src/proc/asset/timeline.hpp @@ -80,7 +80,7 @@ namespace asset { class Timeline; - typedef P PTimeline; + typedef lib::P PTimeline; /** diff --git a/src/proc/asset/viewer.hpp b/src/proc/asset/viewer.hpp index 618e29aa5..9420f8b96 100644 --- a/src/proc/asset/viewer.hpp +++ b/src/proc/asset/viewer.hpp @@ -75,7 +75,7 @@ namespace asset { class Viewer; - typedef P PViewer; + typedef lib::P PViewer; /** diff --git a/src/proc/assetmanager.cpp b/src/proc/assetmanager.cpp index ee5edfdbf..4e8ade4fd 100644 --- a/src/proc/assetmanager.cpp +++ b/src/proc/assetmanager.cpp @@ -117,7 +117,7 @@ namespace asset { DB::Lock guard(®istry); //////////////////////////////////////////////////////////TICKET #840 handle duplicate Registrations - P smart_ptr (obj, &destroy); + lib::P smart_ptr (obj, &destroy); registry.put (asset_id, smart_ptr); return asset_id; @@ -129,10 +129,10 @@ namespace asset { * of the stored object differs and can't be casted. */ template - P + lib::P AssetManager::getAsset (const ID& id) { - if (P obj = registry.get (id)) + if (lib::P obj = registry.get (id)) return obj; else if (known (id)) // provide Ident tuple of existing Asset @@ -148,7 +148,7 @@ namespace asset { * is explicitly given by type KIND. */ template - P + lib::P AssetManager::wrap (const KIND& asset) { ENSURE (instance().known(asset.id), @@ -250,6 +250,7 @@ namespace asset { namespace proc { namespace asset { + using lib::P; template ID AssetManager::reg (Asset* obj, const Asset::Ident& idi); diff --git a/src/proc/assetmanager.hpp b/src/proc/assetmanager.hpp index 5d6edafe9..5d9c7fa04 100644 --- a/src/proc/assetmanager.hpp +++ b/src/proc/assetmanager.hpp @@ -81,11 +81,11 @@ namespace asset { /** retrieve the registered smart-ptr for any asset */ template - static P wrap (const KIND& asset); + static lib::P wrap (const KIND& asset); /** find and return corresponding object */ template - P getAsset (const ID& id); + lib::P getAsset (const ID& id); /** @return true if the given id is registered in the internal asset DB */ diff --git a/src/proc/config-resolver.cpp b/src/proc/config-resolver.cpp index 90a85e597..d7cb64575 100644 --- a/src/proc/config-resolver.cpp +++ b/src/proc/config-resolver.cpp @@ -71,7 +71,7 @@ namespace query { using proc::asset::PSequence; using proc::mobject::session::Fork; - using proc::mobject::session::PFork; + using PFork = lib::P; template PPipe DefsManager::operator() (Query const&); template PProcPatt DefsManager::operator() (Query const&); diff --git a/src/proc/control/styperegistry.hpp b/src/proc/control/styperegistry.hpp index 07b7ab737..5b799aa08 100644 --- a/src/proc/control/styperegistry.hpp +++ b/src/proc/control/styperegistry.hpp @@ -52,7 +52,6 @@ namespace proc { namespace control { -// using lib::P; // using std::string; // using boost::format; diff --git a/src/proc/mobject/builder/buildertool.hpp b/src/proc/mobject/builder/buildertool.hpp index 2f9dc2078..ae41916c3 100644 --- a/src/proc/mobject/builder/buildertool.hpp +++ b/src/proc/mobject/builder/buildertool.hpp @@ -68,7 +68,6 @@ namespace mobject { namespace builder { - using lib::P; /** * Policy invoking an catch-all function for processing @@ -146,10 +145,10 @@ namespace mobject { } template - P + lib::P getPtr () { - P* pP = currentWrapper_.get*>(); + lib::P* pP = currentWrapper_.get*>(); ENSURE (pP, "wrong target type when invoking %s", __PRETTY_FUNCTION__); return *pP; } diff --git a/src/proc/mobject/mobject.hpp b/src/proc/mobject/mobject.hpp index 5929d31e5..cf0ce6217 100644 --- a/src/proc/mobject/mobject.hpp +++ b/src/proc/mobject/mobject.hpp @@ -46,7 +46,6 @@ namespace proc { namespace mobject { using std::string; - using lib::P; //NOBUG_DECLARE_FLAG (mobjectmem); diff --git a/src/proc/mobject/session.hpp b/src/proc/mobject/session.hpp index 49607aece..979231782 100644 --- a/src/proc/mobject/session.hpp +++ b/src/proc/mobject/session.hpp @@ -65,8 +65,8 @@ namespace proc { namespace asset { - class Timeline; typedef P PTimeline; - class Sequence; typedef P PSequence; + class Timeline; typedef lib::P PTimeline; + class Sequence; typedef lib::P PSequence; } namespace mobject { diff --git a/src/proc/mobject/session/binding.hpp b/src/proc/mobject/session/binding.hpp index 3ef96af36..089b946b1 100644 --- a/src/proc/mobject/session/binding.hpp +++ b/src/proc/mobject/session/binding.hpp @@ -32,7 +32,7 @@ namespace proc { namespace asset { class Sequence; - typedef P PSequence; + typedef lib::P PSequence; } diff --git a/src/proc/mobject/session/bus-mo.hpp b/src/proc/mobject/session/bus-mo.hpp index eb8ef4bac..76ea650c4 100644 --- a/src/proc/mobject/session/bus-mo.hpp +++ b/src/proc/mobject/session/bus-mo.hpp @@ -32,7 +32,7 @@ namespace proc { namespace asset { class Pipe; - typedef P PPipe; + typedef lib::P PPipe; } diff --git a/src/proc/mobject/session/clip.hpp b/src/proc/mobject/session/clip.hpp index c6e2a3ba9..c01e37e1f 100644 --- a/src/proc/mobject/session/clip.hpp +++ b/src/proc/mobject/session/clip.hpp @@ -26,6 +26,7 @@ #include "proc/mobject/session/abstractmo.hpp" #include "lib/time/timevalue.hpp" +#include "lib/p.hpp" namespace proc { @@ -40,8 +41,12 @@ namespace session { using asset::Media; using lib::time::TimeVar; - typedef P PMedia; - typedef P PClipAsset; + class Clip; + + using PMedia = lib::P; + using PClipAsset = lib::P; + + using PClip = Placement; /** @@ -103,7 +108,6 @@ namespace session { }; - typedef Placement PClipMO; diff --git a/src/proc/mobject/session/generator-mo.hpp b/src/proc/mobject/session/generator-mo.hpp index ba72e0e9b..8df786d81 100644 --- a/src/proc/mobject/session/generator-mo.hpp +++ b/src/proc/mobject/session/generator-mo.hpp @@ -40,8 +40,8 @@ namespace session { using asset::Media; using lib::time::TimeVar; - typedef P PMedia; - typedef P PClipAsset; + typedef lib::P PMedia; + typedef lib::P PClipAsset; /** diff --git a/src/proc/mobject/session/mobjectfactory.hpp b/src/proc/mobject/session/mobjectfactory.hpp index 721316330..a207dd7f9 100644 --- a/src/proc/mobject/session/mobjectfactory.hpp +++ b/src/proc/mobject/session/mobjectfactory.hpp @@ -42,7 +42,7 @@ namespace asset { class Effect; class Sequence; - typedef P PSequence; + typedef lib::P PSequence; } diff --git a/tests/core/proc/asset/asset-diagnostics.hpp b/tests/core/proc/asset/asset-diagnostics.hpp index 7939a995d..c3b009145 100644 --- a/tests/core/proc/asset/asset-diagnostics.hpp +++ b/tests/core/proc/asset/asset-diagnostics.hpp @@ -76,7 +76,7 @@ namespace asset { template inline bool - dependencyCheck (P child, P parent) + dependencyCheck (lib::P child, lib::P parent) { return (child == parent) || (0 < child->getParents().size() diff --git a/tests/core/proc/asset/basicpipetest.cpp b/tests/core/proc/asset/basicpipetest.cpp index dbc0efadf..47d12f5d6 100644 --- a/tests/core/proc/asset/basicpipetest.cpp +++ b/tests/core/proc/asset/basicpipetest.cpp @@ -153,8 +153,8 @@ namespace test { void dependProcPatt(string pID) { - typedef P PPipe; /////TODO: transition to P<> - typedef P PProcPatt; + typedef lib::P PPipe; /////TODO: transition to P<> + typedef lib::P PProcPatt; PPipe thePipe = Pipe::query ("pipe("+pID+")"); CHECK (thePipe); diff --git a/tests/core/proc/asset/create-asset-test.cpp b/tests/core/proc/asset/create-asset-test.cpp index d13b5fe43..7d54201b6 100644 --- a/tests/core/proc/asset/create-asset-test.cpp +++ b/tests/core/proc/asset/create-asset-test.cpp @@ -65,7 +65,7 @@ namespace test { ////////////////////////////////////TICKET #589 - typedef P PM; /////TODO: transition to P<> + typedef lib::P PM; /////TODO: transition to P<> /** @test Creating and automatically registering Asset instances. * Re-Retrieving the newly created objects from AssetManager. diff --git a/tests/core/proc/asset/dependent-assets-test.cpp b/tests/core/proc/asset/dependent-assets-test.cpp index 8d8a198b8..7ba5a0a33 100644 --- a/tests/core/proc/asset/dependent-assets-test.cpp +++ b/tests/core/proc/asset/dependent-assets-test.cpp @@ -198,8 +198,8 @@ namespace test { Depend4Test within_this_scope; // -----Media and Clip-------------------------------- - typedef P PM; - typedef P PC; + typedef lib::P PM; + typedef lib::P PC; PM mm = asset::Media::create("test-1", VIDEO); PC cc = mm->createClip()->findClipAsset(); CHECK (dependencyCheck (cc,mm)); diff --git a/tests/core/proc/asset/makecliptest.cpp b/tests/core/proc/asset/makecliptest.cpp index dd96fe2ea..1b556d36f 100644 --- a/tests/core/proc/asset/makecliptest.cpp +++ b/tests/core/proc/asset/makecliptest.cpp @@ -54,8 +54,8 @@ namespace test { */ class MakeClip_test : public Test { - typedef P PM; - typedef asset::Media::PClipMO PC; + typedef lib::P PM; + typedef asset::Media::PClip PC; virtual void run (Arg) { diff --git a/tests/core/proc/asset/testasset.cpp b/tests/core/proc/asset/testasset.cpp index 6db47ff36..3bc9b0437 100644 --- a/tests/core/proc/asset/testasset.cpp +++ b/tests/core/proc/asset/testasset.cpp @@ -79,7 +79,7 @@ namespace test { * within AssetManager by the Asset base class ctor */ template - P > + lib::P > TestAsset::ptrFromThis () { return static_pointer_cast,Asset> @@ -111,8 +111,8 @@ namespace test { template TestAsset::TestAsset (PAsset& pRef); template TestAsset::TestAsset (PAsset& pRef); - template P > TestAsset::ptrFromThis (); - template P > TestAsset::ptrFromThis (); + template lib::P > TestAsset::ptrFromThis (); + template lib::P > TestAsset::ptrFromThis (); diff --git a/tests/core/proc/asset/testasset.hpp b/tests/core/proc/asset/testasset.hpp index 188178bfd..0b4c73f5d 100644 --- a/tests/core/proc/asset/testasset.hpp +++ b/tests/core/proc/asset/testasset.hpp @@ -53,7 +53,7 @@ namespace test { static void deleter (TestAsset* aa) { delete aa; } public: - typedef P > PA; + typedef lib::P > PA; static PA create () { return (new TestAsset )->ptrFromThis(); } static PA create (PAsset& pRef) { return (new TestAsset (pRef))->ptrFromThis(); }