From f92238b82cbe64ac78e3513d44ca9959c529618c Mon Sep 17 00:00:00 2001 From: Sean Donnelly <23455376+seando-adsk@users.noreply.github.com> Date: Mon, 27 Mar 2023 10:51:08 -0400 Subject: [PATCH 1/2] Adhere to coding standard and use the fully qualified namespace name. --- lib/mayaUsd/fileio/jobs/meshDataReadJob.cpp | 2 - lib/mayaUsd/fileio/jobs/readJob.cpp | 8 +- lib/mayaUsd/fileio/orphanedNodesManagerIO.cpp | 10 +-- lib/mayaUsd/fileio/primUpdater.cpp | 4 +- lib/mayaUsd/fileio/primUpdaterManager.cpp | 2 +- .../fileio/shading/shadingModePxrRis.cpp | 4 +- lib/mayaUsd/fileio/transformWriter.cpp | 2 +- .../fileio/translators/translatorCamera.cpp | 4 +- .../fileio/translators/translatorCurves.cpp | 6 +- .../translators/translatorMayaReference.cpp | 2 +- .../fileio/translators/translatorSkel.cpp | 10 +-- .../fileio/translators/translatorUtil.cpp | 4 +- lib/mayaUsd/fileio/utils/adaptor.cpp | 23 +++--- lib/mayaUsd/fileio/utils/readUtil.cpp | 81 ++++++++++--------- lib/mayaUsd/fileio/utils/writeUtil.cpp | 8 +- lib/mayaUsd/nodes/layerManager.cpp | 6 +- lib/mayaUsd/nodes/proxyShapeBase.cpp | 2 +- lib/mayaUsd/python/wrapConverter.cpp | 2 +- lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp | 2 +- .../ufe/PulledObjectHierarchyHandler.cpp | 2 +- lib/mayaUsd/ufe/UsdHierarchy.cpp | 2 +- lib/mayaUsd/ufe/UsdPathMappingHandler.cpp | 2 +- lib/mayaUsd/utils/util.cpp | 4 +- lib/usd/translators/mayaReferenceUpdater.cpp | 2 +- .../translators/shading/mtlxBaseReader.cpp | 2 - .../translators/shading/mtlxBaseWriter.cpp | 4 +- .../shading/mtlxFileTextureWriter.cpp | 2 - .../shading/mtlxPreviewSurfaceWriter.cpp | 2 +- .../shading/mtlxStandardSurfaceWriter.cpp | 2 +- .../shading/usdDisplacementShaderWriter.cpp | 2 +- .../translators/shading/usdMaterialWriter.cpp | 4 +- lib/usd/ui/layerEditor/layerTreeModel.cpp | 4 +- .../ui/layerEditor/mayaLayerEditorWindow.cpp | 17 ++-- .../ui/layerEditor/mayaLayerEditorWindow.h | 1 - lib/usd/ui/layerEditor/mayaSessionState.cpp | 1 - .../lib/usdMaya/readJob_ImportWithProxies.cpp | 5 +- .../lib/usdMaya/translatorModelAssembly.cpp | 4 +- test/lib/mayaUsd/utils/testLoadRules.cpp | 19 +++-- test/lib/mayaUsd/utils/testSplitString.cpp | 8 +- test/lib/mayaUsd/utils/testTargetLayer.cpp | 11 ++- test/lib/usd/utils/test_DiffAttributes.cpp | 2 +- .../lib/usd/utils/test_DiffComputeOverall.cpp | 2 +- test/lib/usd/utils/test_DiffDictionaries.cpp | 2 +- test/lib/usd/utils/test_DiffLists.cpp | 2 +- test/lib/usd/utils/test_DiffMetadatas.cpp | 2 +- test/lib/usd/utils/test_DiffPrims.cpp | 2 +- .../usd/utils/test_DiffPrimsAttributes.cpp | 2 +- test/lib/usd/utils/test_DiffPrimsChildren.cpp | 2 +- .../lib/usd/utils/test_DiffPrimsRelations.cpp | 2 +- test/lib/usd/utils/test_DiffRelationships.cpp | 2 +- test/lib/usd/utils/test_DiffValues.cpp | 2 +- test/lib/usd/utils/test_DiffValuesArrays.cpp | 2 +- .../usd/utils/test_DiffValuesDoubleVecs.cpp | 2 +- .../usd/utils/test_DiffValuesFloatVecs.cpp | 2 +- test/lib/usd/utils/test_DiffValuesGeneric.cpp | 2 +- .../lib/usd/utils/test_DiffValuesHalfVecs.cpp | 2 +- test/lib/usd/utils/test_DiffValuesIntVecs.cpp | 2 +- .../lib/usd/utils/test_DiffValuesMatrices.cpp | 2 +- .../usd/utils/test_DiffValuesQuaternions.cpp | 2 +- test/lib/usd/utils/test_MergePrims.cpp | 2 +- 60 files changed, 143 insertions(+), 179 deletions(-) diff --git a/lib/mayaUsd/fileio/jobs/meshDataReadJob.cpp b/lib/mayaUsd/fileio/jobs/meshDataReadJob.cpp index f092b7c59f..f8e657991f 100644 --- a/lib/mayaUsd/fileio/jobs/meshDataReadJob.cpp +++ b/lib/mayaUsd/fileio/jobs/meshDataReadJob.cpp @@ -27,8 +27,6 @@ #include #include -using namespace MAYAUSD_NS_DEF; - namespace { void convertMatrix(const GfMatrix4d& inMatrix, MMatrix& outMatrix, MObject& outMatrixObj) { diff --git a/lib/mayaUsd/fileio/jobs/readJob.cpp b/lib/mayaUsd/fileio/jobs/readJob.cpp index 4845a0f932..05510ecb8b 100644 --- a/lib/mayaUsd/fileio/jobs/readJob.cpp +++ b/lib/mayaUsd/fileio/jobs/readJob.cpp @@ -67,8 +67,6 @@ #include #include -using namespace MAYAUSD_NS_DEF; - PXR_NAMESPACE_OPEN_SCOPE namespace { @@ -204,7 +202,7 @@ bool UsdMaya_ReadJob::Read(std::vector* addedDagPaths) // Do not use the global undo info recording system. // The read job Undo() / redo() functions will handle all operations. - OpUndoItemMuting undoMuting; + MayaUsd::OpUndoItemMuting undoMuting; MStatus status; @@ -694,7 +692,7 @@ bool UsdMaya_ReadJob::Redo() { // Do not use the global undo info recording system. // The read job Undo() / redo() functions will handle all operations. - OpUndoItemMuting undoMuting; + MayaUsd::OpUndoItemMuting undoMuting; // Undo the undo MStatus status = mDagModifierUndo.undoIt(); @@ -715,7 +713,7 @@ bool UsdMaya_ReadJob::Undo() { // Do not use the global undo info recording system. // The read job Undo() / redo() functions will handle all operations. - OpUndoItemMuting undoMuting; + MayaUsd::OpUndoItemMuting undoMuting; // NOTE: (yliangsiew) All chasers need to have their Undo run as well. for (const UsdMayaImportChaserRefPtr& chaser : this->mImportChasers) { diff --git a/lib/mayaUsd/fileio/orphanedNodesManagerIO.cpp b/lib/mayaUsd/fileio/orphanedNodesManagerIO.cpp index c581a4fe1b..eae899ee18 100644 --- a/lib/mayaUsd/fileio/orphanedNodesManagerIO.cpp +++ b/lib/mayaUsd/fileio/orphanedNodesManagerIO.cpp @@ -82,9 +82,9 @@ using Memento = OrphanedNodesManager::Memento; // // Conversion functions to and from JSON for orphaned nodes types. -using MAYAUSD_NS_DEF::convertToArray; -using MAYAUSD_NS_DEF::convertToObject; -using MAYAUSD_NS_DEF::convertToValue; +using MayaUsd::convertToArray; +using MayaUsd::convertToObject; +using MayaUsd::convertToValue; PXR_NS::JsArray convertToArray(const VariantSelection& variantSel); PXR_NS::JsObject convertToObject(const VariantSetDesc& variantDesc); @@ -268,7 +268,7 @@ std::string Memento::convertToJson(const Memento& memento) return PXR_NS::JsWriteToString(convertToObject(memento._pulledPrims)); } catch (const std::exception& e) { // Note: the TF_RUNTIME_ERROR macro needs to be used within the PXR_NS. - using namespace PXR_NS; + PXR_NAMESPACE_USING_DIRECTIVE TF_RUNTIME_ERROR( "Unable to convert the orphaned nodes manager state to JSON: %s", e.what()); } @@ -284,7 +284,7 @@ Memento Memento::convertFromJson(const std::string& json) memento._pulledPrims = convertToPullInfoTrie(convertToObject(PXR_NS::JsParseString(json))); } catch (const std::exception& e) { // Note: the TF_RUNTIME_ERROR macro needs to be used within the PXR_NS. - using namespace PXR_NS; + PXR_NAMESPACE_USING_DIRECTIVE TF_RUNTIME_ERROR( "Unable to convert the JSON text to the orphaned nodes manager state: %s", e.what()); } diff --git a/lib/mayaUsd/fileio/primUpdater.cpp b/lib/mayaUsd/fileio/primUpdater.cpp index df69956e93..5184e634af 100644 --- a/lib/mayaUsd/fileio/primUpdater.cpp +++ b/lib/mayaUsd/fileio/primUpdater.cpp @@ -50,8 +50,6 @@ extern Ufe::Rtid g_MayaRtid; } // namespace ufe } // namespace MAYAUSD_NS_DEF -using namespace MAYAUSD_NS_DEF; - PXR_NAMESPACE_OPEN_SCOPE UsdMayaPrimUpdater::UsdMayaPrimUpdater( @@ -90,7 +88,7 @@ bool UsdMayaPrimUpdater::discardEdits() // the reference is unloaded. Don't try to delete them here. MFnDependencyNode depNode(objectToDelete); if (!depNode.isFromReferencedFile()) { - MStatus status = NodeDeletionUndoItem::deleteNode( + MStatus status = MayaUsd::NodeDeletionUndoItem::deleteNode( "Discard edits delete individual pulled node", depNode.absoluteName(), objectToDelete); if (status != MS::kSuccess) { diff --git a/lib/mayaUsd/fileio/primUpdaterManager.cpp b/lib/mayaUsd/fileio/primUpdaterManager.cpp index 2a792b19d8..5d4a1d48cc 100644 --- a/lib/mayaUsd/fileio/primUpdaterManager.cpp +++ b/lib/mayaUsd/fileio/primUpdaterManager.cpp @@ -103,7 +103,7 @@ Ufe::Path usdToMaya(const Ufe::Path& usdPath) return Ufe::Path(); } std::string dagPathStr; - if (!TF_VERIFY(MAYAUSD_NS_DEF::readPullInformation(prim, dagPathStr))) { + if (!TF_VERIFY(MayaUsd::readPullInformation(prim, dagPathStr))) { return Ufe::Path(); } diff --git a/lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp b/lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp index 8495ee387b..c0f0f05752 100644 --- a/lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp @@ -56,8 +56,6 @@ #include -using namespace MAYAUSD_NS_DEF; - PXR_NAMESPACE_OPEN_SCOPE // clang-format off @@ -220,7 +218,7 @@ class PxrRisShadingModeExporter : public UsdMayaShadingModeExporter continue; } - const SdfValueTypeName attrTypeName = Converter::getUsdTypeName(attrPlug); + const SdfValueTypeName attrTypeName = MayaUsd::Converter::getUsdTypeName(attrPlug); if (!attrTypeName) { continue; } diff --git a/lib/mayaUsd/fileio/transformWriter.cpp b/lib/mayaUsd/fileio/transformWriter.cpp index 5794f79f35..ece4b5c5b9 100644 --- a/lib/mayaUsd/fileio/transformWriter.cpp +++ b/lib/mayaUsd/fileio/transformWriter.cpp @@ -170,7 +170,7 @@ VtValue UsdMayaTransformWriter::_AnimChannel::GetSourceData(unsigned int i) cons MFnMatrixData matrixDataFn(attrPlug.asMObject()); MMatrix mayaMatrix = matrixDataFn.matrix(); GfMatrix4d matrix; - MAYAUSD_NS_DEF::TypedConverter::convert(mayaMatrix, matrix); + MayaUsd::TypedConverter::convert(mayaMatrix, matrix); return VtValue(matrix); } else { return VtValue(plug[i].asDouble()); diff --git a/lib/mayaUsd/fileio/translators/translatorCamera.cpp b/lib/mayaUsd/fileio/translators/translatorCamera.cpp index 85fb4ce09d..8e62af59bc 100644 --- a/lib/mayaUsd/fileio/translators/translatorCamera.cpp +++ b/lib/mayaUsd/fileio/translators/translatorCamera.cpp @@ -43,8 +43,6 @@ #include #include -using namespace MAYAUSD_NS_DEF; - PXR_NAMESPACE_OPEN_SCOPE static bool _ReadToCamera( @@ -330,7 +328,7 @@ bool UsdMayaTranslatorCamera::Read( } // Create the camera shape node. - MDagModifier& dagMod = MDagModifierUndoItem::create("Camera creation"); + MDagModifier& dagMod = MayaUsd::MDagModifierUndoItem::create("Camera creation"); MObject cameraObj = dagMod.createNode(_tokens->MayaCameraTypeName.GetText(), transformObj, &status); CHECK_MSTATUS_AND_RETURN(status, false); diff --git a/lib/mayaUsd/fileio/translators/translatorCurves.cpp b/lib/mayaUsd/fileio/translators/translatorCurves.cpp index ae2dd56980..d62f77a78b 100644 --- a/lib/mayaUsd/fileio/translators/translatorCurves.cpp +++ b/lib/mayaUsd/fileio/translators/translatorCurves.cpp @@ -32,8 +32,6 @@ #include #include -using namespace MAYAUSD_NS_DEF; - PXR_NAMESPACE_OPEN_SCOPE /* static */ @@ -54,7 +52,7 @@ bool convertToBezier(MFnNurbsCurve& nurbsCurveFn, MObject& mayaNodeTransformObj, MPlug convOut = convFn.findPlug("outputCurve", false); MPlug nurbsOut = nurbsCurveFn.findPlug("local", false); MPlug bezIn = dagFn.findPlug("create", false); - MDGModifier& dgm = MDGModifierUndoItem::create("Nurbs curve connections"); + MDGModifier& dgm = MayaUsd::MDGModifierUndoItem::create("Nurbs curve connections"); dgm.connect(nurbsOut, convIn); dgm.connect(convOut, bezIn); dgm.doIt(); @@ -62,7 +60,7 @@ bool convertToBezier(MFnNurbsCurve& nurbsCurveFn, MObject& mayaNodeTransformObj, MPlug bezOut = dagFn.findPlug("local", false); MObject val = bezOut.asMObject(); // Remove the nurbs and converter: - MDGModifier& dagm = MDGModifierUndoItem::create("Nurbs curve deletion"); + MDGModifier& dagm = MayaUsd::MDGModifierUndoItem::create("Nurbs curve deletion"); dagm.deleteNode(convFn.object()); #if MAYA_API_VERSION >= 20200300 dagm.deleteNode(nurbsCurveFn.object(), false); diff --git a/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp b/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp index b1594d7a07..446877ec2b 100644 --- a/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp +++ b/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp @@ -425,7 +425,7 @@ MStatus UsdMayaTranslatorMayaReference::connectReferenceAssociatedNode( result = MS::kFailure; if (!srcPlug.isNull() && !destPlug.isNull()) { - MDGModifier& dgMod = MAYAUSD_NS_DEF::MDGModifierUndoItem::create("Connect reference node"); + MDGModifier& dgMod = MayaUsd::MDGModifierUndoItem::create("Connect reference node"); result = dgMod.connect(srcPlug, destPlug); CHECK_MSTATUS_AND_RETURN_IT(result); result = dgMod.doIt(); diff --git a/lib/mayaUsd/fileio/translators/translatorSkel.cpp b/lib/mayaUsd/fileio/translators/translatorSkel.cpp index 72150d9842..33d3540612 100644 --- a/lib/mayaUsd/fileio/translators/translatorSkel.cpp +++ b/lib/mayaUsd/fileio/translators/translatorSkel.cpp @@ -45,8 +45,6 @@ #include #include -using namespace MAYAUSD_NS_DEF; - PXR_NAMESPACE_OPEN_SCOPE // There are a lot of nodes and connections that go into a basic skinning rig. @@ -726,7 +724,7 @@ bool _CreateDagPose( MObject* dagPoseNode) { MStatus status; - MDGModifier& dgMod = MDGModifierUndoItem::create("Skeleton DAG pose creation"); + MDGModifier& dgMod = MayaUsd::MDGModifierUndoItem::create("Skeleton DAG pose creation"); *dagPoseNode = dgMod.createNode(_MayaTokens->dagPoseType, &status); CHECK_MSTATUS_AND_RETURN(status, false); @@ -1004,7 +1002,7 @@ bool _CreateRestMesh(const MObject& inputMesh, const MObject& parent, MObject* r // Determine a new name for the rest mesh, and rename the copy. static const MString restSuffix("_rest"); MString restMeshName = meshFn.name() + restSuffix; - MDGModifier& dgMod = MDGModifierUndoItem::create("Rename deformer input mesh"); + MDGModifier& dgMod = MayaUsd::MDGModifierUndoItem::create("Rename deformer input mesh"); status = dgMod.renameNode(*restMesh, restMeshName); CHECK_MSTATUS_AND_RETURN(status, false); @@ -1020,7 +1018,7 @@ bool _ClearIncomingConnections(MPlug& plug) MPlugArray connections; if (plug.connectedTo(connections, /*asDst*/ true, /*asSrc*/ false)) { MStatus status; - MDGModifier& dgMod = MDGModifierUndoItem::create("Clear deformer connections"); + MDGModifier& dgMod = MayaUsd::MDGModifierUndoItem::create("Clear deformer connections"); for (unsigned int i = 0; i < connections.length(); ++i) { status = dgMod.disconnect(plug, connections[i]); CHECK_MSTATUS_AND_RETURN(status, false); @@ -1140,7 +1138,7 @@ bool UsdMayaTranslatorSkel::CreateSkinCluster( return false; } - MDGModifier& dgMod = MDGModifierUndoItem::create("Skin cluster creation"); + MDGModifier& dgMod = MayaUsd::MDGModifierUndoItem::create("Skin cluster creation"); MObject skinCluster = dgMod.createNode(_MayaTokens->skinClusterType, &status); CHECK_MSTATUS_AND_RETURN(status, false); diff --git a/lib/mayaUsd/fileio/translators/translatorUtil.cpp b/lib/mayaUsd/fileio/translators/translatorUtil.cpp index 5f0a05acf8..19ca344236 100644 --- a/lib/mayaUsd/fileio/translators/translatorUtil.cpp +++ b/lib/mayaUsd/fileio/translators/translatorUtil.cpp @@ -46,8 +46,6 @@ #include #include -using namespace MAYAUSD_NS_DEF; - PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PRIVATE_TOKENS( @@ -213,7 +211,7 @@ bool UsdMayaTranslatorUtil::CreateNode( // their edits to their parents-- if this is indeed the best pattern for // this, all Maya*Reader node creation needs to be adjusted accordingly (for // much less trivial cases like MFnMesh). - MDagModifier& dagMod = MDagModifierUndoItem::create("Generic node creation"); + MDagModifier& dagMod = MayaUsd::MDagModifierUndoItem::create("Generic node creation"); *mayaNodeObj = dagMod.createNode(nodeTypeName, parentNode, status); CHECK_MSTATUS_AND_RETURN(*status, false); *status = dagMod.renameNode(*mayaNodeObj, nodeName); diff --git a/lib/mayaUsd/fileio/utils/adaptor.cpp b/lib/mayaUsd/fileio/utils/adaptor.cpp index 8badb6d342..2f06bdd978 100644 --- a/lib/mayaUsd/fileio/utils/adaptor.cpp +++ b/lib/mayaUsd/fileio/utils/adaptor.cpp @@ -35,8 +35,6 @@ #include #include -using namespace MAYAUSD_NS_DEF; - PXR_NAMESPACE_OPEN_SCOPE const UsdPrimDefinition* @@ -315,7 +313,7 @@ UsdMayaSchemaAdaptorPtr UsdMayaAdaptor::GetSchemaOrInheritedSchema(const TfType& UsdMayaSchemaAdaptorPtr UsdMayaAdaptor::ApplySchema(const TfType& ty) { - return ApplySchema(ty, MDGModifierUndoItem::create("Adaptor schema application")); + return ApplySchema(ty, MayaUsd::MDGModifierUndoItem::create("Adaptor schema application")); } UsdMayaSchemaAdaptorPtr UsdMayaAdaptor::ApplySchema(const TfType& ty, MDGModifier& modifier) @@ -332,7 +330,7 @@ UsdMayaSchemaAdaptorPtr UsdMayaAdaptor::ApplySchema(const TfType& ty, MDGModifie UsdMayaSchemaAdaptorPtr UsdMayaAdaptor::ApplySchemaByName(const TfToken& schemaName) { return ApplySchemaByName( - schemaName, MDGModifierUndoItem::create("Adaptor schema application by name")); + schemaName, MayaUsd::MDGModifierUndoItem::create("Adaptor schema application by name")); } UsdMayaSchemaAdaptorPtr @@ -415,7 +413,7 @@ UsdMayaAdaptor::ApplySchemaByName(const TfToken& schemaName, MDGModifier& modifi void UsdMayaAdaptor::UnapplySchema(const TfType& ty) { - UnapplySchema(ty, MDGModifierUndoItem::create("Adaptor schema removal")); + UnapplySchema(ty, MayaUsd::MDGModifierUndoItem::create("Adaptor schema removal")); } void UsdMayaAdaptor::UnapplySchema(const TfType& ty, MDGModifier& modifier) @@ -431,7 +429,8 @@ void UsdMayaAdaptor::UnapplySchema(const TfType& ty, MDGModifier& modifier) void UsdMayaAdaptor::UnapplySchemaByName(const TfToken& schemaName) { - UnapplySchemaByName(schemaName, MDGModifierUndoItem::create("Adaptor schema removal by name")); + UnapplySchemaByName( + schemaName, MayaUsd::MDGModifierUndoItem::create("Adaptor schema removal by name")); } void UsdMayaAdaptor::UnapplySchemaByName(const TfToken& schemaName, MDGModifier& modifier) @@ -533,7 +532,8 @@ bool UsdMayaAdaptor::GetMetadata(const TfToken& key, VtValue* value) const bool UsdMayaAdaptor::SetMetadata(const TfToken& key, const VtValue& value) { - return SetMetadata(key, value, MDGModifierUndoItem::create("Adaptor metadata modification")); + return SetMetadata( + key, value, MayaUsd::MDGModifierUndoItem::create("Adaptor metadata modification")); } bool UsdMayaAdaptor::SetMetadata(const TfToken& key, const VtValue& value, MDGModifier& modifier) @@ -579,7 +579,7 @@ bool UsdMayaAdaptor::SetMetadata(const TfToken& key, const VtValue& value, MDGMo void UsdMayaAdaptor::ClearMetadata(const TfToken& key) { - ClearMetadata(key, MDGModifierUndoItem::create("Adaptor metadata clearing")); + ClearMetadata(key, MayaUsd::MDGModifierUndoItem::create("Adaptor metadata clearing")); } void UsdMayaAdaptor::ClearMetadata(const TfToken& key, MDGModifier& modifier) @@ -794,7 +794,8 @@ UsdMayaAttributeAdaptor UsdMayaSchemaAdaptor::GetAttribute(const TfToken& attrNa UsdMayaAttributeAdaptor UsdMayaSchemaAdaptor::CreateAttribute(const TfToken& attrName) { - return CreateAttribute(attrName, MDGModifierUndoItem::create("Adaptor attribute creation")); + return CreateAttribute( + attrName, MayaUsd::MDGModifierUndoItem::create("Adaptor attribute creation")); } UsdMayaAttributeAdaptor @@ -843,7 +844,7 @@ UsdMayaSchemaAdaptor::CreateAttribute(const TfToken& attrName, MDGModifier& modi void UsdMayaSchemaAdaptor::RemoveAttribute(const TfToken& attrName) { - RemoveAttribute(attrName, MDGModifierUndoItem::create("Adaptor attribute removal")); + RemoveAttribute(attrName, MayaUsd::MDGModifierUndoItem::create("Adaptor attribute removal")); } void UsdMayaSchemaAdaptor::RemoveAttribute(const TfToken& attrName, MDGModifier& modifier) @@ -989,7 +990,7 @@ bool UsdMayaAttributeAdaptor::Get(VtValue* value) const bool UsdMayaAttributeAdaptor::Set(const VtValue& newValue) { - return Set(newValue, MDGModifierUndoItem::create("Adaptor attribute modification")); + return Set(newValue, MayaUsd::MDGModifierUndoItem::create("Adaptor attribute modification")); } bool UsdMayaAttributeAdaptor::Set(const VtValue& newValue, MDGModifier& modifier) diff --git a/lib/mayaUsd/fileio/utils/readUtil.cpp b/lib/mayaUsd/fileio/utils/readUtil.cpp index aa62700517..bfd5228ecd 100644 --- a/lib/mayaUsd/fileio/utils/readUtil.cpp +++ b/lib/mayaUsd/fileio/utils/readUtil.cpp @@ -52,8 +52,6 @@ #include #include -using namespace MAYAUSD_NS_DEF; - PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_ENV_SETTING( @@ -76,7 +74,8 @@ MObject UsdMayaReadUtil::FindOrCreateMayaAttr( const std::string& attrName, const std::string& attrNiceName) { - MDGModifier& modifier = MDGModifierUndoItem::create("Generic attribute find or creation"); + MDGModifier& modifier + = MayaUsd::MDGModifierUndoItem::create("Generic attribute find or creation"); return FindOrCreateMayaAttr(typeName, variability, depNode, attrName, attrNiceName, modifier); } @@ -113,7 +112,7 @@ static MObject _FindOrCreateMayaTypedAttr( return attrObj; } else { // Found -- verify. - if (Converter::hasAttrType(plug, type)) { + if (MayaUsd::Converter::hasAttrType(plug, type)) { return plug.attribute(); } else { TF_RUNTIME_ERROR("Plug %s has unexpected type", plug.name().asChar()); @@ -161,8 +160,8 @@ static MObject _FindOrCreateMayaNumericAttr( return attrObj; } else { // Found -- verify. - if (Converter::hasNumericType(plug, type) - || (type == MFnNumericData::kInt && Converter::hasEnumType(plug))) { + if (MayaUsd::Converter::hasNumericType(plug, type) + || (type == MFnNumericData::kInt && MayaUsd::Converter::hasEnumType(plug))) { return plug.attribute(); } else { TF_RUNTIME_ERROR("Plug %s has unexpected type", plug.name().asChar()); @@ -487,7 +486,8 @@ bool UsdMayaReadUtil::SetMayaAttr( const VtValue& newValue, const bool unlinearizeColors) { - MDGModifier& modifier = MDGModifierUndoItem::create("Generic Maya attribute modification"); + MDGModifier& modifier + = MayaUsd::MDGModifierUndoItem::create("Generic Maya attribute modification"); return SetMayaAttr(attrPlug, newValue, modifier, unlinearizeColors); } @@ -500,24 +500,24 @@ bool UsdMayaReadUtil::SetMayaAttr( bool ok = false; if (newValue.IsHolding()) { TfToken token = newValue.Get(); - if (Converter::hasAttrType(attrPlug, MFnData::kString)) { + if (MayaUsd::Converter::hasAttrType(attrPlug, MFnData::kString)) { modifier.newPlugValueString(attrPlug, token.GetText()); ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasAttrType(attrPlug, MFnData::kString)) { + if (MayaUsd::Converter::hasAttrType(attrPlug, MFnData::kString)) { std::string str = newValue.Get(); modifier.newPlugValueString(attrPlug, str.c_str()); ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasAttrType(attrPlug, MFnData::kString)) { + if (MayaUsd::Converter::hasAttrType(attrPlug, MFnData::kString)) { SdfAssetPath assetPath = newValue.Get(); modifier.newPlugValueString(attrPlug, assetPath.GetAssetPath().c_str()); ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasAttrType(attrPlug, MFnData::kMatrix)) { + if (MayaUsd::Converter::hasAttrType(attrPlug, MFnData::kMatrix)) { GfMatrix4d mat = newValue.Get(); MMatrix mayaMat; for (size_t i = 0; i < 4; ++i) { @@ -532,7 +532,7 @@ bool UsdMayaReadUtil::SetMayaAttr( ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasAttrType(attrPlug, MFnData::kStringArray)) { + if (MayaUsd::Converter::hasAttrType(attrPlug, MFnData::kStringArray)) { TfTokenVector result; newValue.Get().ApplyOperations(&result); MStringArray mayaArr; @@ -546,7 +546,7 @@ bool UsdMayaReadUtil::SetMayaAttr( ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasAttrType(attrPlug, MFnData::kStringArray)) { + if (MayaUsd::Converter::hasAttrType(attrPlug, MFnData::kStringArray)) { std::vector result; newValue.Get().ApplyOperations(&result); MStringArray mayaArr; @@ -560,7 +560,7 @@ bool UsdMayaReadUtil::SetMayaAttr( ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasAttrType(attrPlug, MFnData::kStringArray)) { + if (MayaUsd::Converter::hasAttrType(attrPlug, MFnData::kStringArray)) { VtTokenArray arr = newValue.Get(); MStringArray mayaArr; for (const TfToken& tok : arr) { @@ -573,7 +573,7 @@ bool UsdMayaReadUtil::SetMayaAttr( ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasAttrType(attrPlug, MFnData::kStringArray)) { + if (MayaUsd::Converter::hasAttrType(attrPlug, MFnData::kStringArray)) { VtStringArray arr = newValue.Get(); MStringArray mayaArr; for (const std::string& str : arr) { @@ -586,7 +586,7 @@ bool UsdMayaReadUtil::SetMayaAttr( ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasAttrType(attrPlug, MFnData::kDoubleArray)) { + if (MayaUsd::Converter::hasAttrType(attrPlug, MFnData::kDoubleArray)) { VtDoubleArray arr = newValue.Get(); MDoubleArray mayaArr(arr.data(), arr.size()); MFnDoubleArrayData data; @@ -596,7 +596,7 @@ bool UsdMayaReadUtil::SetMayaAttr( ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasAttrType(attrPlug, MFnData::kFloatArray)) { + if (MayaUsd::Converter::hasAttrType(attrPlug, MFnData::kFloatArray)) { VtFloatArray arr = newValue.Get(); MFloatArray mayaArr(arr.data(), arr.size()); MFnFloatArrayData data; @@ -606,7 +606,7 @@ bool UsdMayaReadUtil::SetMayaAttr( ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasAttrType(attrPlug, MFnData::kIntArray)) { + if (MayaUsd::Converter::hasAttrType(attrPlug, MFnData::kIntArray)) { VtIntArray arr = newValue.Get(); MIntArray mayaArr(arr.data(), arr.size()); MFnIntArrayData data; @@ -616,7 +616,7 @@ bool UsdMayaReadUtil::SetMayaAttr( ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasAttrType(attrPlug, MFnData::kVectorArray)) { + if (MayaUsd::Converter::hasAttrType(attrPlug, MFnData::kVectorArray)) { VtVec3dArray arr = newValue.Get(); MVectorArray mayaArr; for (const GfVec3d& v : arr) { @@ -627,7 +627,7 @@ bool UsdMayaReadUtil::SetMayaAttr( data.set(mayaArr); modifier.newPlugValue(attrPlug, dataObj); ok = true; - } else if (Converter::hasAttrType(attrPlug, MFnData::kPointArray)) { + } else if (MayaUsd::Converter::hasAttrType(attrPlug, MFnData::kPointArray)) { VtVec3dArray arr = newValue.Get(); MPointArray mayaArr; for (const GfVec3d& v : arr) { @@ -640,7 +640,7 @@ bool UsdMayaReadUtil::SetMayaAttr( ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasAttrType(attrPlug, MFnData::kVectorArray)) { + if (MayaUsd::Converter::hasAttrType(attrPlug, MFnData::kVectorArray)) { VtVec3fArray arr = newValue.Get(); MVectorArray mayaArr; for (const GfVec3d v : arr) { @@ -651,7 +651,7 @@ bool UsdMayaReadUtil::SetMayaAttr( data.set(mayaArr); modifier.newPlugValue(attrPlug, dataObj); ok = true; - } else if (Converter::hasAttrType(attrPlug, MFnData::kPointArray)) { + } else if (MayaUsd::Converter::hasAttrType(attrPlug, MFnData::kPointArray)) { VtVec3fArray arr = newValue.Get(); MPointArray mayaArr; for (const GfVec3d v : arr) { @@ -664,13 +664,13 @@ bool UsdMayaReadUtil::SetMayaAttr( ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasNumericType(attrPlug, MFnNumericData::kBoolean)) { + if (MayaUsd::Converter::hasNumericType(attrPlug, MFnNumericData::kBoolean)) { bool b = newValue.Get(); modifier.newPlugValueBool(attrPlug, b); ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasNumericType(attrPlug, MFnNumericData::kByte)) { + if (MayaUsd::Converter::hasNumericType(attrPlug, MFnNumericData::kByte)) { unsigned char b = newValue.Get(); modifier.newPlugValueBool(attrPlug, b); ok = true; @@ -678,23 +678,23 @@ bool UsdMayaReadUtil::SetMayaAttr( } else if ( newValue.IsHolding() || newValue.IsHolding() || newValue.IsHolding() || newValue.IsHolding()) { - if (Converter::hasNumericType(attrPlug, MFnNumericData::kInt)) { + if (MayaUsd::Converter::hasNumericType(attrPlug, MFnNumericData::kInt)) { int i = newValue.IsHolding() ? int(VtValue::Cast(newValue).Get()) : VtValue::Cast(newValue).Get(); modifier.newPlugValueInt(attrPlug, i); ok = true; - } else if (Converter::hasNumericType(attrPlug, MFnNumericData::kFloat)) { + } else if (MayaUsd::Converter::hasNumericType(attrPlug, MFnNumericData::kFloat)) { float f = VtValue::Cast(newValue).Get(); modifier.newPlugValueFloat(attrPlug, f); ok = true; - } else if (Converter::hasNumericType(attrPlug, MFnNumericData::kDouble)) { + } else if (MayaUsd::Converter::hasNumericType(attrPlug, MFnNumericData::kDouble)) { double d = VtValue::Cast(newValue).Get(); modifier.newPlugValueDouble(attrPlug, d); ok = true; } else if ( (newValue.IsHolding() || newValue.IsHolding()) - && Converter::hasEnumType(attrPlug)) { + && MayaUsd::Converter::hasEnumType(attrPlug)) { int i = newValue.IsHolding() ? int(VtValue::Cast(newValue).Get()) : VtValue::Cast(newValue).Get(); @@ -702,7 +702,7 @@ bool UsdMayaReadUtil::SetMayaAttr( ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasNumericType(attrPlug, MFnNumericData::k2Int)) { + if (MayaUsd::Converter::hasNumericType(attrPlug, MFnNumericData::k2Int)) { GfVec2i v = newValue.Get(); MFnNumericData data; MObject dataObj = data.create(MFnNumericData::k2Int); @@ -711,7 +711,7 @@ bool UsdMayaReadUtil::SetMayaAttr( ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasNumericType(attrPlug, MFnNumericData::k3Int)) { + if (MayaUsd::Converter::hasNumericType(attrPlug, MFnNumericData::k3Int)) { GfVec3i v = newValue.Get(); MFnNumericData data; MObject dataObj = data.create(MFnNumericData::k3Int); @@ -720,7 +720,7 @@ bool UsdMayaReadUtil::SetMayaAttr( ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasNumericType(attrPlug, MFnNumericData::k2Float)) { + if (MayaUsd::Converter::hasNumericType(attrPlug, MFnNumericData::k2Float)) { GfVec2f v = newValue.Get(); MFnNumericData data; MObject dataObj = data.create(MFnNumericData::k2Float); @@ -729,7 +729,7 @@ bool UsdMayaReadUtil::SetMayaAttr( ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasNumericType(attrPlug, MFnNumericData::k3Float)) { + if (MayaUsd::Converter::hasNumericType(attrPlug, MFnNumericData::k3Float)) { GfVec3f v = newValue.Get(); if (unlinearizeColors) { v = _ConvertVec(attrPlug, v); @@ -743,12 +743,12 @@ bool UsdMayaReadUtil::SetMayaAttr( } else if (newValue.IsHolding()) { GfVec2d v = newValue.Get(); MFnNumericData data; - if (Converter::hasNumericType(attrPlug, MFnNumericData::k2Double)) { + if (MayaUsd::Converter::hasNumericType(attrPlug, MFnNumericData::k2Double)) { MObject dataObj = data.create(MFnNumericData::k2Double); data.setData2Double(v[0], v[1]); modifier.newPlugValue(attrPlug, dataObj); ok = true; - } else if (Converter::hasNumericType(attrPlug, MFnNumericData::k2Float)) { + } else if (MayaUsd::Converter::hasNumericType(attrPlug, MFnNumericData::k2Float)) { MObject dataObj = data.create(MFnNumericData::k2Float); data.setData2Float(v[0], v[1]); modifier.newPlugValue(attrPlug, dataObj); @@ -760,19 +760,19 @@ bool UsdMayaReadUtil::SetMayaAttr( v = _ConvertVec(attrPlug, v); } MFnNumericData data; - if (Converter::hasNumericType(attrPlug, MFnNumericData::k3Double)) { + if (MayaUsd::Converter::hasNumericType(attrPlug, MFnNumericData::k3Double)) { MObject dataObj = data.create(MFnNumericData::k3Double); data.setData3Double(v[0], v[1], v[2]); modifier.newPlugValue(attrPlug, dataObj); ok = true; - } else if (Converter::hasNumericType(attrPlug, MFnNumericData::k3Float)) { + } else if (MayaUsd::Converter::hasNumericType(attrPlug, MFnNumericData::k3Float)) { MObject dataObj = data.create(MFnNumericData::k3Float); data.setData3Float(v[0], v[1], v[2]); modifier.newPlugValue(attrPlug, dataObj); ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasNumericType(attrPlug, MFnNumericData::k4Double)) { + if (MayaUsd::Converter::hasNumericType(attrPlug, MFnNumericData::k4Double)) { GfVec4d v = newValue.Get(); if (unlinearizeColors) { v = _ConvertVec(attrPlug, v); @@ -784,7 +784,7 @@ bool UsdMayaReadUtil::SetMayaAttr( ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasNumericType(attrPlug, MFnNumericData::k4Double)) { + if (MayaUsd::Converter::hasNumericType(attrPlug, MFnNumericData::k4Double)) { GfQuatf q = newValue.Get(); GfVec3f im = q.GetImaginary(); MFnNumericData data; @@ -794,7 +794,7 @@ bool UsdMayaReadUtil::SetMayaAttr( ok = true; } } else if (newValue.IsHolding()) { - if (Converter::hasNumericType(attrPlug, MFnNumericData::k4Double)) { + if (MayaUsd::Converter::hasNumericType(attrPlug, MFnNumericData::k4Double)) { GfQuatd q = newValue.Get(); GfVec3d im = q.GetImaginary(); MFnNumericData data; @@ -818,7 +818,8 @@ bool UsdMayaReadUtil::SetMayaAttr( void UsdMayaReadUtil::SetMayaAttrKeyableState(MPlug& attrPlug, const SdfVariability variability) { - MDGModifier& modifier = MDGModifierUndoItem::create("Generic Maya attribute keyable state"); + MDGModifier& modifier + = MayaUsd::MDGModifierUndoItem::create("Generic Maya attribute keyable state"); SetMayaAttrKeyableState(attrPlug, variability, modifier); } diff --git a/lib/mayaUsd/fileio/utils/writeUtil.cpp b/lib/mayaUsd/fileio/utils/writeUtil.cpp index d941f8a311..a1f32764a3 100644 --- a/lib/mayaUsd/fileio/utils/writeUtil.cpp +++ b/lib/mayaUsd/fileio/utils/writeUtil.cpp @@ -70,8 +70,6 @@ #include #include -using namespace MAYAUSD_NS_DEF; - PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_ENV_SETTING( @@ -181,7 +179,7 @@ UsdAttribute UsdMayaWriteUtil::GetOrCreateUsdAttr( } const SdfValueTypeName& typeName - = Converter::getUsdTypeName(attrPlug, translateMayaDoubleToUsdSinglePrecision); + = MayaUsd::Converter::getUsdTypeName(attrPlug, translateMayaDoubleToUsdSinglePrecision); if (typeName) { usdAttr = usdPrim.CreateAttribute(usdAttrNameToken, typeName, custom); } @@ -223,7 +221,7 @@ UsdGeomPrimvar UsdMayaWriteUtil::GetOrCreatePrimvar( } const SdfValueTypeName& typeName - = Converter::getUsdTypeName(attrPlug, translateMayaDoubleToUsdSinglePrecision); + = MayaUsd::Converter::getUsdTypeName(attrPlug, translateMayaDoubleToUsdSinglePrecision); if (typeName) { primvar = pvAPI.CreatePrimvar(primvarNameToken, typeName, interpolation, elementSize); } @@ -272,7 +270,7 @@ UsdAttribute UsdMayaWriteUtil::GetOrCreateUsdRiAttribute( } const SdfValueTypeName& typeName - = Converter::getUsdTypeName(attrPlug, translateMayaDoubleToUsdSinglePrecision); + = MayaUsd::Converter::getUsdTypeName(attrPlug, translateMayaDoubleToUsdSinglePrecision); if (typeName) { riStatements = UsdMayaTranslatorUtil::GetAPISchemaForAuthoring(usdPrim); usdAttr = riStatements.CreateRiAttribute(riAttrNameToken, typeName.GetType(), nameSpace); diff --git a/lib/mayaUsd/nodes/layerManager.cpp b/lib/mayaUsd/nodes/layerManager.cpp index fc63179ec5..4b07c8ebd4 100644 --- a/lib/mayaUsd/nodes/layerManager.cpp +++ b/lib/mayaUsd/nodes/layerManager.cpp @@ -59,8 +59,6 @@ #include #include -using namespace MAYAUSD_NS_DEF; - namespace { static std::recursive_mutex findNodeMutex; static MObjectHandle layerManagerHandle; @@ -75,7 +73,7 @@ MStatus disconnectCompoundArrayPlug(MPlug arrayPlug) MPlug elemPlug; MPlug srcPlug; MPlugArray destPlugs; - MDGModifier& dgmod = MDGModifierUndoItem::create("Compound array plug disconnection"); + MDGModifier& dgmod = MayaUsd::MDGModifierUndoItem::create("Compound array plug disconnection"); auto disconnectPlug = [&](MPlug plug) -> MStatus { MStatus status; @@ -140,7 +138,7 @@ MayaUsd::LayerManager* findOrCreateNode() { MayaUsd::LayerManager* lm = findNode(); if (!lm) { - MDGModifier& modifier = MDGModifierUndoItem::create("Node find or creation"); + MDGModifier& modifier = MayaUsd::MDGModifierUndoItem::create("Node find or creation"); MObject manager = modifier.createNode(MayaUsd::LayerManager::typeId); modifier.doIt(); diff --git a/lib/mayaUsd/nodes/proxyShapeBase.cpp b/lib/mayaUsd/nodes/proxyShapeBase.cpp index d098e82d7c..6ba5b99981 100644 --- a/lib/mayaUsd/nodes/proxyShapeBase.cpp +++ b/lib/mayaUsd/nodes/proxyShapeBase.cpp @@ -113,7 +113,7 @@ #endif #endif -using namespace MAYAUSD_NS_DEF; +using namespace MayaUsd; PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/python/wrapConverter.cpp b/lib/mayaUsd/python/wrapConverter.cpp index 307a9a8247..e25755f2f2 100644 --- a/lib/mayaUsd/python/wrapConverter.cpp +++ b/lib/mayaUsd/python/wrapConverter.cpp @@ -32,7 +32,7 @@ using namespace boost::python; PXR_NAMESPACE_USING_DIRECTIVE; -using namespace MAYAUSD_NS_DEF; +using namespace MayaUsd; namespace { constexpr auto find1 diff --git a/lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp b/lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp index 95b99ab548..2811821c81 100644 --- a/lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp +++ b/lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp @@ -219,7 +219,7 @@ ProxyShapeHierarchy::createUFEChildList(const UsdPrimSiblingRange& range, bool f UFE_V3(std::string dagPathStr;) for (const auto& child : range) { #ifdef UFE_V3_FEATURES_AVAILABLE - if (MAYAUSD_NS_DEF::readPullInformation(child, dagPathStr)) { + if (MayaUsd::readPullInformation(child, dagPathStr)) { auto item = Ufe::Hierarchy::createItem(Ufe::PathString::path(dagPathStr)); // if we mapped to a valid object, insert it. it's possible that we got stale object // so in this case simply fallback to the usual processing of items diff --git a/lib/mayaUsd/ufe/PulledObjectHierarchyHandler.cpp b/lib/mayaUsd/ufe/PulledObjectHierarchyHandler.cpp index 1369e55f67..0a463f284e 100644 --- a/lib/mayaUsd/ufe/PulledObjectHierarchyHandler.cpp +++ b/lib/mayaUsd/ufe/PulledObjectHierarchyHandler.cpp @@ -57,7 +57,7 @@ Ufe::Hierarchy::Ptr PulledObjectHierarchyHandler::hierarchy(const Ufe::SceneItem Ufe::Path ufePath; auto dagPath = PXR_NS::UsdMayaUtil::nameToDagPath(path.getSegments()[nbSegs - 1].string()); - if (MAYAUSD_NS_DEF::readPullInformation(dagPath, ufePath)) { + if (MayaUsd::readPullInformation(dagPath, ufePath)) { return PulledObjectHierarchy::create(_mayaHierarchyHandler, item, ufePath); } else { return _mayaHierarchyHandler->hierarchy(item); diff --git a/lib/mayaUsd/ufe/UsdHierarchy.cpp b/lib/mayaUsd/ufe/UsdHierarchy.cpp index 168a8dc3d5..f8400a254a 100644 --- a/lib/mayaUsd/ufe/UsdHierarchy.cpp +++ b/lib/mayaUsd/ufe/UsdHierarchy.cpp @@ -225,7 +225,7 @@ UsdHierarchy::createUFEChildList(const UsdPrimSiblingRange& range, bool filterIn UFE_V3(std::string dagPathStr;) for (const auto& child : range) { #ifdef UFE_V3_FEATURES_AVAILABLE - if (MAYAUSD_NS_DEF::readPullInformation(child, dagPathStr)) { + if (MayaUsd::readPullInformation(child, dagPathStr)) { auto item = Ufe::Hierarchy::createItem(Ufe::PathString::path(dagPathStr)); // if we mapped to a valid object, insert it. it's possible that we got stale object // so in this case simply fallback to the usual processing of items diff --git a/lib/mayaUsd/ufe/UsdPathMappingHandler.cpp b/lib/mayaUsd/ufe/UsdPathMappingHandler.cpp index cbc631f69f..762bb91ab0 100644 --- a/lib/mayaUsd/ufe/UsdPathMappingHandler.cpp +++ b/lib/mayaUsd/ufe/UsdPathMappingHandler.cpp @@ -138,7 +138,7 @@ Ufe::Path UsdPathMappingHandler::fromHost(const Ufe::Path& hostPath) const mayaComps.emplace_back(mayaHostPath.back()); mayaHostPath = mayaHostPath.pop(); Ufe::Path ufePath; - if (MAYAUSD_NS_DEF::readPullInformation(dagPath, ufePath)) { + if (MayaUsd::readPullInformation(dagPath, ufePath)) { // From the pulled info path, we pop only the last component and // append the Maya component array. std::reverse(mayaComps.begin(), mayaComps.end()); diff --git a/lib/mayaUsd/utils/util.cpp b/lib/mayaUsd/utils/util.cpp index 7efd90a3a3..4711fa5396 100644 --- a/lib/mayaUsd/utils/util.cpp +++ b/lib/mayaUsd/utils/util.cpp @@ -88,8 +88,6 @@ #include -using namespace MAYAUSD_NS_DEF; - PXR_NAMESPACE_USING_DIRECTIVE namespace { @@ -1285,7 +1283,7 @@ MPlug UsdMayaUtil::GetConnected(const MPlug& plug) void UsdMayaUtil::Connect(const MPlug& srcPlug, const MPlug& dstPlug, const bool clearDstPlug) { - MDGModifier& dgMod = MDGModifierUndoItem::create("Generic plug connection"); + MDGModifier& dgMod = MayaUsd::MDGModifierUndoItem::create("Generic plug connection"); Connect(srcPlug, dstPlug, clearDstPlug, dgMod); } diff --git a/lib/usd/translators/mayaReferenceUpdater.cpp b/lib/usd/translators/mayaReferenceUpdater.cpp index bff7038fb0..277a97547d 100644 --- a/lib/usd/translators/mayaReferenceUpdater.cpp +++ b/lib/usd/translators/mayaReferenceUpdater.cpp @@ -271,7 +271,7 @@ bool PxrUsdTranslators_MayaReferenceUpdater::discardEdits() MStatus status = MDagPath::getAPathTo(parentNode, dagPath); if (status == MS::kSuccess) { Ufe::Path pulledPath; - if (MAYAUSD_NS_DEF::readPullInformation(dagPath, pulledPath)) { + if (MayaUsd::readPullInformation(dagPath, pulledPath)) { // Reset the auto-edit when discarding the edit. clearAutoEdit(pulledPath); } diff --git a/lib/usd/translators/shading/mtlxBaseReader.cpp b/lib/usd/translators/shading/mtlxBaseReader.cpp index 0c978cbdc6..17546c9a8e 100644 --- a/lib/usd/translators/shading/mtlxBaseReader.cpp +++ b/lib/usd/translators/shading/mtlxBaseReader.cpp @@ -37,8 +37,6 @@ #include -using namespace MAYAUSD_NS_DEF; - PXR_NAMESPACE_OPEN_SCOPE REGISTER_SHADING_MODE_IMPORT_MATERIAL_CONVERSION( diff --git a/lib/usd/translators/shading/mtlxBaseWriter.cpp b/lib/usd/translators/shading/mtlxBaseWriter.cpp index b5924b7540..a0b785ed3a 100644 --- a/lib/usd/translators/shading/mtlxBaseWriter.cpp +++ b/lib/usd/translators/shading/mtlxBaseWriter.cpp @@ -52,8 +52,6 @@ #include -using namespace MAYAUSD_NS_DEF; - PXR_NAMESPACE_OPEN_SCOPE // clang-format off @@ -571,7 +569,7 @@ bool MtlxUsd_BaseWriter::AuthorShaderInputFromShadingNodeAttr( return false; } - SdfValueTypeName shaderInputTypeName = Converter::getUsdTypeName(shadingNodePlug); + SdfValueTypeName shaderInputTypeName = MayaUsd::Converter::getUsdTypeName(shadingNodePlug); // We know exactly which types are supported by MaterialX, so we can adjust here: if (shaderInputTypeName == SdfValueTypeNames->Double) { diff --git a/lib/usd/translators/shading/mtlxFileTextureWriter.cpp b/lib/usd/translators/shading/mtlxFileTextureWriter.cpp index 0ea5164d89..d3480f418f 100644 --- a/lib/usd/translators/shading/mtlxFileTextureWriter.cpp +++ b/lib/usd/translators/shading/mtlxFileTextureWriter.cpp @@ -57,8 +57,6 @@ #include -using namespace MAYAUSD_NS_DEF; - PXR_NAMESPACE_OPEN_SCOPE class MtlxUsd_FileWriter : public MtlxUsd_BaseWriter diff --git a/lib/usd/translators/shading/mtlxPreviewSurfaceWriter.cpp b/lib/usd/translators/shading/mtlxPreviewSurfaceWriter.cpp index 9159a07302..b9a2dc36ec 100644 --- a/lib/usd/translators/shading/mtlxPreviewSurfaceWriter.cpp +++ b/lib/usd/translators/shading/mtlxPreviewSurfaceWriter.cpp @@ -40,7 +40,7 @@ #include -using namespace MAYAUSD_NS; +using namespace MayaUsd; PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/usd/translators/shading/mtlxStandardSurfaceWriter.cpp b/lib/usd/translators/shading/mtlxStandardSurfaceWriter.cpp index b23f3e76e1..96dd37c450 100644 --- a/lib/usd/translators/shading/mtlxStandardSurfaceWriter.cpp +++ b/lib/usd/translators/shading/mtlxStandardSurfaceWriter.cpp @@ -38,7 +38,7 @@ #include -using namespace MAYAUSD_NS; +using namespace MayaUsd; PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/usd/translators/shading/usdDisplacementShaderWriter.cpp b/lib/usd/translators/shading/usdDisplacementShaderWriter.cpp index 286cae02e2..d355e221c9 100644 --- a/lib/usd/translators/shading/usdDisplacementShaderWriter.cpp +++ b/lib/usd/translators/shading/usdDisplacementShaderWriter.cpp @@ -37,7 +37,7 @@ #include -using namespace MAYAUSD_NS; +using namespace MayaUsd; PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/usd/translators/shading/usdMaterialWriter.cpp b/lib/usd/translators/shading/usdMaterialWriter.cpp index b12bd47db8..af04ebd441 100644 --- a/lib/usd/translators/shading/usdMaterialWriter.cpp +++ b/lib/usd/translators/shading/usdMaterialWriter.cpp @@ -49,8 +49,6 @@ #include -using namespace MAYAUSD_NS_DEF; - PXR_NAMESPACE_OPEN_SCOPE UsdMayaShaderWriter::ContextSupport @@ -148,7 +146,7 @@ bool PxrUsdTranslators_MaterialWriter::AuthorShaderInputFromScaledShadingNodeAtt } const SdfValueTypeName shaderInputTypeName - = bool(inputTypeName) ? inputTypeName : Converter::getUsdTypeName(shadingNodePlug); + = bool(inputTypeName) ? inputTypeName : MayaUsd::Converter::getUsdTypeName(shadingNodePlug); // Are color values are all linear on the shader? // Do we need to re-linearize them? diff --git a/lib/usd/ui/layerEditor/layerTreeModel.cpp b/lib/usd/ui/layerEditor/layerTreeModel.cpp index 61ac2dea52..cdb493a811 100644 --- a/lib/usd/ui/layerEditor/layerTreeModel.cpp +++ b/lib/usd/ui/layerEditor/layerTreeModel.cpp @@ -273,7 +273,7 @@ void LayerTreeModel::rebuildModel() rootLayer, MayaUsdMetadata->ReferencedLayers); std::vector layerIds; std::move(layers.begin(), layers.end(), inserter(layerIds, layerIds.begin())); - sharedLayers = MAYAUSD_NS_DEF::getAllSublayers(layerIds, true); + sharedLayers = MayaUsd::getAllSublayers(layerIds, true); } std::set incomingLayers; @@ -284,7 +284,7 @@ void LayerTreeModel::rebuildModel() } else { std::vector layerIds; layerIds.push_back(rootLayer->GetIdentifier()); - incomingLayers = MAYAUSD_NS_DEF::getAllSublayers(layerIds, true); + incomingLayers = MayaUsd::getAllSublayers(layerIds, true); } } diff --git a/lib/usd/ui/layerEditor/mayaLayerEditorWindow.cpp b/lib/usd/ui/layerEditor/mayaLayerEditorWindow.cpp index 82e9d5624b..4e46dc9f68 100644 --- a/lib/usd/ui/layerEditor/mayaLayerEditorWindow.cpp +++ b/lib/usd/ui/layerEditor/mayaLayerEditorWindow.cpp @@ -35,19 +35,17 @@ #include #include -using namespace MAYAUSD_NS_DEF; - namespace { using namespace UsdLayerEditor; -class LayerEditorWindowCreator : public AbstractLayerEditorCreator +class LayerEditorWindowCreator : public MayaUsd::AbstractLayerEditorCreator { public: LayerEditorWindowCreator() { ; }; virtual ~LayerEditorWindowCreator() { } - AbstractLayerEditorWindow* createWindow(const char* panelName) override; - AbstractLayerEditorWindow* getWindow(const char* panelName) const override; + MayaUsd::AbstractLayerEditorWindow* createWindow(const char* panelName) override; + MayaUsd::AbstractLayerEditorWindow* getWindow(const char* panelName) const override; std::vector getAllPanelNames() const override; private: @@ -60,7 +58,7 @@ class LayerEditorWindowCreator : public AbstractLayerEditorCreator LayerEditorWindowCreator::EditorsMap LayerEditorWindowCreator::_editors; -AbstractLayerEditorWindow* LayerEditorWindowCreator::createWindow(const char* panelName) +MayaUsd::AbstractLayerEditorWindow* LayerEditorWindowCreator::createWindow(const char* panelName) { auto _workspaceControl = MQtUtil::getCurrentParent(); auto editorWindow = new MayaLayerEditorWindow(panelName, nullptr); @@ -71,13 +69,14 @@ AbstractLayerEditorWindow* LayerEditorWindowCreator::createWindow(const char* pa return editorWindow; } -AbstractLayerEditorWindow* LayerEditorWindowCreator::getWindow(const char* panelName) const +MayaUsd::AbstractLayerEditorWindow* LayerEditorWindowCreator::getWindow(const char* panelName) const { auto window = _editors.find(panelName); return (window == _editors.end()) ? nullptr : window->second; } -AbstractLayerEditorCreator::PanelNamesList LayerEditorWindowCreator::getAllPanelNames() const +MayaUsd::AbstractLayerEditorCreator::PanelNamesList +LayerEditorWindowCreator::getAllPanelNames() const { PanelNamesList result; for (auto entry : _editors) { @@ -92,7 +91,7 @@ namespace UsdLayerEditor { MayaLayerEditorWindow::MayaLayerEditorWindow(const char* panelName, QWidget* parent) : PARENT_CLASS(parent) - , AbstractLayerEditorWindow(panelName) + , MayaUsd::AbstractLayerEditorWindow(panelName) , _panelName(panelName) { // Normally this will be set from the MayaUsd plugin, but only diff --git a/lib/usd/ui/layerEditor/mayaLayerEditorWindow.h b/lib/usd/ui/layerEditor/mayaLayerEditorWindow.h index a3f770c440..3967e42ac1 100644 --- a/lib/usd/ui/layerEditor/mayaLayerEditorWindow.h +++ b/lib/usd/ui/layerEditor/mayaLayerEditorWindow.h @@ -26,7 +26,6 @@ #include #include -using namespace MAYAUSD_NS_DEF; namespace UsdLayerEditor { class LayerEditorWidget; diff --git a/lib/usd/ui/layerEditor/mayaSessionState.cpp b/lib/usd/ui/layerEditor/mayaSessionState.cpp index 804848c92e..8ee78ccf1a 100644 --- a/lib/usd/ui/layerEditor/mayaSessionState.cpp +++ b/lib/usd/ui/layerEditor/mayaSessionState.cpp @@ -46,7 +46,6 @@ MString AUTO_HIDE_OPTION_VAR = "MayaUSDLayerEditor_AutoHideSessionLayer"; } // namespace namespace UsdLayerEditor { -using namespace MAYAUSD_NS_DEF; MayaSessionState::MayaSessionState() : _mayaCommandHook(this) diff --git a/plugin/pxr/maya/lib/usdMaya/readJob_ImportWithProxies.cpp b/plugin/pxr/maya/lib/usdMaya/readJob_ImportWithProxies.cpp index e5bcad64c6..b52535fb19 100644 --- a/plugin/pxr/maya/lib/usdMaya/readJob_ImportWithProxies.cpp +++ b/plugin/pxr/maya/lib/usdMaya/readJob_ImportWithProxies.cpp @@ -199,9 +199,8 @@ bool UsdMaya_ReadJobWithSceneAssembly::_ProcessProxyPrims( std::string excludePathsString = TfStringJoin(collapsePointPathStrings, ","); // Set the excludePrimPaths attribute on the node. - MDagModifier& dagMod - = MAYAUSD_NS_DEF::MDagModifierUndoItem::create("Read job prim exclusion"); - MPlug excludePathsPlug + MDagModifier& dagMod = MayaUsd::MDagModifierUndoItem::create("Read job prim exclusion"); + MPlug excludePathsPlug = depNodeFn.findPlug(_tokens->ExcludePrimPathsPlugName.GetText(), true, &status); CHECK_MSTATUS_AND_RETURN(status, false); status = dagMod.newPlugValueString(excludePathsPlug, excludePathsString.c_str()); diff --git a/plugin/pxr/maya/lib/usdMaya/translatorModelAssembly.cpp b/plugin/pxr/maya/lib/usdMaya/translatorModelAssembly.cpp index 1bff94108c..49b89ba292 100644 --- a/plugin/pxr/maya/lib/usdMaya/translatorModelAssembly.cpp +++ b/plugin/pxr/maya/lib/usdMaya/translatorModelAssembly.cpp @@ -391,7 +391,7 @@ bool UsdMayaTranslatorModelAssembly::Read( CHECK_MSTATUS_AND_RETURN(status, false); // Re-parent the assembly node underneath parentNode. - MDagModifier& dagMod = MAYAUSD_NS_DEF::MDagModifierUndoItem::create("Assembly reparenting"); + MDagModifier& dagMod = MayaUsd::MDagModifierUndoItem::create("Assembly reparenting"); status = dagMod.reparentNode(assemblyObj, parentNode); CHECK_MSTATUS_AND_RETURN(status, false); @@ -502,7 +502,7 @@ bool UsdMayaTranslatorModelAssembly::ReadAsProxy( } // Create the proxy shape node. - MDagModifier& dagMod = MAYAUSD_NS_DEF::MDagModifierUndoItem::create("Proxy shape creation"); + MDagModifier& dagMod = MayaUsd::MDagModifierUndoItem::create("Proxy shape creation"); MObject proxyObj = dagMod.createNode(UsdMayaProxyShapeTokens->MayaTypeName.GetText(), transformObj, &status); CHECK_MSTATUS_AND_RETURN(status, false); diff --git a/test/lib/mayaUsd/utils/testLoadRules.cpp b/test/lib/mayaUsd/utils/testLoadRules.cpp index 886c45be68..cca15ec146 100644 --- a/test/lib/mayaUsd/utils/testLoadRules.cpp +++ b/test/lib/mayaUsd/utils/testLoadRules.cpp @@ -2,16 +2,15 @@ #include -using namespace PXR_NS; -using namespace MAYAUSD_NS_DEF; +PXR_NAMESPACE_USING_DIRECTIVE TEST(ConvertLoadRules, convertEmptyLoadRules) { UsdStageLoadRules originalLoadRules; - const MString text = convertLoadRulesToText(originalLoadRules); + const MString text = MayaUsd::convertLoadRulesToText(originalLoadRules); - UsdStageLoadRules convertedLoadRules = createLoadRulesFromText(text); + UsdStageLoadRules convertedLoadRules = MayaUsd::createLoadRulesFromText(text); EXPECT_EQ(originalLoadRules, convertedLoadRules); } @@ -23,9 +22,9 @@ TEST(ConvertLoadRules, convertSimpleLoadRules) originalLoadRules.AddRule(SdfPath("/a/b"), UsdStageLoadRules::NoneRule); originalLoadRules.AddRule(SdfPath("/d"), UsdStageLoadRules::OnlyRule); - const MString text = convertLoadRulesToText(originalLoadRules); + const MString text = MayaUsd::convertLoadRulesToText(originalLoadRules); - UsdStageLoadRules convertedLoadRules = createLoadRulesFromText(text); + UsdStageLoadRules convertedLoadRules = MayaUsd::createLoadRulesFromText(text); EXPECT_EQ(originalLoadRules, convertedLoadRules); } @@ -34,10 +33,10 @@ TEST(ConvertLoadRules, convertEmptyStageLoadRules) { auto originalStage = UsdStage::CreateInMemory(); - const MString text = convertLoadRulesToText(*originalStage); + const MString text = MayaUsd::convertLoadRulesToText(*originalStage); auto convertedStage = UsdStage::CreateInMemory(); - setLoadRulesFromText(*convertedStage, text); + MayaUsd::setLoadRulesFromText(*convertedStage, text); EXPECT_EQ(originalStage->GetLoadRules(), convertedStage->GetLoadRules()); } @@ -52,10 +51,10 @@ TEST(ConvertLoadRules, convertSimpleStageLoadRules) auto originalStage = UsdStage::CreateInMemory(); originalStage->SetLoadRules(originalLoadRules); - const MString text = convertLoadRulesToText(*originalStage); + const MString text = MayaUsd::convertLoadRulesToText(*originalStage); auto convertedStage = UsdStage::CreateInMemory(); - setLoadRulesFromText(*convertedStage, text); + MayaUsd::setLoadRulesFromText(*convertedStage, text); EXPECT_EQ(originalStage->GetLoadRules(), convertedStage->GetLoadRules()); } diff --git a/test/lib/mayaUsd/utils/testSplitString.cpp b/test/lib/mayaUsd/utils/testSplitString.cpp index 49b21b919f..4930460687 100644 --- a/test/lib/mayaUsd/utils/testSplitString.cpp +++ b/test/lib/mayaUsd/utils/testSplitString.cpp @@ -2,23 +2,21 @@ #include -using namespace MAYAUSD_NS_DEF; - TEST(SplitString, basicTest) { std::string testString = "Hi, how are you?"; - std::vector tokens = ufe::splitString(testString, ", ?"); + std::vector tokens = MayaUsd::ufe::splitString(testString, ", ?"); ASSERT_EQ(static_cast(tokens.size()), 4); ASSERT_STREQ(tokens[0].c_str(), "Hi"); ASSERT_STREQ(tokens[1].c_str(), "how"); ASSERT_STREQ(tokens[2].c_str(), "are"); ASSERT_STREQ(tokens[3].c_str(), "you"); - std::vector tokens2 = ufe::splitString(testString, "!"); + std::vector tokens2 = MayaUsd::ufe::splitString(testString, "!"); ASSERT_EQ(static_cast(tokens2.size()), 1); ASSERT_STREQ(tokens2[0].c_str(), testString.c_str()); - std::vector tokens3 = ufe::splitString(testString, ""); + std::vector tokens3 = MayaUsd::ufe::splitString(testString, ""); ASSERT_EQ(static_cast(tokens3.size()), 1); ASSERT_STREQ(tokens3[0].c_str(), testString.c_str()); } diff --git a/test/lib/mayaUsd/utils/testTargetLayer.cpp b/test/lib/mayaUsd/utils/testTargetLayer.cpp index 624d569a6c..cb7f27d80b 100644 --- a/test/lib/mayaUsd/utils/testTargetLayer.cpp +++ b/test/lib/mayaUsd/utils/testTargetLayer.cpp @@ -4,16 +4,15 @@ #include -using namespace PXR_NS; -using namespace MAYAUSD_NS_DEF; +PXR_NAMESPACE_USING_DIRECTIVE TEST(ConvertTargetLayer, convertDefaultTargetLayer) { auto originalStage = UsdStage::CreateInMemory(); auto originalTargetLayer = originalStage->GetEditTarget(); - const MString text = convertTargetLayerToText(*originalStage); - setTargetLayerFromText(*originalStage, text); + const MString text = MayaUsd::convertTargetLayerToText(*originalStage); + MayaUsd::setTargetLayerFromText(*originalStage, text); auto restoredTargetLayer = originalStage->GetEditTarget(); EXPECT_EQ(originalTargetLayer, restoredTargetLayer); @@ -28,8 +27,8 @@ TEST(ConvertTargetLayer, convertSubLayerTargetLayer) auto originalTargetLayer = originalStage->GetEditTarget(); - const MString text = convertTargetLayerToText(*originalStage); - setTargetLayerFromText(*originalStage, text); + const MString text = MayaUsd::convertTargetLayerToText(*originalStage); + MayaUsd::setTargetLayerFromText(*originalStage, text); auto restoredTargetLayer = originalStage->GetEditTarget(); EXPECT_EQ(originalTargetLayer, restoredTargetLayer); diff --git a/test/lib/usd/utils/test_DiffAttributes.cpp b/test/lib/usd/utils/test_DiffAttributes.cpp index 8ff6d0b14d..4703f92e1e 100644 --- a/test/lib/usd/utils/test_DiffAttributes.cpp +++ b/test/lib/usd/utils/test_DiffAttributes.cpp @@ -5,7 +5,7 @@ #include -using namespace PXR_NS; +PXR_NAMESPACE_USING_DIRECTIVE using namespace MayaUsdUtils; //---------------------------------------------------------------------------------------------------------------------- diff --git a/test/lib/usd/utils/test_DiffComputeOverall.cpp b/test/lib/usd/utils/test_DiffComputeOverall.cpp index 5718d3c50d..219bca0cce 100644 --- a/test/lib/usd/utils/test_DiffComputeOverall.cpp +++ b/test/lib/usd/utils/test_DiffComputeOverall.cpp @@ -5,7 +5,7 @@ #include -using namespace PXR_NS; +PXR_NAMESPACE_USING_DIRECTIVE using namespace MayaUsdUtils; namespace { diff --git a/test/lib/usd/utils/test_DiffDictionaries.cpp b/test/lib/usd/utils/test_DiffDictionaries.cpp index 1a15c35235..8869571684 100644 --- a/test/lib/usd/utils/test_DiffDictionaries.cpp +++ b/test/lib/usd/utils/test_DiffDictionaries.cpp @@ -5,7 +5,7 @@ #include -using namespace PXR_NS; +PXR_NAMESPACE_USING_DIRECTIVE using namespace MayaUsdUtils; //---------------------------------------------------------------------------------------------------------------------- diff --git a/test/lib/usd/utils/test_DiffLists.cpp b/test/lib/usd/utils/test_DiffLists.cpp index d60beddacc..af15728aa7 100644 --- a/test/lib/usd/utils/test_DiffLists.cpp +++ b/test/lib/usd/utils/test_DiffLists.cpp @@ -5,7 +5,7 @@ #include -using namespace PXR_NS; +PXR_NAMESPACE_USING_DIRECTIVE using namespace MayaUsdUtils; //---------------------------------------------------------------------------------------------------------------------- diff --git a/test/lib/usd/utils/test_DiffMetadatas.cpp b/test/lib/usd/utils/test_DiffMetadatas.cpp index f0bb1e137c..a61bc05936 100644 --- a/test/lib/usd/utils/test_DiffMetadatas.cpp +++ b/test/lib/usd/utils/test_DiffMetadatas.cpp @@ -5,7 +5,7 @@ #include -using namespace PXR_NS; +PXR_NAMESPACE_USING_DIRECTIVE using namespace MayaUsdUtils; // Note: metadata must be registered, for tests we used a pre-registered one. diff --git a/test/lib/usd/utils/test_DiffPrims.cpp b/test/lib/usd/utils/test_DiffPrims.cpp index 390d2fa8cf..d28c7c93fa 100644 --- a/test/lib/usd/utils/test_DiffPrims.cpp +++ b/test/lib/usd/utils/test_DiffPrims.cpp @@ -5,7 +5,7 @@ #include -using namespace PXR_NS; +PXR_NAMESPACE_USING_DIRECTIVE using namespace MayaUsdUtils; namespace { diff --git a/test/lib/usd/utils/test_DiffPrimsAttributes.cpp b/test/lib/usd/utils/test_DiffPrimsAttributes.cpp index 563523268e..f2b6a95f80 100644 --- a/test/lib/usd/utils/test_DiffPrimsAttributes.cpp +++ b/test/lib/usd/utils/test_DiffPrimsAttributes.cpp @@ -5,7 +5,7 @@ #include -using namespace PXR_NS; +PXR_NAMESPACE_USING_DIRECTIVE using namespace MayaUsdUtils; static TfToken testAttrName("test_attr"); diff --git a/test/lib/usd/utils/test_DiffPrimsChildren.cpp b/test/lib/usd/utils/test_DiffPrimsChildren.cpp index a58547ad0b..eae32768e2 100644 --- a/test/lib/usd/utils/test_DiffPrimsChildren.cpp +++ b/test/lib/usd/utils/test_DiffPrimsChildren.cpp @@ -5,7 +5,7 @@ #include -using namespace PXR_NS; +PXR_NAMESPACE_USING_DIRECTIVE using namespace MayaUsdUtils; namespace { diff --git a/test/lib/usd/utils/test_DiffPrimsRelations.cpp b/test/lib/usd/utils/test_DiffPrimsRelations.cpp index 6c812e7252..050cedee15 100644 --- a/test/lib/usd/utils/test_DiffPrimsRelations.cpp +++ b/test/lib/usd/utils/test_DiffPrimsRelations.cpp @@ -5,7 +5,7 @@ #include -using namespace PXR_NS; +PXR_NAMESPACE_USING_DIRECTIVE using namespace MayaUsdUtils; namespace { diff --git a/test/lib/usd/utils/test_DiffRelationships.cpp b/test/lib/usd/utils/test_DiffRelationships.cpp index d6c0a2a263..1c7ba31472 100644 --- a/test/lib/usd/utils/test_DiffRelationships.cpp +++ b/test/lib/usd/utils/test_DiffRelationships.cpp @@ -5,7 +5,7 @@ #include -using namespace PXR_NS; +PXR_NAMESPACE_USING_DIRECTIVE using namespace MayaUsdUtils; namespace { diff --git a/test/lib/usd/utils/test_DiffValues.cpp b/test/lib/usd/utils/test_DiffValues.cpp index 56301a35b6..68ae79c0a5 100644 --- a/test/lib/usd/utils/test_DiffValues.cpp +++ b/test/lib/usd/utils/test_DiffValues.cpp @@ -2,7 +2,7 @@ #include -using namespace PXR_NS; +PXR_NAMESPACE_USING_DIRECTIVE using namespace MayaUsdUtils; //---------------------------------------------------------------------------------------------------------------------- diff --git a/test/lib/usd/utils/test_DiffValuesArrays.cpp b/test/lib/usd/utils/test_DiffValuesArrays.cpp index 4276db9836..b4f42ff22b 100644 --- a/test/lib/usd/utils/test_DiffValuesArrays.cpp +++ b/test/lib/usd/utils/test_DiffValuesArrays.cpp @@ -2,7 +2,7 @@ #include -using namespace PXR_NS; +PXR_NAMESPACE_USING_DIRECTIVE using namespace MayaUsdUtils; //---------------------------------------------------------------------------------------------------------------------- diff --git a/test/lib/usd/utils/test_DiffValuesDoubleVecs.cpp b/test/lib/usd/utils/test_DiffValuesDoubleVecs.cpp index f1fe7ce5eb..a2ca49b792 100644 --- a/test/lib/usd/utils/test_DiffValuesDoubleVecs.cpp +++ b/test/lib/usd/utils/test_DiffValuesDoubleVecs.cpp @@ -17,7 +17,7 @@ #include -using namespace PXR_NS; +PXR_NAMESPACE_USING_DIRECTIVE using namespace MayaUsdUtils; //---------------------------------------------------------------------------------------------------------------------- diff --git a/test/lib/usd/utils/test_DiffValuesFloatVecs.cpp b/test/lib/usd/utils/test_DiffValuesFloatVecs.cpp index 7d2cada9d7..1487b2b83b 100644 --- a/test/lib/usd/utils/test_DiffValuesFloatVecs.cpp +++ b/test/lib/usd/utils/test_DiffValuesFloatVecs.cpp @@ -17,7 +17,7 @@ #include -using namespace PXR_NS; +PXR_NAMESPACE_USING_DIRECTIVE using namespace MayaUsdUtils; //---------------------------------------------------------------------------------------------------------------------- diff --git a/test/lib/usd/utils/test_DiffValuesGeneric.cpp b/test/lib/usd/utils/test_DiffValuesGeneric.cpp index ab143e3f1b..9f12e7690c 100644 --- a/test/lib/usd/utils/test_DiffValuesGeneric.cpp +++ b/test/lib/usd/utils/test_DiffValuesGeneric.cpp @@ -2,7 +2,7 @@ #include -using namespace PXR_NS; +PXR_NAMESPACE_USING_DIRECTIVE using namespace MayaUsdUtils; //---------------------------------------------------------------------------------------------------------------------- diff --git a/test/lib/usd/utils/test_DiffValuesHalfVecs.cpp b/test/lib/usd/utils/test_DiffValuesHalfVecs.cpp index bc18074476..31b3df861e 100644 --- a/test/lib/usd/utils/test_DiffValuesHalfVecs.cpp +++ b/test/lib/usd/utils/test_DiffValuesHalfVecs.cpp @@ -17,7 +17,7 @@ #include -using namespace PXR_NS; +PXR_NAMESPACE_USING_DIRECTIVE using namespace MayaUsdUtils; //---------------------------------------------------------------------------------------------------------------------- diff --git a/test/lib/usd/utils/test_DiffValuesIntVecs.cpp b/test/lib/usd/utils/test_DiffValuesIntVecs.cpp index 9cf95f52b0..67084e61bc 100644 --- a/test/lib/usd/utils/test_DiffValuesIntVecs.cpp +++ b/test/lib/usd/utils/test_DiffValuesIntVecs.cpp @@ -17,7 +17,7 @@ #include -using namespace PXR_NS; +PXR_NAMESPACE_USING_DIRECTIVE using namespace MayaUsdUtils; //---------------------------------------------------------------------------------------------------------------------- diff --git a/test/lib/usd/utils/test_DiffValuesMatrices.cpp b/test/lib/usd/utils/test_DiffValuesMatrices.cpp index 1c0bcbc4b0..25b773d01c 100644 --- a/test/lib/usd/utils/test_DiffValuesMatrices.cpp +++ b/test/lib/usd/utils/test_DiffValuesMatrices.cpp @@ -7,7 +7,7 @@ #include -using namespace PXR_NS; +PXR_NAMESPACE_USING_DIRECTIVE using namespace MayaUsdUtils; namespace { diff --git a/test/lib/usd/utils/test_DiffValuesQuaternions.cpp b/test/lib/usd/utils/test_DiffValuesQuaternions.cpp index 00de212d89..2aa82e6b47 100644 --- a/test/lib/usd/utils/test_DiffValuesQuaternions.cpp +++ b/test/lib/usd/utils/test_DiffValuesQuaternions.cpp @@ -7,7 +7,7 @@ #include -using namespace PXR_NS; +PXR_NAMESPACE_USING_DIRECTIVE using namespace MayaUsdUtils; namespace { diff --git a/test/lib/usd/utils/test_MergePrims.cpp b/test/lib/usd/utils/test_MergePrims.cpp index c6e1570591..74a1b337ab 100644 --- a/test/lib/usd/utils/test_MergePrims.cpp +++ b/test/lib/usd/utils/test_MergePrims.cpp @@ -12,7 +12,7 @@ #include -using namespace PXR_NS; +PXR_NAMESPACE_USING_DIRECTIVE using namespace MayaUsdUtils; namespace { From c3881c51b1d5a23be0951507c6859e89d11bf2b3 Mon Sep 17 00:00:00 2001 From: Sean Donnelly <23455376+seando-adsk@users.noreply.github.com> Date: Thu, 30 Mar 2023 13:48:55 -0400 Subject: [PATCH 2/2] Fix clang-format error --- lib/usd/ui/layerEditor/mayaLayerEditorWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/usd/ui/layerEditor/mayaLayerEditorWindow.cpp b/lib/usd/ui/layerEditor/mayaLayerEditorWindow.cpp index 4e46dc9f68..22cd1e80b9 100644 --- a/lib/usd/ui/layerEditor/mayaLayerEditorWindow.cpp +++ b/lib/usd/ui/layerEditor/mayaLayerEditorWindow.cpp @@ -46,7 +46,7 @@ class LayerEditorWindowCreator : public MayaUsd::AbstractLayerEditorCreator MayaUsd::AbstractLayerEditorWindow* createWindow(const char* panelName) override; MayaUsd::AbstractLayerEditorWindow* getWindow(const char* panelName) const override; - std::vector getAllPanelNames() const override; + std::vector getAllPanelNames() const override; private: // it's very important that this be a QPointer, so that it gets