Merge pull request #1214 from Autodesk/tremblp/MAYA-110153/fix_pxr_na…

…mespace_00 Tremblp/maya 110153/fix pxr namespace 00
Autodesk · Feb 26, 2021 · b656585 · b656585
2 parents 02fdccd + 84d3bc2
commit b656585
Show file tree

Hide file tree

Showing 15 changed files with 10 additions and 38 deletions.
diff --git a/lib/mayaUsd/ufe/UsdTransform3d.h b/lib/mayaUsd/ufe/UsdTransform3d.h
@@ -23,8 +23,6 @@
 #include <ufe/path.h>
 #include <ufe/transform3d.h>
 
-PXR_NAMESPACE_USING_DIRECTIVE
-
 namespace MAYAUSD_NS_DEF {
 namespace ufe {
 

diff --git a/lib/mayaUsd/ufe/UsdTransform3dBase.h b/lib/mayaUsd/ufe/UsdTransform3dBase.h
@@ -23,8 +23,6 @@
 #include <ufe/transform3d.h>
 #include <ufe/transform3dHandler.h>
 
-PXR_NAMESPACE_USING_DIRECTIVE
-
 namespace MAYAUSD_NS_DEF {
 namespace ufe {
 

diff --git a/lib/mayaUsd/ufe/UsdTransform3dCommonAPI.h b/lib/mayaUsd/ufe/UsdTransform3dCommonAPI.h
@@ -20,8 +20,6 @@
 
 #include <pxr/usd/usdGeom/xformCommonAPI.h>
 
-PXR_NAMESPACE_USING_DIRECTIVE
-
 namespace MAYAUSD_NS_DEF {
 namespace ufe {
 

diff --git a/lib/mayaUsd/ufe/UsdTransform3dFallbackMayaXformStack.h b/lib/mayaUsd/ufe/UsdTransform3dFallbackMayaXformStack.h
@@ -18,8 +18,6 @@
 #include <mayaUsd/ufe/UfeVersionCompat.h>
 #include <mayaUsd/ufe/UsdTransform3dMayaXformStack.h>
 
-PXR_NAMESPACE_USING_DIRECTIVE
-
 namespace MAYAUSD_NS_DEF {
 namespace ufe {
 

diff --git a/lib/mayaUsd/ufe/UsdTransform3dMatrixOp.h b/lib/mayaUsd/ufe/UsdTransform3dMatrixOp.h
@@ -20,8 +20,6 @@
 
 #include <pxr/usd/usdGeom/xformOp.h>
 
-PXR_NAMESPACE_USING_DIRECTIVE
-
 namespace MAYAUSD_NS_DEF {
 namespace ufe {
 

diff --git a/lib/mayaUsd/ufe/UsdTransform3dMayaXformStack.h b/lib/mayaUsd/ufe/UsdTransform3dMayaXformStack.h
@@ -22,8 +22,6 @@
 
 #include <map>
 
-PXR_NAMESPACE_USING_DIRECTIVE
-
 namespace MAYAUSD_NS_DEF {
 namespace ufe {
 

diff --git a/lib/mayaUsd/ufe/UsdTransform3dSetObjectMatrix.h b/lib/mayaUsd/ufe/UsdTransform3dSetObjectMatrix.h
@@ -20,8 +20,6 @@
 
 #include <pxr/base/gf/matrix4d.h>
 
-PXR_NAMESPACE_USING_DIRECTIVE
-
 namespace MAYAUSD_NS_DEF {
 namespace ufe {
 

diff --git a/lib/mayaUsd/ufe/UsdUndoAddNewPrimCommand.h b/lib/mayaUsd/ufe/UsdUndoAddNewPrimCommand.h
@@ -23,8 +23,6 @@
 #include <ufe/path.h>
 #include <ufe/undoableCommand.h>
 
-PXR_NAMESPACE_USING_DIRECTIVE
-
 namespace MAYAUSD_NS_DEF {
 namespace ufe {
 

diff --git a/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h b/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h
@@ -22,8 +22,6 @@
 #include <ufe/selection.h>
 #include <ufe/undoableCommand.h>
 
-// PXR_NAMESPACE_USING_DIRECTIVE
-
 namespace MAYAUSD_NS_DEF {
 namespace ufe {
 

diff --git a/lib/mayaUsd/ufe/UsdUndoDeleteCommand.h b/lib/mayaUsd/ufe/UsdUndoDeleteCommand.h
@@ -27,8 +27,6 @@
 
 #include <ufe/undoableCommand.h>
 
-PXR_NAMESPACE_USING_DIRECTIVE
-
 namespace MAYAUSD_NS_DEF {
 namespace ufe {
 

diff --git a/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h b/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h
@@ -28,8 +28,6 @@
 #include <ufe/path.h>
 #include <ufe/undoableCommand.h>
 
-PXR_NAMESPACE_USING_DIRECTIVE
-
 namespace MAYAUSD_NS_DEF {
 namespace ufe {
 

diff --git a/lib/mayaUsd/ufe/UsdUndoInsertChildCommand.h b/lib/mayaUsd/ufe/UsdUndoInsertChildCommand.h
@@ -22,8 +22,6 @@
 
 #include <ufe/hierarchy.h>
 
-PXR_NAMESPACE_USING_DIRECTIVE
-
 namespace MAYAUSD_NS_DEF {
 namespace ufe {
 

diff --git a/lib/mayaUsd/ufe/UsdUndoRenameCommand.h b/lib/mayaUsd/ufe/UsdUndoRenameCommand.h
@@ -22,8 +22,6 @@
 #include <ufe/pathComponent.h>
 #include <ufe/undoableCommand.h>
 
-PXR_NAMESPACE_USING_DIRECTIVE
-
 namespace MAYAUSD_NS_DEF {
 namespace ufe {
 

diff --git a/lib/mayaUsd/ufe/UsdUndoReorderCommand.h b/lib/mayaUsd/ufe/UsdUndoReorderCommand.h
@@ -22,8 +22,6 @@
 
 #include <ufe/undoableCommand.h>
 
-PXR_NAMESPACE_USING_DIRECTIVE
-
 namespace MAYAUSD_NS_DEF {
 namespace ufe {
 
@@ -33,7 +31,9 @@ class MAYAUSD_CORE_PUBLIC UsdUndoReorderCommand : public Ufe::UndoableCommand
 public:
     typedef std::shared_ptr<UsdUndoReorderCommand> Ptr;
 
-    UsdUndoReorderCommand(const UsdPrim& parentPrim, const std::vector<TfToken>& orderedTokens);
+    UsdUndoReorderCommand(
+        const PXR_NS::UsdPrim&              parentPrim,
+        const std::vector<PXR_NS::TfToken>& orderedTokens);
     ~UsdUndoReorderCommand() override;
 
     // Delete the copy/move constructors assignment operators.
@@ -44,16 +44,16 @@ class MAYAUSD_CORE_PUBLIC UsdUndoReorderCommand : public Ufe::UndoableCommand
 
     //! Create a UsdUndoReorderCommand
     static UsdUndoReorderCommand::Ptr
-    create(const UsdPrim& parentPrim, const std::vector<TfToken>& orderedTokens);
+    create(const PXR_NS::UsdPrim& parentPrim, const std::vector<PXR_NS::TfToken>& orderedTokens);
 
 private:
     void execute() override;
     void undo() override;
     void redo() override;
 
-    UsdPrim              _parentPrim;
-    std::vector<TfToken> _orderedTokens;
-    UsdUndoableItem      _undoableItem;
+    PXR_NS::UsdPrim              _parentPrim;
+    std::vector<PXR_NS::TfToken> _orderedTokens;
+    UsdUndoableItem              _undoableItem;
 
 }; // UsdUndoReorderCommand
 

diff --git a/lib/mayaUsd/ufe/UsdUndoVisibleCommand.h b/lib/mayaUsd/ufe/UsdUndoVisibleCommand.h
@@ -22,8 +22,6 @@
 
 #include <ufe/undoableCommand.h>
 
-PXR_NAMESPACE_USING_DIRECTIVE
-
 namespace MAYAUSD_NS_DEF {
 namespace ufe {
 
@@ -33,7 +31,7 @@ class MAYAUSD_CORE_PUBLIC UsdUndoVisibleCommand : public Ufe::UndoableCommand
 public:
     typedef std::shared_ptr<UsdUndoVisibleCommand> Ptr;
 
-    UsdUndoVisibleCommand(const UsdPrim& prim, bool vis);
+    UsdUndoVisibleCommand(const PXR_NS::UsdPrim& prim, bool vis);
     ~UsdUndoVisibleCommand() override;
 
     // Delete the copy/move constructors assignment operators.
@@ -43,14 +41,14 @@ class MAYAUSD_CORE_PUBLIC UsdUndoVisibleCommand : public Ufe::UndoableCommand
     UsdUndoVisibleCommand& operator=(UsdUndoVisibleCommand&&) = delete;
 
     //! Create a UsdUndoVisibleCommand object
-    static UsdUndoVisibleCommand::Ptr create(const UsdPrim& prim, bool vis);
+    static UsdUndoVisibleCommand::Ptr create(const PXR_NS::UsdPrim& prim, bool vis);
 
 private:
     void execute() override;
     void undo() override;
     void redo() override;
 
-    UsdPrim _prim;
+    PXR_NS::UsdPrim _prim;
 
     bool _visible;