Skip to content

Simplify DisplayableManager header includes#7321

Merged
jcfr merged 2 commits intoSlicer:mainfrom
jcfr:displayable-manager-misc-header-include-cleanup
Oct 30, 2023
Merged

Simplify DisplayableManager header includes#7321
jcfr merged 2 commits intoSlicer:mainfrom
jcfr:displayable-manager-misc-header-include-cleanup

Conversation

@jcfr
Copy link
Member

@jcfr jcfr commented Oct 30, 2023

No description provided.

@jcfr jcfr requested review from lassoan and pieper October 30, 2023 17:31
@jcfr jcfr mentioned this pull request Oct 30, 2023
Merged
pieper
pieper reviewed Oct 30, 2023
View reviewed changes
Copy link
Member

@pieper pieper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have a strong opinion on this and the related PRs #7320 and #7319.

@lassoan may want to comment but unless there's an issue I'm fine with merging.

@jcfr
Copy link
Member Author

jcfr commented Oct 30, 2023 

/usr/src/Slicer/Libs/MRML/DisplayableManager/vtkMRMLViewInteractorStyle.h:111:32: error: field ‘ClickTimer’ has incomplete type ‘vtkSmartPointer<vtkTimerLog>’
vtkSmartPointer<vtkTimerLog> ClickTimer;

The vtkTimerLog header should be removed in #7322 and not in this one.

@jcfr jcfr force-pushed the displayable-manager-misc-header-include-cleanup branch from 9cf6712 to 08ec72b Compare October 30, 2023 19:29
lassoan
lassoan approved these changes Oct 30, 2023
View reviewed changes
Copy link
Contributor

@lassoan lassoan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@jcfr jcfr enabled auto-merge (rebase) October 30, 2023 19:31
@jcfr jcfr merged commit 09a0e50 into Slicer:main Oct 30, 2023
@jcfr jcfr deleted the displayable-manager-misc-header-include-cleanup branch October 30, 2023 21:35
@jcfr jcfr added the backport:5.x Identify pull request expected to be backported to the current 5.x release branch. label Nov 5, 2023
@jcfr jcfr removed the backport:5.x Identify pull request expected to be backported to the current 5.x release branch. label Nov 15, 2023
This was referenced Dec 21, 2023
Merged
Closed
@jcfr jcfr mentioned this pull request Dec 30, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pieper pieper pieper left review comments

@lassoan lassoan lassoan approved these changes

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jcfr @pieper @lassoan