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

Jump to bottom

Remove trailing white-space in files #2402

Merged
merged 2 commits into from
Feb 20, 2022
Merged

Remove trailing white-space in files #2402

merged 2 commits into from
Feb 20, 2022

Conversation

ann0see
Copy link
Member

@ann0see ann0see commented Feb 18, 2022 •
edited
Loading

Short description of changes

  • Removes unneeded whitespace in all files (found by Atom text editor)
  • Fixes line endings Fix line endings (\r) #2360 They should all be in unix format now

Context: Fixes an issue?
No, but hopefully stops cluttered diffs.
Fixes: #2360
Does this change need documentation? What needs to be documented and how?
CHANGELOG: Internal: Remove unneeded white-space in all files and streamline line endings

Status of this Pull Request
Ready to be merged if CI is ok.

What is missing until this pull request can be merged?

Checklist

  • I've verified that this Pull Request follows the general code principles
  • I tested my code and it does what I want
  • My code follows the style guide
  • I waited some time after this Pull Request was opened and all GitHub checks completed without errors.
  • I've filled all the content above

ann0see
ann0see commented Feb 18, 2022
View reviewed changes
Copy link
Member Author

@ann0see ann0see left a comment

Choose a reason for hiding this comment

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

I think this is not dangerous to merge - maybe clang-format should handle this (probably it already does but not for the files here.)

pljones
pljones approved these changes Feb 18, 2022
View reviewed changes
Copy link
Collaborator

@pljones pljones left a comment

Choose a reason for hiding this comment

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

I'd rather not include this in 3.8.2 now as it's not a blocker on releasing rc1, unlike the translations.

hoffie
hoffie approved these changes Feb 18, 2022
View reviewed changes
Copy link
Member

@hoffie hoffie left a comment

Choose a reason for hiding this comment

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

Another potential whitespace fix to include: #2360.

@ann0see ann0see mentioned this pull request Feb 19, 2022
Merged
5 tasks
@ann0see
Copy link
Member Author

ann0see commented Feb 19, 2022

Could be done with dos2unix, I think?

@ann0see ann0see added this to the Release 3.9.0 milestone Feb 19, 2022
@ann0see
Copy link
Member Author

ann0see commented Feb 19, 2022 •
edited
Loading

Ok @hoffie : I Included the fix as commit in this PR.

ann0see
ann0see commented Feb 19, 2022
View reviewed changes
Copy link
Member Author

@ann0see ann0see left a comment

Choose a reason for hiding this comment

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

How much sense does it make to include unfinished files in main? Shouldn't we put them in a feature branch?

src/vstmain.cpp
// clang-format on
}

bool CLlconVST::GetName ( char* cName )
Copy link
Member Author

Choose a reason for hiding this comment

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

llcon --> Jamulus

Copy link
Collaborator

Choose a reason for hiding this comment

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

The vst code could also all get moved to a (dead) feature branch.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes. I think that's best.

@ann0see
Copy link
Member Author

ann0see commented Feb 19, 2022

Should not be squash merged.

@ann0see ann0see linked an issue Feb 19, 2022 that may be closed by this pull request
Fix line endings (\r) #2360
Closed
@ann0see ann0see mentioned this pull request Feb 19, 2022
Closed
@ann0see
Copy link
Member Author

ann0see commented Feb 20, 2022

Should be merged after upcoming release (not squash merged).

@ann0see ann0see merged commit fa04a8d into jamulussoftware:master Feb 20, 2022
@ann0see ann0see deleted the removeTrWhitespace branch February 20, 2022 18:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pljones pljones pljones approved these changes

@hoffie hoffie hoffie approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Release 3.9.0
Development

Successfully merging this pull request may close these issues.

Fix line endings (\r)
3 participants
@ann0see @hoffie @pljones