-
Notifications
You must be signed in to change notification settings - Fork 202
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.
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
Apply clang-format two more times to make sure we have everything formatted #918
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -878,37 +878,42 @@ void MayaEventHandler::initDagMessage(MayaCallbackInfo& cbi) | |
case DagMessage::kParentAdded: | ||
cbi.mayaCallback = MDagMessage::addParentAddedCallback(bindParentChildFunction, &cbi); | ||
break; | ||
case DagMessage::kParentAddedDagPath: /* cbi.mayaCallback = | ||
MDagMessage::addParentAddedDagPathCallback(bindNodeStringBoolFunc, | ||
&cbi); */ | ||
case DagMessage:: | ||
kParentAddedDagPath: /* cbi.mayaCallback = | ||
MDagMessage::addParentAddedDagPathCallback(bindNodeStringBoolFunc, | ||
&cbi); */ | ||
break; | ||
case DagMessage::kParentRemoved: | ||
cbi.mayaCallback = MDagMessage::addParentRemovedCallback(bindParentChildFunction, &cbi); | ||
break; | ||
case DagMessage::kParentRemovedDagPath: /* cbi.mayaCallback = | ||
MDagMessage::addParentRemovedDagPathCallback(bindNodeStringBoolFunc, | ||
&cbi); */ | ||
case DagMessage:: | ||
kParentRemovedDagPath: /* cbi.mayaCallback = | ||
MDagMessage::addParentRemovedDagPathCallback(bindNodeStringBoolFunc, | ||
&cbi); */ | ||
break; | ||
case DagMessage::kChildAdded: | ||
cbi.mayaCallback = MDagMessage::addChildAddedCallback(bindParentChildFunction, &cbi); | ||
break; | ||
case DagMessage::kChildAddedDagPath: /* cbi.mayaCallback = | ||
MContainerMessage::addChildAddedDagPathCallback(bindNodeStringBoolFunc, | ||
&cbi); */ | ||
case DagMessage:: | ||
kChildAddedDagPath: /* cbi.mayaCallback = | ||
MContainerMessage::addChildAddedDagPathCallback(bindNodeStringBoolFunc, | ||
&cbi); */ | ||
break; | ||
case DagMessage::kChildRemoved: | ||
cbi.mayaCallback = MDagMessage::addChildRemovedCallback(bindParentChildFunction, &cbi); | ||
break; | ||
case DagMessage::kChildRemovedDagPath: /* cbi.mayaCallback = | ||
MDagMessage::addChildRemovedDagPathCallback(bindNodeStringBoolFunc, | ||
&cbi); */ | ||
case DagMessage:: | ||
kChildRemovedDagPath: /* cbi.mayaCallback = | ||
MDagMessage::addChildRemovedDagPathCallback(bindNodeStringBoolFunc, | ||
&cbi); */ | ||
break; | ||
case DagMessage::kChildReordered: | ||
cbi.mayaCallback = MDagMessage::addChildReorderedCallback(bindParentChildFunction, &cbi); | ||
break; | ||
case DagMessage::kChildReorderedDagPath: /* cbi.mayaCallback = | ||
MDagMessage::addChildReorderedDagPathCallback(bindNodeStringBoolFunc, | ||
&cbi); */ | ||
case DagMessage:: | ||
kChildReorderedDagPath: /* cbi.mayaCallback = | ||
MDagMessage::addChildReorderedDagPathCallback(bindNodeStringBoolFunc, | ||
&cbi); */ | ||
break; | ||
case DagMessage::kDag: /* cbi.mayaCallback = | ||
MDagMessage::addDagCallback(bindMessageParentChildFunction, &cbi); */ | ||
|
@@ -921,27 +926,31 @@ void MayaEventHandler::initDagMessage(MayaCallbackInfo& cbi) | |
cbi.mayaCallback | ||
= MDagMessage::addAllDagChangesCallback(bindMessageParentChildFunction, &cbi); | ||
break; | ||
case DagMessage::kAllDagChangesDagPath: /* cbi.mayaCallback = | ||
MDagMessage::addAllDagChangesDagPathCallback(bindNodeStringBoolFunc, | ||
&cbi); */ | ||
case DagMessage:: | ||
kAllDagChangesDagPath: /* cbi.mayaCallback = | ||
MDagMessage::addAllDagChangesDagPathCallback(bindNodeStringBoolFunc, | ||
&cbi); */ | ||
break; | ||
case DagMessage::kInstanceAdded: | ||
cbi.mayaCallback = MDagMessage::addInstanceAddedCallback(bindParentChildFunction, &cbi); | ||
break; | ||
case DagMessage::kInstanceAddedDagPath: /* cbi.mayaCallback = | ||
MDagMessage::addInstanceAddedDagPathCallback(bindNodeStringBoolFunc, | ||
&cbi); */ | ||
case DagMessage:: | ||
kInstanceAddedDagPath: /* cbi.mayaCallback = | ||
MDagMessage::addInstanceAddedDagPathCallback(bindNodeStringBoolFunc, | ||
&cbi); */ | ||
break; | ||
case DagMessage::kInstanceRemoved: | ||
cbi.mayaCallback = MDagMessage::addInstanceRemovedCallback(bindParentChildFunction, &cbi); | ||
break; | ||
case DagMessage::kInstanceRemovedDagPath: /* cbi.mayaCallback = | ||
MDagMessage::addInstanceRemovedDagPathCallback(bindNodeStringBoolFunc, | ||
&cbi); */ | ||
case DagMessage:: | ||
kInstanceRemovedDagPath: /* cbi.mayaCallback = | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is pretty ugly...wasn't expecting clang-format to break it this way. Must have something to do with commented code after. Something to remember and revisit eventually. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why not put it back to what it was before and use the clang-format off/on comment? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't want developers to have to fallback to disabling clang-format in too many cases. We will update clang-format version at one point. This will be a good opportunity to revising some of the clang-format settings and prevent this type of formatting. For that reason, I'm not going to use the clang-format off/on comment. |
||
MDagMessage::addInstanceRemovedDagPathCallback(bindNodeStringBoolFunc, | ||
&cbi); */ | ||
break; | ||
case DagMessage::kWorldMatrixModified: /* cbi.mayaCallback = | ||
MDagMessage::addWorldMatrixModifiedCallback(bindNodeStringBoolFunc, | ||
&cbi); */ | ||
case DagMessage:: | ||
kWorldMatrixModified: /* cbi.mayaCallback = | ||
MDagMessage::addWorldMatrixModifiedCallback(bindNodeStringBoolFunc, | ||
&cbi); */ | ||
break; | ||
default: break; | ||
} | ||
|
@@ -1143,13 +1152,15 @@ void MayaEventHandler::initModelMessage(MayaCallbackInfo& cbi) | |
case ModelMessage::kAfterDuplicate: | ||
cbi.mayaCallback = MModelMessage::addAfterDuplicateCallback(bindBasicFunction, &cbi); | ||
break; | ||
case ModelMessage::kNodeAddedToModel: /* cbi.mayaCallback = | ||
MModelMessage::addNodeAddedToModelCallback(bindTimeFunction, | ||
&cbi); */ | ||
case ModelMessage:: | ||
kNodeAddedToModel: /* cbi.mayaCallback = | ||
MModelMessage::addNodeAddedToModelCallback(bindTimeFunction, | ||
&cbi); */ | ||
break; | ||
case ModelMessage::kNodeRemovedFromModel: /* cbi.mayaCallback = | ||
MModelMessage::addNodeRemovedFromModelCallback(bindTimeFunction, | ||
&cbi); */ | ||
case ModelMessage:: | ||
kNodeRemovedFromModel: /* cbi.mayaCallback = | ||
MModelMessage::addNodeRemovedFromModelCallback(bindTimeFunction, | ||
&cbi); */ | ||
break; | ||
default: break; | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I really hate this formatting and this make it impossible to read. Can you please revert this map back to its original state before the first clang-format was applied. Then you can manually change the tabs to spaces. And add in the clang-format off/on comment so this block will remain unchanged by clang-format.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed dead code and fixed based on our discussion.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Much better, thanks.