-
-
Notifications
You must be signed in to change notification settings - Fork 1k
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: Add missing prefixes to types in AudioSoundIo. #6447
Conversation
🤖 Hey, I'm @LmmsBot from github.com/lmms/bot and I made downloads for this pull request, click me to make them magically appear! 🎩
Windows
Linux
macOS🤖{"platform_name_to_artifacts": {"Windows": [{"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://output.circle-artifacts.com/output/job/5a0f6036-a956-4e62-8e93-4bb7c01dacfa/artifacts/0/lmms-1.3.0-alpha.1.203+g3b4ed9fa0-mingw-win32.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/17483?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://output.circle-artifacts.com/output/job/2673a710-be7a-4778-9a7a-688e143fe6b3/artifacts/0/lmms-1.3.0-alpha.1.203+g3b4ed9fa0-mingw-win64.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/17481?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/b31074nr9pcbxov7/artifacts/build/lmms-1.3.0-alpha-msvc2017-win32.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/43979231"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/equtq5bpov758n24/artifacts/build/lmms-1.3.0-alpha-msvc2017-win64.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/43979231"}], "Linux": [{"artifact": {"title": {"title": "(AppImage)", "platform_name": "Linux"}, "link": {"link": "https://output.circle-artifacts.com/output/job/9541dace-7d45-4e54-8f44-be9cc6a303a3/artifacts/0/lmms-1.3.0-alpha.1.203+g3b4ed9fa0-linux-x86_64.AppImage"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/17485?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}], "macOS": [{"artifact": {"title": {"title": "", "platform_name": "macOS"}, "link": {"link": "https://output.circle-artifacts.com/output/job/8b784ce0-e291-4d63-be92-31bb41edd589/artifacts/0/lmms-1.3.0-alpha.1.203+g3b4ed9fa0-mac10.14.dmg"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/17484?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}]}, "commit_sha": "f8491bade17bcb5f98dd4246ea8505ded95aa20e"} |
@@ -70,7 +70,7 @@ class AudioSoundIo : public AudioDevice | |||
return QT_TRANSLATE_NOOP( "AudioDeviceSetupWidget", "soundio" ); | |||
} | |||
|
|||
class setupWidget : public AudioDeviceSetupWidget | |||
class setupWidget : public gui::AudioDeviceSetupWidget |
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.
Shouldn't this be in the gui
namespace? This also makes all the gui::
inside this classe obsolete...
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.
This is a nested class inside the class lmms::AudioSoundIo
and can't be put into a different namespace scope than its container.
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.
Un-nest it 😁
In the end, I'm OK with both, though I think core/gui separation might be more important than nesting here.
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.
Aye, unnesting it would make more sense for separation, but I should note that the other audio interface classes (AudioDummy
, AudioJack
, AudioSdl
, etc.) follow the same pattern as this one, with the setupWidget
nested inside the main class. Let's separate them in a separate PR for proper separation of these separate tasks.
Edit: Error on my side. Compiles fine... @irrenhaus3 Thanks for the fast fix! There's still something a bit off there though. In file included from /home/zonkmachine/builds/lmms/build/src/lmmsobjs_autogen/DGKZTCOIDE/moc_AudioSoundIo.cpp:10,
from /home/zonkmachine/builds/lmms/build/src/lmmsobjs_autogen/mocs_compilation.cpp:14:
/home/zonkmachine/builds/lmms/build/src/lmmsobjs_autogen/DGKZTCOIDE/../../../../include/AudioSoundIo.h:74:9: error: expected class-name before ‘{’ token
74 | {
| ^
PS. Let it be understood. I wouldn't recognize a namespace if my life depended on it... |
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.
Compiles fine
CI didn't catch this one, but @zonkmachine sure did! Now, 'tis fixed.