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.

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

Split Track.cpp and Track.h #5806

Merged
merged 7 commits into from
Dec 4, 2020
Merged

Split Track.cpp and Track.h #5806

merged 7 commits into from
Dec 4, 2020

Conversation

M374LX
Copy link
Contributor

@M374LX M374LX commented Nov 25, 2020

This PR splits Track.cpp and Track.h into one pair of files per class, as suggested in #5592.

@LmmsBot
Copy link

LmmsBot commented Nov 25, 2020

🤖 Hey, I'm @LmmsBot from github.com/lmms/bot and I made downloads for this pull request, click me to make them magically appear! 🎩

Linux

Windows

🤖
{"platform_name_to_artifacts": {"Linux": [{"artifact": {"title": {"title": "(AppImage)", "platform_name": "Linux"}, "link": {"link": "https://11291-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.44%2Bg996763e-linux-x86_64.AppImage"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/11291?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}], "Windows": [{"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://11290-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.44%2Bg996763e56-mingw-win32.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/11290?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://11292-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.44%2Bg996763e56-mingw-win64.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/11292?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/j05v3978ggu7s8lp/artifacts/build/lmms-1.3.0-alpha-msvc2017-win32.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/36650353"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/ag6j9ke0b1wmc2en/artifacts/build/lmms-1.3.0-alpha-msvc2017-win64.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/36650353"}]}, "commit_sha": "58ab3f06c591027071938a3262acf8b26c39b86b"}

@M374LX M374LX changed the title [WIP] Split Track.cpp and Track.h Split Track.cpp and Track.h Nov 27, 2020
@M374LX M374LX marked this pull request as ready for review November 27, 2020 03:06
@JohannesLorenz JohannesLorenz self-requested a review November 29, 2020 10:24
@JohannesLorenz
Copy link
Contributor

@M374LX This is just moving code between files, nothing else?

@M374LX
Copy link
Contributor Author

M374LX commented Nov 29, 2020

@JohannesLorenz Other than moving code between files, there are a few changes in includes and forward declarations.

@JohannesLorenz
Copy link
Contributor

Are you able to rebase this branch, so the mentioned conflicts will vanish?

@JohannesLorenz
Copy link
Contributor

Let me know when I should review it.

Also, as you develop more PRs, just as information: We are currently trying to stop writing new PRs, in order to get our already started PRs closed for the reorganizing (#5592).

@M374LX
Copy link
Contributor Author

M374LX commented Nov 30, 2020 via email

Copy link
Contributor

@JohannesLorenz JohannesLorenz left a comment

Choose a reason for hiding this comment

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

Very useful PR, thanks for your efforts.

I left a lot of comments, but it's almost all about unused includes. Removing them will partly be a bit of work, but it will increase compile time.

include/AutomationPattern.h Outdated Show resolved Hide resolved
include/BBEditor.h Outdated Show resolved Hide resolved
include/TrackContainerView.h Show resolved Hide resolved
include/Track.h Outdated Show resolved Hide resolved
include/Track.h Outdated Show resolved Hide resolved
src/gui/TrackView.cpp Outdated Show resolved Hide resolved
src/gui/TrackView.cpp Outdated Show resolved Hide resolved
src/gui/TrackView.cpp Outdated Show resolved Hide resolved
src/gui/TrackView.cpp Outdated Show resolved Hide resolved
src/gui/widgets/FxLineLcdSpinBox.cpp Outdated Show resolved Hide resolved
@M374LX M374LX marked this pull request as draft December 2, 2020 17:16
@M374LX M374LX marked this pull request as ready for review December 2, 2020 22:35
@M374LX M374LX requested a review from JohannesLorenz December 2, 2020 22:35
Copy link
Contributor

@JohannesLorenz JohannesLorenz left a comment

Choose a reason for hiding this comment

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

Only one review comment added about some code comments. Functional it's all OK.

src/core/Track.cpp Show resolved Hide resolved
Copy link
Contributor

@JohannesLorenz JohannesLorenz left a comment

Choose a reason for hiding this comment

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

LGTM!

@JohannesLorenz
Copy link
Contributor

Thanks for the PR!

I'll wait for CI to finish and then I will "Squash and Merge". If you think it's too early for a merge because you want to add more commits for any reason, scream now 😃

@M374LX
Copy link
Contributor Author

M374LX commented Dec 4, 2020

@JohannesLorenz I believe it is ready to be merged.

@JohannesLorenz JohannesLorenz merged commit b701e82 into LMMS:master Dec 4, 2020
@M374LX M374LX deleted the track-split branch December 4, 2020 02:01
IanCaio added a commit to IanCaio/lmms that referenced this pull request Dec 5, 2020
	Fixes conflicts introduced by recent commits (LMMS#5684 and LMMS#5806
mostly).
IanCaio added a commit to IanCaio/lmms that referenced this pull request Dec 8, 2020
	Fixes conflict caused by LMMS#5806, which splitted Track.cpp and
Track.h
IanCaio pushed a commit to IanCaio/lmms that referenced this pull request Mar 28, 2021
devnexen pushed a commit to devnexen/lmms that referenced this pull request Apr 10, 2021
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants