Address feedbacks:

- Fix private headers in translator promoted as public - Fix grouping order
Autodesk · Apr 7, 2020 · c6eecc5 · c6eecc5
1 parent 6b66aba
commit c6eecc5
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 53 deletions.
diff --git a/lib/usd/schemas/wrapALMayaReference.cpp b/lib/usd/schemas/wrapALMayaReference.cpp
@@ -17,13 +17,13 @@
 
 #include <boost/python.hpp>
 
-#include <pxr/usd/usd/schemaBase.h>
 #include <pxr/base/tf/pyContainerConversions.h>
 #include <pxr/base/tf/pyResultConversions.h>
 #include <pxr/base/tf/pyUtils.h>
 #include <pxr/base/tf/wrapTypeHelpers.h>
 #include <pxr/usd/sdf/primSpec.h>
 #include <pxr/usd/usd/pyConversions.h>
+#include <pxr/usd/usd/schemaBase.h>
 
 #include <mayaUsd_Schemas/ALMayaReference.h>
 

diff --git a/lib/usd/translators/CMakeLists.txt b/lib/usd/translators/CMakeLists.txt
@@ -46,42 +46,6 @@ target_sources(${TARGET_NAME}
         xformReader.cpp
 )
 
-set(headers
-    api.h
-    cameraReader.h
-    cameraWriter.h
-    fileTextureWriter.h
-    instancerWriter.h
-    jointWriter.h
-    lightReader.h
-    lightWriter.h
-    locatorWriter.h
-    materialReader.h
-    mayaReferenceReader.h
-    mayaReferenceUpdater.h
-    meshReader.h
-    meshWriter.h
-    meshWriter_Primvars.h
-    meshWriter_Skin.h
-    meshWriter_Subdiv.h
-    nurbsCurvesReader.h
-    nurbsCurveWriter.h
-    nurbsPatchReader.h
-    nurbsSurfaceWriter.h
-    particleWriter.h
-    scopeReader.h
-    skelReader.h
-    strokeWriter.h
-    xformReader.h
-)
-
-# -----------------------------------------------------------------------------
-# promoted headers
-# -----------------------------------------------------------------------------
-mayaUsd_promoteHeaderList(HEADERS ${headers}
-                          BASEDIR ${TARGET_NAME}
-)
-
 # -----------------------------------------------------------------------------
 # compile definitions
 # -----------------------------------------------------------------------------

diff --git a/lib/usd/translators/cameraWriter.h b/lib/usd/translators/cameraWriter.h
@@ -16,7 +16,7 @@
 #ifndef PXRUSDTRANSLATORS_CAMERA_WRITER_H
 #define PXRUSDTRANSLATORS_CAMERA_WRITER_H
 
-/// \file pxrUsdTranslators/cameraWriter.h
+/// \file
 
 #include <maya/MFnDependencyNode.h>
 

diff --git a/lib/usd/translators/fileTextureWriter.h b/lib/usd/translators/fileTextureWriter.h
@@ -16,7 +16,7 @@
 #ifndef PXRUSDTRANSLATORS_FILE_TEXTURE_WRITER_H
 #define PXRUSDTRANSLATORS_FILE_TEXTURE_WRITER_H
 
-/// \file pxrUsdTranslators/fileTextureWriter.h
+/// \file
 
 #include <maya/MFnDependencyNode.h>
 

diff --git a/lib/usd/translators/instancerWriter.h b/lib/usd/translators/instancerWriter.h
@@ -16,7 +16,7 @@
 #ifndef PXRUSDTRANSLATORS_INSTANCER_WRITER_H
 #define PXRUSDTRANSLATORS_INSTANCER_WRITER_H
 
-/// \file pxrUsdTranslators/instancerWriter.h
+/// \file
 
 #include <vector>
 

diff --git a/lib/usd/translators/jointWriter.h b/lib/usd/translators/jointWriter.h
@@ -16,7 +16,7 @@
 #ifndef PXRUSDTRANSLATORS_JOINT_WRITER_H
 #define PXRUSDTRANSLATORS_JOINT_WRITER_H
 
-/// \file pxrUsdTranslators/jointWriter.h
+/// \file
 
 #include <maya/MFnDependencyNode.h>
 

diff --git a/lib/usd/translators/locatorWriter.h b/lib/usd/translators/locatorWriter.h
@@ -16,7 +16,7 @@
 #ifndef PXRUSDTRANSLATORS_LOCATOR_WRITER_H
 #define PXRUSDTRANSLATORS_LOCATOR_WRITER_H
 
-/// \file pxrUsdTranslators/locatorWriter.h
+/// \file
 
 #include <maya/MFnDependencyNode.h>
 

diff --git a/lib/usd/translators/mayaReferenceUpdater.h b/lib/usd/translators/mayaReferenceUpdater.h
@@ -16,8 +16,6 @@
 #ifndef PXRUSDTRANSLATORS_MAYAREFERENCE_UPDATER_H
 #define PXRUSDTRANSLATORS_MAYAREFERENCE_UPDATER_H
 
-/// \file pxrUsdTranslators/mayaReferenceUpdater.h
-
 #include <maya/MFnDependencyNode.h>
 
 #include <pxr/pxr.h>

diff --git a/lib/usd/translators/meshWriter.h b/lib/usd/translators/meshWriter.h
@@ -16,7 +16,7 @@
 #ifndef PXRUSDTRANSLATORS_MESH_WRITER_H
 #define PXRUSDTRANSLATORS_MESH_WRITER_H
 
-/// \file pxrUsdTranslators/meshWriter.h
+/// \file
 
 #include <set>
 #include <string>

diff --git a/lib/usd/translators/meshWriter_Primvars.cpp b/lib/usd/translators/meshWriter_Primvars.cpp
@@ -31,7 +31,7 @@
 #include <mayaUsd/utils/colorSpace.h>
 #include <mayaUsd/utils/util.h>
 
-#include <mayaUsd_Translators/meshWriter.h>
+#include "meshWriter.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 

diff --git a/lib/usd/translators/meshWriter_Skin.cpp b/lib/usd/translators/meshWriter_Skin.cpp
@@ -35,8 +35,8 @@
 #include <mayaUsd/fileio/translators/translatorUtil.h>
 #include <mayaUsd/fileio/writeJobContext.h>
 
-#include <mayaUsd_Translators/jointWriter.h>
-#include <mayaUsd_Translators/meshWriter.h>
+#include "jointWriter.h"
+#include "meshWriter.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 

diff --git a/lib/usd/translators/meshWriter_Subdiv.cpp b/lib/usd/translators/meshWriter_Subdiv.cpp
@@ -19,7 +19,7 @@
 #include <pxr/pxr.h>
 #include <pxr/usd/usdGeom/mesh.h>
 
-#include <mayaUsd_Translators/meshWriter.h>
+#include "meshWriter.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 

diff --git a/lib/usd/translators/nurbsCurveWriter.h b/lib/usd/translators/nurbsCurveWriter.h
@@ -16,7 +16,7 @@
 #ifndef PXRUSDTRANSLATORS_NURBS_CURVE_WRITER_H
 #define PXRUSDTRANSLATORS_NURBS_CURVE_WRITER_H
 
-/// \file pxrUsdTranslators/nurbsCurveWriter.h
+/// \file
 
 #include <maya/MFnDependencyNode.h>
 

diff --git a/lib/usd/translators/nurbsSurfaceWriter.h b/lib/usd/translators/nurbsSurfaceWriter.h
@@ -16,7 +16,7 @@
 #ifndef PXRUSDTRANSLATORS_NURBS_SURFACE_WRITER_H
 #define PXRUSDTRANSLATORS_NURBS_SURFACE_WRITER_H
 
-/// \file pxrUsdTranslators/nurbsSurfaceWriter.h
+/// \file
 
 #include <maya/MFnDependencyNode.h>
 

diff --git a/lib/usd/translators/particleWriter.h b/lib/usd/translators/particleWriter.h
@@ -16,7 +16,8 @@
 #ifndef PXRUSDTRANSLATORS_PARTICLE_WRITER_H
 #define PXRUSDTRANSLATORS_PARTICLE_WRITER_H
 
-/// \file pxrUsdTranslators/particleWriter.h
+/// \file
+
 #include <mayaUsd/fileio/transformWriter.h>
 #include <mayaUsd/fileio/writeJobContext.h>
 

diff --git a/lib/usd/translators/plugin.cpp b/lib/usd/translators/plugin.cpp
@@ -18,7 +18,7 @@
 
 #include <pxr/pxr.h>
 
-#include <mayaUsd_Translators/api.h>
+#include "api.h"
 
 PXR_NAMESPACE_USING_DIRECTIVE
 

diff --git a/lib/usd/translators/strokeWriter.h b/lib/usd/translators/strokeWriter.h
@@ -16,6 +16,8 @@
 #ifndef PXRUSDTRANSLATORS_STROKE_WRITER_H
 #define PXRUSDTRANSLATORS_STROKE_WRITER_H
 
+/// \file
+
 #include <maya/MFnDependencyNode.h>
 
 #include <pxr/pxr.h>