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

Namespace lmms #6174

Merged
merged 123 commits into from
Jun 19, 2022
Merged

Namespace lmms #6174

merged 123 commits into from
Jun 19, 2022

Conversation

irrenhaus3
Copy link
Contributor

This PR places all LMMS symbols into namespaces to eliminate any potential future name collisions between LMMS and third-party modules.

Work in progress; See #6086 for discussion.

…d for type name / enum value name differentiation.
…ed in two places, name it explicitly in those.
…ypedef alias - to keep until we find a better name for it.
…ructor implementation from Xpressive and XpressiveView
…strument) and remove explicit default destructor implementation from all classes in ZynAddSubFx.h
@irrenhaus3
Copy link
Contributor Author

All requests in the second clazy-related comment addressed; In the mentioned files, all overriding functions (including non-empty destructors) have been marked override, empty destructors have been removed since the compiler default-generates them, and the unused private member in Lv2ViewBase has been removed.

irrenhaus3 and others added 2 commits June 18, 2022 22:37
Co-authored-by: Johannes Lorenz <1042576+JohannesLorenz@users.noreply.github.com>
@JohannesLorenz
Copy link
Contributor

IIRC, you forgot those:

include/InstrumentTrack.h:240:2: warning: signal arguments need to be fully-qualified (const lmms::Note instead of const Note) [-Wclazy-fully-qualified-moc-types]
        void midiNoteOn( const Note& );
        ^
include/InstrumentTrack.h:241:2: warning: signal arguments need to be fully-qualified (const lmms::Note instead of const Note) [-Wclazy-fully-qualified-moc-types]
        void midiNoteOff( const Note& );
        
include/SampleBuffer.h:287:2: warning: slot arguments need to be fully-qualified (const lmms::f_cnt_t instead of const f_cnt_t) [-Wclazy-fully-qualified-moc-types]
        void setStartFrame(const f_cnt_t s);
        ^
include/SampleBuffer.h:288:2: warning: slot arguments need to be fully-qualified (const lmms::f_cnt_t instead of const f_cnt_t) [-Wclazy-fully-qualified-moc-types]
        void setEndFrame(const f_cnt_t e);

include/SampleBuffer.h:287:2: warning: slot arguments need to be fully-qualified (const lmms::f_cnt_t instead of const f_cnt_t) [-Wclazy-fully-qualified-moc-types]
        void setStartFrame(const f_cnt_t s);
        ^
include/SampleBuffer.h:288:2: warning: slot arguments need to be fully-qualified (const lmms::f_cnt_t instead of const f_cnt_t) [-Wclazy-fully-qualified-moc-types]
        void setEndFrame(const f_cnt_t e);

After that, I can approve the code.

@irrenhaus3
Copy link
Contributor Author

The clazy run from within my IDE missed these for some reason. Here you go. :)

@JohannesLorenz
Copy link
Contributor

Sorry, copy&paste error from my side. 2 more:

plugins/AudioFileProcessor/AudioFileProcessor.h:97:2: warning: signal arguments need to be fully-qualified (lmms::f_cnt_t instead of f_cnt_t) [-Wclazy-fully-qualified-moc-types]
        void isPlaying( f_cnt_t _current_frame );
        ^
plugins/AudioFileProcessor/AudioFileProcessor.h:238:2: warning: slot arguments need to be fully-qualified (lmms::f_cnt_t instead of f_cnt_t) [-Wclazy-fully-qualified-moc-types]
        void isPlaying( f_cnt_t _current_frame );
        ^

@irrenhaus3
Copy link
Contributor Author

Yup, looks like my IDE is acting up there. It marks this one in a tooltip, but running the inspection action on the file doesn't find it. Whyyyyy.
Anyway, here you go again. ^^

@irrenhaus3
Copy link
Contributor Author

Program is displaying runtime errors now. Turns out, you need to fully qualify the signals in their connect-statements, too, or Qt doesn't know what you're talking about. Gonna fix these next.

@JohannesLorenz
Copy link
Contributor

Yeah, there were a lot more warnings with signals/slots overriding each other. Let me know if you need the whole log. Also, I posted 2 issues in that file and you only fixed one 😁

JohannesLorenz pushed a commit to LMMS/zynaddsubfx that referenced this pull request Jun 19, 2022
Add LMMS namespace prefixes in QtXmlWrapper.cpp for LMMS/lmms#6174 .
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.

Code looks good. All comments solved. The PR does not introduce new clazy issues.

I did some basic testing (the 5 track types, load/save, playing something in zyn), it all worked. Themes are working, too.

@JohannesLorenz JohannesLorenz merged commit 7227c89 into LMMS:master Jun 19, 2022
JohannesLorenz pushed a commit that referenced this pull request Jun 24, 2022
M374LX pushed a commit to M374LX/lmms that referenced this pull request Feb 18, 2023
This PR places all LMMS symbols into namespaces to eliminate any potential future name collisions between LMMS and third-party modules.

Also, this PR changes back `LmmsCore` to `Engine`, reverting c519921 .

Co-authored-by: allejok96 <allejok96@gmail.com>
sakertooth pushed a commit to sakertooth/lmms that referenced this pull request May 30, 2023
This PR places all LMMS symbols into namespaces to eliminate any potential future name collisions between LMMS and third-party modules.

Also, this PR changes back `LmmsCore` to `Engine`, reverting c519921 .

Co-authored-by: allejok96 <allejok96@gmail.com>
sakertooth pushed a commit to sakertooth/lmms that referenced this pull request May 30, 2023
M374LX pushed a commit to M374LX/lmms that referenced this pull request Sep 11, 2023
This PR places all LMMS symbols into namespaces to eliminate any potential future name collisions between LMMS and third-party modules.

Also, this PR changes back `LmmsCore` to `Engine`, reverting c519921 .

Co-authored-by: allejok96 <allejok96@gmail.com>
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.

7 participants