Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix up header includes using "./" and "../" and other misc. clean-up #585

Merged
merged 10 commits into from
Jun 14, 2020
Merged

fix up header includes using "./" and "../" and other misc. clean-up #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
236542e
[plugin/al] remove path on include of private headers
mattyjams Jun 10, 2020
7ed1116
[plugin/al] move private header includes to their own group before px…
mattyjams Jun 10, 2020
330a33d
[plugin/al] remove path on include of related header from cpp file
mattyjams Jun 10, 2020
da71172
[plugin/al] ensure related header includes are in their own group at …
mattyjams Jun 10, 2020
99fcff5
[plugin/al] use full paths for includes of public headers
mattyjams Jun 10, 2020
a5ea0b2
[plugin/al] use angle braces for includes of public AL headers
mattyjams Jun 10, 2020
ff4ddfd
[plugin/al] arrange header includes according to coding guidelines
mattyjams Jun 11, 2020
bdd436f
[mayaUsd/ufe] use full path for includes of public headers
mattyjams Jun 11, 2020
f7893bd
[mayaUsd/ufe] use angle braces for includes of public headers
mattyjams Jun 11, 2020
e71c72f
[mayaUsd/ufe] arrange header includes according to coding guidelines
mattyjams Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib/mayaUsd/ufe/UsdTRSUndoableCommandBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 3 additions & 4 deletions lib/mayaUsd/ufe/UsdUndoInsertChildCommand.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 3 additions & 4 deletions plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
12 changes: 6 additions & 6 deletions plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ListTranslators.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
13 changes: 6 additions & 7 deletions plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
5 changes: 2 additions & 3 deletions plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/SyncFileIOGui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
11 changes: 5 additions & 6 deletions plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 3 additions & 4 deletions plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 4 additions & 5 deletions plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 5 additions & 4 deletions plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
22 changes: 10 additions & 12 deletions plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
13 changes: 6 additions & 7 deletions plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
15 changes: 7 additions & 8 deletions plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TestExtraDataPlugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 3 additions & 4 deletions plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
18 changes: 9 additions & 9 deletions plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
25 changes: 13 additions & 12 deletions plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading