Adhere to coding standard and use the fully qualified namespace name

lib/mayaUsd/fileio/jobs/meshDataReadJob.cpp

@@ -27,8 +27,6 @@
 #include <maya/MMatrix.h>
 #include <maya/MObject.h>
 
-using namespace MAYAUSD_NS_DEF;
-
 namespace {
 void convertMatrix(const GfMatrix4d& inMatrix, MMatrix& outMatrix, MObject& outMatrixObj)
 {

lib/mayaUsd/fileio/jobs/readJob.cpp

@@ -67,8 +67,6 @@
 #include <utility>
 #include <vector>
 
-using namespace MAYAUSD_NS_DEF;
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 namespace {
@@ -204,7 +202,7 @@ bool UsdMaya_ReadJob::Read(std::vector<MDagPath>* 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) {

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());
     }

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) {

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();
     }
 

lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp

@@ -56,8 +56,6 @@
 
 #include <vector>
 
-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;
             }

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<MMatrix, GfMatrix4d>::convert(mayaMatrix, matrix);
+        MayaUsd::TypedConverter<MMatrix, GfMatrix4d>::convert(mayaMatrix, matrix);
         return VtValue(matrix);
     } else {
         return VtValue(plug[i].asDouble());

lib/mayaUsd/fileio/translators/translatorCamera.cpp

@@ -43,8 +43,6 @@
 #include <string>
 #include <vector>
 
-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);

lib/mayaUsd/fileio/translators/translatorCurves.cpp

@@ -32,8 +32,6 @@
 #include <maya/MTime.h>
 #include <maya/MTimeArray.h>
 
-using namespace MAYAUSD_NS_DEF;
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 /* static */
@@ -54,15 +52,15 @@ 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();
     // Pull on the bezier output to force computing the values :
     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);

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();

lib/mayaUsd/fileio/translators/translatorSkel.cpp

@@ -45,8 +45,6 @@
 #include <maya/MPlug.h>
 #include <maya/MPlugArray.h>
 
-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);

lib/mayaUsd/fileio/translators/translatorUtil.cpp

@@ -46,8 +46,6 @@
 #include <maya/MStatus.h>
 #include <maya/MString.h>
 
-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);

lib/mayaUsd/fileio/utils/adaptor.cpp

@@ -35,8 +35,6 @@
 #include <maya/MFnDependencyNode.h>
 #include <maya/MPlug.h>
 
-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)