Merge pull request #585 from mattyjams/pr/fix_relative_include_paths_…

…in_AL_plugins fix up header includes using "./" and "../" and other misc. clean-up
Autodesk · Jun 14, 2020 · 14e89f9 · 14e89f9
2 parents 6226279 + e71c72f
commit 14e89f9
Show file tree

Hide file tree

Showing 35 changed files with 159 additions and 175 deletions.
diff --git a/lib/mayaUsd/ufe/UsdTRSUndoableCommandBase.h b/lib/mayaUsd/ufe/UsdTRSUndoableCommandBase.h
@@ -15,14 +15,14 @@
 //
 #pragma once
 
-#include "../base/api.h"
-#include "UsdSceneItem.h"
-
-#include <ufe/transform3dUndoableCommands.h>
-#include <ufe/observer.h>
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdSceneItem.h>
 
 #include <pxr/usd/usd/attribute.h>
 
+#include <ufe/observer.h>
+#include <ufe/transform3dUndoableCommands.h>
+
 PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {

diff --git a/lib/mayaUsd/ufe/UsdUndoInsertChildCommand.h b/lib/mayaUsd/ufe/UsdUndoInsertChildCommand.h
@@ -15,14 +15,13 @@
 //
 #pragma once
 
-#include "../base/api.h"
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdSceneItem.h>
 
-#include "UsdSceneItem.h"
+#include <pxr/usd/usd/prim.h>
 
 #include <ufe/undoableCommand.h>
 
-#include <pxr/usd/usd/prim.h>
-
 PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.h
@@ -15,13 +15,12 @@
 //
 #pragma once
 
-#include "../Api.h"
+#include <AL/maya/utils/Api.h>
+#include <AL/maya/utils/MayaHelperMacros.h>
+#include <AL/usdmaya/Api.h>
 
 #include <maya/MPxCommand.h>
 
-#include "AL/maya/utils/Api.h"
-#include "AL/maya/utils/MayaHelperMacros.h"
-
 
 namespace AL {
 namespace usdmaya {

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.h
@@ -15,16 +15,16 @@
 //
 #pragma once
 
-#include "../Api.h"
+#include <AL/maya/utils/Api.h>
+#include <AL/maya/utils/MayaHelperMacros.h>
+#include <AL/usdmaya/Api.h>
+#include <AL/usdmaya/ForwardDeclares.h>
+
+#include <pxr/usd/usd/stage.h>
 
-#include "AL/usdmaya/ForwardDeclares.h"
-#include "AL/maya/utils/Api.h"
-#include "AL/maya/utils/MayaHelperMacros.h"
 #include <maya/MDGModifier.h>
 #include <maya/MPxCommand.h>
 
-#include <pxr/usd/usd/stage.h>
-
 PXR_NAMESPACE_USING_DIRECTIVE
 
 namespace AL {

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ListTranslators.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ListTranslators.h
@@ -15,9 +15,9 @@
 //
 #pragma once
 
-#include "../Api.h"
+#include <AL/maya/utils/MayaHelperMacros.h>
+#include <AL/usdmaya/Api.h>
 
-#include "AL/maya/utils/MayaHelperMacros.h"
 #include <maya/MPxCommand.h>
 
 namespace AL {

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.h
@@ -15,18 +15,17 @@
 //
 #pragma once
 
-#include "../Api.h"
+#include <AL/usdmaya/Api.h>
+#include <AL/usdmaya/StageCache.h>
+#include <AL/usdmaya/fileio/ImportParams.h>
+#include <AL/usdmaya/nodes/ProxyShape.h>
+
+#include <pxr/usd/usd/stage.h>
 
 #include <maya/MDagModifier.h>
 #include <maya/MObjectArray.h>
 #include <maya/MPxCommand.h>
 
-#include "AL/usdmaya/fileio/ImportParams.h"
-#include "AL/usdmaya/nodes/ProxyShape.h"
-#include "AL/usdmaya/StageCache.h"
-
-#include <pxr/usd/usd/stage.h>
-
 PXR_NAMESPACE_USING_DIRECTIVE
 
 namespace AL {

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.h
@@ -15,9 +15,8 @@
 //
 #pragma once
 
-#include "../Api.h"
-
-#include "AL/maya/utils/MayaHelperMacros.h"
+#include <AL/maya/utils/MayaHelperMacros.h>
+#include <AL/usdmaya/Api.h>
 
 #include <maya/MPxCommand.h>
 

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/SyncFileIOGui.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/SyncFileIOGui.h
@@ -15,12 +15,11 @@
 //
 #pragma once
 
-#include "../Api.h"
+#include <AL/maya/utils/MayaHelperMacros.h>
+#include <AL/usdmaya/Api.h>
 
 #include <maya/MPxCommand.h>
 
-#include "AL/maya/utils/MayaHelperMacros.h"
-
 namespace AL {
 namespace usdmaya {
 namespace cmds {

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.h
@@ -15,14 +15,13 @@
 //
 #pragma once
 
-#include "../Api.h"
-
-#include "AL/maya/utils/Utils.h"
-
-#include "AL/usdmaya/utils/AnimationTranslator.h"
-#include "AL/usdmaya/fileio/translators/TranslatorBase.h"
+#include <AL/maya/utils/Utils.h>
+#include <AL/usdmaya/Api.h>
+#include <AL/usdmaya/fileio/translators/TranslatorBase.h>
+#include <AL/usdmaya/utils/AnimationTranslator.h>
 
 #include <pxr/usd/usd/attribute.h>
+
 PXR_NAMESPACE_USING_DIRECTIVE
 
 namespace AL {

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.h
@@ -15,10 +15,9 @@
 //
 #pragma once
 
-#include "../Api.h"
-
-#include "AL/maya/utils/FileTranslatorBase.h"
-#include "AL/maya/utils/PluginTranslatorOptions.h"
+#include <AL/maya/utils/FileTranslatorBase.h>
+#include <AL/maya/utils/PluginTranslatorOptions.h>
+#include <AL/usdmaya/Api.h>
 
 namespace AL {
 namespace usdmaya {

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.h
@@ -15,11 +15,10 @@
 //
 #pragma once
 
-#include "../Api.h"
-
-#include "AL/maya/utils/FileTranslatorBase.h"
-#include "AL/usdmaya/fileio/ImportParams.h"
-#include "AL/maya/utils/PluginTranslatorOptions.h"
+#include <AL/maya/utils/FileTranslatorBase.h>
+#include <AL/maya/utils/PluginTranslatorOptions.h>
+#include <AL/usdmaya/Api.h>
+#include <AL/usdmaya/fileio/ImportParams.h>
 
 namespace AL {
 namespace usdmaya {

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.h
@@ -15,13 +15,14 @@
 //
 #pragma once
 
-#include "../../Api.h"
-
+#include <AL/usdmaya/Api.h>
 #include <AL/usdmaya/ForwardDeclares.h>
-#include "AL/usdmaya/fileio/translators/DgNodeTranslator.h"
-#include <maya/MObject.h>
+#include <AL/usdmaya/fileio/translators/DgNodeTranslator.h>
+
 #include <pxr/base/tf/token.h>
 
+#include <maya/MObject.h>
+
 namespace AL {
 namespace usdmaya {
 namespace fileio {

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.h
@@ -15,24 +15,22 @@
 //
 #pragma once
 
-#include "../../Api.h"
-
+#include <AL/maya/utils/MayaHelperMacros.h>
+#include <AL/usdmaya/Api.h>
 #include <AL/usdmaya/ForwardDeclares.h>
-#include "AL/usdmaya/utils/AttributeType.h"
-#include "AL/usdmaya/utils/DgNodeHelper.h"
-#include "AL/usdmaya/utils/ForwardDeclares.h"
-#include "AL/maya/utils/MayaHelperMacros.h"
+#include <AL/usdmaya/utils/AttributeType.h>
+#include <AL/usdmaya/utils/DgNodeHelper.h>
+#include <AL/usdmaya/utils/ForwardDeclares.h>
+
+#include <pxr/base/gf/half.h>
+#include <pxr/usd/usd/attribute.h>
 
-#include <maya/MPlug.h>
 #include <maya/MAngle.h>
 #include <maya/MDistance.h>
-#include <maya/MTime.h>
-
 #include <maya/MGlobal.h>
+#include <maya/MPlug.h>
 #include <maya/MStatus.h>
-
-#include <pxr/base/gf/half.h>
-#include <pxr/usd/usd/attribute.h>
+#include <maya/MTime.h>
 
 #include <string>
 #include <vector>

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.h
@@ -15,19 +15,18 @@
 //
 #pragma once
 
-#include "../../Api.h"
-#include "AL/maya/utils/Api.h"
-
-#include <maya/MDagPath.h>
+#include <AL/maya/utils/Api.h>
+#include <AL/usdmaya/Api.h>
+#include <AL/usdmaya/fileio/ExportParams.h>
+#include <AL/usdmaya/fileio/translators/TranslatorContext.h>
 
 #include <pxr/base/tf/refBase.h>
+#include <pxr/base/tf/registryManager.h>
 #include <pxr/base/tf/type.h>
 #include <pxr/base/tf/weakBase.h>
-#include <pxr/base/tf/registryManager.h>
 #include <pxr/usd/usd/prim.h>
 
-#include "AL/usdmaya/fileio/translators/TranslatorContext.h"
-#include "AL/usdmaya/fileio/ExportParams.h"
+#include <maya/MDagPath.h>
 
 namespace AL {
 namespace usdmaya {

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TestExtraDataPlugin.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TestExtraDataPlugin.h
@@ -15,21 +15,20 @@
 //
 #pragma once
 
-#include "../../Api.h"
-#include "AL/maya/utils/Api.h"
-
-#include <maya/MDagPath.h>
+#include <AL/maya/utils/Api.h>
+#include <AL/usdmaya/Api.h>
+#include <AL/usdmaya/fileio/ExportParams.h>
+#include <AL/usdmaya/fileio/translators/ExtraDataPlugin.h>
+#include <AL/usdmaya/fileio/translators/TranslatorContext.h>
 
 #include <pxr/base/tf/refBase.h>
+#include <pxr/base/tf/registryManager.h>
 #include <pxr/base/tf/type.h>
 #include <pxr/base/tf/weakBase.h>
-#include <pxr/base/tf/registryManager.h>
 #include <pxr/usd/usd/prim.h>
 #include <pxr/usd/usd/attribute.h>
 
-#include "AL/usdmaya/fileio/translators/TranslatorContext.h"
-#include "AL/usdmaya/fileio/translators/ExtraDataPlugin.h"
-#include "AL/usdmaya/fileio/ExportParams.h"
+#include <maya/MDagPath.h>
 
 namespace AL {
 namespace usdmaya {

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.h
@@ -15,11 +15,10 @@
 //
 #pragma once
 
-#include "../../Api.h"
-
+#include <AL/usdmaya/Api.h>
 #include <AL/usdmaya/ForwardDeclares.h>
-#include "AL/usdmaya/TransformOperation.h"
-#include "AL/usdmaya/fileio/translators/DagNodeTranslator.h"
+#include <AL/usdmaya/TransformOperation.h>
+#include <AL/usdmaya/fileio/translators/DagNodeTranslator.h>
 
 #include <pxr/usd/usd/attribute.h>
 #include <pxr/usd/usdGeom/xform.h>

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.h
@@ -15,23 +15,23 @@
 //
 #pragma once
 
-#include "../../Api.h"
-#include "AL/maya/utils/Api.h"
-
-#include <maya/MDagPath.h>
+#include <AL/maya/utils/Api.h>
+#include <AL/usdmaya/Api.h>
+#include <AL/usdmaya/fileio/ExportParams.h>
+#include <AL/usdmaya/fileio/translators/ExtraDataPlugin.h>
+#include <AL/usdmaya/fileio/translators/TranslatorContext.h>
 
 #include <pxr/base/tf/refBase.h>
+#include <pxr/base/tf/registryManager.h>
 #include <pxr/base/tf/type.h>
 #include <pxr/base/tf/weakBase.h>
-#include <pxr/base/tf/registryManager.h>
 #include <pxr/usd/usd/prim.h>
 
+#include <maya/MDagPath.h>
+
+#include <functional>
 #include <iostream>
 #include <unordered_map>
-#include <functional>
-#include "AL/usdmaya/fileio/translators/TranslatorContext.h"
-#include "AL/usdmaya/fileio/translators/ExtraDataPlugin.h"
-#include "AL/usdmaya/fileio/ExportParams.h"
 
 namespace AL {
 namespace usdmaya {

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.h
@@ -15,24 +15,25 @@
 //
 #pragma once
 
-#include "../../Api.h"
-
+#include <AL/usdmaya/Api.h>
+#include <AL/usdmaya/DebugCodes.h>
 #include <AL/usdmaya/ForwardDeclares.h>
-#include <maya/MPxData.h>
+#include <mayaUsdUtils/ForwardDeclares.h>
+
+#include <pxr/base/tf/debug.h>
+#include <pxr/base/tf/refPtr.h>
+#include <pxr/pxr.h>
+#include <pxr/usd/usd/prim.h>
+
+#include <maya/MDGModifier.h>
 #include <maya/MGlobal.h>
 #include <maya/MObject.h>
-#include <maya/MObjectHandle.h>
 #include <maya/MObjectArray.h>
-#include <maya/MDGModifier.h>
-#include <pxr/pxr.h>
-#include <pxr/base/tf/refPtr.h>
-#include <pxr/usd/usd/prim.h>
-#include <pxr/base/tf/debug.h>
-#include "AL/usdmaya/DebugCodes.h"
+#include <maya/MObjectHandle.h>
+#include <maya/MPxData.h>
 
-#include <vector>
 #include <string>
-#include <mayaUsdUtils/ForwardDeclares.h>
+#include <vector>
 
 PXR_NAMESPACE_USING_DIRECTIVE