From 33af515f2bdefe3870c0583fc000c9c9e8d0b830 Mon Sep 17 00:00:00 2001 From: David Feltell Date: Wed, 8 Apr 2026 18:02:20 +0100 Subject: [PATCH] [Core] Use versioned trait view classes Since OpenAssetIO/OpenAssetIO-MediaCreation#64, trait classes are suffixed with a version number, with unversioned class names remaining only as a deprecated alias for backward compatibility. So clean up deprecation warnings (causing CI to fail) by migrating the usages of `LocatableContentTrait` to `LocatableContentTrait_v1`. Signed-off-by: David Feltell --- src/resolver.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/resolver.cpp b/src/resolver.cpp index 704b67a..f0b3c20 100644 --- a/src/resolver.cpp +++ b/src/resolver.cpp @@ -214,14 +214,14 @@ class UsdOpenAssetIOResolver final : public PXR_NS::ArDefaultResolver { [[nodiscard]] std::string resolveToPath( const openassetio::EntityReference &entityReference) const { using openassetio::access::ResolveAccess; - using openassetio_mediacreation::traits::content::LocatableContentTrait; + using openassetio_mediacreation::traits::content::LocatableContentTrait_v1; // Resolve the locatable content trait, this will provide a URL // that points to the final content const openassetio::trait::TraitsDataPtr traitsData = manager_->resolve( - entityReference, {LocatableContentTrait::kId}, ResolveAccess::kRead, context_); + entityReference, {LocatableContentTrait_v1::kId}, ResolveAccess::kRead, context_); - const std::optional url = LocatableContentTrait(traitsData).getLocation(); + const std::optional url = LocatableContentTrait_v1(traitsData).getLocation(); if (!url) { throw std::invalid_argument{"Entity reference does not have a location: " + entityReference.toString()};