From fe6df8dbafdbb09a5a02c4e163f4979508dbec91 Mon Sep 17 00:00:00 2001 From: Dalton Messmer Date: Mon, 2 Jan 2023 19:51:32 -0500 Subject: [PATCH 1/5] Add namespace prefix to include guards --- include/AboutDialog.h | 6 ++---- include/ActionGroup.h | 5 ++--- include/AudioAlsa.h | 4 ++-- include/AudioAlsaSetupWidget.h | 4 ++-- include/AudioDevice.h | 4 ++-- include/AudioDeviceSetupWidget.h | 4 ++-- include/AudioDummy.h | 4 ++-- include/AudioEngine.h | 4 ++-- include/AudioEngineProfiler.h | 4 ++-- include/AudioEngineWorkerThread.h | 4 ++-- include/AudioFileDevice.h | 4 ++-- include/AudioFileFlac.h | 8 ++++---- include/AudioFileMP3.h | 4 ++-- include/AudioFileOgg.h | 4 ++-- include/AudioFileWave.h | 4 ++-- include/AudioJack.h | 4 ++-- include/AudioOss.h | 4 ++-- include/AudioPort.h | 4 ++-- include/AudioPortAudio.h | 4 ++-- include/AudioPulseAudio.h | 4 ++-- include/AudioSampleRecorder.h | 4 ++-- include/AudioSdl.h | 4 ++-- include/AudioSndio.h | 8 ++++---- include/AudioSoundIo.h | 4 ++-- include/AutomatableButton.h | 5 ++--- include/AutomatableModel.h | 4 ++-- include/AutomatableModelView.h | 4 ++-- include/AutomatableSlider.h | 5 ++--- include/AutomationClip.h | 4 ++-- include/AutomationClipView.h | 4 ++-- include/AutomationEditor.h | 4 ++-- include/AutomationNode.h | 4 ++-- include/AutomationTrack.h | 4 ++-- include/AutomationTrackView.h | 4 ++-- include/BandLimitedWave.h | 4 ++-- include/BasicFilters.h | 5 ++--- include/BufferManager.h | 4 ++-- include/CPULoadWidget.h | 5 ++--- include/CaptionMenu.h | 5 ++--- include/Clip.h | 4 ++-- include/ClipView.h | 4 ++-- include/Clipboard.h | 4 ++-- include/ColorChooser.h | 7 +++---- include/ComboBox.h | 5 ++--- include/ComboBoxModel.h | 4 ++-- include/ConfigManager.h | 5 ++--- include/ControlLayout.h | 6 +++--- include/Controller.h | 6 ++---- include/ControllerConnection.h | 6 ++---- include/ControllerConnectionDialog.h | 5 ++--- include/ControllerDialog.h | 4 ++-- include/ControllerRackView.h | 4 ++-- include/ControllerView.h | 4 ++-- include/Controls.h | 8 +++----- include/CustomTextKnob.h | 4 ++-- include/DataFile.h | 5 ++--- include/Delay.h | 7 +++---- include/DeprecationHelper.h | 6 +++--- include/DetuningHelper.h | 4 ++-- include/DrumSynth.h | 7 +++---- include/DspEffectLibrary.h | 5 ++--- include/DummyEffect.h | 4 ++-- include/DummyInstrument.h | 4 ++-- include/DummyPlugin.h | 4 ++-- include/Editor.h | 4 ++-- include/Effect.h | 4 ++-- include/EffectChain.h | 5 ++--- include/EffectControlDialog.h | 4 ++-- include/EffectControls.h | 4 ++-- include/EffectRackView.h | 4 ++-- include/EffectSelectDialog.h | 4 ++-- include/EffectView.h | 4 ++-- include/Engine.h | 7 ++----- include/EnvelopeAndLfoParameters.h | 4 ++-- include/EnvelopeAndLfoView.h | 4 ++-- include/ExportFilter.h | 4 ++-- include/ExportProjectDialog.h | 5 ++--- include/FadeButton.h | 5 ++--- include/Fader.h | 5 ++--- include/FifoBuffer.h | 4 ++-- include/FileBrowser.h | 5 ++--- include/FileDialog.h | 7 +++---- include/Graph.h | 5 ++--- include/GroupBox.h | 5 ++--- include/GuiApplication.h | 6 +++--- include/ImportFilter.h | 4 ++-- include/InlineAutomation.h | 4 ++-- include/Instrument.h | 4 ++-- include/InstrumentFunctionViews.h | 4 ++-- include/InstrumentFunctions.h | 4 ++-- include/InstrumentMidiIOView.h | 4 ++-- include/InstrumentMiscView.h | 4 ++-- include/InstrumentPlayHandle.h | 4 ++-- include/InstrumentSoundShaping.h | 4 ++-- include/InstrumentSoundShapingView.h | 4 ++-- include/InstrumentTrack.h | 4 ++-- include/InstrumentTrackView.h | 4 ++-- include/InstrumentTrackWindow.h | 4 ++-- include/InstrumentView.h | 5 ++--- include/IoHelper.h | 4 ++-- include/JournallingObject.h | 5 ++--- include/Keymap.h | 4 ++-- include/Knob.h | 5 ++--- include/Ladspa2LMMS.h | 6 ++---- include/LadspaBase.h | 4 ++-- include/LadspaControl.h | 4 ++-- include/LadspaControlView.h | 4 ++-- include/LadspaManager.h | 5 ++--- include/LcdFloatSpinBox.h | 5 ++--- include/LcdSpinBox.h | 5 ++--- include/LcdWidget.h | 5 ++--- include/LedCheckBox.h | 5 ++--- include/LeftRightNav.h | 6 +++--- include/LfoController.h | 6 +++--- include/LinkedModelGroupViews.h | 8 +++----- include/LinkedModelGroups.h | 8 +++----- include/LmmsPalette.h | 6 ++---- include/LmmsStyle.h | 5 ++--- include/LocaleHelper.h | 6 +++--- include/LocklessAllocator.h | 4 ++-- include/LocklessList.h | 4 ++-- include/LocklessRingBuffer.h | 6 +++--- include/Lv2Basics.h | 9 ++++----- include/Lv2ControlBase.h | 7 ++++--- include/Lv2Evbuf.h | 8 ++++---- include/Lv2Features.h | 6 +++--- include/Lv2Manager.h | 6 +++--- include/Lv2Options.h | 6 +++--- include/Lv2Ports.h | 7 ++++--- include/Lv2Proc.h | 7 ++++--- include/Lv2SubPluginFeatures.h | 4 ++-- include/Lv2UridCache.h | 7 ++++--- include/Lv2UridMap.h | 7 ++++--- include/Lv2ViewBase.h | 8 ++++---- include/MainApplication.h | 6 +++--- include/MainWindow.h | 4 ++-- include/MemoryHelper.h | 6 ++---- include/MemoryManager.h | 4 ++-- include/MeterDialog.h | 4 ++-- include/MeterModel.h | 4 ++-- include/MicroTimer.h | 6 +++--- include/Microtuner.h | 4 ++-- include/MicrotunerConfig.h | 5 ++--- include/Midi.h | 4 ++-- include/MidiAlsaRaw.h | 4 ++-- include/MidiAlsaSeq.h | 5 ++--- include/MidiApple.h | 5 ++--- include/MidiCCRackView.h | 4 ++-- include/MidiClient.h | 5 ++--- include/MidiClip.h | 5 ++--- include/MidiClipView.h | 14 +++++++------- include/MidiController.h | 4 ++-- include/MidiDummy.h | 4 ++-- include/MidiEvent.h | 4 ++-- include/MidiEventProcessor.h | 4 ++-- include/MidiEventToByteSeq.h | 6 +++--- include/MidiJack.h | 6 +++--- include/MidiOss.h | 5 ++--- include/MidiPort.h | 4 ++-- include/MidiPortMenu.h | 4 ++-- include/MidiSetupWidget.h | 5 ++--- include/MidiSndio.h | 6 +++--- include/MidiWinMM.h | 5 ++--- include/MixHelpers.h | 5 ++--- include/Mixer.h | 24 ++++++++++++------------ include/MixerLine.h | 6 +++--- include/MixerLineLcdSpinBox.h | 4 ++-- include/MixerView.h | 6 +++--- include/Model.h | 5 ++--- include/ModelView.h | 5 ++--- include/ModelVisitor.h | 6 +++--- include/NStateButton.h | 5 ++--- include/Note.h | 4 ++-- include/NotePlayHandle.h | 4 ++-- include/Oscillator.h | 4 ++-- include/OscillatorConstants.h | 8 ++++---- include/Oscilloscope.h | 7 +++---- include/OutputSettings.h | 5 ++--- include/PathUtil.h | 4 ++-- include/PatternClip.h | 5 ++--- include/PatternClipView.h | 6 ++---- include/PatternEditor.h | 6 ++---- include/PatternStore.h | 5 ++--- include/PatternTrack.h | 6 ++---- include/PatternTrackView.h | 6 ++---- include/PeakController.h | 4 ++-- include/PerfLog.h | 4 ++-- include/Piano.h | 5 ++--- include/PianoRoll.h | 4 ++-- include/PianoView.h | 4 ++-- include/Pitch.h | 4 ++-- include/PixmapButton.h | 5 ++--- include/PlayHandle.h | 4 ++-- include/Plugin.h | 4 ++-- include/PluginBrowser.h | 6 ++---- include/PluginFactory.h | 6 +++--- include/PluginIssue.h | 7 +++---- include/PluginView.h | 4 ++-- include/PositionLine.h | 4 ++-- include/PresetPreviewPlayHandle.h | 4 ++-- include/ProjectJournal.h | 5 ++--- include/ProjectNotes.h | 5 ++--- include/ProjectRenderer.h | 4 ++-- include/ProjectVersion.h | 5 ++--- include/QuadratureLfo.h | 6 +++--- include/RaiiHelpers.h | 7 ++++--- include/RecentProjectsMenu.h | 6 +++--- include/RemotePlugin.h | 6 +++--- include/RemotePluginBase.h | 6 +++--- include/RemotePluginClient.h | 6 +++--- include/RenameDialog.h | 6 ++---- include/RenderManager.h | 4 ++-- include/RingBuffer.h | 5 ++--- include/RmsHelper.h | 4 ++-- include/RowTableView.h | 4 ++-- include/Rubberband.h | 6 ++---- include/SampleBuffer.h | 5 ++--- include/SampleClip.h | 6 +++--- include/SampleClipView.h | 6 ++---- include/SamplePlayHandle.h | 4 ++-- include/SampleRecordHandle.h | 5 ++--- include/SampleTrack.h | 7 +++---- include/SampleTrackView.h | 6 +++--- include/SampleTrackWindow.h | 9 +++------ include/Scale.h | 4 ++-- include/SendButtonIndicator.h | 7 ++++--- include/SerializingObject.h | 5 ++--- include/SetupDialog.h | 5 ++--- include/SharedMemory.h | 7 ++++--- include/SideBar.h | 4 ++-- include/SideBarWidget.h | 4 ++-- include/Song.h | 4 ++-- include/SongEditor.h | 6 ++---- include/StepRecorder.h | 6 +++--- include/StepRecorderWidget.h | 6 +++--- include/StringPairDrag.h | 4 ++-- include/SubWindow.h | 5 +++-- include/SweepOscillator.h | 4 ++-- include/TabBar.h | 5 ++--- include/TabButton.h | 5 ++--- include/TabWidget.h | 5 ++--- include/TemplatesMenu.h | 7 ++++--- include/TempoSyncKnob.h | 4 ++-- include/TempoSyncKnobModel.h | 4 ++-- include/TextFloat.h | 5 ++--- include/ThreadableJob.h | 4 ++-- include/TimeDisplayWidget.h | 6 +++--- include/TimeLineWidget.h | 5 ++--- include/TimePos.h | 6 ++---- include/ToolButton.h | 6 ++---- include/ToolPlugin.h | 4 ++-- include/ToolPluginView.h | 4 ++-- include/Track.h | 4 ++-- include/TrackContainer.h | 4 ++-- include/TrackContainerView.h | 5 ++--- include/TrackContentWidget.h | 4 ++-- include/TrackLabelButton.h | 5 ++--- include/TrackOperationsWidget.h | 4 ++-- include/TrackRenameLineEdit.h | 5 ++--- include/TrackView.h | 7 ++----- include/ValueBuffer.h | 4 ++-- include/VersionedSaveDialog.h | 7 +++---- include/VstSyncController.h | 4 ++-- include/VstSyncData.h | 4 ++-- include/aeffectx.h | 1 - include/base64.h | 4 ++-- include/debug.h | 5 ++--- include/denormals.h | 9 ++++----- include/embed.h | 4 ++-- include/endian_handling.h | 4 ++-- include/fft_helpers.h | 5 ++--- include/gui_templates.h | 5 ++--- include/interpolation.h | 5 ++--- include/lmms_basics.h | 5 ++--- include/lmms_math.h | 1 - include/panning.h | 4 ++-- include/panning_constants.h | 4 ++-- include/shared_object.h | 4 ++-- include/versioninfo.h | 4 ++-- include/volume.h | 4 ++-- 280 files changed, 645 insertions(+), 761 deletions(-) diff --git a/include/AboutDialog.h b/include/AboutDialog.h index c7d65023f..bb0c509a9 100644 --- a/include/AboutDialog.h +++ b/include/AboutDialog.h @@ -22,9 +22,8 @@ * */ - -#ifndef ABOUT_DIALOG_H -#define ABOUT_DIALOG_H +#ifndef LMMS_GUI_ABOUT_DIALOG_H +#define LMMS_GUI_ABOUT_DIALOG_H #include @@ -43,4 +42,3 @@ public: } // namespace lmms::gui #endif - diff --git a/include/ActionGroup.h b/include/ActionGroup.h index 0fe9d78ed..80a6d523e 100644 --- a/include/ActionGroup.h +++ b/include/ActionGroup.h @@ -22,9 +22,8 @@ * */ - -#ifndef ACTION_GROUP_H -#define ACTION_GROUP_H +#ifndef LMMS_GUI_ACTION_GROUP_H +#define LMMS_GUI_ACTION_GROUP_H #include diff --git a/include/AudioAlsa.h b/include/AudioAlsa.h index f96dd01c9..263925286 100644 --- a/include/AudioAlsa.h +++ b/include/AudioAlsa.h @@ -22,8 +22,8 @@ * */ -#ifndef AUDIO_ALSA_H -#define AUDIO_ALSA_H +#ifndef LMMS_AUDIO_ALSA_H +#define LMMS_AUDIO_ALSA_H #include "lmmsconfig.h" diff --git a/include/AudioAlsaSetupWidget.h b/include/AudioAlsaSetupWidget.h index f68d71e8a..068754b69 100644 --- a/include/AudioAlsaSetupWidget.h +++ b/include/AudioAlsaSetupWidget.h @@ -22,8 +22,8 @@ * */ -#ifndef AUDIO_ALSA_SETUP_WIDGET_H -#define AUDIO_ALSA_SETUP_WIDGET_H +#ifndef LMMS_GUI_AUDIO_ALSA_SETUP_WIDGET_H +#define LMMS_GUI_AUDIO_ALSA_SETUP_WIDGET_H #include "lmmsconfig.h" diff --git a/include/AudioDevice.h b/include/AudioDevice.h index 6b4e9939a..26cbbaccc 100644 --- a/include/AudioDevice.h +++ b/include/AudioDevice.h @@ -22,8 +22,8 @@ * */ -#ifndef AUDIO_DEVICE_H -#define AUDIO_DEVICE_H +#ifndef LMMS_AUDIO_DEVICE_H +#define LMMS_AUDIO_DEVICE_H #include #include diff --git a/include/AudioDeviceSetupWidget.h b/include/AudioDeviceSetupWidget.h index e984651e4..9c70859d2 100644 --- a/include/AudioDeviceSetupWidget.h +++ b/include/AudioDeviceSetupWidget.h @@ -22,8 +22,8 @@ * */ -#ifndef AUDIO_DEVICE_SETUP_WIDGET_H -#define AUDIO_DEVICE_SETUP_WIDGET_H +#ifndef LMMS_GUI_AUDIO_DEVICE_SETUP_WIDGET_H +#define LMMS_GUI_AUDIO_DEVICE_SETUP_WIDGET_H #include "TabWidget.h" diff --git a/include/AudioDummy.h b/include/AudioDummy.h index 30b125b3a..37363d501 100644 --- a/include/AudioDummy.h +++ b/include/AudioDummy.h @@ -22,8 +22,8 @@ * */ -#ifndef AUDIO_DUMMY_H -#define AUDIO_DUMMY_H +#ifndef LMMS_AUDIO_DUMMY_H +#define LMMS_AUDIO_DUMMY_H #include "AudioDevice.h" #include "AudioDeviceSetupWidget.h" diff --git a/include/AudioEngine.h b/include/AudioEngine.h index 71751acb8..534182d69 100644 --- a/include/AudioEngine.h +++ b/include/AudioEngine.h @@ -22,8 +22,8 @@ * */ -#ifndef AUDIO_ENGINE_H -#define AUDIO_ENGINE_H +#ifndef LMMS_AUDIO_ENGINE_H +#define LMMS_AUDIO_ENGINE_H #include diff --git a/include/AudioEngineProfiler.h b/include/AudioEngineProfiler.h index 38631c6a9..1f72939be 100644 --- a/include/AudioEngineProfiler.h +++ b/include/AudioEngineProfiler.h @@ -22,8 +22,8 @@ * */ -#ifndef AUDIO_ENGINE_PROFILER_H -#define AUDIO_ENGINE_PROFILER_H +#ifndef LMMS_AUDIO_ENGINE_PROFILER_H +#define LMMS_AUDIO_ENGINE_PROFILER_H #include diff --git a/include/AudioEngineWorkerThread.h b/include/AudioEngineWorkerThread.h index 87e2791b1..0f41982a1 100644 --- a/include/AudioEngineWorkerThread.h +++ b/include/AudioEngineWorkerThread.h @@ -22,8 +22,8 @@ * */ -#ifndef AUDIO_ENGINE_WORKER_THREAD_H -#define AUDIO_ENGINE_WORKER_THREAD_H +#ifndef LMMS_AUDIO_ENGINE_WORKER_THREAD_H +#define LMMS_AUDIO_ENGINE_WORKER_THREAD_H #include diff --git a/include/AudioFileDevice.h b/include/AudioFileDevice.h index beee087e7..fb98315db 100644 --- a/include/AudioFileDevice.h +++ b/include/AudioFileDevice.h @@ -23,8 +23,8 @@ * */ -#ifndef AUDIO_FILE_DEVICE_H -#define AUDIO_FILE_DEVICE_H +#ifndef LMMS_AUDIO_FILE_DEVICE_H +#define LMMS_AUDIO_FILE_DEVICE_H #include diff --git a/include/AudioFileFlac.h b/include/AudioFileFlac.h index 542a2e717..6750d264a 100644 --- a/include/AudioFileFlac.h +++ b/include/AudioFileFlac.h @@ -22,8 +22,8 @@ * */ -#ifndef AUDIO_FILE_FLAC_H -#define AUDIO_FILE_FLAC_H +#ifndef LMMS_AUDIO_FILE_FLAC_H +#define LMMS_AUDIO_FILE_FLAC_H #include "lmmsconfig.h" @@ -33,7 +33,7 @@ namespace lmms { -class AudioFileFlac: public AudioFileDevice +class AudioFileFlac : public AudioFileDevice { public: AudioFileFlac(OutputSettings const& outputSettings, @@ -77,4 +77,4 @@ private: } // namespace lmms -#endif //AUDIO_FILE_FLAC_H +#endif diff --git a/include/AudioFileMP3.h b/include/AudioFileMP3.h index 290c9ccbf..61406cced 100644 --- a/include/AudioFileMP3.h +++ b/include/AudioFileMP3.h @@ -23,8 +23,8 @@ * */ -#ifndef AUDIO_FILE_MP3_H -#define AUDIO_FILE_MP3_H +#ifndef LMMS_AUDIO_FILE_MP3_H +#define LMMS_AUDIO_FILE_MP3_H #include "lmmsconfig.h" diff --git a/include/AudioFileOgg.h b/include/AudioFileOgg.h index 18617fa5f..981b61733 100644 --- a/include/AudioFileOgg.h +++ b/include/AudioFileOgg.h @@ -23,8 +23,8 @@ * */ -#ifndef AUDIO_FILE_OGG_H -#define AUDIO_FILE_OGG_H +#ifndef LMMS_AUDIO_FILE_OGG_H +#define LMMS_AUDIO_FILE_OGG_H #include "lmmsconfig.h" diff --git a/include/AudioFileWave.h b/include/AudioFileWave.h index 8dd3566f4..06b797cc6 100644 --- a/include/AudioFileWave.h +++ b/include/AudioFileWave.h @@ -23,8 +23,8 @@ * */ -#ifndef AUDIO_FILE_WAVE_H -#define AUDIO_FILE_WAVE_H +#ifndef LMMS_AUDIO_FILE_WAVE_H +#define LMMS_AUDIO_FILE_WAVE_H #include "lmmsconfig.h" #include "AudioFileDevice.h" diff --git a/include/AudioJack.h b/include/AudioJack.h index 263399487..5e63074bd 100644 --- a/include/AudioJack.h +++ b/include/AudioJack.h @@ -22,8 +22,8 @@ * */ -#ifndef AUDIO_JACK_H -#define AUDIO_JACK_H +#ifndef LMMS_AUDIO_JACK_H +#define LMMS_AUDIO_JACK_H #include "lmmsconfig.h" diff --git a/include/AudioOss.h b/include/AudioOss.h index 71103586a..045cc6c56 100644 --- a/include/AudioOss.h +++ b/include/AudioOss.h @@ -22,8 +22,8 @@ * */ -#ifndef AUDIO_OSS_H -#define AUDIO_OSS_H +#ifndef LMMS_AUDIO_OSS_H +#define LMMS_AUDIO_OSS_H #include "lmmsconfig.h" diff --git a/include/AudioPort.h b/include/AudioPort.h index 5a2645784..38e495436 100644 --- a/include/AudioPort.h +++ b/include/AudioPort.h @@ -22,8 +22,8 @@ * */ -#ifndef AUDIO_PORT_H -#define AUDIO_PORT_H +#ifndef LMMS_AUDIO_PORT_H +#define LMMS_AUDIO_PORT_H #include #include diff --git a/include/AudioPortAudio.h b/include/AudioPortAudio.h index 3fd32a7ac..8ab18ce6e 100644 --- a/include/AudioPortAudio.h +++ b/include/AudioPortAudio.h @@ -22,8 +22,8 @@ * */ -#ifndef AUDIO_PORTAUDIO_H -#define AUDIO_PORTAUDIO_H +#ifndef LMMS_AUDIO_PORTAUDIO_H +#define LMMS_AUDIO_PORTAUDIO_H #include diff --git a/include/AudioPulseAudio.h b/include/AudioPulseAudio.h index 789296e27..bb5541a30 100644 --- a/include/AudioPulseAudio.h +++ b/include/AudioPulseAudio.h @@ -22,8 +22,8 @@ * */ -#ifndef AUDIO_PULSEAUDIO_H -#define AUDIO_PULSEAUDIO_H +#ifndef LMMS_AUDIO_PULSEAUDIO_H +#define LMMS_AUDIO_PULSEAUDIO_H #include "lmmsconfig.h" diff --git a/include/AudioSampleRecorder.h b/include/AudioSampleRecorder.h index 7ad551916..23c4643d8 100644 --- a/include/AudioSampleRecorder.h +++ b/include/AudioSampleRecorder.h @@ -23,8 +23,8 @@ * */ -#ifndef AUDIO_SAMPLE_RECORDER_H -#define AUDIO_SAMPLE_RECORDER_H +#ifndef LMMS_AUDIO_SAMPLE_RECORDER_H +#define LMMS_AUDIO_SAMPLE_RECORDER_H #include #include diff --git a/include/AudioSdl.h b/include/AudioSdl.h index 7e7710a2f..bd7f4b960 100644 --- a/include/AudioSdl.h +++ b/include/AudioSdl.h @@ -22,8 +22,8 @@ * */ -#ifndef AUDIO_SDL_H -#define AUDIO_SDL_H +#ifndef LMMS_AUDIO_SDL_H +#define LMMS_AUDIO_SDL_H #include "lmmsconfig.h" diff --git a/include/AudioSndio.h b/include/AudioSndio.h index 606850105..b7f42aca2 100644 --- a/include/AudioSndio.h +++ b/include/AudioSndio.h @@ -23,8 +23,8 @@ * */ -#ifndef _AUDIO_SNDIO_H -#define _AUDIO_SNDIO_H +#ifndef LMMS_AUDIO_SNDIO_H +#define LMMS_AUDIO_SNDIO_H #include "lmmsconfig.h" @@ -87,6 +87,6 @@ private: } // namespace lmms -#endif // LMMS_HAVE_SNDIO +#endif // LMMS_HAVE_SNDIO -#endif // _AUDIO_SNDIO_H +#endif diff --git a/include/AudioSoundIo.h b/include/AudioSoundIo.h index dc9afe7e4..b29ff3779 100644 --- a/include/AudioSoundIo.h +++ b/include/AudioSoundIo.h @@ -22,8 +22,8 @@ * */ -#ifndef AUDIO_SOUNDIO_H -#define AUDIO_SOUNDIO_H +#ifndef LMMS_AUDIO_SOUNDIO_H +#define LMMS_AUDIO_SOUNDIO_H #include diff --git a/include/AutomatableButton.h b/include/AutomatableButton.h index d8c58523c..4a695a677 100644 --- a/include/AutomatableButton.h +++ b/include/AutomatableButton.h @@ -22,9 +22,8 @@ * */ - -#ifndef AUTOMATABLE_BUTTON_H -#define AUTOMATABLE_BUTTON_H +#ifndef LMMS_GUI_AUTOMATABLE_BUTTON_H +#define LMMS_GUI_AUTOMATABLE_BUTTON_H #include diff --git a/include/AutomatableModel.h b/include/AutomatableModel.h index c8f2ab548..2fccf31f4 100644 --- a/include/AutomatableModel.h +++ b/include/AutomatableModel.h @@ -22,8 +22,8 @@ * */ -#ifndef AUTOMATABLE_MODEL_H -#define AUTOMATABLE_MODEL_H +#ifndef LMMS_AUTOMATABLE_MODEL_H +#define LMMS_AUTOMATABLE_MODEL_H #include #include diff --git a/include/AutomatableModelView.h b/include/AutomatableModelView.h index 1e8ef7398..e2475be48 100644 --- a/include/AutomatableModelView.h +++ b/include/AutomatableModelView.h @@ -23,8 +23,8 @@ * */ -#ifndef AUTOMATABLE_MODEL_VIEW_H -#define AUTOMATABLE_MODEL_VIEW_H +#ifndef LMMS_GUI_AUTOMATABLE_MODEL_VIEW_H +#define LMMS_GUI_AUTOMATABLE_MODEL_VIEW_H #include "ModelView.h" #include "AutomatableModel.h" diff --git a/include/AutomatableSlider.h b/include/AutomatableSlider.h index ba11741b5..9ec55c2df 100644 --- a/include/AutomatableSlider.h +++ b/include/AutomatableSlider.h @@ -22,9 +22,8 @@ * */ - -#ifndef AUTOMATABLE_SLIDER_H -#define AUTOMATABLE_SLIDER_H +#ifndef LMMS_GUI_AUTOMATABLE_SLIDER_H +#define LMMS_GUI_AUTOMATABLE_SLIDER_H #include diff --git a/include/AutomationClip.h b/include/AutomationClip.h index 3e253d85f..7281af133 100644 --- a/include/AutomationClip.h +++ b/include/AutomationClip.h @@ -24,8 +24,8 @@ * */ -#ifndef AUTOMATION_CLIP_H -#define AUTOMATION_CLIP_H +#ifndef LMMS_AUTOMATION_CLIP_H +#define LMMS_AUTOMATION_CLIP_H #include #include diff --git a/include/AutomationClipView.h b/include/AutomationClipView.h index b4de7839c..69d4943bc 100644 --- a/include/AutomationClipView.h +++ b/include/AutomationClipView.h @@ -22,8 +22,8 @@ * */ -#ifndef AUTOMATION_CLIP_VIEW_H -#define AUTOMATION_CLIP_VIEW_H +#ifndef LMMS_GUI_AUTOMATION_CLIP_VIEW_H +#define LMMS_GUI_AUTOMATION_CLIP_VIEW_H #include diff --git a/include/AutomationEditor.h b/include/AutomationEditor.h index 52609416f..8ead191a9 100644 --- a/include/AutomationEditor.h +++ b/include/AutomationEditor.h @@ -23,8 +23,8 @@ * */ -#ifndef AUTOMATION_EDITOR_H -#define AUTOMATION_EDITOR_H +#ifndef LMMS_GUI_AUTOMATION_EDITOR_H +#define LMMS_GUI_AUTOMATION_EDITOR_H #include diff --git a/include/AutomationNode.h b/include/AutomationNode.h index 11bd6d57d..9f4a4f219 100644 --- a/include/AutomationNode.h +++ b/include/AutomationNode.h @@ -23,8 +23,8 @@ * */ -#ifndef AUTOMATION_NODE_H -#define AUTOMATION_NODE_H +#ifndef LMMS_AUTOMATION_NODE_H +#define LMMS_AUTOMATION_NODE_H namespace lmms { diff --git a/include/AutomationTrack.h b/include/AutomationTrack.h index 1779bf102..653174caa 100644 --- a/include/AutomationTrack.h +++ b/include/AutomationTrack.h @@ -24,8 +24,8 @@ * */ -#ifndef AUTOMATION_TRACK_H -#define AUTOMATION_TRACK_H +#ifndef LMMS_AUTOMATION_TRACK_H +#define LMMS_AUTOMATION_TRACK_H #include "Track.h" diff --git a/include/AutomationTrackView.h b/include/AutomationTrackView.h index 18454bec2..d948d762a 100644 --- a/include/AutomationTrackView.h +++ b/include/AutomationTrackView.h @@ -23,8 +23,8 @@ * */ -#ifndef AUTOMATION_TRACK_VIEW_H -#define AUTOMATION_TRACK_VIEW_H +#ifndef LMMS_GUI_AUTOMATION_TRACK_VIEW_H +#define LMMS_GUI_AUTOMATION_TRACK_VIEW_H #include "TrackView.h" diff --git a/include/BandLimitedWave.h b/include/BandLimitedWave.h index 588fc4eea..51e55c337 100644 --- a/include/BandLimitedWave.h +++ b/include/BandLimitedWave.h @@ -23,8 +23,8 @@ * */ -#ifndef BANDLIMITEDWAVE_H -#define BANDLIMITEDWAVE_H +#ifndef LMMS_BANDLIMITEDWAVE_H +#define LMMS_BANDLIMITEDWAVE_H class QDataStream; class QString; diff --git a/include/BasicFilters.h b/include/BasicFilters.h index 836d758b6..6912f3d36 100644 --- a/include/BasicFilters.h +++ b/include/BasicFilters.h @@ -28,9 +28,8 @@ * */ - -#ifndef BASIC_FILTERS_H -#define BASIC_FILTERS_H +#ifndef LMMS_BASIC_FILTERS_H +#define LMMS_BASIC_FILTERS_H #ifndef __USE_XOPEN #define __USE_XOPEN diff --git a/include/BufferManager.h b/include/BufferManager.h index 57729918e..8e93afc92 100644 --- a/include/BufferManager.h +++ b/include/BufferManager.h @@ -23,8 +23,8 @@ * */ -#ifndef BUFFER_MANAGER_H -#define BUFFER_MANAGER_H +#ifndef LMMS_BUFFER_MANAGER_H +#define LMMS_BUFFER_MANAGER_H #include "lmms_export.h" #include "lmms_basics.h" diff --git a/include/CPULoadWidget.h b/include/CPULoadWidget.h index dd2747ef2..a249cdc5e 100644 --- a/include/CPULoadWidget.h +++ b/include/CPULoadWidget.h @@ -23,9 +23,8 @@ * */ - -#ifndef CPULOAD_WIDGET_H -#define CPULOAD_WIDGET_H +#ifndef LMMS_GUI_CPU_LOAD_WIDGET_H +#define LMMS_GUI_CPU_LOAD_WIDGET_H #include #include diff --git a/include/CaptionMenu.h b/include/CaptionMenu.h index f6a2fff25..87aedf133 100644 --- a/include/CaptionMenu.h +++ b/include/CaptionMenu.h @@ -22,9 +22,8 @@ * */ - -#ifndef CAPTION_MENU_H -#define CAPTION_MENU_H +#ifndef LMMS_GUI_CAPTION_MENU_H +#define LMMS_GUI_CAPTION_MENU_H #include diff --git a/include/Clip.h b/include/Clip.h index 204a071a7..75416ef94 100644 --- a/include/Clip.h +++ b/include/Clip.h @@ -22,8 +22,8 @@ * */ -#ifndef TRACK_CONTENT_OBJECT_H -#define TRACK_CONTENT_OBJECT_H +#ifndef LMMS_CLIP_H +#define LMMS_CLIP_H #include diff --git a/include/ClipView.h b/include/ClipView.h index 8cfb9e7a4..a342590e1 100644 --- a/include/ClipView.h +++ b/include/ClipView.h @@ -22,8 +22,8 @@ * */ -#ifndef TRACK_CONTENT_OBJECT_VIEW_H -#define TRACK_CONTENT_OBJECT_VIEW_H +#ifndef LMMS_GUI_CLIP_VIEW_H +#define LMMS_GUI_CLIP_VIEW_H #include diff --git a/include/Clipboard.h b/include/Clipboard.h index 1c2dcb647..3c38c90fe 100644 --- a/include/Clipboard.h +++ b/include/Clipboard.h @@ -22,8 +22,8 @@ * */ -#ifndef CLIPBOARD_H -#define CLIPBOARD_H +#ifndef LMMS_CLIPBOARD_H +#define LMMS_CLIPBOARD_H #include #include diff --git a/include/ColorChooser.h b/include/ColorChooser.h index 5482a9a03..da4069f5d 100644 --- a/include/ColorChooser.h +++ b/include/ColorChooser.h @@ -21,8 +21,8 @@ * */ -#ifndef COLOR_CHOOSER_H -#define COLOR_CHOOSER_H +#ifndef LMMS_GUI_COLOR_CHOOSER_H +#define LMMS_GUI_COLOR_CHOOSER_H #include #include @@ -34,7 +34,7 @@ namespace lmms::gui { -class ColorChooser: public QColorDialog +class ColorChooser : public QColorDialog { public: ColorChooser(const QColor &initial, QWidget *parent): QColorDialog(initial, parent) {}; @@ -69,4 +69,3 @@ private: } // namespace lmms::gui #endif - diff --git a/include/ComboBox.h b/include/ComboBox.h index 9a0e5a517..ba2410491 100644 --- a/include/ComboBox.h +++ b/include/ComboBox.h @@ -22,9 +22,8 @@ * */ - -#ifndef COMBOBOX_H -#define COMBOBOX_H +#ifndef LMMS_GUI_COMBOBOX_H +#define LMMS_GUI_COMBOBOX_H #include #include diff --git a/include/ComboBoxModel.h b/include/ComboBoxModel.h index 0c76620d8..a895b838f 100644 --- a/include/ComboBoxModel.h +++ b/include/ComboBoxModel.h @@ -22,8 +22,8 @@ * */ -#ifndef COMBOBOX_MODEL_H -#define COMBOBOX_MODEL_H +#ifndef LMMS_COMBOBOX_MODEL_H +#define LMMS_COMBOBOX_MODEL_H #include #include diff --git a/include/ConfigManager.h b/include/ConfigManager.h index fd2967b6a..abeb5246f 100644 --- a/include/ConfigManager.h +++ b/include/ConfigManager.h @@ -22,9 +22,8 @@ * */ - -#ifndef CONFIG_MGR_H -#define CONFIG_MGR_H +#ifndef LMMS_CONFIG_MANAGER_H +#define LMMS_CONFIG_MANAGER_H #include "lmmsconfig.h" diff --git a/include/ControlLayout.h b/include/ControlLayout.h index 8c629f8e1..e78609a37 100644 --- a/include/ControlLayout.h +++ b/include/ControlLayout.h @@ -70,8 +70,8 @@ ** ****************************************************************************/ -#ifndef CONTROLLAYOUT_H -#define CONTROLLAYOUT_H +#ifndef LMMS_GUI_CONTROL_LAYOUT_H +#define LMMS_GUI_CONTROL_LAYOUT_H #include #include @@ -141,4 +141,4 @@ private: } // namespace lmms::gui -#endif // CONTROLLAYOUT_H +#endif diff --git a/include/Controller.h b/include/Controller.h index d949cf90c..0bb229d38 100644 --- a/include/Controller.h +++ b/include/Controller.h @@ -23,9 +23,8 @@ * */ - -#ifndef CONTROLLER_H -#define CONTROLLER_H +#ifndef LMMS_CONTROLLER_H +#define LMMS_CONTROLLER_H #include "lmms_export.h" #include "Engine.h" @@ -185,4 +184,3 @@ signals: } // namespace lmms #endif - diff --git a/include/ControllerConnection.h b/include/ControllerConnection.h index 8230971cc..d75d529f6 100644 --- a/include/ControllerConnection.h +++ b/include/ControllerConnection.h @@ -26,9 +26,8 @@ * */ - -#ifndef CONTROLLER_CONNECTION_H -#define CONTROLLER_CONNECTION_H +#ifndef LMMS_CONTROLLER_CONNECTION_H +#define LMMS_CONTROLLER_CONNECTION_H #include #include @@ -129,4 +128,3 @@ signals: } // namespace lmms #endif - diff --git a/include/ControllerConnectionDialog.h b/include/ControllerConnectionDialog.h index 5565c8a67..2e3446072 100644 --- a/include/ControllerConnectionDialog.h +++ b/include/ControllerConnectionDialog.h @@ -23,9 +23,8 @@ * */ - -#ifndef CONTROLLER_CONNECTION_DIALOG_H -#define CONTROLLER_CONNECTION_DIALOG_H +#ifndef LMMS_GUI_CONTROLLER_CONNECTION_DIALOG_H +#define LMMS_GUI_CONTROLLER_CONNECTION_DIALOG_H #include #include diff --git a/include/ControllerDialog.h b/include/ControllerDialog.h index 4f496ad77..81a9a0eb6 100644 --- a/include/ControllerDialog.h +++ b/include/ControllerDialog.h @@ -23,8 +23,8 @@ * */ -#ifndef CONTROLLER_DIALOG_H -#define CONTROLLER_DIALOG_H +#ifndef LMMS_GUI_CONTROLLER_DIALOG_H +#define LMMS_GUI_CONTROLLER_DIALOG_H #include diff --git a/include/ControllerRackView.h b/include/ControllerRackView.h index 904e523dd..1133e8ec8 100644 --- a/include/ControllerRackView.h +++ b/include/ControllerRackView.h @@ -22,8 +22,8 @@ * */ -#ifndef CONTROLLER_RACK_VIEW_H -#define CONTROLLER_RACK_VIEW_H +#ifndef LMMS_GUI_CONTROLLER_RACK_VIEW_H +#define LMMS_GUI_CONTROLLER_RACK_VIEW_H #include #include diff --git a/include/ControllerView.h b/include/ControllerView.h index 8b8db0674..44f362b70 100644 --- a/include/ControllerView.h +++ b/include/ControllerView.h @@ -22,8 +22,8 @@ * */ -#ifndef CONTROLLER_VIEW_H -#define CONTROLLER_VIEW_H +#ifndef LMMS_GUI_CONTROLLER_VIEW_H +#define LMMS_GUI_CONTROLLER_VIEW_H #include diff --git a/include/Controls.h b/include/Controls.h index 9ffed465e..53c93a36f 100644 --- a/include/Controls.h +++ b/include/Controls.h @@ -22,10 +22,8 @@ * */ -#ifndef CONTROLS_H -#define CONTROLS_H - - +#ifndef LMMS_GUI_CONTROLS_H +#define LMMS_GUI_CONTROLS_H // headers only required for covariance #include "AutomatableModel.h" @@ -146,4 +144,4 @@ public: } // namespace lmms -#endif // CONTROLS_H +#endif diff --git a/include/CustomTextKnob.h b/include/CustomTextKnob.h index cde718810..23b7e8b1f 100644 --- a/include/CustomTextKnob.h +++ b/include/CustomTextKnob.h @@ -1,6 +1,6 @@ /* Text customizable knob */ -#ifndef CUSTOM_TEXT_KNOB_H -#define CUSTOM_TEXT_KNOB_H +#ifndef LMMS_GUI_CUSTOM_TEXT_KNOB_H +#define LMMS_GUI_CUSTOM_TEXT_KNOB_H #include "Knob.h" diff --git a/include/DataFile.h b/include/DataFile.h index fb8b2ae3e..18f9697b0 100644 --- a/include/DataFile.h +++ b/include/DataFile.h @@ -23,9 +23,8 @@ * */ - -#ifndef DATA_FILE_H -#define DATA_FILE_H +#ifndef LMMS_DATA_FILE_H +#define LMMS_DATA_FILE_H #include #include diff --git a/include/Delay.h b/include/Delay.h index 529577d58..ef23d7be1 100644 --- a/include/Delay.h +++ b/include/Delay.h @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA. * */ - - -#ifndef DELAY_H -#define DELAY_H + +#ifndef LMMS_DELAY_H +#define LMMS_DELAY_H #include "lmms_basics.h" #include "lmms_math.h" diff --git a/include/DeprecationHelper.h b/include/DeprecationHelper.h index 7786665a3..f1c68902b 100644 --- a/include/DeprecationHelper.h +++ b/include/DeprecationHelper.h @@ -24,8 +24,8 @@ * */ -#ifndef DEPRECATIONHELPER_H -#define DEPRECATIONHELPER_H +#ifndef LMMS_DEPRECATIONHELPER_H +#define LMMS_DEPRECATIONHELPER_H #include #include @@ -66,4 +66,4 @@ inline QPoint position(QWheelEvent *wheelEvent) } // namespace lmms -#endif // DEPRECATIONHELPER_H +#endif diff --git a/include/DetuningHelper.h b/include/DetuningHelper.h index f90af3697..41723bee8 100644 --- a/include/DetuningHelper.h +++ b/include/DetuningHelper.h @@ -23,8 +23,8 @@ * */ -#ifndef DETUNING_HELPER_H -#define DETUNING_HELPER_H +#ifndef LMMS_DETUNING_HELPER_H +#define LMMS_DETUNING_HELPER_H #include "InlineAutomation.h" #include "MemoryManager.h" diff --git a/include/DrumSynth.h b/include/DrumSynth.h index 98574f2d2..9b759ac1a 100644 --- a/include/DrumSynth.h +++ b/include/DrumSynth.h @@ -23,9 +23,8 @@ * */ - -#ifndef DRUMSYNTH_H -#define DRUMSYNTH_H +#ifndef LMMS_DRUM_SYNTH_H +#define LMMS_DRUM_SYNTH_H #include #include "lmms_basics.h" @@ -57,4 +56,4 @@ class DrumSynth { } // namespace lmms -#endif // DRUMSYNTH_H +#endif diff --git a/include/DspEffectLibrary.h b/include/DspEffectLibrary.h index eb03e1cf0..0a19783f6 100644 --- a/include/DspEffectLibrary.h +++ b/include/DspEffectLibrary.h @@ -22,9 +22,8 @@ * */ - -#ifndef DSP_EFFECT_LIBRARY_H -#define DSP_EFFECT_LIBRARY_H +#ifndef LMMS_DSPEFFECTLIBRARY_H +#define LMMS_DSPEFFECTLIBRARY_H #include "lmms_math.h" #include "lmms_constants.h" diff --git a/include/DummyEffect.h b/include/DummyEffect.h index 9db45a3e1..945738e1b 100644 --- a/include/DummyEffect.h +++ b/include/DummyEffect.h @@ -22,8 +22,8 @@ * */ -#ifndef DUMMY_EFFECT_H -#define DUMMY_EFFECT_H +#ifndef LMMS_DUMMY_EFFECT_H +#define LMMS_DUMMY_EFFECT_H #include diff --git a/include/DummyInstrument.h b/include/DummyInstrument.h index a40d8338f..19b6b6fbd 100644 --- a/include/DummyInstrument.h +++ b/include/DummyInstrument.h @@ -23,8 +23,8 @@ * */ -#ifndef DUMMY_INSTRUMENT_H -#define DUMMY_INSTRUMENT_H +#ifndef LMMS_DUMMY_INSTRUMENT_H +#define LMMS_DUMMY_INSTRUMENT_H #include "Instrument.h" #include "InstrumentView.h" diff --git a/include/DummyPlugin.h b/include/DummyPlugin.h index 1c763ec3e..ad517c1a9 100644 --- a/include/DummyPlugin.h +++ b/include/DummyPlugin.h @@ -23,8 +23,8 @@ * */ -#ifndef DUMMY_PLUGIN_H -#define DUMMY_PLUGIN_H +#ifndef LMMS_DUMMY_PLUGIN_H +#define LMMS_DUMMY_PLUGIN_H #include "Plugin.h" #include "PluginView.h" diff --git a/include/Editor.h b/include/Editor.h index 1a39ea72f..ad330ac06 100644 --- a/include/Editor.h +++ b/include/Editor.h @@ -22,8 +22,8 @@ * */ -#ifndef EDITOR_COMMON_H -#define EDITOR_COMMON_H +#ifndef LMMS_EDITOR_H +#define LMMS_EDITOR_H #include #include diff --git a/include/Effect.h b/include/Effect.h index add1f7158..a9952d339 100644 --- a/include/Effect.h +++ b/include/Effect.h @@ -23,8 +23,8 @@ * */ -#ifndef EFFECT_H -#define EFFECT_H +#ifndef LMMS_EFFECT_H +#define LMMS_EFFECT_H #include "Plugin.h" #include "Engine.h" diff --git a/include/EffectChain.h b/include/EffectChain.h index a9da8e530..dad4de5e1 100644 --- a/include/EffectChain.h +++ b/include/EffectChain.h @@ -23,8 +23,8 @@ * */ -#ifndef EFFECT_CHAIN_H -#define EFFECT_CHAIN_H +#ifndef LMMS_EFFECT_CHAIN_H +#define LMMS_EFFECT_CHAIN_H #include "Model.h" #include "SerializingObject.h" @@ -86,4 +86,3 @@ signals: } // namespace lmms #endif - diff --git a/include/EffectControlDialog.h b/include/EffectControlDialog.h index 6389db4a3..bda845dc5 100644 --- a/include/EffectControlDialog.h +++ b/include/EffectControlDialog.h @@ -23,8 +23,8 @@ * */ -#ifndef EFFECT_CONTROL_DIALOG_H -#define EFFECT_CONTROL_DIALOG_H +#ifndef LMMS_GUI_EFFECT_CONTROL_DIALOG_H +#define LMMS_GUI_EFFECT_CONTROL_DIALOG_H #include diff --git a/include/EffectControls.h b/include/EffectControls.h index 994145a40..dfecc0792 100644 --- a/include/EffectControls.h +++ b/include/EffectControls.h @@ -22,8 +22,8 @@ * */ -#ifndef EFFECT_CONTROLS_H -#define EFFECT_CONTROLS_H +#ifndef LMMS_EFFECT_CONTROLS_H +#define LMMS_EFFECT_CONTROLS_H #include "Model.h" #include "JournallingObject.h" diff --git a/include/EffectRackView.h b/include/EffectRackView.h index fb68fda68..96f70548a 100644 --- a/include/EffectRackView.h +++ b/include/EffectRackView.h @@ -23,8 +23,8 @@ * */ -#ifndef EFFECT_RACK_VIEW_H -#define EFFECT_RACK_VIEW_H +#ifndef LMMS_GUI_EFFECT_RACK_VIEW_H +#define LMMS_GUI_EFFECT_RACK_VIEW_H #include diff --git a/include/EffectSelectDialog.h b/include/EffectSelectDialog.h index b0acfb734..c31f96e14 100644 --- a/include/EffectSelectDialog.h +++ b/include/EffectSelectDialog.h @@ -22,8 +22,8 @@ * */ -#ifndef EFFECT_SELECT_DIALOG_H -#define EFFECT_SELECT_DIALOG_H +#ifndef LMMS_GUI_EFFECT_SELECT_DIALOG_H +#define LMMS_GUI_EFFECT_SELECT_DIALOG_H #include #include diff --git a/include/EffectView.h b/include/EffectView.h index 90bb54896..fb19d52dd 100644 --- a/include/EffectView.h +++ b/include/EffectView.h @@ -23,8 +23,8 @@ * */ -#ifndef EFFECT_VIEW_H -#define EFFECT_VIEW_H +#ifndef LMMS_GUI_EFFECT_VIEW_H +#define LMMS_GUI_EFFECT_VIEW_H #include "AutomatableModel.h" #include "PluginView.h" diff --git a/include/Engine.h b/include/Engine.h index b63308cde..0cb77315f 100644 --- a/include/Engine.h +++ b/include/Engine.h @@ -22,14 +22,12 @@ * */ - -#ifndef ENGINE_H -#define ENGINE_H +#ifndef LMMS_ENGINE_H +#define LMMS_ENGINE_H #include #include - #include "lmmsconfig.h" #include "lmms_export.h" #include "lmms_basics.h" @@ -158,4 +156,3 @@ private: } // namespace lmms #endif - diff --git a/include/EnvelopeAndLfoParameters.h b/include/EnvelopeAndLfoParameters.h index 534adcbe5..0a90ec68b 100644 --- a/include/EnvelopeAndLfoParameters.h +++ b/include/EnvelopeAndLfoParameters.h @@ -22,8 +22,8 @@ * */ -#ifndef ENVELOPE_AND_LFO_PARAMETERS_H -#define ENVELOPE_AND_LFO_PARAMETERS_H +#ifndef LMMS_ENVELOPE_AND_LFO_PARAMETERS_H +#define LMMS_ENVELOPE_AND_LFO_PARAMETERS_H #include diff --git a/include/EnvelopeAndLfoView.h b/include/EnvelopeAndLfoView.h index a82ccf606..e927e9fcc 100644 --- a/include/EnvelopeAndLfoView.h +++ b/include/EnvelopeAndLfoView.h @@ -23,8 +23,8 @@ * */ -#ifndef ENVELOPE_AND_LFO_VIEW_H -#define ENVELOPE_AND_LFO_VIEW_H +#ifndef LMMS_GUI_ENVELOPE_AND_LFO_VIEW_H +#define LMMS_GUI_ENVELOPE_AND_LFO_VIEW_H #include diff --git a/include/ExportFilter.h b/include/ExportFilter.h index 29efef539..13a3c179d 100644 --- a/include/ExportFilter.h +++ b/include/ExportFilter.h @@ -23,8 +23,8 @@ * */ -#ifndef EXPORT_FILTER_H -#define EXPORT_FILTER_H +#ifndef LMMS_EXPORT_FILTER_H +#define LMMS_EXPORT_FILTER_H #include diff --git a/include/ExportProjectDialog.h b/include/ExportProjectDialog.h index 56d039afe..af33d6766 100644 --- a/include/ExportProjectDialog.h +++ b/include/ExportProjectDialog.h @@ -23,9 +23,8 @@ * */ - -#ifndef EXPORT_PROJECT_DIALOG_H -#define EXPORT_PROJECT_DIALOG_H +#ifndef LMMS_GUI_EXPORT_PROJECT_DIALOG_H +#define LMMS_GUI_EXPORT_PROJECT_DIALOG_H #include #include diff --git a/include/FadeButton.h b/include/FadeButton.h index d33900913..df0e2abf2 100644 --- a/include/FadeButton.h +++ b/include/FadeButton.h @@ -22,9 +22,8 @@ * */ - -#ifndef FADE_BUTTON_H -#define FADE_BUTTON_H +#ifndef LMMS_GUI_FADE_BUTTON_H +#define LMMS_GUI_FADE_BUTTON_H #include #include diff --git a/include/Fader.h b/include/Fader.h index 54acfc57d..cfffba843 100644 --- a/include/Fader.h +++ b/include/Fader.h @@ -44,9 +44,8 @@ * */ - -#ifndef FADER_H -#define FADER_H +#ifndef LMMS_GUI_FADER_H +#define LMMS_GUI_FADER_H #include #include diff --git a/include/FifoBuffer.h b/include/FifoBuffer.h index d49e367c0..4b5682a51 100644 --- a/include/FifoBuffer.h +++ b/include/FifoBuffer.h @@ -22,8 +22,8 @@ * */ -#ifndef FIFO_BUFFER_H -#define FIFO_BUFFER_H +#ifndef LMMS_FIFO_BUFFER_H +#define LMMS_FIFO_BUFFER_H #include diff --git a/include/FileBrowser.h b/include/FileBrowser.h index 43a0b3331..387be38d1 100644 --- a/include/FileBrowser.h +++ b/include/FileBrowser.h @@ -22,9 +22,8 @@ * */ - -#ifndef FILE_BROWSER_H -#define FILE_BROWSER_H +#ifndef LMMS_GUI_FILE_BROWSER_H +#define LMMS_GUI_FILE_BROWSER_H #include #include diff --git a/include/FileDialog.h b/include/FileDialog.h index ed5d2f231..a999fff16 100644 --- a/include/FileDialog.h +++ b/include/FileDialog.h @@ -22,9 +22,8 @@ * */ - -#ifndef FILEDIALOG_H -#define FILEDIALOG_H +#ifndef LMMS_GUI_FILE_DIALOG_H +#define LMMS_GUI_FILE_DIALOG_H #include @@ -57,4 +56,4 @@ public: } // namespace lmms::gui -#endif // FILEDIALOG_H +#endif diff --git a/include/Graph.h b/include/Graph.h index 178d1b567..d04fd926c 100644 --- a/include/Graph.h +++ b/include/Graph.h @@ -23,9 +23,8 @@ * */ - -#ifndef GRAPH_H -#define GRAPH_H +#ifndef LMMS_GUI_GRAPH_H +#define LMMS_GUI_GRAPH_H #include #include diff --git a/include/GroupBox.h b/include/GroupBox.h index e20db80a6..bf2773e23 100644 --- a/include/GroupBox.h +++ b/include/GroupBox.h @@ -22,9 +22,8 @@ * */ - -#ifndef GROUP_BOX_H -#define GROUP_BOX_H +#ifndef LMMS_GUI_GROUP_BOX_H +#define LMMS_GUI_GROUP_BOX_H #include diff --git a/include/GuiApplication.h b/include/GuiApplication.h index e39983138..dd87a5607 100644 --- a/include/GuiApplication.h +++ b/include/GuiApplication.h @@ -22,8 +22,8 @@ * */ -#ifndef GUIAPPLICATION_H -#define GUIAPPLICATION_H +#ifndef LMMS_GUI_GUI_APPLICATION_H +#define LMMS_GUI_GUI_APPLICATION_H #include @@ -93,4 +93,4 @@ LMMS_EXPORT GuiApplication* getGUI(); } // namespace lmms::gui -#endif // GUIAPPLICATION_H +#endif diff --git a/include/ImportFilter.h b/include/ImportFilter.h index b7a910e5d..587a62a78 100644 --- a/include/ImportFilter.h +++ b/include/ImportFilter.h @@ -23,8 +23,8 @@ * */ -#ifndef IMPORT_FILTER_H -#define IMPORT_FILTER_H +#ifndef LMMS_IMPORT_FILTER_H +#define LMMS_IMPORT_FILTER_H #include diff --git a/include/InlineAutomation.h b/include/InlineAutomation.h index 435604506..fbecd2769 100644 --- a/include/InlineAutomation.h +++ b/include/InlineAutomation.h @@ -22,8 +22,8 @@ * */ -#ifndef INLINE_AUTOMATION_H -#define INLINE_AUTOMATION_H +#ifndef LMMS_INLINE_AUTOMATION_H +#define LMMS_INLINE_AUTOMATION_H #include "AutomationNode.h" #include "AutomationClip.h" diff --git a/include/Instrument.h b/include/Instrument.h index 4e48e2fd6..3ea8bdf2f 100644 --- a/include/Instrument.h +++ b/include/Instrument.h @@ -23,8 +23,8 @@ * */ -#ifndef INSTRUMENT_H -#define INSTRUMENT_H +#ifndef LMMS_INSTRUMENT_H +#define LMMS_INSTRUMENT_H #include #include "lmms_export.h" diff --git a/include/InstrumentFunctionViews.h b/include/InstrumentFunctionViews.h index 99ba92031..3abd8eae7 100644 --- a/include/InstrumentFunctionViews.h +++ b/include/InstrumentFunctionViews.h @@ -22,8 +22,8 @@ * */ -#ifndef INSTRUMENT_FUNCTION_VIEWS_H -#define INSTRUMENT_FUNCTION_VIEWS_H +#ifndef LMMS_INSTRUMENT_FUNCTION_VIEWS_H +#define LMMS_INSTRUMENT_FUNCTION_VIEWS_H #include "ModelView.h" diff --git a/include/InstrumentFunctions.h b/include/InstrumentFunctions.h index 5dcb1114b..5b6c1af6d 100644 --- a/include/InstrumentFunctions.h +++ b/include/InstrumentFunctions.h @@ -22,8 +22,8 @@ * */ -#ifndef INSTRUMENT_FUNCTIONS_H -#define INSTRUMENT_FUNCTIONS_H +#ifndef LMMS_INSTRUMENT_FUNCTIONS_H +#define LMMS_INSTRUMENT_FUNCTIONS_H #include "JournallingObject.h" #include "lmms_basics.h" diff --git a/include/InstrumentMidiIOView.h b/include/InstrumentMidiIOView.h index 81feee082..dd6e43151 100644 --- a/include/InstrumentMidiIOView.h +++ b/include/InstrumentMidiIOView.h @@ -23,8 +23,8 @@ * */ -#ifndef INSTRUMENT_MIDI_IO_VIEW_H -#define INSTRUMENT_MIDI_IO_VIEW_H +#ifndef LMMS_GUI_INSTRUMENT_MIDI_IO_VIEW_H +#define LMMS_GUI_INSTRUMENT_MIDI_IO_VIEW_H #include diff --git a/include/InstrumentMiscView.h b/include/InstrumentMiscView.h index 25e16395d..9aee23676 100644 --- a/include/InstrumentMiscView.h +++ b/include/InstrumentMiscView.h @@ -24,8 +24,8 @@ * */ -#ifndef INSTRUMENT_MISC_VIEW_H -#define INSTRUMENT_MISC_VIEW_H +#ifndef LMMS_GUI_INSTRUMENT_MISC_VIEW_H +#define LMMS_GUI_INSTRUMENT_MISC_VIEW_H #include diff --git a/include/InstrumentPlayHandle.h b/include/InstrumentPlayHandle.h index e9516ab19..b65f906ae 100644 --- a/include/InstrumentPlayHandle.h +++ b/include/InstrumentPlayHandle.h @@ -22,8 +22,8 @@ * */ -#ifndef INSTRUMENT_PLAY_HANDLE_H -#define INSTRUMENT_PLAY_HANDLE_H +#ifndef LMMS_INSTRUMENT_PLAY_HANDLE_H +#define LMMS_INSTRUMENT_PLAY_HANDLE_H #include "PlayHandle.h" #include "Instrument.h" diff --git a/include/InstrumentSoundShaping.h b/include/InstrumentSoundShaping.h index 11ed4f1c4..607871c85 100644 --- a/include/InstrumentSoundShaping.h +++ b/include/InstrumentSoundShaping.h @@ -22,8 +22,8 @@ * */ -#ifndef INSTRUMENT_SOUND_SHAPING_H -#define INSTRUMENT_SOUND_SHAPING_H +#ifndef LMMS_INSTRUMENT_SOUND_SHAPING_H +#define LMMS_INSTRUMENT_SOUND_SHAPING_H #include "ComboBoxModel.h" diff --git a/include/InstrumentSoundShapingView.h b/include/InstrumentSoundShapingView.h index aa8aff19d..f37cfaa55 100644 --- a/include/InstrumentSoundShapingView.h +++ b/include/InstrumentSoundShapingView.h @@ -22,8 +22,8 @@ * */ -#ifndef INSTRUMENT_SOUND_SHAPING_VIEW_H -#define INSTRUMENT_SOUND_SHAPING_VIEW_H +#ifndef LMMS_GUI_INSTRUMENT_SOUND_SHAPING_VIEW_H +#define LMMS_GUI_INSTRUMENT_SOUND_SHAPING_VIEW_H #include diff --git a/include/InstrumentTrack.h b/include/InstrumentTrack.h index 129969292..6fa41b4a1 100644 --- a/include/InstrumentTrack.h +++ b/include/InstrumentTrack.h @@ -23,8 +23,8 @@ * */ -#ifndef INSTRUMENT_TRACK_H -#define INSTRUMENT_TRACK_H +#ifndef LMMS_INSTRUMENT_TRACK_H +#define LMMS_INSTRUMENT_TRACK_H #include "AudioPort.h" #include "InstrumentFunctions.h" diff --git a/include/InstrumentTrackView.h b/include/InstrumentTrackView.h index 3201f81d6..66fb7804b 100644 --- a/include/InstrumentTrackView.h +++ b/include/InstrumentTrackView.h @@ -22,8 +22,8 @@ * */ -#ifndef INSTRUMENT_TRACK_VIEW_H -#define INSTRUMENT_TRACK_VIEW_H +#ifndef LMMS_GUI_INSTRUMENT_TRACK_VIEW_H +#define LMMS_GUI_INSTRUMENT_TRACK_VIEW_H #include "TrackView.h" diff --git a/include/InstrumentTrackWindow.h b/include/InstrumentTrackWindow.h index 68750c0b8..f50b138df 100644 --- a/include/InstrumentTrackWindow.h +++ b/include/InstrumentTrackWindow.h @@ -22,8 +22,8 @@ * */ -#ifndef INSTRUMENT_TRACK_WINDOW_H -#define INSTRUMENT_TRACK_WINDOW_H +#ifndef LMMS_GUI_INSTRUMENT_TRACK_WINDOW_H +#define LMMS_GUI_INSTRUMENT_TRACK_WINDOW_H #include diff --git a/include/InstrumentView.h b/include/InstrumentView.h index ab18465eb..ff4b9cd66 100644 --- a/include/InstrumentView.h +++ b/include/InstrumentView.h @@ -22,9 +22,8 @@ * */ - -#ifndef INSTRUMENT_VIEW_H -#define INSTRUMENT_VIEW_H +#ifndef LMMS_GUI_INSTRUMENT_VIEW_H +#define LMMS_GUI_INSTRUMENT_VIEW_H #include "Instrument.h" #include "PluginView.h" diff --git a/include/IoHelper.h b/include/IoHelper.h index c7d65c917..423cbaab3 100644 --- a/include/IoHelper.h +++ b/include/IoHelper.h @@ -22,8 +22,8 @@ * */ -#ifndef IO_HELPER_H -#define IO_HELPER_H +#ifndef LMMS_IO_HELPER_H +#define LMMS_IO_HELPER_H #include "lmmsconfig.h" diff --git a/include/JournallingObject.h b/include/JournallingObject.h index 41ae65295..15e071577 100644 --- a/include/JournallingObject.h +++ b/include/JournallingObject.h @@ -22,8 +22,8 @@ * */ -#ifndef JOURNALLING_OBJECT_H -#define JOURNALLING_OBJECT_H +#ifndef LMMS_JOURNALLING_OBJECT_H +#define LMMS_JOURNALLING_OBJECT_H #include @@ -104,4 +104,3 @@ private: } // namespace lmms #endif - diff --git a/include/Keymap.h b/include/Keymap.h index 6286f8362..88f0df428 100644 --- a/include/Keymap.h +++ b/include/Keymap.h @@ -22,8 +22,8 @@ * */ -#ifndef KEYMAP_H -#define KEYMAP_H +#ifndef LMMS_KEYMAP_H +#define LMMS_KEYMAP_H #include #include diff --git a/include/Knob.h b/include/Knob.h index 16ac7ed01..94fb8b640 100644 --- a/include/Knob.h +++ b/include/Knob.h @@ -22,9 +22,8 @@ * */ - -#ifndef KNOB_H -#define KNOB_H +#ifndef LMMS_GUI_KNOB_H +#define LMMS_GUI_KNOB_H #include #include diff --git a/include/Ladspa2LMMS.h b/include/Ladspa2LMMS.h index 4b7eb2482..d4fd12b2d 100644 --- a/include/Ladspa2LMMS.h +++ b/include/Ladspa2LMMS.h @@ -23,13 +23,11 @@ * */ -#ifndef LADSPA_2_LMMS_H -#define LADSPA_2_LMMS_H - +#ifndef LMMS_LADSPA_2_LMMS_H +#define LMMS_LADSPA_2_LMMS_H #include "LadspaManager.h" - namespace lmms { diff --git a/include/LadspaBase.h b/include/LadspaBase.h index 3feb7d204..442d12293 100644 --- a/include/LadspaBase.h +++ b/include/LadspaBase.h @@ -23,8 +23,8 @@ * */ -#ifndef LADSPA_BASE_H -#define LADSPA_BASE_H +#ifndef LMMS_LADSPA_BASE_H +#define LMMS_LADSPA_BASE_H #include "LadspaManager.h" #include "Plugin.h" diff --git a/include/LadspaControl.h b/include/LadspaControl.h index 258a5d8fc..9bc83e352 100644 --- a/include/LadspaControl.h +++ b/include/LadspaControl.h @@ -23,8 +23,8 @@ * */ -#ifndef LADSPA_CONTROL_H -#define LADSPA_CONTROL_H +#ifndef LMMS_LADSPA_CONTROL_H +#define LMMS_LADSPA_CONTROL_H #include diff --git a/include/LadspaControlView.h b/include/LadspaControlView.h index 5dafa4e5c..4638d5b5c 100644 --- a/include/LadspaControlView.h +++ b/include/LadspaControlView.h @@ -23,8 +23,8 @@ * */ -#ifndef LADSPA_CONTROL_VIEW_H -#define LADSPA_CONTROL_VIEW_H +#ifndef LMMS_GUI_LADSPA_CONTROL_VIEW_H +#define LMMS_GUI_LADSPA_CONTROL_VIEW_H #include diff --git a/include/LadspaManager.h b/include/LadspaManager.h index 176526193..7b8639779 100644 --- a/include/LadspaManager.h +++ b/include/LadspaManager.h @@ -24,9 +24,8 @@ * */ - -#ifndef LADSPA_MANAGER_H -#define LADSPA_MANAGER_H +#ifndef LMMS_LADSPA_MANAGER_H +#define LMMS_LADSPA_MANAGER_H #include diff --git a/include/LcdFloatSpinBox.h b/include/LcdFloatSpinBox.h index ab0de304e..3dcf500b9 100644 --- a/include/LcdFloatSpinBox.h +++ b/include/LcdFloatSpinBox.h @@ -23,9 +23,8 @@ * */ - -#ifndef LCD_FLOATSPINBOX_H -#define LCD_FLOATSPINBOX_H +#ifndef LMMS_GUI_LCD_FLOATSPINBOX_H +#define LMMS_GUI_LCD_FLOATSPINBOX_H #include diff --git a/include/LcdSpinBox.h b/include/LcdSpinBox.h index 9c8923763..6dcb68c1b 100644 --- a/include/LcdSpinBox.h +++ b/include/LcdSpinBox.h @@ -22,9 +22,8 @@ * */ - -#ifndef LCD_SPINBOX_H -#define LCD_SPINBOX_H +#ifndef LMMS_GUI_LCD_SPINBOX_H +#define LMMS_GUI_LCD_SPINBOX_H #include "LcdWidget.h" #include "AutomatableModelView.h" diff --git a/include/LcdWidget.h b/include/LcdWidget.h index d55cfc017..665668b3f 100644 --- a/include/LcdWidget.h +++ b/include/LcdWidget.h @@ -22,9 +22,8 @@ * */ - -#ifndef LCD_WIDGET_H -#define LCD_WIDGET_H +#ifndef LMMS_GUI_LCD_WIDGET_H +#define LMMS_GUI_LCD_WIDGET_H #include #include diff --git a/include/LedCheckBox.h b/include/LedCheckBox.h index a215592e6..12642ef3b 100644 --- a/include/LedCheckBox.h +++ b/include/LedCheckBox.h @@ -22,9 +22,8 @@ * */ - -#ifndef LED_CHECKBOX_H -#define LED_CHECKBOX_H +#ifndef LMMS_GUI_LED_CHECKBOX_H +#define LMMS_GUI_LED_CHECKBOX_H #include "AutomatableButton.h" diff --git a/include/LeftRightNav.h b/include/LeftRightNav.h index df72193dc..e752d44c0 100644 --- a/include/LeftRightNav.h +++ b/include/LeftRightNav.h @@ -22,8 +22,8 @@ * */ -#ifndef LEFT_RIGHT_NAV_H -#define LEFT_RIGHT_NAV_H +#ifndef LMMS_GUI_LEFT_RIGHT_NAV_H +#define LMMS_GUI_LEFT_RIGHT_NAV_H #include "PixmapButton.h" @@ -51,4 +51,4 @@ private: } // namespace lmms::gui -#endif \ No newline at end of file +#endif diff --git a/include/LfoController.h b/include/LfoController.h index 48aee3d30..ccd5804c7 100644 --- a/include/LfoController.h +++ b/include/LfoController.h @@ -22,8 +22,8 @@ * */ -#ifndef LFO_CONTROLLER_H -#define LFO_CONTROLLER_H +#ifndef LMMS_LFO_CONTROLLER_H +#define LMMS_LFO_CONTROLLER_H #include @@ -51,7 +51,7 @@ class LfoControllerDialog; } -class LfoController : public Controller +class LfoController : public Controller { Q_OBJECT public: diff --git a/include/LinkedModelGroupViews.h b/include/LinkedModelGroupViews.h index 72598281b..08c25a8bb 100644 --- a/include/LinkedModelGroupViews.h +++ b/include/LinkedModelGroupViews.h @@ -22,15 +22,13 @@ * */ -#ifndef LINKEDMODELGROUPVIEWS_H -#define LINKEDMODELGROUPVIEWS_H - +#ifndef LMMS_GUI_LINKEDMODELGROUPVIEWS_H +#define LMMS_GUI_LINKEDMODELGROUPVIEWS_H #include #include #include - namespace lmms { @@ -120,4 +118,4 @@ private: } // namespace lmms -#endif // LINKEDMODELGROUPVIEWS_H +#endif diff --git a/include/LinkedModelGroups.h b/include/LinkedModelGroups.h index 84a216f30..11950d85e 100644 --- a/include/LinkedModelGroups.h +++ b/include/LinkedModelGroups.h @@ -22,15 +22,13 @@ * */ -#ifndef LINKEDMODELGROUPS_H -#define LINKEDMODELGROUPS_H - +#ifndef LMMS_LINKEDMODELGROUPS_H +#define LMMS_LINKEDMODELGROUPS_H #include #include "Model.h" - class QDomDocument; class QDomElement; @@ -178,4 +176,4 @@ public: } // namespace lmms -#endif // LINKEDMODELGROUPS_H +#endif diff --git a/include/LmmsPalette.h b/include/LmmsPalette.h index 023872254..68cd2d2ab 100644 --- a/include/LmmsPalette.h +++ b/include/LmmsPalette.h @@ -23,13 +23,12 @@ * */ -#ifndef LMMSPALETTE_H -#define LMMSPALETTE_H +#ifndef LMMS_GUI_LMMS_PALETTE_H +#define LMMS_GUI_LMMS_PALETTE_H #include #include "lmms_export.h" - namespace lmms::gui { @@ -86,7 +85,6 @@ private: }; - } // namespace lmms::gui #endif diff --git a/include/LmmsStyle.h b/include/LmmsStyle.h index ae5b65f99..c560b5be8 100644 --- a/include/LmmsStyle.h +++ b/include/LmmsStyle.h @@ -23,9 +23,8 @@ * */ - -#ifndef LMMS_STYLE_H -#define LMMS_STYLE_H +#ifndef LMMS_GUI_LMMS_STYLE_H +#define LMMS_GUI_LMMS_STYLE_H #include diff --git a/include/LocaleHelper.h b/include/LocaleHelper.h index b071a1596..61298f42b 100644 --- a/include/LocaleHelper.h +++ b/include/LocaleHelper.h @@ -25,8 +25,8 @@ * */ -#ifndef LOCALEHELPER_H -#define LOCALEHELPER_H +#ifndef LMMS_LOCALEHELPER_H +#define LMMS_LOCALEHELPER_H #include @@ -67,4 +67,4 @@ inline float toFloat(QString str, bool* ok = nullptr) } // namespace lmms::LocaleHelper -#endif // LOCALEHELPER_H +#endif diff --git a/include/LocklessAllocator.h b/include/LocklessAllocator.h index adde5fe6f..f1b3dea40 100644 --- a/include/LocklessAllocator.h +++ b/include/LocklessAllocator.h @@ -22,8 +22,8 @@ * */ -#ifndef LOCKLESS_ALLOCATOR_H -#define LOCKLESS_ALLOCATOR_H +#ifndef LMMS_LOCKLESS_ALLOCATOR_H +#define LMMS_LOCKLESS_ALLOCATOR_H #include #include diff --git a/include/LocklessList.h b/include/LocklessList.h index 44b718059..e5c5cce71 100644 --- a/include/LocklessList.h +++ b/include/LocklessList.h @@ -22,8 +22,8 @@ * */ -#ifndef LOCKLESS_LIST_H -#define LOCKLESS_LIST_H +#ifndef LMMS_LOCKLESS_LIST_H +#define LMMS_LOCKLESS_LIST_H #include "LocklessAllocator.h" diff --git a/include/LocklessRingBuffer.h b/include/LocklessRingBuffer.h index e77c62ccb..904e54f9c 100644 --- a/include/LocklessRingBuffer.h +++ b/include/LocklessRingBuffer.h @@ -22,8 +22,8 @@ * */ -#ifndef LOCKLESSRINGBUFFER_H -#define LOCKLESSRINGBUFFER_H +#ifndef LMMS_LOCKLESS_RING_BUFFER_H +#define LMMS_LOCKLESS_RING_BUFFER_H #include #include @@ -89,4 +89,4 @@ private: } // namespace lmms -#endif //LOCKLESSRINGBUFFER_H +#endif diff --git a/include/Lv2Basics.h b/include/Lv2Basics.h index b935e6a02..73f006b46 100644 --- a/include/Lv2Basics.h +++ b/include/Lv2Basics.h @@ -22,10 +22,8 @@ * */ - -#ifndef LV2BASICS_H -#define LV2BASICS_H - +#ifndef LMMS_LV2BASICS_H +#define LMMS_LV2BASICS_H #include "lmmsconfig.h" @@ -69,4 +67,5 @@ std::string stdStringFromPortName(const LilvPlugin* plug, const LilvPort* port); } // namespace lmms #endif // LMMS_HAVE_LV2 -#endif // LV2BASICS_H + +#endif diff --git a/include/Lv2ControlBase.h b/include/Lv2ControlBase.h index c6b08db8c..dcb90f27a 100644 --- a/include/Lv2ControlBase.h +++ b/include/Lv2ControlBase.h @@ -22,8 +22,8 @@ * */ -#ifndef LV2_CONTROL_BASE_H -#define LV2_CONTROL_BASE_H +#ifndef LMMS_LV2_CONTROL_BASE_H +#define LMMS_LV2_CONTROL_BASE_H #include "lmmsconfig.h" @@ -163,4 +163,5 @@ private: } // namespace lmms #endif // LMMS_HAVE_LV2 -#endif // LV2_CONTROL_BASE_H + +#endif diff --git a/include/Lv2Evbuf.h b/include/Lv2Evbuf.h index 9732fc5e1..ecf61ec99 100644 --- a/include/Lv2Evbuf.h +++ b/include/Lv2Evbuf.h @@ -1,5 +1,5 @@ /* - * lv2_evbuf.h - Lv2 event buffer definitions + * Lv2Evbuf.h - Lv2 event buffer definitions * * Copyright (c) 2019-2020 Johannes Lorenz * @@ -30,8 +30,8 @@ * match the LMMS coding conventions. */ -#ifndef LV2_EVBUF_H -#define LV2_EVBUF_H +#ifndef LMMS_LV2_EVBUF_H +#define LMMS_LV2_EVBUF_H #include "lmmsconfig.h" @@ -155,4 +155,4 @@ lv2_evbuf_write( LV2_Evbuf_Iterator* iter, #endif // LMMS_HAVE_LV2 -#endif // LV2_EVBUF_H +#endif diff --git a/include/Lv2Features.h b/include/Lv2Features.h index 033273f31..99a5762b0 100644 --- a/include/Lv2Features.h +++ b/include/Lv2Features.h @@ -22,8 +22,8 @@ * */ -#ifndef LV2FEATURES_H -#define LV2FEATURES_H +#ifndef LMMS_LV2_FEATURES_H +#define LMMS_LV2_FEATURES_H #include "lmmsconfig.h" @@ -84,4 +84,4 @@ private: #endif // LMMS_HAVE_LV2 -#endif // LV2FEATURES_H +#endif diff --git a/include/Lv2Manager.h b/include/Lv2Manager.h index 7c4a4bcb7..45ca868dd 100644 --- a/include/Lv2Manager.h +++ b/include/Lv2Manager.h @@ -22,8 +22,8 @@ * */ -#ifndef LV2MANAGER_H -#define LV2MANAGER_H +#ifndef LMMS_LV2_MANAGER_H +#define LMMS_LV2_MANAGER_H #include "lmmsconfig.h" @@ -166,4 +166,4 @@ private: #endif // LMMS_HAVE_LV2 -#endif // LV2MANAGER_H +#endif diff --git a/include/Lv2Options.h b/include/Lv2Options.h index 32225ea89..c81e4b953 100644 --- a/include/Lv2Options.h +++ b/include/Lv2Options.h @@ -22,8 +22,8 @@ * */ -#ifndef LV2OPTIONS_H -#define LV2OPTIONS_H +#ifndef LMMS_LV2_OPTIONS_H +#define LMMS_LV2_OPTIONS_H #include "lmmsconfig.h" @@ -107,4 +107,4 @@ private: #endif // LMMS_HAVE_LV2 -#endif // LV2OPTIONS_H +#endif diff --git a/include/Lv2Ports.h b/include/Lv2Ports.h index 07676fdd4..7283ebbd3 100644 --- a/include/Lv2Ports.h +++ b/include/Lv2Ports.h @@ -22,8 +22,8 @@ * */ -#ifndef LV2PORTS_H -#define LV2PORTS_H +#ifndef LMMS_LV2PORTS_H +#define LMMS_LV2PORTS_H #include "lmmsconfig.h" @@ -270,4 +270,5 @@ const Target* dcast(const PortBase* base) } // namespace lmms #endif // LMMS_HAVE_LV2 -#endif // LV2PORTS_H + +#endif diff --git a/include/Lv2Proc.h b/include/Lv2Proc.h index 31a694044..eea4e7c0e 100644 --- a/include/Lv2Proc.h +++ b/include/Lv2Proc.h @@ -22,8 +22,8 @@ * */ -#ifndef LV2PROC_H -#define LV2PROC_H +#ifndef LMMS_LV2_PROC_H +#define LMMS_LV2_PROC_H #include "lmmsconfig.h" @@ -220,4 +220,5 @@ private: } // namespace lmms #endif // LMMS_HAVE_LV2 -#endif // LV2PROC_H + +#endif diff --git a/include/Lv2SubPluginFeatures.h b/include/Lv2SubPluginFeatures.h index 9ba2c76cb..f8fbf55df 100644 --- a/include/Lv2SubPluginFeatures.h +++ b/include/Lv2SubPluginFeatures.h @@ -24,8 +24,8 @@ * */ -#ifndef LV2_SUBPLUGIN_FEATURES_H -#define LV2_SUBPLUGIN_FEATURES_H +#ifndef LMMS_LV2_SUBPLUGIN_FEATURES_H +#define LMMS_LV2_SUBPLUGIN_FEATURES_H #include "lmmsconfig.h" diff --git a/include/Lv2UridCache.h b/include/Lv2UridCache.h index bae42d318..ab80760b0 100644 --- a/include/Lv2UridCache.h +++ b/include/Lv2UridCache.h @@ -22,8 +22,8 @@ * */ -#ifndef LV2URIDCACHE_H -#define LV2URIDCACHE_H +#ifndef LMMS_LV2_URID_CACHE_H +#define LMMS_LV2_URID_CACHE_H #include "lmmsconfig.h" @@ -74,4 +74,5 @@ template<> struct Lv2UridCache::IdForType { static constexpr auto } // namespace lmms #endif // LMMS_HAVE_LV2 -#endif // LV2URIDCACHE_H + +#endif diff --git a/include/Lv2UridMap.h b/include/Lv2UridMap.h index 9db9cb0c2..ec23f4c6d 100644 --- a/include/Lv2UridMap.h +++ b/include/Lv2UridMap.h @@ -22,8 +22,8 @@ * */ -#ifndef LV2URIDMAP_H -#define LV2URIDMAP_H +#ifndef LMMS_LV2_URID_MAP_H +#define LMMS_LV2_URID_MAP_H #include "lmmsconfig.h" @@ -75,4 +75,5 @@ public: } // namespace lmms #endif // LMMS_HAVE_LV2 -#endif // LV2URIDMAP_H + +#endif diff --git a/include/Lv2ViewBase.h b/include/Lv2ViewBase.h index 605440814..e84c6c5dc 100644 --- a/include/Lv2ViewBase.h +++ b/include/Lv2ViewBase.h @@ -22,15 +22,14 @@ * */ -#ifndef LV2VIEWBASE_H -#define LV2VIEWBASE_H +#ifndef LMMS_LV2_VIEW_BASE_H +#define LMMS_LV2_VIEW_BASE_H #include "lmmsconfig.h" #ifdef LMMS_HAVE_LV2 - #include "LinkedModelGroupViews.h" #include "lmms_export.h" #include "Lv2Basics.h" @@ -109,4 +108,5 @@ private: } // namespace lmms #endif // LMMS_HAVE_LV2 -#endif // LV2VIEWBASE_H + +#endif diff --git a/include/MainApplication.h b/include/MainApplication.h index 04bc82226..0ab2877e7 100644 --- a/include/MainApplication.h +++ b/include/MainApplication.h @@ -22,8 +22,8 @@ * */ -#ifndef MAINAPPLICATION_H -#define MAINAPPLICATION_H +#ifndef LMMS_GUI_MAIN_APPLICATION_H +#define LMMS_GUI_MAIN_APPLICATION_H #include "lmmsconfig.h" @@ -64,4 +64,4 @@ private: } // namespace lmms::gui -#endif // MAINAPPLICATION_H +#endif diff --git a/include/MainWindow.h b/include/MainWindow.h index e093d1082..78d7f48d8 100644 --- a/include/MainWindow.h +++ b/include/MainWindow.h @@ -22,8 +22,8 @@ * */ -#ifndef MAIN_WINDOW_H -#define MAIN_WINDOW_H +#ifndef LMMS_GUI_MAIN_WINDOW_H +#define LMMS_GUI_MAIN_WINDOW_H #include #include diff --git a/include/MemoryHelper.h b/include/MemoryHelper.h index 1def9d9c4..22ab10a6c 100644 --- a/include/MemoryHelper.h +++ b/include/MemoryHelper.h @@ -21,9 +21,8 @@ * */ - -#ifndef MEMORY_HELPER_H -#define MEMORY_HELPER_H +#ifndef LMMS_MEMORY_HELPER_H +#define LMMS_MEMORY_HELPER_H #include @@ -48,4 +47,3 @@ private: } // namespace lmms #endif - diff --git a/include/MemoryManager.h b/include/MemoryManager.h index d50ad173d..6e172468b 100644 --- a/include/MemoryManager.h +++ b/include/MemoryManager.h @@ -24,8 +24,8 @@ * */ -#ifndef MEMORY_MANAGER_H -#define MEMORY_MANAGER_H +#ifndef LMMS_MEMORY_MANAGER_H +#define LMMS_MEMORY_MANAGER_H #include #include diff --git a/include/MeterDialog.h b/include/MeterDialog.h index 67dca2568..425590807 100644 --- a/include/MeterDialog.h +++ b/include/MeterDialog.h @@ -23,8 +23,8 @@ * */ -#ifndef METER_DIALOG_H -#define METER_DIALOG_H +#ifndef LMMS_GUI_METER_DIALOG_H +#define LMMS_GUI_METER_DIALOG_H #include diff --git a/include/MeterModel.h b/include/MeterModel.h index c2e715b79..9a6ec8015 100644 --- a/include/MeterModel.h +++ b/include/MeterModel.h @@ -22,8 +22,8 @@ * */ -#ifndef METER_MODEL_H -#define METER_MODEL_H +#ifndef LMMS_METER_MODEL_H +#define LMMS_METER_MODEL_H #include "AutomatableModel.h" diff --git a/include/MicroTimer.h b/include/MicroTimer.h index ea74e964d..e5c8e2f61 100644 --- a/include/MicroTimer.h +++ b/include/MicroTimer.h @@ -22,8 +22,8 @@ * */ -#ifndef MICRO_TIMER_H -#define MICRO_TIMER_H +#ifndef LMMS_MICRO_TIMER_H +#define LMMS_MICRO_TIMER_H #include @@ -48,4 +48,4 @@ private: } // namespace lmms -#endif // MICRO_TIMER_H +#endif diff --git a/include/Microtuner.h b/include/Microtuner.h index dff8f5773..795748b39 100644 --- a/include/Microtuner.h +++ b/include/Microtuner.h @@ -22,8 +22,8 @@ * */ -#ifndef MICROTUNER_H -#define MICROTUNER_H +#ifndef LMMS_MICROTUNER_H +#define LMMS_MICROTUNER_H #include "AutomatableModel.h" #include "ComboBoxModel.h" diff --git a/include/MicrotunerConfig.h b/include/MicrotunerConfig.h index 690587dd5..3a5130b60 100644 --- a/include/MicrotunerConfig.h +++ b/include/MicrotunerConfig.h @@ -22,9 +22,8 @@ * */ -#ifndef MICROTUNER_CONFIG_H -#define MICROTUNER_CONFIG_H - +#ifndef LMMS_GUI_MICROTUNER_CONFIG_H +#define LMMS_GUI_MICROTUNER_CONFIG_H #include diff --git a/include/Midi.h b/include/Midi.h index f75254d84..839d0b684 100644 --- a/include/Midi.h +++ b/include/Midi.h @@ -22,8 +22,8 @@ * */ -#ifndef MIDI_H -#define MIDI_H +#ifndef LMMS_MIDI_H +#define LMMS_MIDI_H #include "lmms_basics.h" diff --git a/include/MidiAlsaRaw.h b/include/MidiAlsaRaw.h index 57a477264..a2b8c4e69 100644 --- a/include/MidiAlsaRaw.h +++ b/include/MidiAlsaRaw.h @@ -22,8 +22,8 @@ * */ -#ifndef MIDI_ALSA_RAW_H -#define MIDI_ALSA_RAW_H +#ifndef LMMS_MIDI_ALSA_RAW_H +#define LMMS_MIDI_ALSA_RAW_H #include "lmmsconfig.h" diff --git a/include/MidiAlsaSeq.h b/include/MidiAlsaSeq.h index fa287a409..d6f488c82 100644 --- a/include/MidiAlsaSeq.h +++ b/include/MidiAlsaSeq.h @@ -22,8 +22,8 @@ * */ -#ifndef MIDI_ALSA_SEQ_H -#define MIDI_ALSA_SEQ_H +#ifndef LMMS_MIDI_ALSA_SEQ_H +#define LMMS_MIDI_ALSA_SEQ_H #include "lmmsconfig.h" @@ -159,4 +159,3 @@ signals: #endif // LMMS_HAVE_ALSA #endif - diff --git a/include/MidiApple.h b/include/MidiApple.h index 794641e64..1b0d59218 100644 --- a/include/MidiApple.h +++ b/include/MidiApple.h @@ -23,8 +23,8 @@ * */ -#ifndef MIDI_APPLE_H -#define MIDI_APPLE_H +#ifndef LMMS_MIDI_APPLE_H +#define LMMS_MIDI_APPLE_H #include "lmmsconfig.h" @@ -155,5 +155,4 @@ signals: #endif // LMMS_BUILD_APPLE - #endif diff --git a/include/MidiCCRackView.h b/include/MidiCCRackView.h index 59f1de020..98f5ce183 100644 --- a/include/MidiCCRackView.h +++ b/include/MidiCCRackView.h @@ -1,5 +1,5 @@ -#ifndef MIDI_CC_RACK_VIEW_H -#define MIDI_CC_RACK_VIEW_H +#ifndef LMMS_GUI_MIDI_CC_RACK_VIEW_H +#define LMMS_GUI_MIDI_CC_RACK_VIEW_H #include diff --git a/include/MidiClient.h b/include/MidiClient.h index 954cd5ef5..45ba54ee5 100644 --- a/include/MidiClient.h +++ b/include/MidiClient.h @@ -22,8 +22,8 @@ * */ -#ifndef MIDI_CLIENT_H -#define MIDI_CLIENT_H +#ifndef LMMS_MIDI_CLIENT_H +#define LMMS_MIDI_CLIENT_H #include #include @@ -174,4 +174,3 @@ private: } // namespace lmms #endif - diff --git a/include/MidiClip.h b/include/MidiClip.h index 6433ba507..2dbedc0dd 100644 --- a/include/MidiClip.h +++ b/include/MidiClip.h @@ -23,9 +23,8 @@ * */ -#ifndef MIDI_CLIP_H -#define MIDI_CLIP_H - +#ifndef LMMS_MIDI_CLIP_H +#define LMMS_MIDI_CLIP_H #include "Clip.h" #include "Note.h" diff --git a/include/MidiClipView.h b/include/MidiClipView.h index 1a9809733..dd83f98b8 100644 --- a/include/MidiClipView.h +++ b/include/MidiClipView.h @@ -21,10 +21,10 @@ * Boston, MA 02110-1301 USA. * */ - -#ifndef MIDI_CLIP_VIEW_H -#define MIDI_CLIP_VIEW_H - + +#ifndef LMMS_GUI_MIDI_CLIP_VIEW_H +#define LMMS_GUI_MIDI_CLIP_VIEW_H + #include #include "ClipView.h" @@ -43,7 +43,7 @@ class MidiClipView : public ClipView public: MidiClipView( MidiClip* clip, TrackView* parent ); - ~MidiClipView() override = default; + ~MidiClipView() override = default; Q_PROPERTY(QColor noteFillColor READ getNoteFillColor WRITE setNoteFillColor) Q_PROPERTY(QColor noteBorderColor READ getNoteBorderColor WRITE setNoteBorderColor) @@ -107,5 +107,5 @@ private: } // namespace gui } // namespace lmms - - #endif + +#endif diff --git a/include/MidiController.h b/include/MidiController.h index 500acc5f8..19577281f 100644 --- a/include/MidiController.h +++ b/include/MidiController.h @@ -22,8 +22,8 @@ * */ -#ifndef MIDI_CONTROLLER_H -#define MIDI_CONTROLLER_H +#ifndef LMMS_MIDI_CONTROLLER_H +#define LMMS_MIDI_CONTROLLER_H #include diff --git a/include/MidiDummy.h b/include/MidiDummy.h index 67a91e326..03deaf7bc 100644 --- a/include/MidiDummy.h +++ b/include/MidiDummy.h @@ -22,8 +22,8 @@ * */ -#ifndef MIDI_DUMMY_H -#define MIDI_DUMMY_H +#ifndef LMMS_MIDI_DUMMY_H +#define LMMS_MIDI_DUMMY_H #include "MidiClient.h" diff --git a/include/MidiEvent.h b/include/MidiEvent.h index 6c2bfdd55..03d3be604 100644 --- a/include/MidiEvent.h +++ b/include/MidiEvent.h @@ -22,8 +22,8 @@ * */ -#ifndef MIDI_EVENT_H -#define MIDI_EVENT_H +#ifndef LMMS_MIDI_EVENT_H +#define LMMS_MIDI_EVENT_H #include #include "Midi.h" diff --git a/include/MidiEventProcessor.h b/include/MidiEventProcessor.h index 132a5fc42..3e51d1177 100644 --- a/include/MidiEventProcessor.h +++ b/include/MidiEventProcessor.h @@ -22,8 +22,8 @@ * */ -#ifndef MIDI_EVENT_PROCESSOR_H -#define MIDI_EVENT_PROCESSOR_H +#ifndef LMMS_MIDI_EVENT_PROCESSOR_H +#define LMMS_MIDI_EVENT_PROCESSOR_H #include "MidiEvent.h" #include "MemoryManager.h" diff --git a/include/MidiEventToByteSeq.h b/include/MidiEventToByteSeq.h index f2e36f50a..03308d7b8 100644 --- a/include/MidiEventToByteSeq.h +++ b/include/MidiEventToByteSeq.h @@ -22,8 +22,8 @@ * */ -#ifndef MIDIEVENTTOBYTESEQ_H -#define MIDIEVENTTOBYTESEQ_H +#ifndef LMMS_MIDIEVENTTOBYTESEQ_H +#define LMMS_MIDIEVENTTOBYTESEQ_H #include #include @@ -51,4 +51,4 @@ std::size_t LMMS_EXPORT writeToByteSeq( const class MidiEvent& ev, } // namespace lmms -#endif // MIDIEVENTTOBYTESEQ_H +#endif diff --git a/include/MidiJack.h b/include/MidiJack.h index a4a944b81..265abedfc 100644 --- a/include/MidiJack.h +++ b/include/MidiJack.h @@ -22,8 +22,8 @@ * */ -#ifndef MIDIJACK_H -#define MIDIJACK_H +#ifndef LMMS_MIDI_JACK_H +#define LMMS_MIDI_JACK_H #include "lmmsconfig.h" @@ -102,4 +102,4 @@ private: #endif // LMMS_HAVE_JACK -#endif // MIDIJACK_H +#endif diff --git a/include/MidiOss.h b/include/MidiOss.h index 944359055..dba0a9a71 100644 --- a/include/MidiOss.h +++ b/include/MidiOss.h @@ -22,8 +22,8 @@ * */ -#ifndef MIDI_OSS_H -#define MIDI_OSS_H +#ifndef LMMS_MIDI_OSS_H +#define LMMS_MIDI_OSS_H #include "lmmsconfig.h" @@ -78,5 +78,4 @@ private: #endif // LMMS_HAVE_OSS - #endif diff --git a/include/MidiPort.h b/include/MidiPort.h index 7ef9adf90..a03b8477c 100644 --- a/include/MidiPort.h +++ b/include/MidiPort.h @@ -23,8 +23,8 @@ * */ -#ifndef MIDI_PORT_H -#define MIDI_PORT_H +#ifndef LMMS_MIDI_PORT_H +#define LMMS_MIDI_PORT_H #include #include diff --git a/include/MidiPortMenu.h b/include/MidiPortMenu.h index 215a73d06..88328e734 100644 --- a/include/MidiPortMenu.h +++ b/include/MidiPortMenu.h @@ -23,8 +23,8 @@ * */ -#ifndef MIDI_PORT_MENU_H -#define MIDI_PORT_MENU_H +#ifndef LMMS_GUI_MIDI_PORT_MENU_H +#define LMMS_GUI_MIDI_PORT_MENU_H #include diff --git a/include/MidiSetupWidget.h b/include/MidiSetupWidget.h index 4021db142..492a5bb85 100644 --- a/include/MidiSetupWidget.h +++ b/include/MidiSetupWidget.h @@ -22,9 +22,8 @@ * */ -#ifndef MIDISETUPWIDGET_H -#define MIDISETUPWIDGET_H - +#ifndef LMMS_GUI_MIDI_SETUP_WIDGET_H +#define LMMS_GUI_MIDI_SETUP_WIDGET_H #include "TabWidget.h" diff --git a/include/MidiSndio.h b/include/MidiSndio.h index 3ebd14d05..3d7226431 100644 --- a/include/MidiSndio.h +++ b/include/MidiSndio.h @@ -23,8 +23,8 @@ * */ -#ifndef _MIDI_SNDIO_H -#define _MIDI_SNDIO_H +#ifndef LMMS_MIDI_SNDIO_H +#define LMMS_MIDI_SNDIO_H #include "lmmsconfig.h" @@ -75,4 +75,4 @@ private: #endif // LMMS_HAVE_SNDIO -#endif // _MIDI_SNDIO_H +#endif diff --git a/include/MidiWinMM.h b/include/MidiWinMM.h index 0f2bd0d5f..ca1850347 100644 --- a/include/MidiWinMM.h +++ b/include/MidiWinMM.h @@ -22,8 +22,8 @@ * */ -#ifndef MIDI_WINMM_H -#define MIDI_WINMM_H +#ifndef LMMS_MIDI_WINMM_H +#define LMMS_MIDI_WINMM_H #include "lmmsconfig.h" @@ -151,4 +151,3 @@ signals: #endif // LMMS_BUILD_WIN32 #endif - diff --git a/include/MixHelpers.h b/include/MixHelpers.h index 6599b40ec..76242dd7a 100644 --- a/include/MixHelpers.h +++ b/include/MixHelpers.h @@ -22,8 +22,8 @@ * */ -#ifndef MIX_HELPERS_H -#define MIX_HELPERS_H +#ifndef LMMS_MIX_HELPERS_H +#define LMMS_MIX_HELPERS_H #include "lmms_basics.h" @@ -82,4 +82,3 @@ void multiplyAndAddMultipliedJoined( sampleFrame* dst, const sample_t* srcLeft, } // namespace lmms #endif - diff --git a/include/Mixer.h b/include/Mixer.h index ecd864ae7..d49d950ea 100644 --- a/include/Mixer.h +++ b/include/Mixer.h @@ -22,8 +22,8 @@ * */ -#ifndef MIXER_H -#define MIXER_H +#ifndef LMMS_MIXER_H +#define LMMS_MIXER_H #include "Model.h" #include "EffectChain.h" @@ -100,37 +100,37 @@ class MixerChannel : public ThreadableJob class MixerRoute : public QObject { Q_OBJECT - public: - MixerRoute( MixerChannel * from, MixerChannel * to, float amount ); - ~MixerRoute() override = default; - +public: + MixerRoute( MixerChannel * from, MixerChannel * to, float amount ); + ~MixerRoute() override = default; + mix_ch_t senderIndex() const { return m_from->m_channelIndex; } - + mix_ch_t receiverIndex() const { return m_to->m_channelIndex; } - + FloatModel * amount() { return &m_amount; } - + MixerChannel * sender() const { return m_from; } - + MixerChannel * receiver() const { return m_to; } - + void updateName(); - + private: MixerChannel * m_from; MixerChannel * m_to; diff --git a/include/MixerLine.h b/include/MixerLine.h index decd5f3aa..0121717cf 100644 --- a/include/MixerLine.h +++ b/include/MixerLine.h @@ -23,8 +23,8 @@ * */ -#ifndef MIXERLINE_H -#define MIXERLINE_H +#ifndef LMMS_GUI_MIXER_LINE_H +#define LMMS_GUI_MIXER_LINE_H #include @@ -117,4 +117,4 @@ private slots: } // namespace lmms::gui -#endif // MIXERLINE_H +#endif diff --git a/include/MixerLineLcdSpinBox.h b/include/MixerLineLcdSpinBox.h index bfd6cd5c9..0d3b182b0 100644 --- a/include/MixerLineLcdSpinBox.h +++ b/include/MixerLineLcdSpinBox.h @@ -22,8 +22,8 @@ * */ -#ifndef MIXER_LINE_LCD_SPIN_BOX_H -#define MIXER_LINE_LCD_SPIN_BOX_H +#ifndef LMMS_GUI_MIXER_LINE_LCD_SPIN_BOX_H +#define LMMS_GUI_MIXER_LINE_LCD_SPIN_BOX_H #include "LcdSpinBox.h" diff --git a/include/MixerView.h b/include/MixerView.h index a7b1b5191..e73e2e391 100644 --- a/include/MixerView.h +++ b/include/MixerView.h @@ -22,8 +22,8 @@ * */ -#ifndef MIXER_VIEW_H -#define MIXER_VIEW_H +#ifndef LMMS_GUI_MIXER_VIEW_H +#define LMMS_GUI_MIXER_VIEW_H #include #include @@ -132,7 +132,7 @@ private: QWidget * m_racksWidget; void updateMaxChannelSelector(); - + friend class MixerChannelView; } ; diff --git a/include/Model.h b/include/Model.h index 567d4ffd7..0b8142659 100644 --- a/include/Model.h +++ b/include/Model.h @@ -22,8 +22,8 @@ * */ -#ifndef MODEL_H -#define MODEL_H +#ifndef LMMS_MODEL_H +#define LMMS_MODEL_H #include #include @@ -91,4 +91,3 @@ signals: } // namespace lmms #endif - diff --git a/include/ModelView.h b/include/ModelView.h index a858dc7ec..89e60c3a6 100644 --- a/include/ModelView.h +++ b/include/ModelView.h @@ -22,8 +22,8 @@ * */ -#ifndef MODEL_VIEW_H -#define MODEL_VIEW_H +#ifndef LMMS_GUI_MODEL_VIEW_H +#define LMMS_GUI_MODEL_VIEW_H #include #include "Model.h" @@ -86,4 +86,3 @@ private: } // namespace lmms::gui #endif - diff --git a/include/ModelVisitor.h b/include/ModelVisitor.h index 8805e30e2..59928d04b 100644 --- a/include/ModelVisitor.h +++ b/include/ModelVisitor.h @@ -22,8 +22,8 @@ * */ -#ifndef MODELVISITOR_H -#define MODELVISITOR_H +#ifndef LMMS_MODEL_VISITOR_H +#define LMMS_MODEL_VISITOR_H namespace lmms { @@ -68,4 +68,4 @@ public: } // namespace lmms -#endif // MODELVISITOR_H +#endif diff --git a/include/NStateButton.h b/include/NStateButton.h index 4dac1a436..dd1c06a66 100644 --- a/include/NStateButton.h +++ b/include/NStateButton.h @@ -22,9 +22,8 @@ * */ - -#ifndef NSTATE_BUTTON_H -#define NSTATE_BUTTON_H +#ifndef LMMS_GUI_NSTATE_BUTTON_H +#define LMMS_GUI_NSTATE_BUTTON_H #include #include diff --git a/include/Note.h b/include/Note.h index 464f3906f..9eecd585f 100644 --- a/include/Note.h +++ b/include/Note.h @@ -23,8 +23,8 @@ * */ -#ifndef NOTE_H -#define NOTE_H +#ifndef LMMS_NOTE_H +#define LMMS_NOTE_H #include #include diff --git a/include/NotePlayHandle.h b/include/NotePlayHandle.h index 4969fd84a..89fc7e570 100644 --- a/include/NotePlayHandle.h +++ b/include/NotePlayHandle.h @@ -23,8 +23,8 @@ * */ -#ifndef NOTE_PLAY_HANDLE_H -#define NOTE_PLAY_HANDLE_H +#ifndef LMMS_NOTE_PLAY_HANDLE_H +#define LMMS_NOTE_PLAY_HANDLE_H #include diff --git a/include/Oscillator.h b/include/Oscillator.h index 8727ee39c..025404c41 100644 --- a/include/Oscillator.h +++ b/include/Oscillator.h @@ -23,8 +23,8 @@ * */ -#ifndef OSCILLATOR_H -#define OSCILLATOR_H +#ifndef LMMS_OSCILLATOR_H +#define LMMS_OSCILLATOR_H #include #include diff --git a/include/OscillatorConstants.h b/include/OscillatorConstants.h index 0450c2f17..ef12636d4 100644 --- a/include/OscillatorConstants.h +++ b/include/OscillatorConstants.h @@ -1,5 +1,5 @@ /* - * OscillatorConstants.h - declaration of constants used in Oscillator and SampleBuffer + * OscillatorConstants.h - declaration of constants used in Oscillator and SampleBuffer * for band limited wave tables * * Copyright (c) 2018 Dave French @@ -23,8 +23,8 @@ * */ -#ifndef OSCILLATORCONSTANTS_H -#define OSCILLATORCONSTANTS_H +#ifndef LMMS_OSCILLATORCONSTANTS_H +#define LMMS_OSCILLATORCONSTANTS_H #include @@ -55,4 +55,4 @@ namespace lmms::OscillatorConstants } // namespace lmms::OscillatorConstants -#endif // OSCILLATORCONSTANTS_H +#endif diff --git a/include/Oscilloscope.h b/include/Oscilloscope.h index db4cf2b4a..c7a52cef9 100644 --- a/include/Oscilloscope.h +++ b/include/Oscilloscope.h @@ -22,9 +22,8 @@ * */ - -#ifndef OSCILLOSCOPE_H -#define OSCILLOSCOPE_H +#ifndef LMMS_GUI_OSCILLOSCOPE_H +#define LMMS_GUI_OSCILLOSCOPE_H #include #include @@ -79,4 +78,4 @@ private: } // namespace lmms::gui -#endif // OSCILLOSCOPE_H +#endif diff --git a/include/OutputSettings.h b/include/OutputSettings.h index 03e3333ac..0b10d2b01 100644 --- a/include/OutputSettings.h +++ b/include/OutputSettings.h @@ -23,12 +23,11 @@ * */ -#ifndef OUTPUT_SETTINGS_H -#define OUTPUT_SETTINGS_H +#ifndef LMMS_OUTPUT_SETTINGS_H +#define LMMS_OUTPUT_SETTINGS_H #include "lmms_basics.h" - namespace lmms { diff --git a/include/PathUtil.h b/include/PathUtil.h index 8b1ef1097..9efd73096 100644 --- a/include/PathUtil.h +++ b/include/PathUtil.h @@ -22,8 +22,8 @@ * */ -#ifndef PATHUTIL_H -#define PATHUTIL_H +#ifndef LMMS_PATHUTIL_H +#define LMMS_PATHUTIL_H #include "lmms_export.h" diff --git a/include/PatternClip.h b/include/PatternClip.h index f1d0e2557..3f9d07cb6 100644 --- a/include/PatternClip.h +++ b/include/PatternClip.h @@ -21,10 +21,9 @@ * Boston, MA 02110-1301 USA. * */ - -#ifndef PATTERN_CLIP_H -#define PATTERN_CLIP_H +#ifndef LMMS_PATTERN_CLIP_H +#define LMMS_PATTERN_CLIP_H #include "Clip.h" diff --git a/include/PatternClipView.h b/include/PatternClipView.h index d170e4bef..f2e2208bd 100644 --- a/include/PatternClipView.h +++ b/include/PatternClipView.h @@ -21,11 +21,9 @@ * Boston, MA 02110-1301 USA. * */ - - -#ifndef PATTERN_CLIP_VIEW_H -#define PATTERN_CLIP_VIEW_H +#ifndef LMMS_GUI_PATTERN_CLIP_VIEW_H +#define LMMS_GUI_PATTERN_CLIP_VIEW_H #include diff --git a/include/PatternEditor.h b/include/PatternEditor.h index ffe08e335..fd9a1b254 100644 --- a/include/PatternEditor.h +++ b/include/PatternEditor.h @@ -22,10 +22,8 @@ * */ - -#ifndef PATTERN_EDITOR_H -#define PATTERN_EDITOR_H - +#ifndef LMMS_GUI_PATTERN_EDITOR_H +#define LMMS_GUI_PATTERN_EDITOR_H #include "Editor.h" #include "TrackContainerView.h" diff --git a/include/PatternStore.h b/include/PatternStore.h index 7bd377941..024505b83 100644 --- a/include/PatternStore.h +++ b/include/PatternStore.h @@ -22,9 +22,8 @@ * */ - -#ifndef PATTERN_STORE_H -#define PATTERN_STORE_H +#ifndef LMMS_PATTERN_STORE_H +#define LMMS_PATTERN_STORE_H #include "TrackContainer.h" #include "ComboBoxModel.h" diff --git a/include/PatternTrack.h b/include/PatternTrack.h index 73ddd4766..8e319216a 100644 --- a/include/PatternTrack.h +++ b/include/PatternTrack.h @@ -22,10 +22,8 @@ * */ - -#ifndef PATTERN_TRACK_H -#define PATTERN_TRACK_H - +#ifndef LMMS_PATTERN_TRACK_H +#define LMMS_PATTERN_TRACK_H #include diff --git a/include/PatternTrackView.h b/include/PatternTrackView.h index b6d33e444..b4d373b5d 100644 --- a/include/PatternTrackView.h +++ b/include/PatternTrackView.h @@ -22,10 +22,8 @@ * */ - -#ifndef PATTERN_TRACK_VIEW_H -#define PATTERN_TRACK_VIEW_H - +#ifndef LMMS_GUI_PATTERN_TRACK_VIEW_H +#define LMMS_GUI_PATTERN_TRACK_VIEW_H #include "TrackView.h" diff --git a/include/PeakController.h b/include/PeakController.h index 58d666dd0..ebdf49cb0 100644 --- a/include/PeakController.h +++ b/include/PeakController.h @@ -22,8 +22,8 @@ * */ -#ifndef PEAK_CONTROLLER_H -#define PEAK_CONTROLLER_H +#ifndef LMMS_PEAK_CONTROLLER_H +#define LMMS_PEAK_CONTROLLER_H #include "Controller.h" #include "ControllerDialog.h" diff --git a/include/PerfLog.h b/include/PerfLog.h index b8cc35f45..f786de1cc 100644 --- a/include/PerfLog.h +++ b/include/PerfLog.h @@ -22,8 +22,8 @@ * */ -#ifndef PERFLOG_H -#define PERFLOG_H +#ifndef LMMS_PERFLOG_H +#define LMMS_PERFLOG_H #include #include diff --git a/include/Piano.h b/include/Piano.h index 531bb65a6..e22710bba 100644 --- a/include/Piano.h +++ b/include/Piano.h @@ -22,8 +22,8 @@ * */ -#ifndef PIANO_H -#define PIANO_H +#ifndef LMMS_PIANO_H +#define LMMS_PIANO_H #include "Note.h" #include "Model.h" @@ -90,4 +90,3 @@ private: } // namespace lmms #endif - diff --git a/include/PianoRoll.h b/include/PianoRoll.h index c1973f407..5013e3e1b 100644 --- a/include/PianoRoll.h +++ b/include/PianoRoll.h @@ -24,8 +24,8 @@ * */ -#ifndef PIANO_ROLL_H -#define PIANO_ROLL_H +#ifndef LMMS_GUI_PIANO_ROLL_H +#define LMMS_GUI_PIANO_ROLL_H #include #include diff --git a/include/PianoView.h b/include/PianoView.h index 7f586809d..1d5cd4be4 100644 --- a/include/PianoView.h +++ b/include/PianoView.h @@ -22,8 +22,8 @@ * */ -#ifndef PIANO_VIEW_H -#define PIANO_VIEW_H +#ifndef LMMS_GUI_PIANO_VIEW_H +#define LMMS_GUI_PIANO_VIEW_H #include #include diff --git a/include/Pitch.h b/include/Pitch.h index 6213ef374..537941700 100644 --- a/include/Pitch.h +++ b/include/Pitch.h @@ -22,8 +22,8 @@ * */ -#ifndef PITCH_H -#define PITCH_H +#ifndef LMMS_PITCH_H +#define LMMS_PITCH_H #include diff --git a/include/PixmapButton.h b/include/PixmapButton.h index 6c37f9112..b9568e5ad 100644 --- a/include/PixmapButton.h +++ b/include/PixmapButton.h @@ -22,9 +22,8 @@ * */ - -#ifndef PIXMAP_BUTTON_H -#define PIXMAP_BUTTON_H +#ifndef LMMS_GUI_PIXMAP_BUTTON_H +#define LMMS_GUI_PIXMAP_BUTTON_H #include diff --git a/include/PlayHandle.h b/include/PlayHandle.h index 542d45871..005ef17a0 100644 --- a/include/PlayHandle.h +++ b/include/PlayHandle.h @@ -22,8 +22,8 @@ * */ -#ifndef PLAY_HANDLE_H -#define PLAY_HANDLE_H +#ifndef LMMS_PLAY_HANDLE_H +#define LMMS_PLAY_HANDLE_H #include #include diff --git a/include/Plugin.h b/include/Plugin.h index 6a4d95bb4..0a7b68a55 100644 --- a/include/Plugin.h +++ b/include/Plugin.h @@ -22,8 +22,8 @@ * */ -#ifndef PLUGIN_H -#define PLUGIN_H +#ifndef LMMS_PLUGIN_H +#define LMMS_PLUGIN_H #include #include diff --git a/include/PluginBrowser.h b/include/PluginBrowser.h index 1f2041cf4..262732398 100644 --- a/include/PluginBrowser.h +++ b/include/PluginBrowser.h @@ -22,8 +22,8 @@ * */ -#ifndef PLUGIN_BROWSER_H -#define PLUGIN_BROWSER_H +#ifndef LMMS_GUI_PLUGIN_BROWSER_H +#define LMMS_GUI_PLUGIN_BROWSER_H #include @@ -56,8 +56,6 @@ private: }; - - class PluginDescWidget : public QWidget { Q_OBJECT diff --git a/include/PluginFactory.h b/include/PluginFactory.h index 8b8b88b6e..8ea020073 100644 --- a/include/PluginFactory.h +++ b/include/PluginFactory.h @@ -22,8 +22,8 @@ * */ -#ifndef PLUGINFACTORY_H -#define PLUGINFACTORY_H +#ifndef LMMS_PLUGIN_FACTORY_H +#define LMMS_PLUGIN_FACTORY_H #include #include @@ -111,4 +111,4 @@ LMMS_EXPORT PluginFactory* getPluginFactory(); } // namespace lmms -#endif // PLUGINFACTORY_H +#endif diff --git a/include/PluginIssue.h b/include/PluginIssue.h index f0fa275f3..c3f3e5dbe 100644 --- a/include/PluginIssue.h +++ b/include/PluginIssue.h @@ -22,13 +22,12 @@ * */ -#ifndef PLUGINISSUE_H -#define PLUGINISSUE_H +#ifndef LMMS_PLUGIN_ISSUE_H +#define LMMS_PLUGIN_ISSUE_H #include #include - namespace lmms { @@ -86,4 +85,4 @@ QDebug operator<<(QDebug stream, const PluginIssue& iss); } // namespace lmms -#endif // PLUGINISSUE_H +#endif diff --git a/include/PluginView.h b/include/PluginView.h index 2c06b9ba2..75576a8c8 100644 --- a/include/PluginView.h +++ b/include/PluginView.h @@ -22,8 +22,8 @@ * */ -#ifndef PLUGIN_VIEW_H -#define PLUGIN_VIEW_H +#ifndef LMMS_GUI_PLUGIN_VIEW_H +#define LMMS_GUI_PLUGIN_VIEW_H #include diff --git a/include/PositionLine.h b/include/PositionLine.h index cc1313e57..8c1d7d60a 100644 --- a/include/PositionLine.h +++ b/include/PositionLine.h @@ -23,8 +23,8 @@ * */ -#ifndef POSITION_LINE_H -#define POSITION_LINE_H +#ifndef LMMS_GUI_POSITION_LINE_H +#define LMMS_GUI_POSITION_LINE_H #include diff --git a/include/PresetPreviewPlayHandle.h b/include/PresetPreviewPlayHandle.h index dfff0fc21..e37e976e0 100644 --- a/include/PresetPreviewPlayHandle.h +++ b/include/PresetPreviewPlayHandle.h @@ -23,8 +23,8 @@ * */ -#ifndef PRESET_PREVIEW_PLAY_HANDLE_H -#define PRESET_PREVIEW_PLAY_HANDLE_H +#ifndef LMMS_PRESET_PREVIEW_PLAY_HANDLE_H +#define LMMS_PRESET_PREVIEW_PLAY_HANDLE_H #include "NotePlayHandle.h" diff --git a/include/ProjectJournal.h b/include/ProjectJournal.h index 31a61755d..655d64a17 100644 --- a/include/ProjectJournal.h +++ b/include/ProjectJournal.h @@ -22,8 +22,8 @@ * */ -#ifndef PROJECT_JOURNAL_H -#define PROJECT_JOURNAL_H +#ifndef LMMS_PROJECT_JOURNAL_H +#define LMMS_PROJECT_JOURNAL_H #include #include @@ -127,4 +127,3 @@ private: } // namespace lmms #endif - diff --git a/include/ProjectNotes.h b/include/ProjectNotes.h index 4b9476616..51577f0b2 100644 --- a/include/ProjectNotes.h +++ b/include/ProjectNotes.h @@ -22,9 +22,8 @@ * */ - -#ifndef PROJECT_NOTES_H -#define PROJECT_NOTES_H +#ifndef LMMS_GUI_PROJECT_NOTES_H +#define LMMS_GUI_PROJECT_NOTES_H #include diff --git a/include/ProjectRenderer.h b/include/ProjectRenderer.h index 2ca20569b..d9309d3db 100644 --- a/include/ProjectRenderer.h +++ b/include/ProjectRenderer.h @@ -22,8 +22,8 @@ * */ -#ifndef PROJECT_RENDERER_H -#define PROJECT_RENDERER_H +#ifndef LMMS_PROJECT_RENDERER_H +#define LMMS_PROJECT_RENDERER_H #include "AudioFileDevice.h" #include "lmmsconfig.h" diff --git a/include/ProjectVersion.h b/include/ProjectVersion.h index 5be259c97..5401e7126 100644 --- a/include/ProjectVersion.h +++ b/include/ProjectVersion.h @@ -23,9 +23,8 @@ * */ - -#ifndef PROJECT_VERSION_H -#define PROJECT_VERSION_H +#ifndef LMMS_PROJECT_VERSION_H +#define LMMS_PROJECT_VERSION_H #include #include diff --git a/include/QuadratureLfo.h b/include/QuadratureLfo.h index 42d4d32c0..59ff81ba7 100644 --- a/include/QuadratureLfo.h +++ b/include/QuadratureLfo.h @@ -22,8 +22,8 @@ * */ -#ifndef QUADRATURELFO_H -#define QUADRATURELFO_H +#ifndef LMMS_QUADRATURE_LFO_H +#define LMMS_QUADRATURE_LFO_H #include "lmms_math.h" @@ -100,4 +100,4 @@ private: } // namespace lmms -#endif // QUADRATURELFO_H +#endif diff --git a/include/RaiiHelpers.h b/include/RaiiHelpers.h index 0cfa2c4ac..827cc955d 100644 --- a/include/RaiiHelpers.h +++ b/include/RaiiHelpers.h @@ -19,10 +19,11 @@ * License along with this program (see COPYING); if not, write to the * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. + * */ -#ifndef RAII_HELPERS_H -#define RAII_HELPERS_H +#ifndef LMMS_RAII_HELPERS_H +#define LMMS_RAII_HELPERS_H #include #include @@ -63,4 +64,4 @@ using UniqueNullableResource = std::unique_ptr @@ -45,4 +45,4 @@ private slots: } // namespace lmms::gui -#endif // RECENTPROJECTSMENU_H +#endif diff --git a/include/RemotePlugin.h b/include/RemotePlugin.h index 96c910d5d..af15d7d14 100644 --- a/include/RemotePlugin.h +++ b/include/RemotePlugin.h @@ -22,8 +22,8 @@ * */ -#ifndef REMOTE_PLUGIN_H -#define REMOTE_PLUGIN_H +#ifndef LMMS_REMOTE_PLUGIN_H +#define LMMS_REMOTE_PLUGIN_H #include "RemotePluginBase.h" #include "SharedMemory.h" @@ -197,4 +197,4 @@ LMMS_EXPORT inline std::string QSTR_TO_STDSTR(QString const& qstr) } // namespace lmms -#endif // REMOTE_PLUGIN_H +#endif diff --git a/include/RemotePluginBase.h b/include/RemotePluginBase.h index e309496bc..2c5e5054e 100644 --- a/include/RemotePluginBase.h +++ b/include/RemotePluginBase.h @@ -22,8 +22,8 @@ * */ -#ifndef REMOTE_PLUGIN_BASE_H -#define REMOTE_PLUGIN_BASE_H +#ifndef LMMS_REMOTE_PLUGIN_BASE_H +#define LMMS_REMOTE_PLUGIN_BASE_H #include "MidiEvent.h" @@ -673,4 +673,4 @@ private: } // namespace lmms -#endif // REMOTE_PLUGIN_BASE_H +#endif diff --git a/include/RemotePluginClient.h b/include/RemotePluginClient.h index 4c5fcc060..38c311129 100644 --- a/include/RemotePluginClient.h +++ b/include/RemotePluginClient.h @@ -22,8 +22,8 @@ * */ -#ifndef REMOTE_PLUGIN_CLIENT_H -#define REMOTE_PLUGIN_CLIENT_H +#ifndef LMMS_REMOTE_PLUGIN_CLIENT_H +#define LMMS_REMOTE_PLUGIN_CLIENT_H #include "RemotePluginBase.h" @@ -355,4 +355,4 @@ void RemotePluginClient::doProcessing() } // namespace lmms -#endif // REMOTE_PLUGIN_CLIENT_H +#endif diff --git a/include/RenameDialog.h b/include/RenameDialog.h index b543963d7..e7e5b662f 100644 --- a/include/RenameDialog.h +++ b/include/RenameDialog.h @@ -23,13 +23,11 @@ * */ - -#ifndef RENAME_DIALOG_H -#define RENAME_DIALOG_H +#ifndef LMMS_GUI_RENAME_DIALOG_H +#define LMMS_GUI_RENAME_DIALOG_H #include - class QLineEdit; namespace lmms::gui diff --git a/include/RenderManager.h b/include/RenderManager.h index 9ec4c511e..0787db6d7 100644 --- a/include/RenderManager.h +++ b/include/RenderManager.h @@ -23,8 +23,8 @@ * */ -#ifndef RENDER_MANAGER_H -#define RENDER_MANAGER_H +#ifndef LMMS_RENDER_MANAGER_H +#define LMMS_RENDER_MANAGER_H #include diff --git a/include/RingBuffer.h b/include/RingBuffer.h index c7db6b4e5..17f06fc00 100644 --- a/include/RingBuffer.h +++ b/include/RingBuffer.h @@ -23,9 +23,8 @@ * */ - -#ifndef RINGBUFFER_H -#define RINGBUFFER_H +#ifndef LMMS_RING_BUFFER_H +#define LMMS_RING_BUFFER_H #include #include diff --git a/include/RmsHelper.h b/include/RmsHelper.h index 19b7da89c..1d739ee0b 100644 --- a/include/RmsHelper.h +++ b/include/RmsHelper.h @@ -23,8 +23,8 @@ * */ -#ifndef RMS_HELPER_H -#define RMS_HELPER_H +#ifndef LMMS_RMS_HELPER_H +#define LMMS_RMS_HELPER_H #include "lmms_math.h" diff --git a/include/RowTableView.h b/include/RowTableView.h index 9934dbade..04272026e 100644 --- a/include/RowTableView.h +++ b/include/RowTableView.h @@ -22,8 +22,8 @@ * */ -#ifndef ROW_TABLE_VIEW_H -#define ROW_TABLE_VIEW_H +#ifndef LMMS_GUI_ROW_TABLE_VIEW_H +#define LMMS_GUI_ROW_TABLE_VIEW_H #include diff --git a/include/Rubberband.h b/include/Rubberband.h index d35233b4f..4805d1d31 100644 --- a/include/Rubberband.h +++ b/include/Rubberband.h @@ -23,9 +23,8 @@ * */ - -#ifndef RUBBERBAND_H -#define RUBBERBAND_H +#ifndef LMMS_GUI_RUBBERBAND_H +#define LMMS_GUI_RUBBERBAND_H #include #include @@ -95,4 +94,3 @@ private: } // namespace lmms::gui #endif - diff --git a/include/SampleBuffer.h b/include/SampleBuffer.h index f4d67859e..3fac28168 100644 --- a/include/SampleBuffer.h +++ b/include/SampleBuffer.h @@ -22,9 +22,8 @@ * */ - -#ifndef SAMPLE_BUFFER_H -#define SAMPLE_BUFFER_H +#ifndef LMMS_SAMPLE_BUFFER_H +#define LMMS_SAMPLE_BUFFER_H #include #include diff --git a/include/SampleClip.h b/include/SampleClip.h index 51225ded8..427a2bf8b 100644 --- a/include/SampleClip.h +++ b/include/SampleClip.h @@ -21,9 +21,9 @@ * Boston, MA 02110-1301 USA. * */ - -#ifndef SAMPLE_CLIP_H -#define SAMPLE_CLIP_H + +#ifndef LMMS_SAMPLE_CLIP_H +#define LMMS_SAMPLE_CLIP_H #include "Clip.h" diff --git a/include/SampleClipView.h b/include/SampleClipView.h index 74873dca7..7f09ec022 100644 --- a/include/SampleClipView.h +++ b/include/SampleClipView.h @@ -22,13 +22,11 @@ * */ -#ifndef SAMPLE_CLIP_VIEW_H -#define SAMPLE_CLIP_VIEW_H +#ifndef LMMS_GUI_SAMPLE_CLIP_VIEW_H +#define LMMS_GUI_SAMPLE_CLIP_VIEW_H #include "ClipView.h" - - namespace lmms { diff --git a/include/SamplePlayHandle.h b/include/SamplePlayHandle.h index 69ee3b38d..c0ff656db 100644 --- a/include/SamplePlayHandle.h +++ b/include/SamplePlayHandle.h @@ -23,8 +23,8 @@ * */ -#ifndef SAMPLE_PLAY_HANDLE_H -#define SAMPLE_PLAY_HANDLE_H +#ifndef LMMS_SAMPLE_PLAY_HANDLE_H +#define LMMS_SAMPLE_PLAY_HANDLE_H #include "SampleBuffer.h" #include "AutomatableModel.h" diff --git a/include/SampleRecordHandle.h b/include/SampleRecordHandle.h index 5b23f5345..deb415537 100644 --- a/include/SampleRecordHandle.h +++ b/include/SampleRecordHandle.h @@ -22,9 +22,8 @@ * */ - -#ifndef SAMPLE_RECORD_HANDLE_H -#define SAMPLE_RECORD_HANDLE_H +#ifndef LMMS_SAMPLE_RECORD_HANDLE_H +#define LMMS_SAMPLE_RECORD_HANDLE_H #include #include diff --git a/include/SampleTrack.h b/include/SampleTrack.h index 8f424178a..94d1413b7 100644 --- a/include/SampleTrack.h +++ b/include/SampleTrack.h @@ -22,9 +22,8 @@ * */ -#ifndef SAMPLE_TRACK_H -#define SAMPLE_TRACK_H - +#ifndef LMMS_SAMPLE_TRACK_H +#define LMMS_SAMPLE_TRACK_H #include "AudioPort.h" #include "Track.h" @@ -110,4 +109,4 @@ private: } // namespace lmms -#endif \ No newline at end of file +#endif diff --git a/include/SampleTrackView.h b/include/SampleTrackView.h index 9921aa735..12f95bd19 100644 --- a/include/SampleTrackView.h +++ b/include/SampleTrackView.h @@ -22,8 +22,8 @@ * */ -#ifndef SAMPLE_TRACK_VIEW_H -#define SAMPLE_TRACK_VIEW_H +#ifndef LMMS_GUI_SAMPLE_TRACK_VIEW_H +#define LMMS_GUI_SAMPLE_TRACK_VIEW_H #include "TrackView.h" @@ -109,4 +109,4 @@ private: } // namespace lmms -#endif \ No newline at end of file +#endif diff --git a/include/SampleTrackWindow.h b/include/SampleTrackWindow.h index d302b2c44..02d5cacb0 100644 --- a/include/SampleTrackWindow.h +++ b/include/SampleTrackWindow.h @@ -21,12 +21,9 @@ * Boston, MA 02110-1301 USA. * */ - - -#ifndef SAMPLE_TRACK_WINDOW_H -#define SAMPLE_TRACK_WINDOW_H - +#ifndef LMMS_GUI_SAMPLE_TRACK_WINDOW_H +#define LMMS_GUI_SAMPLE_TRACK_WINDOW_H #include @@ -43,7 +40,7 @@ class EffectRackView; class Knob; class MixerLineLcdSpinBox; class SampleTrackView; - + class SampleTrackWindow : public QWidget, public ModelView, public SerializingObjectHook { diff --git a/include/Scale.h b/include/Scale.h index 96159a53c..e36a5e08d 100644 --- a/include/Scale.h +++ b/include/Scale.h @@ -22,8 +22,8 @@ * */ -#ifndef SCALE_H -#define SCALE_H +#ifndef LMMS_SCALE_H +#define LMMS_SCALE_H #include #include diff --git a/include/SendButtonIndicator.h b/include/SendButtonIndicator.h index ec4a90db3..78fe23852 100644 --- a/include/SendButtonIndicator.h +++ b/include/SendButtonIndicator.h @@ -21,8 +21,9 @@ * Boston, MA 02110-1301 USA. * */ -#ifndef SENDBUTTONINDICATOR_H -#define SENDBUTTONINDICATOR_H + +#ifndef LMMS_GUI_SEND_BUTTON_INDICATOR_H +#define LMMS_GUI_SEND_BUTTON_INDICATOR_H #include @@ -63,4 +64,4 @@ private: } // namespace lmms -#endif // SENDBUTTONINDICATOR_H +#endif diff --git a/include/SerializingObject.h b/include/SerializingObject.h index e32d5d046..bbbbaafcc 100644 --- a/include/SerializingObject.h +++ b/include/SerializingObject.h @@ -22,8 +22,8 @@ * */ -#ifndef SERIALIZING_OBJECT_H -#define SERIALIZING_OBJECT_H +#ifndef LMMS_SERIALIZING_OBJECT_H +#define LMMS_SERIALIZING_OBJECT_H #include @@ -102,4 +102,3 @@ private: } // namespace lmms #endif - diff --git a/include/SetupDialog.h b/include/SetupDialog.h index 8973938bf..962804a9c 100644 --- a/include/SetupDialog.h +++ b/include/SetupDialog.h @@ -22,9 +22,8 @@ * */ - -#ifndef SETUP_DIALOG_H -#define SETUP_DIALOG_H +#ifndef LMMS_GUI_SETUP_DIALOG_H +#define LMMS_GUI_SETUP_DIALOG_H #include #include diff --git a/include/SharedMemory.h b/include/SharedMemory.h index 32a40ff25..0a6d3bf89 100644 --- a/include/SharedMemory.h +++ b/include/SharedMemory.h @@ -19,10 +19,11 @@ * License along with this program (see COPYING); if not, write to the * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. + * */ -#ifndef SHARED_MEMORY_H -#define SHARED_MEMORY_H +#ifndef LMMS_SHARED_MEMORY_H +#define LMMS_SHARED_MEMORY_H #include #include @@ -148,4 +149,4 @@ private: } // namespace lmms -#endif // SHARED_MEMORY_H +#endif diff --git a/include/SideBar.h b/include/SideBar.h index 8755c660a..0ca597b5a 100644 --- a/include/SideBar.h +++ b/include/SideBar.h @@ -22,8 +22,8 @@ * */ -#ifndef SIDE_BAR_H -#define SIDE_BAR_H +#ifndef LMMS_GUI_SIDE_BAR_H +#define LMMS_GUI_SIDE_BAR_H #include #include diff --git a/include/SideBarWidget.h b/include/SideBarWidget.h index 5df3ccb7a..2d7cce15a 100644 --- a/include/SideBarWidget.h +++ b/include/SideBarWidget.h @@ -22,8 +22,8 @@ * */ -#ifndef SIDE_BAR_WIDGET_H -#define SIDE_BAR_WIDGET_H +#ifndef LMMS_GUI_SIDE_BAR_WIDGET_H +#define LMMS_GUI_SIDE_BAR_WIDGET_H #include #include diff --git a/include/Song.h b/include/Song.h index 569b3ad14..2e4736ea5 100644 --- a/include/Song.h +++ b/include/Song.h @@ -22,8 +22,8 @@ * */ -#ifndef SONG_H -#define SONG_H +#ifndef LMMS_SONG_H +#define LMMS_SONG_H #include diff --git a/include/SongEditor.h b/include/SongEditor.h index ea57cc125..ab71b7fa7 100644 --- a/include/SongEditor.h +++ b/include/SongEditor.h @@ -23,10 +23,8 @@ * */ - -#ifndef SONG_EDITOR_H -#define SONG_EDITOR_H - +#ifndef LMMS_GUI_SONG_EDITOR_H +#define LMMS_GUI_SONG_EDITOR_H #include "Editor.h" #include "TrackContainerView.h" diff --git a/include/StepRecorder.h b/include/StepRecorder.h index b89fadb15..7cd568a79 100644 --- a/include/StepRecorder.h +++ b/include/StepRecorder.h @@ -18,8 +18,8 @@ * */ -#ifndef STEP_RECORDER_H -#define STEP_RECORDER_H +#ifndef LMMS_STEP_RECORDER_H +#define LMMS_STEP_RECORDER_H #include #include @@ -152,4 +152,4 @@ class StepRecorder : public QObject } // namespace lmms -#endif //STEP_RECORDER_H +#endif diff --git a/include/StepRecorderWidget.h b/include/StepRecorderWidget.h index 4067b0001..ec6a37330 100644 --- a/include/StepRecorderWidget.h +++ b/include/StepRecorderWidget.h @@ -19,9 +19,9 @@ * Boston, MA 02110-1301 USA. * */ -#ifndef STEP_RECOREDER_WIDGET_H -#define STEP_RECOREDER_WIDGET_H +#ifndef LMMS_GUI_STEP_RECOREDER_WIDGET_H +#define LMMS_GUI_STEP_RECOREDER_WIDGET_H #include #include @@ -95,4 +95,4 @@ signals: } // namespace lmms::gui -#endif //STEP_RECOREDER_WIDGET_H +#endif diff --git a/include/StringPairDrag.h b/include/StringPairDrag.h index e58b88f90..4763122be 100644 --- a/include/StringPairDrag.h +++ b/include/StringPairDrag.h @@ -23,8 +23,8 @@ * */ -#ifndef STRING_PAIR_DRAG_H -#define STRING_PAIR_DRAG_H +#ifndef LMMS_GUI_STRING_PAIR_DRAG_H +#define LMMS_GUI_STRING_PAIR_DRAG_H #include #include diff --git a/include/SubWindow.h b/include/SubWindow.h index 3c73a9dde..95bd6c59e 100644 --- a/include/SubWindow.h +++ b/include/SubWindow.h @@ -23,8 +23,9 @@ * Boston, MA 02110-1301 USA. * */ -#ifndef SUBWINDOW_H -#define SUBWINDOW_H + +#ifndef LMMS_GUI_SUBWINDOW_H +#define LMMS_GUI_SUBWINDOW_H #include #include diff --git a/include/SweepOscillator.h b/include/SweepOscillator.h index f113ea0fa..3463851c4 100644 --- a/include/SweepOscillator.h +++ b/include/SweepOscillator.h @@ -22,8 +22,8 @@ * */ -#ifndef SWEEP_OSCILLATOR_H -#define SWEEP_OSCILLATOR_H +#ifndef LMMS_SWEEP_OSCILLATOR_H +#define LMMS_SWEEP_OSCILLATOR_H #include "Oscillator.h" #include "DspEffectLibrary.h" diff --git a/include/TabBar.h b/include/TabBar.h index 2395e15f5..b8334c1f5 100644 --- a/include/TabBar.h +++ b/include/TabBar.h @@ -22,9 +22,8 @@ * */ - -#ifndef TAB_BAR_H -#define TAB_BAR_H +#ifndef LMMS_GUI_TAB_BAR_H +#define LMMS_GUI_TAB_BAR_H #include #include diff --git a/include/TabButton.h b/include/TabButton.h index 938230a91..c09d1ed8a 100644 --- a/include/TabButton.h +++ b/include/TabButton.h @@ -22,9 +22,8 @@ * */ - -#ifndef TAB_BUTTON_H -#define TAB_BUTTON_H +#ifndef LMMS_GUI_TAB_BUTTON_H +#define LMMS_GUI_TAB_BUTTON_H #include diff --git a/include/TabWidget.h b/include/TabWidget.h index 27a35d2a8..942b08738 100644 --- a/include/TabWidget.h +++ b/include/TabWidget.h @@ -22,9 +22,8 @@ * */ - -#ifndef TAB_WIDGET_H -#define TAB_WIDGET_H +#ifndef LMMS_GUI_TAB_WIDGET_H +#define LMMS_GUI_TAB_WIDGET_H #include #include diff --git a/include/TemplatesMenu.h b/include/TemplatesMenu.h index 7f425bd2f..660d3c760 100644 --- a/include/TemplatesMenu.h +++ b/include/TemplatesMenu.h @@ -21,8 +21,9 @@ * Boston, MA 02110-1301 USA. * */ -#ifndef TEMPLATESMENU_H -#define TEMPLATESMENU_H + +#ifndef LMMS_GUI_TEMPLATES_MENU_H +#define LMMS_GUI_TEMPLATES_MENU_H #include #include @@ -49,4 +50,4 @@ private slots: } // namespace lmms::gui -#endif // TEMPLATESMENU_H +#endif diff --git a/include/TempoSyncKnob.h b/include/TempoSyncKnob.h index 25a3b7e3b..0987e1903 100644 --- a/include/TempoSyncKnob.h +++ b/include/TempoSyncKnob.h @@ -23,8 +23,8 @@ * */ -#ifndef TEMPO_SYNC_KNOB_H -#define TEMPO_SYNC_KNOB_H +#ifndef LMMS_GUI_TEMPO_SYNC_KNOB_H +#define LMMS_GUI_TEMPO_SYNC_KNOB_H #include #include diff --git a/include/TempoSyncKnobModel.h b/include/TempoSyncKnobModel.h index 1a18486ff..7b1a10b5e 100644 --- a/include/TempoSyncKnobModel.h +++ b/include/TempoSyncKnobModel.h @@ -23,8 +23,8 @@ * */ -#ifndef TEMPO_SYNC_KNOB_MODEL_H -#define TEMPO_SYNC_KNOB_MODEL_H +#ifndef LMMS_TEMPO_SYNC_KNOB_MODEL_H +#define LMMS_TEMPO_SYNC_KNOB_MODEL_H #include "MeterModel.h" diff --git a/include/TextFloat.h b/include/TextFloat.h index 9fdabc06b..7ba38d141 100644 --- a/include/TextFloat.h +++ b/include/TextFloat.h @@ -22,9 +22,8 @@ * */ - -#ifndef TEXT_FLOAT_H -#define TEXT_FLOAT_H +#ifndef LMMS_GUI_TEXT_FLOAT_H +#define LMMS_GUI_TEXT_FLOAT_H #include #include diff --git a/include/ThreadableJob.h b/include/ThreadableJob.h index 8e714ae19..efb4b3dc7 100644 --- a/include/ThreadableJob.h +++ b/include/ThreadableJob.h @@ -22,8 +22,8 @@ * */ -#ifndef THREADABLE_JOB_H -#define THREADABLE_JOB_H +#ifndef LMMS_THREADABLE_JOB_H +#define LMMS_THREADABLE_JOB_H #include "lmms_basics.h" diff --git a/include/TimeDisplayWidget.h b/include/TimeDisplayWidget.h index 894666970..269c24978 100644 --- a/include/TimeDisplayWidget.h +++ b/include/TimeDisplayWidget.h @@ -23,8 +23,8 @@ * */ -#ifndef TIME_DISPLAY_WIDGET_H -#define TIME_DISPLAY_WIDGET_H +#ifndef LMMS_GUI_TIME_DISPLAY_WIDGET_H +#define LMMS_GUI_TIME_DISPLAY_WIDGET_H #include #include @@ -71,4 +71,4 @@ private: } // namespace lmms::gui -#endif // TIME_DISPLAY_WIDGET_H +#endif diff --git a/include/TimeLineWidget.h b/include/TimeLineWidget.h index bada25640..882e9453c 100644 --- a/include/TimeLineWidget.h +++ b/include/TimeLineWidget.h @@ -22,9 +22,8 @@ * */ - -#ifndef TIMELINE_H -#define TIMELINE_H +#ifndef LMMS_GUI_TIMELINE_WIDGET_H +#define LMMS_GUI_TIMELINE_WIDGET_H #include diff --git a/include/TimePos.h b/include/TimePos.h index 808eede25..61769de35 100644 --- a/include/TimePos.h +++ b/include/TimePos.h @@ -23,10 +23,8 @@ * */ - -#ifndef TIME_POS_H -#define TIME_POS_H - +#ifndef LMMS_TIME_POS_H +#define LMMS_TIME_POS_H #include "lmms_export.h" #include "lmms_basics.h" diff --git a/include/ToolButton.h b/include/ToolButton.h index c173a9052..aeb88a7e5 100644 --- a/include/ToolButton.h +++ b/include/ToolButton.h @@ -22,9 +22,8 @@ * */ - -#ifndef TOOL_BUTTON_H -#define TOOL_BUTTON_H +#ifndef LMMS_GUI_TOOL_BUTTON_H +#define LMMS_GUI_TOOL_BUTTON_H #include @@ -50,4 +49,3 @@ public: } // namespace lmms::gui #endif - diff --git a/include/ToolPlugin.h b/include/ToolPlugin.h index 38f4d87b1..4d7107582 100644 --- a/include/ToolPlugin.h +++ b/include/ToolPlugin.h @@ -24,8 +24,8 @@ * */ -#ifndef TOOL_PLUGIN_H -#define TOOL_PLUGIN_H +#ifndef LMMS_TOOL_PLUGIN_H +#define LMMS_TOOL_PLUGIN_H #include "Plugin.h" diff --git a/include/ToolPluginView.h b/include/ToolPluginView.h index 0b702fd1b..201a4b165 100644 --- a/include/ToolPluginView.h +++ b/include/ToolPluginView.h @@ -23,8 +23,8 @@ * */ -#ifndef TOOL_PLUGIN_VIEW_H -#define TOOL_PLUGIN_VIEW_H +#ifndef LMMS_GUI_TOOL_PLUGIN_VIEW_H +#define LMMS_GUI_TOOL_PLUGIN_VIEW_H #include "PluginView.h" diff --git a/include/Track.h b/include/Track.h index 8d756c914..555850f88 100644 --- a/include/Track.h +++ b/include/Track.h @@ -22,8 +22,8 @@ * */ -#ifndef TRACK_H -#define TRACK_H +#ifndef LMMS_TRACK_H +#define LMMS_TRACK_H #include diff --git a/include/TrackContainer.h b/include/TrackContainer.h index d947094f7..d0c116f3a 100644 --- a/include/TrackContainer.h +++ b/include/TrackContainer.h @@ -23,8 +23,8 @@ * */ -#ifndef TRACK_CONTAINER_H -#define TRACK_CONTAINER_H +#ifndef LMMS_TRACK_CONTAINER_H +#define LMMS_TRACK_CONTAINER_H #include diff --git a/include/TrackContainerView.h b/include/TrackContainerView.h index 444420d98..df61666b8 100644 --- a/include/TrackContainerView.h +++ b/include/TrackContainerView.h @@ -22,9 +22,8 @@ * */ - -#ifndef TRACK_CONTAINER_VIEW_H -#define TRACK_CONTAINER_VIEW_H +#ifndef LMMS_GUI_TRACK_CONTAINER_VIEW_H +#define LMMS_GUI_TRACK_CONTAINER_VIEW_H #include #include diff --git a/include/TrackContentWidget.h b/include/TrackContentWidget.h index f4a44d2a6..09239b392 100644 --- a/include/TrackContentWidget.h +++ b/include/TrackContentWidget.h @@ -22,8 +22,8 @@ * */ -#ifndef TRACK_CONTENT_WIDGET_H -#define TRACK_CONTENT_WIDGET_H +#ifndef LMMS_GUI_TRACK_CONTENT_WIDGET_H +#define LMMS_GUI_TRACK_CONTENT_WIDGET_H #include diff --git a/include/TrackLabelButton.h b/include/TrackLabelButton.h index 1a8d05e71..e7f159798 100644 --- a/include/TrackLabelButton.h +++ b/include/TrackLabelButton.h @@ -22,9 +22,8 @@ * */ - -#ifndef TRACK_LABEL_BUTTON_H -#define TRACK_LABEL_BUTTON_H +#ifndef LMMS_GUI_TRACK_LABEL_BUTTON_H +#define LMMS_GUI_TRACK_LABEL_BUTTON_H #include diff --git a/include/TrackOperationsWidget.h b/include/TrackOperationsWidget.h index edd9796ac..39e59ac98 100644 --- a/include/TrackOperationsWidget.h +++ b/include/TrackOperationsWidget.h @@ -22,8 +22,8 @@ * */ -#ifndef TRACK_OPERATIONS_WIDGET_H -#define TRACK_OPERATIONS_WIDGET_H +#ifndef LMMS_GUI_TRACK_OPERATIONS_WIDGET_H +#define LMMS_GUI_TRACK_OPERATIONS_WIDGET_H #include diff --git a/include/TrackRenameLineEdit.h b/include/TrackRenameLineEdit.h index 4b13ff9b7..48fb96092 100644 --- a/include/TrackRenameLineEdit.h +++ b/include/TrackRenameLineEdit.h @@ -23,9 +23,8 @@ * */ - -#ifndef TRACK_RENAME_LINE_EDIT_H -#define TRACK_RENAME_LINE_EDIT_H +#ifndef LMMS_GUI_TRACK_RENAME_LINE_EDIT_H +#define LMMS_GUI_TRACK_RENAME_LINE_EDIT_H #include diff --git a/include/TrackView.h b/include/TrackView.h index 4b02c8015..a46c15d75 100644 --- a/include/TrackView.h +++ b/include/TrackView.h @@ -22,10 +22,8 @@ * */ - - -#ifndef TRACK_VIEW_H -#define TRACK_VIEW_H +#ifndef LMMS_GUI_TRACK_VIEW_H +#define LMMS_GUI_TRACK_VIEW_H #include @@ -34,7 +32,6 @@ #include "TrackContentWidget.h" #include "TrackOperationsWidget.h" - class QMenu; namespace lmms diff --git a/include/ValueBuffer.h b/include/ValueBuffer.h index 950ad06f0..9e80b7ead 100644 --- a/include/ValueBuffer.h +++ b/include/ValueBuffer.h @@ -23,8 +23,8 @@ * */ -#ifndef VALUE_BUFFER_H -#define VALUE_BUFFER_H +#ifndef LMMS_VALUE_BUFFER_H +#define LMMS_VALUE_BUFFER_H #include diff --git a/include/VersionedSaveDialog.h b/include/VersionedSaveDialog.h index 79ab516b0..326b11fde 100644 --- a/include/VersionedSaveDialog.h +++ b/include/VersionedSaveDialog.h @@ -24,9 +24,8 @@ * */ - -#ifndef VERSIONEDSAVEDIALOG_H -#define VERSIONEDSAVEDIALOG_H +#ifndef LMMS_GUI_VERSIONED_SAVE_DIALOG_H +#define LMMS_GUI_VERSIONED_SAVE_DIALOG_H #include "FileDialog.h" #include "Song.h" @@ -69,4 +68,4 @@ public slots: } // namespace lmms::gui -#endif // VERSIONEDSAVEDIALOG_H +#endif diff --git a/include/VstSyncController.h b/include/VstSyncController.h index c70bc85c8..f63bafc41 100644 --- a/include/VstSyncController.h +++ b/include/VstSyncController.h @@ -23,8 +23,8 @@ * */ -#ifndef VST_SYNC_CONTROLLER_H -#define VST_SYNC_CONTROLLER_H +#ifndef LMMS_VST_SYNC_CONTROLLER_H +#define LMMS_VST_SYNC_CONTROLLER_H #include diff --git a/include/VstSyncData.h b/include/VstSyncData.h index baf3fa7a8..11da91d8d 100644 --- a/include/VstSyncData.h +++ b/include/VstSyncData.h @@ -23,8 +23,8 @@ * */ -#ifndef VST_SYNC_DATA_H -#define VST_SYNC_DATA_H +#ifndef LMMS_VST_SYNC_DATA_H +#define LMMS_VST_SYNC_DATA_H namespace lmms { diff --git a/include/aeffectx.h b/include/aeffectx.h index a06567ba7..188feae9f 100644 --- a/include/aeffectx.h +++ b/include/aeffectx.h @@ -22,7 +22,6 @@ * */ - #ifndef AEFFECTX_H #define AEFFECTX_H diff --git a/include/base64.h b/include/base64.h index f52d90d13..01116e4cd 100644 --- a/include/base64.h +++ b/include/base64.h @@ -23,8 +23,8 @@ * */ -#ifndef _BASE64_H -#define _BASE64_H +#ifndef LMMS_BASE64_H +#define LMMS_BASE64_H #include #include diff --git a/include/debug.h b/include/debug.h index f2ea29cc1..efabd4522 100644 --- a/include/debug.h +++ b/include/debug.h @@ -22,9 +22,8 @@ * */ - -#ifndef DEBUG_H -#define DEBUG_H +#ifndef LMMS_DEBUG_H +#define LMMS_DEBUG_H #include "lmmsconfig.h" diff --git a/include/denormals.h b/include/denormals.h index e99e767a3..cfb0d5c92 100644 --- a/include/denormals.h +++ b/include/denormals.h @@ -1,8 +1,8 @@ -// Denormals stripping. +// Denormals stripping. // These snippets should be common enough to be considered public domain. -#ifndef DENORMALS_H -#define DENORMALS_H +#ifndef LMMS_DENORMALS_H +#define LMMS_DENORMALS_H #ifdef __SSE__ #include @@ -50,5 +50,4 @@ void inline disable_denormals() } // namespace lmms -#endif // DENORMALS_H - +#endif diff --git a/include/embed.h b/include/embed.h index 03d767b43..b3d1cbc21 100644 --- a/include/embed.h +++ b/include/embed.h @@ -22,8 +22,8 @@ * */ -#ifndef EMBED_H -#define EMBED_H +#ifndef LMMS_EMBED_H +#define LMMS_EMBED_H #include #include diff --git a/include/endian_handling.h b/include/endian_handling.h index b3d122fa3..96bf11704 100644 --- a/include/endian_handling.h +++ b/include/endian_handling.h @@ -22,8 +22,8 @@ * */ -#ifndef ENDIAN_HANDLING_H -#define ENDIAN_HANDLING_H +#ifndef LMMS_ENDIAN_HANDLING_H +#define LMMS_ENDIAN_HANDLING_H #include diff --git a/include/fft_helpers.h b/include/fft_helpers.h index 8ba0fc7a0..ab4238409 100644 --- a/include/fft_helpers.h +++ b/include/fft_helpers.h @@ -23,9 +23,8 @@ * */ - -#ifndef FFT_HELPERS_H -#define FFT_HELPERS_H +#ifndef LMMS_FFT_HELPERS_H +#define LMMS_FFT_HELPERS_H #include "lmms_export.h" diff --git a/include/gui_templates.h b/include/gui_templates.h index ee0ccdbf6..7a61ccfed 100644 --- a/include/gui_templates.h +++ b/include/gui_templates.h @@ -22,9 +22,8 @@ * */ - -#ifndef GUI_TEMPLATES_H -#define GUI_TEMPLATES_H +#ifndef LMMS_GUI_TEMPLATES_H +#define LMMS_GUI_TEMPLATES_H #include "lmmsconfig.h" diff --git a/include/interpolation.h b/include/interpolation.h index 3a74334e4..9f3b3913d 100644 --- a/include/interpolation.h +++ b/include/interpolation.h @@ -22,9 +22,8 @@ * */ - -#ifndef INTERPOLATION_H -#define INTERPOLATION_H +#ifndef LMMS_INTERPOLATION_H +#define LMMS_INTERPOLATION_H #ifndef __USE_XOPEN #define __USE_XOPEN diff --git a/include/lmms_basics.h b/include/lmms_basics.h index 59a6aa359..71cc4ce53 100644 --- a/include/lmms_basics.h +++ b/include/lmms_basics.h @@ -22,9 +22,8 @@ * */ - -#ifndef TYPES_H -#define TYPES_H +#ifndef LMMS_TYPES_H +#define LMMS_TYPES_H #include #include diff --git a/include/lmms_math.h b/include/lmms_math.h index db4502f1c..a010a9d3e 100644 --- a/include/lmms_math.h +++ b/include/lmms_math.h @@ -22,7 +22,6 @@ * */ - #ifndef LMMS_MATH_H #define LMMS_MATH_H diff --git a/include/panning.h b/include/panning.h index 1521ec984..52698677c 100644 --- a/include/panning.h +++ b/include/panning.h @@ -23,8 +23,8 @@ * */ -#ifndef PANNING_H -#define PANNING_H +#ifndef LMMS_PANNING_H +#define LMMS_PANNING_H #include "lmms_basics.h" #include "panning_constants.h" diff --git a/include/panning_constants.h b/include/panning_constants.h index 00a5c3291..6e894e9d8 100644 --- a/include/panning_constants.h +++ b/include/panning_constants.h @@ -23,8 +23,8 @@ * */ -#ifndef PANNING_CONSTANTS_H -#define PANNING_CONSTANTS_H +#ifndef LMMS_PANNING_CONSTANTS_H +#define LMMS_PANNING_CONSTANTS_H namespace lmms { diff --git a/include/shared_object.h b/include/shared_object.h index ac45d6cd7..dfc94b96a 100644 --- a/include/shared_object.h +++ b/include/shared_object.h @@ -23,8 +23,8 @@ * */ -#ifndef SHARED_OBJECT_H -#define SHARED_OBJECT_H +#ifndef LMMS_SHARED_OBJECT_H +#define LMMS_SHARED_OBJECT_H #include diff --git a/include/versioninfo.h b/include/versioninfo.h index 29bf3bea9..de852b59c 100644 --- a/include/versioninfo.h +++ b/include/versioninfo.h @@ -1,5 +1,5 @@ -#ifndef VERSION_INFO_H -#define VERSION_INFO_H +#ifndef LMMS_VERSION_INFO_H +#define LMMS_VERSION_INFO_H #include "lmms_basics.h" diff --git a/include/volume.h b/include/volume.h index 5223bfa09..4d26cc815 100644 --- a/include/volume.h +++ b/include/volume.h @@ -23,8 +23,8 @@ * */ -#ifndef VOLUME_H -#define VOLUME_H +#ifndef LMMS_VOLUME_H +#define LMMS_VOLUME_H #include "lmms_basics.h" From bbf31a2e7384a7ff8eb20c6d7db5169b149a42d7 Mon Sep 17 00:00:00 2001 From: Dalton Messmer Date: Mon, 2 Jan 2023 22:02:12 -0500 Subject: [PATCH 2/5] Add missing copyright statement to MidiCCRackView.h --- include/MidiCCRackView.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/MidiCCRackView.h b/include/MidiCCRackView.h index 98f5ce183..ca99a7ce5 100644 --- a/include/MidiCCRackView.h +++ b/include/MidiCCRackView.h @@ -1,3 +1,27 @@ +/* + * MidiCCRackView.h - declaration of the MIDI CC rack widget + * + * Copyright (c) 2020 Ian Caio + * + * This file is part of LMMS - https://lmms.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program (see COPYING); if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + */ + #ifndef LMMS_GUI_MIDI_CC_RACK_VIEW_H #define LMMS_GUI_MIDI_CC_RACK_VIEW_H From 92522cf3ab82506e31cdbcb961abd82da2e86c9c Mon Sep 17 00:00:00 2001 From: Dalton Messmer Date: Thu, 5 Jan 2023 14:03:07 -0500 Subject: [PATCH 3/5] Add missing copyright statement to CustomTextKnob.h/cpp --- include/CustomTextKnob.h | 25 ++++++++++++++++++++++++- src/gui/widgets/CustomTextKnob.cpp | 24 ++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/include/CustomTextKnob.h b/include/CustomTextKnob.h index 23b7e8b1f..25bba1315 100644 --- a/include/CustomTextKnob.h +++ b/include/CustomTextKnob.h @@ -1,4 +1,27 @@ -/* Text customizable knob */ +/* + * CustomTextKnob.h + * + * Copyright (c) 2020 Ibuki Sugiyama
+ * + * This file is part of LMMS - https://lmms.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program (see COPYING); if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + */ + #ifndef LMMS_GUI_CUSTOM_TEXT_KNOB_H #define LMMS_GUI_CUSTOM_TEXT_KNOB_H diff --git a/src/gui/widgets/CustomTextKnob.cpp b/src/gui/widgets/CustomTextKnob.cpp index 9f6e19b90..ce880608c 100644 --- a/src/gui/widgets/CustomTextKnob.cpp +++ b/src/gui/widgets/CustomTextKnob.cpp @@ -1,3 +1,27 @@ +/* + * CustomTextKnob.cpp + * + * Copyright (c) 2020 Ibuki Sugiyama
+ * + * This file is part of LMMS - https://lmms.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program (see COPYING); if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + */ + #include "CustomTextKnob.h" namespace lmms::gui From 2c6d88f799203bc2a21173d597af566ac783f174 Mon Sep 17 00:00:00 2001 From: Dalton Messmer Date: Thu, 5 Jan 2023 17:58:49 -0500 Subject: [PATCH 4/5] Add GUARD_H closing comments --- include/AboutDialog.h | 2 +- include/ActionGroup.h | 2 +- include/AudioAlsa.h | 2 +- include/AudioAlsaSetupWidget.h | 2 +- include/AudioDevice.h | 2 +- include/AudioDeviceSetupWidget.h | 2 +- include/AudioDummy.h | 2 +- include/AudioEngine.h | 2 +- include/AudioEngineProfiler.h | 2 +- include/AudioEngineWorkerThread.h | 2 +- include/AudioFileDevice.h | 2 +- include/AudioFileFlac.h | 2 +- include/AudioFileMP3.h | 2 +- include/AudioFileOgg.h | 2 +- include/AudioFileWave.h | 2 +- include/AudioJack.h | 2 +- include/AudioOss.h | 2 +- include/AudioPort.h | 2 +- include/AudioPortAudio.h | 2 +- include/AudioPulseAudio.h | 2 +- include/AudioSampleRecorder.h | 2 +- include/AudioSdl.h | 2 +- include/AudioSndio.h | 2 +- include/AudioSoundIo.h | 2 +- include/AutomatableButton.h | 2 +- include/AutomatableModel.h | 3 +-- include/AutomatableModelView.h | 3 +-- include/AutomatableSlider.h | 2 +- include/AutomationClip.h | 2 +- include/AutomationClipView.h | 2 +- include/AutomationEditor.h | 2 +- include/AutomationNode.h | 2 +- include/AutomationTrack.h | 2 +- include/AutomationTrackView.h | 2 +- include/BandLimitedWave.h | 7 ++++--- include/BasicFilters.h | 2 +- include/BufferManager.h | 2 +- include/CPULoadWidget.h | 2 +- include/CaptionMenu.h | 2 +- include/Clip.h | 2 +- include/ClipView.h | 2 +- include/Clipboard.h | 2 +- include/ColorChooser.h | 2 +- include/ComboBox.h | 2 +- include/ComboBoxModel.h | 2 +- include/ConfigManager.h | 2 +- include/ControlLayout.h | 2 +- include/Controller.h | 2 +- include/ControllerConnection.h | 2 +- include/ControllerConnectionDialog.h | 2 +- include/ControllerDialog.h | 2 +- include/ControllerRackView.h | 2 +- include/ControllerView.h | 2 +- include/Controls.h | 2 +- include/CustomTextKnob.h | 2 +- include/DataFile.h | 2 +- include/Delay.h | 2 +- include/DeprecationHelper.h | 2 +- include/DetuningHelper.h | 2 +- include/DrumSynth.h | 2 +- include/DspEffectLibrary.h | 3 +-- include/DummyEffect.h | 2 +- include/DummyInstrument.h | 2 +- include/DummyPlugin.h | 2 +- include/Editor.h | 2 +- include/Effect.h | 2 +- include/EffectChain.h | 2 +- include/EffectControlDialog.h | 2 +- include/EffectControls.h | 2 +- include/EffectRackView.h | 2 +- include/EffectSelectDialog.h | 3 +-- include/EffectView.h | 2 +- include/Engine.h | 2 +- include/EnvelopeAndLfoParameters.h | 2 +- include/EnvelopeAndLfoView.h | 2 +- include/ExportFilter.h | 2 +- include/ExportProjectDialog.h | 3 +-- include/FadeButton.h | 2 +- include/Fader.h | 3 +-- include/FifoBuffer.h | 2 +- include/FileBrowser.h | 2 +- include/FileDialog.h | 2 +- include/Graph.h | 2 +- include/GroupBox.h | 3 +-- include/GuiApplication.h | 2 +- include/ImportFilter.h | 2 +- include/InlineAutomation.h | 2 +- include/Instrument.h | 2 +- include/InstrumentFunctionViews.h | 2 +- include/InstrumentFunctions.h | 2 +- include/InstrumentMidiIOView.h | 2 +- include/InstrumentMiscView.h | 2 +- include/InstrumentPlayHandle.h | 2 +- include/InstrumentSoundShaping.h | 2 +- include/InstrumentSoundShapingView.h | 2 +- include/InstrumentTrack.h | 2 +- include/InstrumentTrackView.h | 2 +- include/InstrumentTrackWindow.h | 2 +- include/InstrumentView.h | 2 +- include/IoHelper.h | 2 +- include/JournallingObject.h | 2 +- include/Keymap.h | 2 +- include/Knob.h | 2 +- include/Ladspa2LMMS.h | 2 +- include/LadspaBase.h | 2 +- include/LadspaControl.h | 2 +- include/LadspaControlView.h | 2 +- include/LadspaManager.h | 2 +- include/LcdFloatSpinBox.h | 2 +- include/LcdSpinBox.h | 2 +- include/LcdWidget.h | 2 +- include/LedCheckBox.h | 2 +- include/LeftRightNav.h | 2 +- include/LfoController.h | 2 +- include/LinkedModelGroupViews.h | 6 +++--- include/LinkedModelGroups.h | 6 +++--- include/LmmsPalette.h | 2 +- include/LmmsStyle.h | 2 +- include/LocaleHelper.h | 2 +- include/LocklessAllocator.h | 2 +- include/LocklessList.h | 2 +- include/LocklessRingBuffer.h | 2 +- include/Lv2Basics.h | 2 +- include/Lv2ControlBase.h | 2 +- include/Lv2Evbuf.h | 2 +- include/Lv2Features.h | 2 +- include/Lv2Manager.h | 2 +- include/Lv2Options.h | 2 +- include/Lv2Ports.h | 2 +- include/Lv2Proc.h | 2 +- include/Lv2SubPluginFeatures.h | 2 +- include/Lv2UridCache.h | 2 +- include/Lv2UridMap.h | 2 +- include/Lv2ViewBase.h | 2 +- include/MainApplication.h | 2 +- include/MainWindow.h | 2 +- include/MemoryHelper.h | 2 +- include/MemoryManager.h | 2 +- include/MeterDialog.h | 2 +- include/MeterModel.h | 2 +- include/MicroTimer.h | 2 +- include/Microtuner.h | 2 +- include/MicrotunerConfig.h | 2 +- include/Midi.h | 2 +- include/MidiAlsaRaw.h | 2 +- include/MidiAlsaSeq.h | 2 +- include/MidiApple.h | 2 +- include/MidiCCRackView.h | 2 +- include/MidiClient.h | 2 +- include/MidiClip.h | 2 +- include/MidiClipView.h | 2 +- include/MidiController.h | 2 +- include/MidiDummy.h | 2 +- include/MidiEvent.h | 2 +- include/MidiEventProcessor.h | 2 +- include/MidiEventToByteSeq.h | 2 +- include/MidiJack.h | 2 +- include/MidiOss.h | 2 +- include/MidiPort.h | 2 +- include/MidiPortMenu.h | 2 +- include/MidiSetupWidget.h | 2 +- include/MidiSndio.h | 2 +- include/MidiWinMM.h | 2 +- include/MixHelpers.h | 2 +- include/Mixer.h | 2 +- include/MixerLine.h | 2 +- include/MixerLineLcdSpinBox.h | 2 +- include/MixerView.h | 2 +- include/Model.h | 2 +- include/ModelView.h | 2 +- include/ModelVisitor.h | 2 +- include/NStateButton.h | 2 +- include/Note.h | 2 +- include/NotePlayHandle.h | 2 +- include/Oscillator.h | 2 +- include/OscillatorConstants.h | 2 +- include/Oscilloscope.h | 2 +- include/OutputSettings.h | 2 +- include/PathUtil.h | 2 +- include/PatternClip.h | 2 +- include/PatternClipView.h | 2 +- include/PatternEditor.h | 2 +- include/PatternStore.h | 2 +- include/PatternTrack.h | 2 +- include/PatternTrackView.h | 2 +- include/PeakController.h | 2 +- include/PerfLog.h | 2 +- include/Piano.h | 2 +- include/PianoRoll.h | 2 +- include/PianoView.h | 2 +- include/Pitch.h | 2 +- include/PixmapButton.h | 2 +- include/PlayHandle.h | 2 +- include/Plugin.h | 2 +- include/PluginBrowser.h | 2 +- include/PluginFactory.h | 2 +- include/PluginIssue.h | 3 +-- include/PluginView.h | 2 +- include/PositionLine.h | 2 +- include/PresetPreviewPlayHandle.h | 2 +- include/ProjectJournal.h | 2 +- include/ProjectNotes.h | 2 +- include/ProjectRenderer.h | 2 +- include/ProjectVersion.h | 2 +- include/QuadratureLfo.h | 2 +- include/RaiiHelpers.h | 2 +- include/RecentProjectsMenu.h | 2 +- include/RemotePlugin.h | 2 +- include/RemotePluginBase.h | 2 +- include/RemotePluginClient.h | 2 +- include/RenameDialog.h | 2 +- include/RenderManager.h | 2 +- include/RingBuffer.h | 2 +- include/RmsHelper.h | 2 +- include/RowTableView.h | 2 +- include/Rubberband.h | 2 +- include/SampleBuffer.h | 2 +- include/SampleClip.h | 2 +- include/SampleClipView.h | 2 +- include/SamplePlayHandle.h | 2 +- include/SampleRecordHandle.h | 2 +- include/SampleTrack.h | 2 +- include/SampleTrackView.h | 2 +- include/SampleTrackWindow.h | 3 +-- include/Scale.h | 2 +- include/SendButtonIndicator.h | 2 +- include/SerializingObject.h | 2 +- include/SetupDialog.h | 2 +- include/SharedMemory.h | 2 +- include/SideBar.h | 2 +- include/SideBarWidget.h | 2 +- include/Song.h | 2 +- include/SongEditor.h | 2 +- include/StepRecorder.h | 2 +- include/StepRecorderWidget.h | 2 +- include/StringPairDrag.h | 2 +- include/SubWindow.h | 2 +- include/SweepOscillator.h | 2 +- include/TabBar.h | 2 +- include/TabButton.h | 2 +- include/TabWidget.h | 2 +- include/TemplatesMenu.h | 2 +- include/TempoSyncKnob.h | 2 +- include/TempoSyncKnobModel.h | 2 +- include/TextFloat.h | 2 +- include/ThreadableJob.h | 2 +- include/TimeDisplayWidget.h | 2 +- include/TimeLineWidget.h | 2 +- include/TimePos.h | 2 +- include/ToolButton.h | 2 +- include/ToolPlugin.h | 2 +- include/ToolPluginView.h | 2 +- include/Track.h | 3 +-- include/TrackContainer.h | 2 +- include/TrackContainerView.h | 2 +- include/TrackContentWidget.h | 2 +- include/TrackLabelButton.h | 2 +- include/TrackOperationsWidget.h | 2 +- include/TrackRenameLineEdit.h | 2 +- include/TrackView.h | 2 +- include/ValueBuffer.h | 2 +- include/VersionedSaveDialog.h | 2 +- include/VstSyncController.h | 2 +- include/VstSyncData.h | 2 +- include/aeffectx.h | 6 +++--- include/base64.h | 2 +- include/debug.h | 2 +- include/denormals.h | 4 ++-- include/embed.h | 2 +- include/endian_handling.h | 2 +- include/fenv.h | 2 +- include/fft_helpers.h | 2 +- include/gui_templates.h | 2 +- include/interpolation.h | 2 +- include/lmms_basics.h | 2 +- include/lmms_constants.h | 2 +- include/lmms_math.h | 2 +- include/panning.h | 2 +- include/panning_constants.h | 2 +- include/shared_object.h | 2 +- include/versioninfo.h | 2 +- include/volume.h | 2 +- 282 files changed, 292 insertions(+), 301 deletions(-) diff --git a/include/AboutDialog.h b/include/AboutDialog.h index bb0c509a9..2fd01faf5 100644 --- a/include/AboutDialog.h +++ b/include/AboutDialog.h @@ -41,4 +41,4 @@ public: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_ABOUT_DIALOG_H diff --git a/include/ActionGroup.h b/include/ActionGroup.h index 80a6d523e..e18f6fb23 100644 --- a/include/ActionGroup.h +++ b/include/ActionGroup.h @@ -58,4 +58,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_ACTION_GROUP_H diff --git a/include/AudioAlsa.h b/include/AudioAlsa.h index 263925286..975532071 100644 --- a/include/AudioAlsa.h +++ b/include/AudioAlsa.h @@ -108,4 +108,4 @@ private: #endif // LMMS_HAVE_ALSA -#endif +#endif // LMMS_AUDIO_ALSA_H diff --git a/include/AudioAlsaSetupWidget.h b/include/AudioAlsaSetupWidget.h index 068754b69..cbe99ba01 100644 --- a/include/AudioAlsaSetupWidget.h +++ b/include/AudioAlsaSetupWidget.h @@ -66,4 +66,4 @@ private: #endif // LMMS_HAVE_ALSA -#endif +#endif // LMMS_GUI_AUDIO_ALSA_SETUP_WIDGET_H diff --git a/include/AudioDevice.h b/include/AudioDevice.h index 26cbbaccc..d1a9617cd 100644 --- a/include/AudioDevice.h +++ b/include/AudioDevice.h @@ -160,4 +160,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_AUDIO_DEVICE_H diff --git a/include/AudioDeviceSetupWidget.h b/include/AudioDeviceSetupWidget.h index 9c70859d2..f56fa07a6 100644 --- a/include/AudioDeviceSetupWidget.h +++ b/include/AudioDeviceSetupWidget.h @@ -45,4 +45,4 @@ public: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_AUDIO_DEVICE_SETUP_WIDGET_H diff --git a/include/AudioDummy.h b/include/AudioDummy.h index 37363d501..e34260171 100644 --- a/include/AudioDummy.h +++ b/include/AudioDummy.h @@ -116,4 +116,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_AUDIO_DUMMY_H diff --git a/include/AudioEngine.h b/include/AudioEngine.h index 534182d69..d0f269d87 100644 --- a/include/AudioEngine.h +++ b/include/AudioEngine.h @@ -487,4 +487,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_AUDIO_ENGINE_H diff --git a/include/AudioEngineProfiler.h b/include/AudioEngineProfiler.h index 1f72939be..7b5191e76 100644 --- a/include/AudioEngineProfiler.h +++ b/include/AudioEngineProfiler.h @@ -62,4 +62,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_AUDIO_ENGINE_PROFILER_H diff --git a/include/AudioEngineWorkerThread.h b/include/AudioEngineWorkerThread.h index 0f41982a1..112930808 100644 --- a/include/AudioEngineWorkerThread.h +++ b/include/AudioEngineWorkerThread.h @@ -121,4 +121,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_AUDIO_ENGINE_WORKER_THREAD_H diff --git a/include/AudioFileDevice.h b/include/AudioFileDevice.h index fb98315db..dc9a786a4 100644 --- a/include/AudioFileDevice.h +++ b/include/AudioFileDevice.h @@ -73,4 +73,4 @@ using AudioFileDeviceInstantiaton } // namespace lmms -#endif +#endif // LMMS_AUDIO_FILE_DEVICE_H diff --git a/include/AudioFileFlac.h b/include/AudioFileFlac.h index 6750d264a..944e30478 100644 --- a/include/AudioFileFlac.h +++ b/include/AudioFileFlac.h @@ -77,4 +77,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_AUDIO_FILE_FLAC_H diff --git a/include/AudioFileMP3.h b/include/AudioFileMP3.h index 61406cced..4289ad211 100644 --- a/include/AudioFileMP3.h +++ b/include/AudioFileMP3.h @@ -75,4 +75,4 @@ private: #endif // LMMS_HAVE_MP3LAME -#endif +#endif // LMMS_AUDIO_FILE_MP3_H diff --git a/include/AudioFileOgg.h b/include/AudioFileOgg.h index 981b61733..77be8ca1c 100644 --- a/include/AudioFileOgg.h +++ b/include/AudioFileOgg.h @@ -113,4 +113,4 @@ private: #endif // LMMS_HAVE_OGGVORBIS -#endif +#endif // LMMS_AUDIO_FILE_OGG_H diff --git a/include/AudioFileWave.h b/include/AudioFileWave.h index 06b797cc6..c186aaaa7 100644 --- a/include/AudioFileWave.h +++ b/include/AudioFileWave.h @@ -71,4 +71,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_AUDIO_FILE_WAVE_H diff --git a/include/AudioJack.h b/include/AudioJack.h index 5e63074bd..2ef0f665c 100644 --- a/include/AudioJack.h +++ b/include/AudioJack.h @@ -144,4 +144,4 @@ signals: #endif // LMMS_HAVE_JACK -#endif +#endif // LMMS_AUDIO_JACK_H diff --git a/include/AudioOss.h b/include/AudioOss.h index 045cc6c56..55f64de85 100644 --- a/include/AudioOss.h +++ b/include/AudioOss.h @@ -92,4 +92,4 @@ private: #endif // LMMS_HAVE_OSS -#endif +#endif // LMMS_AUDIO_OSS_H diff --git a/include/AudioPort.h b/include/AudioPort.h index 38e495436..d9803d205 100644 --- a/include/AudioPort.h +++ b/include/AudioPort.h @@ -138,4 +138,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_AUDIO_PORT_H diff --git a/include/AudioPortAudio.h b/include/AudioPortAudio.h index 8ab18ce6e..01b8f3fd7 100644 --- a/include/AudioPortAudio.h +++ b/include/AudioPortAudio.h @@ -163,4 +163,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_AUDIO_PORTAUDIO_H diff --git a/include/AudioPulseAudio.h b/include/AudioPulseAudio.h index bb5541a30..b6a998274 100644 --- a/include/AudioPulseAudio.h +++ b/include/AudioPulseAudio.h @@ -104,4 +104,4 @@ private: #endif // LMMS_HAVE_PULSEAUDIO -#endif +#endif // LMMS_AUDIO_PULSEAUDIO_H diff --git a/include/AudioSampleRecorder.h b/include/AudioSampleRecorder.h index 23c4643d8..8937ceb5e 100644 --- a/include/AudioSampleRecorder.h +++ b/include/AudioSampleRecorder.h @@ -59,4 +59,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_AUDIO_SAMPLE_RECORDER_H diff --git a/include/AudioSdl.h b/include/AudioSdl.h index bd7f4b960..62db8b68a 100644 --- a/include/AudioSdl.h +++ b/include/AudioSdl.h @@ -115,4 +115,4 @@ private: #endif // LMMS_HAVE_SDL -#endif +#endif // LMMS_AUDIO_SDL_H diff --git a/include/AudioSndio.h b/include/AudioSndio.h index b7f42aca2..594ca94e7 100644 --- a/include/AudioSndio.h +++ b/include/AudioSndio.h @@ -89,4 +89,4 @@ private: #endif // LMMS_HAVE_SNDIO -#endif +#endif // LMMS_AUDIO_SNDIO_H diff --git a/include/AudioSoundIo.h b/include/AudioSoundIo.h index b29ff3779..b327f7d84 100644 --- a/include/AudioSoundIo.h +++ b/include/AudioSoundIo.h @@ -145,4 +145,4 @@ private: #endif // LMMS_HAVE_SOUNDIO -#endif +#endif // LMMS_AUDIO_SOUNDIO_H diff --git a/include/AutomatableButton.h b/include/AutomatableButton.h index 4a695a677..3d78b8e9c 100644 --- a/include/AutomatableButton.h +++ b/include/AutomatableButton.h @@ -108,4 +108,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_AUTOMATABLE_BUTTON_H diff --git a/include/AutomatableModel.h b/include/AutomatableModel.h index 2fccf31f4..1e6d5eda3 100644 --- a/include/AutomatableModel.h +++ b/include/AutomatableModel.h @@ -507,5 +507,4 @@ using AutomatedValueMap = QMap; } // namespace lmms -#endif - +#endif // LMMS_AUTOMATABLE_MODEL_H diff --git a/include/AutomatableModelView.h b/include/AutomatableModelView.h index e2475be48..12b2e4d49 100644 --- a/include/AutomatableModelView.h +++ b/include/AutomatableModelView.h @@ -137,5 +137,4 @@ using BoolModelView = TypedModelView; } // namespace lmms::gui -#endif - +#endif // LMMS_GUI_AUTOMATABLE_MODEL_VIEW_H diff --git a/include/AutomatableSlider.h b/include/AutomatableSlider.h index 9ec55c2df..cb1a6965f 100644 --- a/include/AutomatableSlider.h +++ b/include/AutomatableSlider.h @@ -76,4 +76,4 @@ using sliderModel = IntModel; } // namespace lmms::gui -#endif +#endif // LMMS_GUI_AUTOMATABLE_SLIDER_H diff --git a/include/AutomationClip.h b/include/AutomationClip.h index 7281af133..077c282f8 100644 --- a/include/AutomationClip.h +++ b/include/AutomationClip.h @@ -260,4 +260,4 @@ inline int POS(AutomationClip::TimemapIterator it) } // namespace lmms -#endif +#endif // LMMS_AUTOMATION_CLIP_H diff --git a/include/AutomationClipView.h b/include/AutomationClipView.h index 69d4943bc..a20e2ce28 100644 --- a/include/AutomationClipView.h +++ b/include/AutomationClipView.h @@ -85,4 +85,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_GUI_AUTOMATION_CLIP_VIEW_H diff --git a/include/AutomationEditor.h b/include/AutomationEditor.h index 8ead191a9..c2ab98092 100644 --- a/include/AutomationEditor.h +++ b/include/AutomationEditor.h @@ -304,4 +304,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_GUI_AUTOMATION_EDITOR_H diff --git a/include/AutomationNode.h b/include/AutomationNode.h index 9f4a4f219..a922109e6 100644 --- a/include/AutomationNode.h +++ b/include/AutomationNode.h @@ -156,4 +156,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_AUTOMATION_NODE_H diff --git a/include/AutomationTrack.h b/include/AutomationTrack.h index 653174caa..64c2cc43a 100644 --- a/include/AutomationTrack.h +++ b/include/AutomationTrack.h @@ -62,4 +62,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_AUTOMATION_TRACK_H diff --git a/include/AutomationTrackView.h b/include/AutomationTrackView.h index d948d762a..449e9bef8 100644 --- a/include/AutomationTrackView.h +++ b/include/AutomationTrackView.h @@ -52,4 +52,4 @@ public: } // namespace lmms -#endif +#endif // LMMS_GUI_AUTOMATION_TRACK_VIEW_H diff --git a/include/BandLimitedWave.h b/include/BandLimitedWave.h index 51e55c337..2a12c62e3 100644 --- a/include/BandLimitedWave.h +++ b/include/BandLimitedWave.h @@ -149,7 +149,8 @@ public: return sr; -/* lookup = lookup << 1; + /* + lookup = lookup << 1; tlen = tlen << 1; t += 1; const sample_t s3 = s_waveforms[ _wave ].sampleAt( t, lookup ); @@ -159,7 +160,7 @@ public: const float ip2 = ( ( tlen - _wavelen ) / tlen - 0.5 ) * 2.0; return linearInterpolate( s12, s34, ip2 ); - */ + */ }; @@ -174,4 +175,4 @@ public: } // namespace lmms -#endif +#endif // LMMS_BANDLIMITEDWAVE_H diff --git a/include/BasicFilters.h b/include/BasicFilters.h index 6912f3d36..c10c47489 100644 --- a/include/BasicFilters.h +++ b/include/BasicFilters.h @@ -917,4 +917,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_BASIC_FILTERS_H diff --git a/include/BufferManager.h b/include/BufferManager.h index 8e93afc92..712e420ff 100644 --- a/include/BufferManager.h +++ b/include/BufferManager.h @@ -54,4 +54,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_BUFFER_MANAGER_H diff --git a/include/CPULoadWidget.h b/include/CPULoadWidget.h index a249cdc5e..904445c67 100644 --- a/include/CPULoadWidget.h +++ b/include/CPULoadWidget.h @@ -69,4 +69,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_CPU_LOAD_WIDGET_H diff --git a/include/CaptionMenu.h b/include/CaptionMenu.h index 87aedf133..4a8889a83 100644 --- a/include/CaptionMenu.h +++ b/include/CaptionMenu.h @@ -46,4 +46,4 @@ public: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_CAPTION_MENU_H diff --git a/include/Clip.h b/include/Clip.h index 75416ef94..8f4162d96 100644 --- a/include/Clip.h +++ b/include/Clip.h @@ -194,4 +194,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_CLIP_H diff --git a/include/ClipView.h b/include/ClipView.h index a342590e1..32c5130b9 100644 --- a/include/ClipView.h +++ b/include/ClipView.h @@ -252,4 +252,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_GUI_CLIP_VIEW_H diff --git a/include/Clipboard.h b/include/Clipboard.h index 3c38c90fe..c6ae66ee8 100644 --- a/include/Clipboard.h +++ b/include/Clipboard.h @@ -68,4 +68,4 @@ namespace lmms::Clipboard } // namespace lmms::Clipboard -#endif +#endif // LMMS_CLIPBOARD_H diff --git a/include/ColorChooser.h b/include/ColorChooser.h index da4069f5d..0e85ea9bb 100644 --- a/include/ColorChooser.h +++ b/include/ColorChooser.h @@ -68,4 +68,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_COLOR_CHOOSER_H diff --git a/include/ComboBox.h b/include/ComboBox.h index ba2410491..8153451e8 100644 --- a/include/ComboBox.h +++ b/include/ComboBox.h @@ -82,4 +82,4 @@ private slots: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_COMBOBOX_H diff --git a/include/ComboBoxModel.h b/include/ComboBoxModel.h index a895b838f..8fd1f49f4 100644 --- a/include/ComboBoxModel.h +++ b/include/ComboBoxModel.h @@ -95,4 +95,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_COMBOBOX_MODEL_H diff --git a/include/ConfigManager.h b/include/ConfigManager.h index abeb5246f..eee069681 100644 --- a/include/ConfigManager.h +++ b/include/ConfigManager.h @@ -313,4 +313,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_CONFIG_MANAGER_H diff --git a/include/ControlLayout.h b/include/ControlLayout.h index e78609a37..568ce1a85 100644 --- a/include/ControlLayout.h +++ b/include/ControlLayout.h @@ -141,4 +141,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_CONTROL_LAYOUT_H diff --git a/include/Controller.h b/include/Controller.h index 0bb229d38..0a5eb0f36 100644 --- a/include/Controller.h +++ b/include/Controller.h @@ -183,4 +183,4 @@ signals: } // namespace lmms -#endif +#endif // LMMS_CONTROLLER_H diff --git a/include/ControllerConnection.h b/include/ControllerConnection.h index d75d529f6..4473b68e0 100644 --- a/include/ControllerConnection.h +++ b/include/ControllerConnection.h @@ -127,4 +127,4 @@ signals: } // namespace lmms -#endif +#endif // LMMS_CONTROLLER_CONNECTION_H diff --git a/include/ControllerConnectionDialog.h b/include/ControllerConnectionDialog.h index 2e3446072..6fb9d45d0 100644 --- a/include/ControllerConnectionDialog.h +++ b/include/ControllerConnectionDialog.h @@ -110,4 +110,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_GUI_CONTROLLER_CONNECTION_DIALOG_H diff --git a/include/ControllerDialog.h b/include/ControllerDialog.h index 81a9a0eb6..0c53a8c84 100644 --- a/include/ControllerDialog.h +++ b/include/ControllerDialog.h @@ -61,4 +61,4 @@ protected: } // namespace lmms -#endif +#endif // LMMS_GUI_CONTROLLER_DIALOG_H diff --git a/include/ControllerRackView.h b/include/ControllerRackView.h index 1133e8ec8..303cc2b40 100644 --- a/include/ControllerRackView.h +++ b/include/ControllerRackView.h @@ -92,4 +92,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_GUI_CONTROLLER_RACK_VIEW_H diff --git a/include/ControllerView.h b/include/ControllerView.h index 44f362b70..d1ba533a1 100644 --- a/include/ControllerView.h +++ b/include/ControllerView.h @@ -88,4 +88,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_CONTROLLER_VIEW_H diff --git a/include/Controls.h b/include/Controls.h index 53c93a36f..5ed19027e 100644 --- a/include/Controls.h +++ b/include/Controls.h @@ -144,4 +144,4 @@ public: } // namespace lmms -#endif +#endif // LMMS_GUI_CONTROLS_H diff --git a/include/CustomTextKnob.h b/include/CustomTextKnob.h index 25bba1315..19768ec87 100644 --- a/include/CustomTextKnob.h +++ b/include/CustomTextKnob.h @@ -57,4 +57,4 @@ protected: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_CUSTOM_TEXT_KNOB_H diff --git a/include/DataFile.h b/include/DataFile.h index 18f9697b0..a91b37f9b 100644 --- a/include/DataFile.h +++ b/include/DataFile.h @@ -153,4 +153,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_DATA_FILE_H diff --git a/include/Delay.h b/include/Delay.h index ef23d7be1..daa871baf 100644 --- a/include/Delay.h +++ b/include/Delay.h @@ -364,4 +364,4 @@ using StereoAllpassDelay = AllpassDelay<2>; } // namespace lmms -#endif +#endif // LMMS_DELAY_H diff --git a/include/DeprecationHelper.h b/include/DeprecationHelper.h index f1c68902b..b9be6d42f 100644 --- a/include/DeprecationHelper.h +++ b/include/DeprecationHelper.h @@ -66,4 +66,4 @@ inline QPoint position(QWheelEvent *wheelEvent) } // namespace lmms -#endif +#endif // LMMS_DEPRECATIONHELPER_H diff --git a/include/DetuningHelper.h b/include/DetuningHelper.h index 41723bee8..e5d5f5712 100644 --- a/include/DetuningHelper.h +++ b/include/DetuningHelper.h @@ -64,4 +64,4 @@ public: } // namespace lmms -#endif +#endif // LMMS_DETUNING_HELPER_H diff --git a/include/DrumSynth.h b/include/DrumSynth.h index 9b759ac1a..750055ddb 100644 --- a/include/DrumSynth.h +++ b/include/DrumSynth.h @@ -56,4 +56,4 @@ class DrumSynth { } // namespace lmms -#endif +#endif // LMMS_DRUM_SYNTH_H diff --git a/include/DspEffectLibrary.h b/include/DspEffectLibrary.h index 0a19783f6..d8268fd8d 100644 --- a/include/DspEffectLibrary.h +++ b/include/DspEffectLibrary.h @@ -330,5 +330,4 @@ namespace lmms::DspEffectLibrary } // namespace lmms::DspEffectLibrary - -#endif +#endif // LMMS_DSPEFFECTLIBRARY_H diff --git a/include/DummyEffect.h b/include/DummyEffect.h index 945738e1b..0a80b90a9 100644 --- a/include/DummyEffect.h +++ b/include/DummyEffect.h @@ -149,4 +149,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_DUMMY_EFFECT_H diff --git a/include/DummyInstrument.h b/include/DummyInstrument.h index 19b6b6fbd..aefa035db 100644 --- a/include/DummyInstrument.h +++ b/include/DummyInstrument.h @@ -77,4 +77,4 @@ public: } // namespace lmms -#endif +#endif // LMMS_DUMMY_INSTRUMENT_H diff --git a/include/DummyPlugin.h b/include/DummyPlugin.h index ad517c1a9..3f6746b74 100644 --- a/include/DummyPlugin.h +++ b/include/DummyPlugin.h @@ -68,4 +68,4 @@ protected: } // namespace lmms -#endif +#endif // LMMS_DUMMY_PLUGIN_H diff --git a/include/Editor.h b/include/Editor.h index ad330ac06..c5e9a2d05 100644 --- a/include/Editor.h +++ b/include/Editor.h @@ -113,4 +113,4 @@ protected: } // namespace lmms::gui -#endif +#endif // LMMS_EDITOR_H diff --git a/include/Effect.h b/include/Effect.h index a9952d339..1f566e0e9 100644 --- a/include/Effect.h +++ b/include/Effect.h @@ -241,4 +241,4 @@ using EffectKeyList = Effect::Descriptor::SubPluginFeatures::KeyList; } // namespace lmms -#endif +#endif // LMMS_EFFECT_H diff --git a/include/EffectChain.h b/include/EffectChain.h index dad4de5e1..57cf8d547 100644 --- a/include/EffectChain.h +++ b/include/EffectChain.h @@ -85,4 +85,4 @@ signals: } // namespace lmms -#endif +#endif // LMMS_EFFECT_CHAIN_H diff --git a/include/EffectControlDialog.h b/include/EffectControlDialog.h index bda845dc5..4bef5ee79 100644 --- a/include/EffectControlDialog.h +++ b/include/EffectControlDialog.h @@ -64,4 +64,4 @@ protected: } // namespace lmms -#endif +#endif // LMMS_GUI_EFFECT_CONTROL_DIALOG_H diff --git a/include/EffectControls.h b/include/EffectControls.h index dfecc0792..294f61027 100644 --- a/include/EffectControls.h +++ b/include/EffectControls.h @@ -82,4 +82,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_EFFECT_CONTROLS_H diff --git a/include/EffectRackView.h b/include/EffectRackView.h index 96f70548a..a1e21be09 100644 --- a/include/EffectRackView.h +++ b/include/EffectRackView.h @@ -88,4 +88,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_EFFECT_RACK_VIEW_H diff --git a/include/EffectSelectDialog.h b/include/EffectSelectDialog.h index c31f96e14..493b07774 100644 --- a/include/EffectSelectDialog.h +++ b/include/EffectSelectDialog.h @@ -70,5 +70,4 @@ private: } // namespace lmms::gui - -#endif +#endif // LMMS_GUI_EFFECT_SELECT_DIALOG_H diff --git a/include/EffectView.h b/include/EffectView.h index fb19d52dd..5b669114d 100644 --- a/include/EffectView.h +++ b/include/EffectView.h @@ -96,4 +96,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_EFFECT_VIEW_H diff --git a/include/Engine.h b/include/Engine.h index 0cb77315f..ed4cbd93c 100644 --- a/include/Engine.h +++ b/include/Engine.h @@ -155,4 +155,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_ENGINE_H diff --git a/include/EnvelopeAndLfoParameters.h b/include/EnvelopeAndLfoParameters.h index 0a90ec68b..a713a90f3 100644 --- a/include/EnvelopeAndLfoParameters.h +++ b/include/EnvelopeAndLfoParameters.h @@ -190,4 +190,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_ENVELOPE_AND_LFO_PARAMETERS_H diff --git a/include/EnvelopeAndLfoView.h b/include/EnvelopeAndLfoView.h index e927e9fcc..b5c7a67d4 100644 --- a/include/EnvelopeAndLfoView.h +++ b/include/EnvelopeAndLfoView.h @@ -104,4 +104,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_GUI_ENVELOPE_AND_LFO_VIEW_H diff --git a/include/ExportFilter.h b/include/ExportFilter.h index 13a3c179d..acbdbb65e 100644 --- a/include/ExportFilter.h +++ b/include/ExportFilter.h @@ -69,4 +69,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_EXPORT_FILTER_H diff --git a/include/ExportProjectDialog.h b/include/ExportProjectDialog.h index af33d6766..56a9fc1f5 100644 --- a/include/ExportProjectDialog.h +++ b/include/ExportProjectDialog.h @@ -69,5 +69,4 @@ private: } // namespace lmms::gui - -#endif +#endif // LMMS_GUI_EXPORT_PROJECT_DIALOG_H diff --git a/include/FadeButton.h b/include/FadeButton.h index df0e2abf2..166ef5f21 100644 --- a/include/FadeButton.h +++ b/include/FadeButton.h @@ -76,4 +76,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_FADE_BUTTON_H diff --git a/include/Fader.h b/include/Fader.h index cfffba843..2847819a4 100644 --- a/include/Fader.h +++ b/include/Fader.h @@ -173,5 +173,4 @@ private: } // namespace lmms::gui - -#endif +#endif // LMMS_GUI_FADER_H diff --git a/include/FifoBuffer.h b/include/FifoBuffer.h index 4b5682a51..cdb1df41f 100644 --- a/include/FifoBuffer.h +++ b/include/FifoBuffer.h @@ -94,4 +94,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_FIFO_BUFFER_H diff --git a/include/FileBrowser.h b/include/FileBrowser.h index 387be38d1..51103b19f 100644 --- a/include/FileBrowser.h +++ b/include/FileBrowser.h @@ -297,4 +297,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_GUI_FILE_BROWSER_H diff --git a/include/FileDialog.h b/include/FileDialog.h index a999fff16..67ef1d8eb 100644 --- a/include/FileDialog.h +++ b/include/FileDialog.h @@ -56,4 +56,4 @@ public: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_FILE_DIALOG_H diff --git a/include/Graph.h b/include/Graph.h index d04fd926c..f62215ac2 100644 --- a/include/Graph.h +++ b/include/Graph.h @@ -227,4 +227,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_GUI_GRAPH_H diff --git a/include/GroupBox.h b/include/GroupBox.h index bf2773e23..6a8f424f9 100644 --- a/include/GroupBox.h +++ b/include/GroupBox.h @@ -73,5 +73,4 @@ private: } // namespace lmms::gui - -#endif +#endif // LMMS_GUI_GROUP_BOX_H diff --git a/include/GuiApplication.h b/include/GuiApplication.h index dd87a5607..3a0851499 100644 --- a/include/GuiApplication.h +++ b/include/GuiApplication.h @@ -93,4 +93,4 @@ LMMS_EXPORT GuiApplication* getGUI(); } // namespace lmms::gui -#endif +#endif // LMMS_GUI_GUI_APPLICATION_H diff --git a/include/ImportFilter.h b/include/ImportFilter.h index 587a62a78..9c73b3861 100644 --- a/include/ImportFilter.h +++ b/include/ImportFilter.h @@ -114,4 +114,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_IMPORT_FILTER_H diff --git a/include/InlineAutomation.h b/include/InlineAutomation.h index fbecd2769..3e27e137b 100644 --- a/include/InlineAutomation.h +++ b/include/InlineAutomation.h @@ -99,4 +99,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_INLINE_AUTOMATION_H diff --git a/include/Instrument.h b/include/Instrument.h index 3ea8bdf2f..1c42c970e 100644 --- a/include/Instrument.h +++ b/include/Instrument.h @@ -154,4 +154,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Instrument::Flags) } // namespace lmms -#endif +#endif // LMMS_INSTRUMENT_H diff --git a/include/InstrumentFunctionViews.h b/include/InstrumentFunctionViews.h index 3abd8eae7..71a6e8aaa 100644 --- a/include/InstrumentFunctionViews.h +++ b/include/InstrumentFunctionViews.h @@ -99,4 +99,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_INSTRUMENT_FUNCTION_VIEWS_H diff --git a/include/InstrumentFunctions.h b/include/InstrumentFunctions.h index 5b6c1af6d..f62b74e9a 100644 --- a/include/InstrumentFunctions.h +++ b/include/InstrumentFunctions.h @@ -224,4 +224,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_INSTRUMENT_FUNCTIONS_H diff --git a/include/InstrumentMidiIOView.h b/include/InstrumentMidiIOView.h index dd6e43151..7877229a2 100644 --- a/include/InstrumentMidiIOView.h +++ b/include/InstrumentMidiIOView.h @@ -77,4 +77,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_GUI_INSTRUMENT_MIDI_IO_VIEW_H diff --git a/include/InstrumentMiscView.h b/include/InstrumentMiscView.h index 9aee23676..28f3c6a8e 100644 --- a/include/InstrumentMiscView.h +++ b/include/InstrumentMiscView.h @@ -71,4 +71,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_GUI_INSTRUMENT_MISC_VIEW_H diff --git a/include/InstrumentPlayHandle.h b/include/InstrumentPlayHandle.h index b65f906ae..bbf53d16c 100644 --- a/include/InstrumentPlayHandle.h +++ b/include/InstrumentPlayHandle.h @@ -85,4 +85,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_INSTRUMENT_PLAY_HANDLE_H diff --git a/include/InstrumentSoundShaping.h b/include/InstrumentSoundShaping.h index 607871c85..6db3078ec 100644 --- a/include/InstrumentSoundShaping.h +++ b/include/InstrumentSoundShaping.h @@ -92,4 +92,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_INSTRUMENT_SOUND_SHAPING_H diff --git a/include/InstrumentSoundShapingView.h b/include/InstrumentSoundShapingView.h index f37cfaa55..8f671514a 100644 --- a/include/InstrumentSoundShapingView.h +++ b/include/InstrumentSoundShapingView.h @@ -73,4 +73,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_INSTRUMENT_SOUND_SHAPING_VIEW_H diff --git a/include/InstrumentTrack.h b/include/InstrumentTrack.h index 6fa41b4a1..7c6d1d795 100644 --- a/include/InstrumentTrack.h +++ b/include/InstrumentTrack.h @@ -325,4 +325,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_INSTRUMENT_TRACK_H diff --git a/include/InstrumentTrackView.h b/include/InstrumentTrackView.h index 66fb7804b..363f5b3ab 100644 --- a/include/InstrumentTrackView.h +++ b/include/InstrumentTrackView.h @@ -121,4 +121,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_INSTRUMENT_TRACK_VIEW_H diff --git a/include/InstrumentTrackWindow.h b/include/InstrumentTrackWindow.h index f50b138df..d41bbdac8 100644 --- a/include/InstrumentTrackWindow.h +++ b/include/InstrumentTrackWindow.h @@ -169,4 +169,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_GUI_INSTRUMENT_TRACK_WINDOW_H diff --git a/include/InstrumentView.h b/include/InstrumentView.h index ff4b9cd66..40014a11f 100644 --- a/include/InstrumentView.h +++ b/include/InstrumentView.h @@ -75,4 +75,4 @@ public: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_INSTRUMENT_VIEW_H diff --git a/include/IoHelper.h b/include/IoHelper.h index 423cbaab3..8043df9af 100644 --- a/include/IoHelper.h +++ b/include/IoHelper.h @@ -91,4 +91,4 @@ int fileToDescriptor(FILE* f, bool closeFile = true) } // namespace lmms -#endif +#endif // LMMS_IO_HELPER_H diff --git a/include/JournallingObject.h b/include/JournallingObject.h index 15e071577..f3e134f34 100644 --- a/include/JournallingObject.h +++ b/include/JournallingObject.h @@ -103,4 +103,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_JOURNALLING_OBJECT_H diff --git a/include/Keymap.h b/include/Keymap.h index 88f0df428..967d80789 100644 --- a/include/Keymap.h +++ b/include/Keymap.h @@ -80,4 +80,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_KEYMAP_H diff --git a/include/Knob.h b/include/Knob.h index 94fb8b640..18b26f7e6 100644 --- a/include/Knob.h +++ b/include/Knob.h @@ -213,4 +213,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_KNOB_H diff --git a/include/Ladspa2LMMS.h b/include/Ladspa2LMMS.h index d4fd12b2d..abb969124 100644 --- a/include/Ladspa2LMMS.h +++ b/include/Ladspa2LMMS.h @@ -81,4 +81,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_LADSPA_2_LMMS_H diff --git a/include/LadspaBase.h b/include/LadspaBase.h index 442d12293..51c0ca202 100644 --- a/include/LadspaBase.h +++ b/include/LadspaBase.h @@ -83,4 +83,4 @@ inline Plugin::Descriptor::SubPluginFeatures::Key ladspaKeyToSubPluginKey( } // namespace lmms -#endif +#endif // LMMS_LADSPA_BASE_H diff --git a/include/LadspaControl.h b/include/LadspaControl.h index 9bc83e352..e4f0cd745 100644 --- a/include/LadspaControl.h +++ b/include/LadspaControl.h @@ -131,4 +131,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_LADSPA_CONTROL_H diff --git a/include/LadspaControlView.h b/include/LadspaControlView.h index 4638d5b5c..4f12c29e2 100644 --- a/include/LadspaControlView.h +++ b/include/LadspaControlView.h @@ -55,4 +55,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_GUI_LADSPA_CONTROL_VIEW_H diff --git a/include/LadspaManager.h b/include/LadspaManager.h index 7b8639779..8c00d2604 100644 --- a/include/LadspaManager.h +++ b/include/LadspaManager.h @@ -349,4 +349,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_LADSPA_MANAGER_H diff --git a/include/LcdFloatSpinBox.h b/include/LcdFloatSpinBox.h index 3dcf500b9..74a870114 100644 --- a/include/LcdFloatSpinBox.h +++ b/include/LcdFloatSpinBox.h @@ -84,4 +84,4 @@ using LcdFloatSpinBoxModel = FloatModel; } // namespace lmms::gui -#endif +#endif // LMMS_GUI_LCD_FLOATSPINBOX_H diff --git a/include/LcdSpinBox.h b/include/LcdSpinBox.h index 6dcb68c1b..aeccd2635 100644 --- a/include/LcdSpinBox.h +++ b/include/LcdSpinBox.h @@ -89,4 +89,4 @@ using LcdSpinBoxModel = IntModel; } // namespace lmms::gui -#endif +#endif // LMMS_GUI_LCD_SPINBOX_H diff --git a/include/LcdWidget.h b/include/LcdWidget.h index 665668b3f..f19c2c583 100644 --- a/include/LcdWidget.h +++ b/include/LcdWidget.h @@ -116,4 +116,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_LCD_WIDGET_H diff --git a/include/LedCheckBox.h b/include/LedCheckBox.h index 12642ef3b..95016b87f 100644 --- a/include/LedCheckBox.h +++ b/include/LedCheckBox.h @@ -83,4 +83,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_LED_CHECKBOX_H diff --git a/include/LeftRightNav.h b/include/LeftRightNav.h index e752d44c0..49ad25ecf 100644 --- a/include/LeftRightNav.h +++ b/include/LeftRightNav.h @@ -51,4 +51,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_LEFT_RIGHT_NAV_H diff --git a/include/LfoController.h b/include/LfoController.h index ccd5804c7..1c63ba698 100644 --- a/include/LfoController.h +++ b/include/LfoController.h @@ -136,4 +136,4 @@ private slots: } // namespace lmms -#endif +#endif // LMMS_LFO_CONTROLLER_H diff --git a/include/LinkedModelGroupViews.h b/include/LinkedModelGroupViews.h index 08c25a8bb..cf5aabd0d 100644 --- a/include/LinkedModelGroupViews.h +++ b/include/LinkedModelGroupViews.h @@ -22,8 +22,8 @@ * */ -#ifndef LMMS_GUI_LINKEDMODELGROUPVIEWS_H -#define LMMS_GUI_LINKEDMODELGROUPVIEWS_H +#ifndef LMMS_GUI_LINKED_MODEL_GROUP_VIEWS_H +#define LMMS_GUI_LINKED_MODEL_GROUP_VIEWS_H #include #include @@ -118,4 +118,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_GUI_LINKED_MODEL_GROUP_VIEWS_H diff --git a/include/LinkedModelGroups.h b/include/LinkedModelGroups.h index 11950d85e..3f274d10c 100644 --- a/include/LinkedModelGroups.h +++ b/include/LinkedModelGroups.h @@ -22,8 +22,8 @@ * */ -#ifndef LMMS_LINKEDMODELGROUPS_H -#define LMMS_LINKEDMODELGROUPS_H +#ifndef LMMS_LINKED_MODEL_GROUPS_H +#define LMMS_LINKED_MODEL_GROUPS_H #include @@ -176,4 +176,4 @@ public: } // namespace lmms -#endif +#endif // LMMS_LINKED_MODEL_GROUPS_H diff --git a/include/LmmsPalette.h b/include/LmmsPalette.h index 68cd2d2ab..91a469de0 100644 --- a/include/LmmsPalette.h +++ b/include/LmmsPalette.h @@ -87,4 +87,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_LMMS_PALETTE_H diff --git a/include/LmmsStyle.h b/include/LmmsStyle.h index c560b5be8..b3be03952 100644 --- a/include/LmmsStyle.h +++ b/include/LmmsStyle.h @@ -95,4 +95,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_LMMS_STYLE_H diff --git a/include/LocaleHelper.h b/include/LocaleHelper.h index 61298f42b..9c829fcaa 100644 --- a/include/LocaleHelper.h +++ b/include/LocaleHelper.h @@ -67,4 +67,4 @@ inline float toFloat(QString str, bool* ok = nullptr) } // namespace lmms::LocaleHelper -#endif +#endif // LMMS_LOCALEHELPER_H diff --git a/include/LocklessAllocator.h b/include/LocklessAllocator.h index f1b3dea40..d44b99543 100644 --- a/include/LocklessAllocator.h +++ b/include/LocklessAllocator.h @@ -84,4 +84,4 @@ public: } // namespace lmms -#endif +#endif // LMMS_LOCKLESS_ALLOCATOR_H diff --git a/include/LocklessList.h b/include/LocklessList.h index e5c5cce71..4a0c27de0 100644 --- a/include/LocklessList.h +++ b/include/LocklessList.h @@ -97,4 +97,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_LOCKLESS_LIST_H diff --git a/include/LocklessRingBuffer.h b/include/LocklessRingBuffer.h index 904e54f9c..99c48cc90 100644 --- a/include/LocklessRingBuffer.h +++ b/include/LocklessRingBuffer.h @@ -89,4 +89,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_LOCKLESS_RING_BUFFER_H diff --git a/include/Lv2Basics.h b/include/Lv2Basics.h index 73f006b46..3dae4c9f2 100644 --- a/include/Lv2Basics.h +++ b/include/Lv2Basics.h @@ -68,4 +68,4 @@ std::string stdStringFromPortName(const LilvPlugin* plug, const LilvPort* port); #endif // LMMS_HAVE_LV2 -#endif +#endif // LMMS_LV2BASICS_H diff --git a/include/Lv2ControlBase.h b/include/Lv2ControlBase.h index dcb90f27a..93b3b21ef 100644 --- a/include/Lv2ControlBase.h +++ b/include/Lv2ControlBase.h @@ -164,4 +164,4 @@ private: #endif // LMMS_HAVE_LV2 -#endif +#endif // LMMS_LV2_CONTROL_BASE_H diff --git a/include/Lv2Evbuf.h b/include/Lv2Evbuf.h index ecf61ec99..319bdf9ce 100644 --- a/include/Lv2Evbuf.h +++ b/include/Lv2Evbuf.h @@ -155,4 +155,4 @@ lv2_evbuf_write( LV2_Evbuf_Iterator* iter, #endif // LMMS_HAVE_LV2 -#endif +#endif // LMMS_LV2_EVBUF_H diff --git a/include/Lv2Features.h b/include/Lv2Features.h index 99a5762b0..b4fd6c06d 100644 --- a/include/Lv2Features.h +++ b/include/Lv2Features.h @@ -84,4 +84,4 @@ private: #endif // LMMS_HAVE_LV2 -#endif +#endif // LMMS_LV2_FEATURES_H diff --git a/include/Lv2Manager.h b/include/Lv2Manager.h index 45ca868dd..b62e989cf 100644 --- a/include/Lv2Manager.h +++ b/include/Lv2Manager.h @@ -166,4 +166,4 @@ private: #endif // LMMS_HAVE_LV2 -#endif +#endif // LMMS_LV2_MANAGER_H diff --git a/include/Lv2Options.h b/include/Lv2Options.h index c81e4b953..ca4fe2b7f 100644 --- a/include/Lv2Options.h +++ b/include/Lv2Options.h @@ -107,4 +107,4 @@ private: #endif // LMMS_HAVE_LV2 -#endif +#endif // LMMS_LV2_OPTIONS_H diff --git a/include/Lv2Ports.h b/include/Lv2Ports.h index 7283ebbd3..0f0b02913 100644 --- a/include/Lv2Ports.h +++ b/include/Lv2Ports.h @@ -271,4 +271,4 @@ const Target* dcast(const PortBase* base) #endif // LMMS_HAVE_LV2 -#endif +#endif // LMMS_LV2PORTS_H diff --git a/include/Lv2Proc.h b/include/Lv2Proc.h index eea4e7c0e..7e6342ec4 100644 --- a/include/Lv2Proc.h +++ b/include/Lv2Proc.h @@ -221,4 +221,4 @@ private: #endif // LMMS_HAVE_LV2 -#endif +#endif // LMMS_LV2_PROC_H diff --git a/include/Lv2SubPluginFeatures.h b/include/Lv2SubPluginFeatures.h index f8fbf55df..497c72830 100644 --- a/include/Lv2SubPluginFeatures.h +++ b/include/Lv2SubPluginFeatures.h @@ -66,4 +66,4 @@ public: #endif // LMMS_HAVE_LV2 -#endif +#endif // LMMS_LV2_SUBPLUGIN_FEATURES_H diff --git a/include/Lv2UridCache.h b/include/Lv2UridCache.h index ab80760b0..b64003a2e 100644 --- a/include/Lv2UridCache.h +++ b/include/Lv2UridCache.h @@ -75,4 +75,4 @@ template<> struct Lv2UridCache::IdForType { static constexpr auto #endif // LMMS_HAVE_LV2 -#endif +#endif // LMMS_LV2_URID_CACHE_H diff --git a/include/Lv2UridMap.h b/include/Lv2UridMap.h index ec23f4c6d..b8733023e 100644 --- a/include/Lv2UridMap.h +++ b/include/Lv2UridMap.h @@ -76,4 +76,4 @@ public: #endif // LMMS_HAVE_LV2 -#endif +#endif // LMMS_LV2_URID_MAP_H diff --git a/include/Lv2ViewBase.h b/include/Lv2ViewBase.h index e84c6c5dc..f6d97d6aa 100644 --- a/include/Lv2ViewBase.h +++ b/include/Lv2ViewBase.h @@ -109,4 +109,4 @@ private: #endif // LMMS_HAVE_LV2 -#endif +#endif // LMMS_LV2_VIEW_BASE_H diff --git a/include/MainApplication.h b/include/MainApplication.h index 0ab2877e7..98fcdef20 100644 --- a/include/MainApplication.h +++ b/include/MainApplication.h @@ -64,4 +64,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_MAIN_APPLICATION_H diff --git a/include/MainWindow.h b/include/MainWindow.h index 78d7f48d8..c4bbb6767 100644 --- a/include/MainWindow.h +++ b/include/MainWindow.h @@ -263,4 +263,4 @@ signals: } // namespace lmms -#endif +#endif // LMMS_GUI_MAIN_WINDOW_H diff --git a/include/MemoryHelper.h b/include/MemoryHelper.h index 22ab10a6c..e709ffc8a 100644 --- a/include/MemoryHelper.h +++ b/include/MemoryHelper.h @@ -46,4 +46,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_MEMORY_HELPER_H diff --git a/include/MemoryManager.h b/include/MemoryManager.h index 6e172468b..fa2fe8110 100644 --- a/include/MemoryManager.h +++ b/include/MemoryManager.h @@ -108,4 +108,4 @@ void MM_FREE(T* ptr) } // namespace lmms -#endif +#endif // LMMS_MEMORY_MANAGER_H diff --git a/include/MeterDialog.h b/include/MeterDialog.h index 425590807..dca7e5de6 100644 --- a/include/MeterDialog.h +++ b/include/MeterDialog.h @@ -54,4 +54,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_METER_DIALOG_H diff --git a/include/MeterModel.h b/include/MeterModel.h index 9a6ec8015..6c0304e37 100644 --- a/include/MeterModel.h +++ b/include/MeterModel.h @@ -68,4 +68,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_METER_MODEL_H diff --git a/include/MicroTimer.h b/include/MicroTimer.h index e5c8e2f61..cd03403dc 100644 --- a/include/MicroTimer.h +++ b/include/MicroTimer.h @@ -48,4 +48,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_MICRO_TIMER_H diff --git a/include/Microtuner.h b/include/Microtuner.h index 795748b39..c92549581 100644 --- a/include/Microtuner.h +++ b/include/Microtuner.h @@ -74,4 +74,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_MICROTUNER_H diff --git a/include/MicrotunerConfig.h b/include/MicrotunerConfig.h index 3a5130b60..0706a530f 100644 --- a/include/MicrotunerConfig.h +++ b/include/MicrotunerConfig.h @@ -95,4 +95,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_MICROTUNER_CONFIG_H diff --git a/include/Midi.h b/include/Midi.h index 839d0b684..21db021b3 100644 --- a/include/Midi.h +++ b/include/Midi.h @@ -143,4 +143,4 @@ const int MidiMaxPitchBend = 16383; } // namespace lmms -#endif +#endif // LMMS_MIDI_H diff --git a/include/MidiAlsaRaw.h b/include/MidiAlsaRaw.h index a2b8c4e69..345cdbd54 100644 --- a/include/MidiAlsaRaw.h +++ b/include/MidiAlsaRaw.h @@ -85,4 +85,4 @@ private: #endif // LMMS_HAVE_ALSA -#endif +#endif // LMMS_MIDI_ALSA_RAW_H diff --git a/include/MidiAlsaSeq.h b/include/MidiAlsaSeq.h index d6f488c82..006cdefc8 100644 --- a/include/MidiAlsaSeq.h +++ b/include/MidiAlsaSeq.h @@ -158,4 +158,4 @@ signals: #endif // LMMS_HAVE_ALSA -#endif +#endif // LMMS_MIDI_ALSA_SEQ_H diff --git a/include/MidiApple.h b/include/MidiApple.h index 1b0d59218..37d408d4d 100644 --- a/include/MidiApple.h +++ b/include/MidiApple.h @@ -155,4 +155,4 @@ signals: #endif // LMMS_BUILD_APPLE -#endif +#endif // LMMS_MIDI_APPLE_H diff --git a/include/MidiCCRackView.h b/include/MidiCCRackView.h index ca99a7ce5..4cb82b3d8 100644 --- a/include/MidiCCRackView.h +++ b/include/MidiCCRackView.h @@ -73,4 +73,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_GUI_MIDI_CC_RACK_VIEW_H diff --git a/include/MidiClient.h b/include/MidiClient.h index 45ba54ee5..3a64f709c 100644 --- a/include/MidiClient.h +++ b/include/MidiClient.h @@ -173,4 +173,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_MIDI_CLIENT_H diff --git a/include/MidiClip.h b/include/MidiClip.h index 2dbedc0dd..bbb7d325d 100644 --- a/include/MidiClip.h +++ b/include/MidiClip.h @@ -154,4 +154,4 @@ signals: } // namespace lmms -#endif +#endif // LMMS_MIDI_CLIP_H diff --git a/include/MidiClipView.h b/include/MidiClipView.h index dd83f98b8..6558688b4 100644 --- a/include/MidiClipView.h +++ b/include/MidiClipView.h @@ -108,4 +108,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_GUI_MIDI_CLIP_VIEW_H diff --git a/include/MidiController.h b/include/MidiController.h index 19577281f..c4ef49590 100644 --- a/include/MidiController.h +++ b/include/MidiController.h @@ -92,4 +92,4 @@ protected: } // namespace lmms -#endif +#endif // LMMS_MIDI_CONTROLLER_H diff --git a/include/MidiDummy.h b/include/MidiDummy.h index 03deaf7bc..b117bd136 100644 --- a/include/MidiDummy.h +++ b/include/MidiDummy.h @@ -65,4 +65,4 @@ protected: } // namespace lmms -#endif +#endif // LMMS_MIDI_DUMMY_H diff --git a/include/MidiEvent.h b/include/MidiEvent.h index 03d3be604..956c33fb3 100644 --- a/include/MidiEvent.h +++ b/include/MidiEvent.h @@ -221,4 +221,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_MIDI_EVENT_H diff --git a/include/MidiEventProcessor.h b/include/MidiEventProcessor.h index 3e51d1177..1c45b3e3f 100644 --- a/include/MidiEventProcessor.h +++ b/include/MidiEventProcessor.h @@ -49,4 +49,4 @@ public: } // namespace lmms -#endif +#endif // LMMS_MIDI_EVENT_PROCESSOR_H diff --git a/include/MidiEventToByteSeq.h b/include/MidiEventToByteSeq.h index 03308d7b8..6490ae385 100644 --- a/include/MidiEventToByteSeq.h +++ b/include/MidiEventToByteSeq.h @@ -51,4 +51,4 @@ std::size_t LMMS_EXPORT writeToByteSeq( const class MidiEvent& ev, } // namespace lmms -#endif +#endif // LMMS_MIDIEVENTTOBYTESEQ_H diff --git a/include/MidiJack.h b/include/MidiJack.h index 265abedfc..e2b38e290 100644 --- a/include/MidiJack.h +++ b/include/MidiJack.h @@ -102,4 +102,4 @@ private: #endif // LMMS_HAVE_JACK -#endif +#endif // LMMS_MIDI_JACK_H diff --git a/include/MidiOss.h b/include/MidiOss.h index dba0a9a71..9acc0e8e6 100644 --- a/include/MidiOss.h +++ b/include/MidiOss.h @@ -78,4 +78,4 @@ private: #endif // LMMS_HAVE_OSS -#endif +#endif // LMMS_MIDI_OSS_H diff --git a/include/MidiPort.h b/include/MidiPort.h index a03b8477c..6f759708e 100644 --- a/include/MidiPort.h +++ b/include/MidiPort.h @@ -190,4 +190,4 @@ using MidiPortList = QList; } // namespace lmms -#endif +#endif // LMMS_MIDI_PORT_H diff --git a/include/MidiPortMenu.h b/include/MidiPortMenu.h index 88328e734..0b3fc1b2f 100644 --- a/include/MidiPortMenu.h +++ b/include/MidiPortMenu.h @@ -61,4 +61,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_MIDI_PORT_MENU_H diff --git a/include/MidiSetupWidget.h b/include/MidiSetupWidget.h index 492a5bb85..a61b606ac 100644 --- a/include/MidiSetupWidget.h +++ b/include/MidiSetupWidget.h @@ -59,4 +59,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_MIDI_SETUP_WIDGET_H diff --git a/include/MidiSndio.h b/include/MidiSndio.h index 3d7226431..5734745b9 100644 --- a/include/MidiSndio.h +++ b/include/MidiSndio.h @@ -75,4 +75,4 @@ private: #endif // LMMS_HAVE_SNDIO -#endif +#endif // LMMS_MIDI_SNDIO_H diff --git a/include/MidiWinMM.h b/include/MidiWinMM.h index ca1850347..3a8edfbcd 100644 --- a/include/MidiWinMM.h +++ b/include/MidiWinMM.h @@ -150,4 +150,4 @@ signals: #endif // LMMS_BUILD_WIN32 -#endif +#endif // LMMS_MIDI_WINMM_H diff --git a/include/MixHelpers.h b/include/MixHelpers.h index 76242dd7a..6458c65fc 100644 --- a/include/MixHelpers.h +++ b/include/MixHelpers.h @@ -81,4 +81,4 @@ void multiplyAndAddMultipliedJoined( sampleFrame* dst, const sample_t* srcLeft, } // namespace lmms -#endif +#endif // LMMS_MIX_HELPERS_H diff --git a/include/Mixer.h b/include/Mixer.h index d49d950ea..d84a11063 100644 --- a/include/Mixer.h +++ b/include/Mixer.h @@ -226,4 +226,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_MIXER_H diff --git a/include/MixerLine.h b/include/MixerLine.h index 0121717cf..68a61728c 100644 --- a/include/MixerLine.h +++ b/include/MixerLine.h @@ -117,4 +117,4 @@ private slots: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_MIXER_LINE_H diff --git a/include/MixerLineLcdSpinBox.h b/include/MixerLineLcdSpinBox.h index 0d3b182b0..1ae2813f2 100644 --- a/include/MixerLineLcdSpinBox.h +++ b/include/MixerLineLcdSpinBox.h @@ -56,4 +56,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_MIXER_LINE_LCD_SPIN_BOX_H diff --git a/include/MixerView.h b/include/MixerView.h index e73e2e391..9dc5abeee 100644 --- a/include/MixerView.h +++ b/include/MixerView.h @@ -139,4 +139,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_MIXER_VIEW_H diff --git a/include/Model.h b/include/Model.h index 0b8142659..3e304297f 100644 --- a/include/Model.h +++ b/include/Model.h @@ -90,4 +90,4 @@ signals: } // namespace lmms -#endif +#endif // LMMS_MODEL_H diff --git a/include/ModelView.h b/include/ModelView.h index 89e60c3a6..786a6812c 100644 --- a/include/ModelView.h +++ b/include/ModelView.h @@ -85,4 +85,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_MODEL_VIEW_H diff --git a/include/ModelVisitor.h b/include/ModelVisitor.h index 59928d04b..a4654e529 100644 --- a/include/ModelVisitor.h +++ b/include/ModelVisitor.h @@ -68,4 +68,4 @@ public: } // namespace lmms -#endif +#endif // LMMS_MODEL_VISITOR_H diff --git a/include/NStateButton.h b/include/NStateButton.h index dd1c06a66..a6b4c4d9a 100644 --- a/include/NStateButton.h +++ b/include/NStateButton.h @@ -77,4 +77,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_NSTATE_BUTTON_H diff --git a/include/Note.h b/include/Note.h index 9eecd585f..15aeaa2ce 100644 --- a/include/Note.h +++ b/include/Note.h @@ -265,4 +265,4 @@ std::optional boundsForNotes(const NoteVector& notes); } // namespace lmms -#endif +#endif // LMMS_NOTE_H diff --git a/include/NotePlayHandle.h b/include/NotePlayHandle.h index 89fc7e570..29477705b 100644 --- a/include/NotePlayHandle.h +++ b/include/NotePlayHandle.h @@ -364,4 +364,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_NOTE_PLAY_HANDLE_H diff --git a/include/Oscillator.h b/include/Oscillator.h index 025404c41..46d858032 100644 --- a/include/Oscillator.h +++ b/include/Oscillator.h @@ -313,4 +313,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_OSCILLATOR_H diff --git a/include/OscillatorConstants.h b/include/OscillatorConstants.h index ef12636d4..85ae38fe8 100644 --- a/include/OscillatorConstants.h +++ b/include/OscillatorConstants.h @@ -55,4 +55,4 @@ namespace lmms::OscillatorConstants } // namespace lmms::OscillatorConstants -#endif +#endif // LMMS_OSCILLATORCONSTANTS_H diff --git a/include/Oscilloscope.h b/include/Oscilloscope.h index c7a52cef9..209370ce0 100644 --- a/include/Oscilloscope.h +++ b/include/Oscilloscope.h @@ -78,4 +78,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_OSCILLOSCOPE_H diff --git a/include/OutputSettings.h b/include/OutputSettings.h index 0b10d2b01..12242e1bb 100644 --- a/include/OutputSettings.h +++ b/include/OutputSettings.h @@ -119,4 +119,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_OUTPUT_SETTINGS_H diff --git a/include/PathUtil.h b/include/PathUtil.h index 9efd73096..9b410d014 100644 --- a/include/PathUtil.h +++ b/include/PathUtil.h @@ -70,4 +70,4 @@ namespace lmms::PathUtil } // namespace lmms::PathUtil -#endif +#endif // LMMS_PATHUTIL_H diff --git a/include/PatternClip.h b/include/PatternClip.h index 3f9d07cb6..968a0b198 100644 --- a/include/PatternClip.h +++ b/include/PatternClip.h @@ -58,4 +58,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_PATTERN_CLIP_H diff --git a/include/PatternClipView.h b/include/PatternClipView.h index f2e2208bd..ee313f32a 100644 --- a/include/PatternClipView.h +++ b/include/PatternClipView.h @@ -72,4 +72,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_GUI_PATTERN_CLIP_VIEW_H diff --git a/include/PatternEditor.h b/include/PatternEditor.h index fd9a1b254..5787f27ec 100644 --- a/include/PatternEditor.h +++ b/include/PatternEditor.h @@ -97,4 +97,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_GUI_PATTERN_EDITOR_H diff --git a/include/PatternStore.h b/include/PatternStore.h index 024505b83..fcb55e411 100644 --- a/include/PatternStore.h +++ b/include/PatternStore.h @@ -113,4 +113,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_PATTERN_STORE_H diff --git a/include/PatternTrack.h b/include/PatternTrack.h index 8e319216a..1c0c610d2 100644 --- a/include/PatternTrack.h +++ b/include/PatternTrack.h @@ -102,4 +102,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_PATTERN_TRACK_H diff --git a/include/PatternTrackView.h b/include/PatternTrackView.h index b4d373b5d..09a1ba37b 100644 --- a/include/PatternTrackView.h +++ b/include/PatternTrackView.h @@ -68,4 +68,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_GUI_PATTERN_TRACK_VIEW_H diff --git a/include/PeakController.h b/include/PeakController.h index ebdf49cb0..357e2a95d 100644 --- a/include/PeakController.h +++ b/include/PeakController.h @@ -107,4 +107,4 @@ protected: } // namespace lmms -#endif +#endif // LMMS_PEAK_CONTROLLER_H diff --git a/include/PerfLog.h b/include/PerfLog.h index f786de1cc..7b0b587f6 100644 --- a/include/PerfLog.h +++ b/include/PerfLog.h @@ -77,4 +77,4 @@ class PerfLogTimer } // namespace lmms -#endif +#endif // LMMS_PERFLOG_H diff --git a/include/Piano.h b/include/Piano.h index e22710bba..96f374840 100644 --- a/include/Piano.h +++ b/include/Piano.h @@ -89,4 +89,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_PIANO_H diff --git a/include/PianoRoll.h b/include/PianoRoll.h index 5013e3e1b..23fe7ddc6 100644 --- a/include/PianoRoll.h +++ b/include/PianoRoll.h @@ -573,4 +573,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_GUI_PIANO_ROLL_H diff --git a/include/PianoView.h b/include/PianoView.h index 1d5cd4be4..6421ff438 100644 --- a/include/PianoView.h +++ b/include/PianoView.h @@ -103,4 +103,4 @@ signals: } // namespace lmms -#endif +#endif // LMMS_GUI_PIANO_VIEW_H diff --git a/include/Pitch.h b/include/Pitch.h index 537941700..1f721b5f1 100644 --- a/include/Pitch.h +++ b/include/Pitch.h @@ -40,4 +40,4 @@ constexpr pitch_t DefaultPitch = 0; } // namespace lmms -#endif +#endif // LMMS_PITCH_H diff --git a/include/PixmapButton.h b/include/PixmapButton.h index b9568e5ad..e8f546dc0 100644 --- a/include/PixmapButton.h +++ b/include/PixmapButton.h @@ -67,4 +67,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_PIXMAP_BUTTON_H diff --git a/include/PlayHandle.h b/include/PlayHandle.h index 005ef17a0..c64931ac0 100644 --- a/include/PlayHandle.h +++ b/include/PlayHandle.h @@ -166,4 +166,4 @@ using ConstPlayHandleList = QList; } // namespace lmms -#endif +#endif // LMMS_PLAY_HANDLE_H diff --git a/include/Plugin.h b/include/Plugin.h index 0a7b68a55..b1982f98c 100644 --- a/include/Plugin.h +++ b/include/Plugin.h @@ -312,4 +312,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_PLUGIN_H diff --git a/include/PluginBrowser.h b/include/PluginBrowser.h index 262732398..dd2e0a5cb 100644 --- a/include/PluginBrowser.h +++ b/include/PluginBrowser.h @@ -83,4 +83,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_PLUGIN_BROWSER_H diff --git a/include/PluginFactory.h b/include/PluginFactory.h index 8ea020073..ad09b74ed 100644 --- a/include/PluginFactory.h +++ b/include/PluginFactory.h @@ -111,4 +111,4 @@ LMMS_EXPORT PluginFactory* getPluginFactory(); } // namespace lmms -#endif +#endif // LMMS_PLUGIN_FACTORY_H diff --git a/include/PluginIssue.h b/include/PluginIssue.h index c3f3e5dbe..87e895113 100644 --- a/include/PluginIssue.h +++ b/include/PluginIssue.h @@ -84,5 +84,4 @@ QDebug operator<<(QDebug stream, const PluginIssue& iss); } // namespace lmms - -#endif +#endif // LMMS_PLUGIN_ISSUE_H diff --git a/include/PluginView.h b/include/PluginView.h index 75576a8c8..3c78cb00a 100644 --- a/include/PluginView.h +++ b/include/PluginView.h @@ -47,4 +47,4 @@ public: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_PLUGIN_VIEW_H diff --git a/include/PositionLine.h b/include/PositionLine.h index 8c1d7d60a..3e798948f 100644 --- a/include/PositionLine.h +++ b/include/PositionLine.h @@ -51,4 +51,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_POSITION_LINE_H diff --git a/include/PresetPreviewPlayHandle.h b/include/PresetPreviewPlayHandle.h index e37e976e0..b8199a71b 100644 --- a/include/PresetPreviewPlayHandle.h +++ b/include/PresetPreviewPlayHandle.h @@ -69,4 +69,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_PRESET_PREVIEW_PLAY_HANDLE_H diff --git a/include/ProjectJournal.h b/include/ProjectJournal.h index 655d64a17..a4a263078 100644 --- a/include/ProjectJournal.h +++ b/include/ProjectJournal.h @@ -126,4 +126,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_PROJECT_JOURNAL_H diff --git a/include/ProjectNotes.h b/include/ProjectNotes.h index 51577f0b2..861dcb4a8 100644 --- a/include/ProjectNotes.h +++ b/include/ProjectNotes.h @@ -93,4 +93,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_PROJECT_NOTES_H diff --git a/include/ProjectRenderer.h b/include/ProjectRenderer.h index d9309d3db..95a1f53ed 100644 --- a/include/ProjectRenderer.h +++ b/include/ProjectRenderer.h @@ -103,4 +103,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_PROJECT_RENDERER_H diff --git a/include/ProjectVersion.h b/include/ProjectVersion.h index 5401e7126..d9a459a43 100644 --- a/include/ProjectVersion.h +++ b/include/ProjectVersion.h @@ -81,4 +81,4 @@ inline bool operator!=(const ProjectVersion & v1, const ProjectVersion & v2) { r } // namespace lmms -#endif +#endif // LMMS_PROJECT_VERSION_H diff --git a/include/QuadratureLfo.h b/include/QuadratureLfo.h index 59ff81ba7..6f007e072 100644 --- a/include/QuadratureLfo.h +++ b/include/QuadratureLfo.h @@ -100,4 +100,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_QUADRATURE_LFO_H diff --git a/include/RaiiHelpers.h b/include/RaiiHelpers.h index 827cc955d..3108dc080 100644 --- a/include/RaiiHelpers.h +++ b/include/RaiiHelpers.h @@ -64,4 +64,4 @@ using UniqueNullableResource = std::unique_ptr #include @@ -257,4 +256,4 @@ signals: } // namespace lmms -#endif +#endif // LMMS_TRACK_H diff --git a/include/TrackContainer.h b/include/TrackContainer.h index d0c116f3a..5ca831dbe 100644 --- a/include/TrackContainer.h +++ b/include/TrackContainer.h @@ -124,4 +124,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_TRACK_CONTAINER_H diff --git a/include/TrackContainerView.h b/include/TrackContainerView.h index df61666b8..d53291c33 100644 --- a/include/TrackContainerView.h +++ b/include/TrackContainerView.h @@ -218,4 +218,4 @@ signals: } // namespace lmms -#endif +#endif // LMMS_GUI_TRACK_CONTAINER_VIEW_H diff --git a/include/TrackContentWidget.h b/include/TrackContentWidget.h index 09239b392..1a3e14a0e 100644 --- a/include/TrackContentWidget.h +++ b/include/TrackContentWidget.h @@ -149,4 +149,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_GUI_TRACK_CONTENT_WIDGET_H diff --git a/include/TrackLabelButton.h b/include/TrackLabelButton.h index e7f159798..0d1c6e163 100644 --- a/include/TrackLabelButton.h +++ b/include/TrackLabelButton.h @@ -71,4 +71,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_TRACK_LABEL_BUTTON_H diff --git a/include/TrackOperationsWidget.h b/include/TrackOperationsWidget.h index 39e59ac98..4dbb5353c 100644 --- a/include/TrackOperationsWidget.h +++ b/include/TrackOperationsWidget.h @@ -80,4 +80,4 @@ signals: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_TRACK_OPERATIONS_WIDGET_H diff --git a/include/TrackRenameLineEdit.h b/include/TrackRenameLineEdit.h index 48fb96092..2f6a1f4fb 100644 --- a/include/TrackRenameLineEdit.h +++ b/include/TrackRenameLineEdit.h @@ -47,4 +47,4 @@ private: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_TRACK_RENAME_LINE_EDIT_H diff --git a/include/TrackView.h b/include/TrackView.h index a46c15d75..efa4f4a0a 100644 --- a/include/TrackView.h +++ b/include/TrackView.h @@ -176,4 +176,4 @@ private slots: } // namespace lmms -#endif +#endif // LMMS_GUI_TRACK_VIEW_H diff --git a/include/ValueBuffer.h b/include/ValueBuffer.h index 9e80b7ead..683d17fb1 100644 --- a/include/ValueBuffer.h +++ b/include/ValueBuffer.h @@ -57,4 +57,4 @@ public: } // namespace lmms -#endif +#endif // LMMS_VALUE_BUFFER_H diff --git a/include/VersionedSaveDialog.h b/include/VersionedSaveDialog.h index 326b11fde..6d707cd51 100644 --- a/include/VersionedSaveDialog.h +++ b/include/VersionedSaveDialog.h @@ -68,4 +68,4 @@ public slots: } // namespace lmms::gui -#endif +#endif // LMMS_GUI_VERSIONED_SAVE_DIALOG_H diff --git a/include/VstSyncController.h b/include/VstSyncController.h index f63bafc41..d3c6af051 100644 --- a/include/VstSyncController.h +++ b/include/VstSyncController.h @@ -62,4 +62,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_VST_SYNC_CONTROLLER_H diff --git a/include/VstSyncData.h b/include/VstSyncData.h index 11da91d8d..480bc7fb4 100644 --- a/include/VstSyncData.h +++ b/include/VstSyncData.h @@ -61,4 +61,4 @@ struct VstSyncData } // namespace lmms -#endif +#endif // LMMS_VST_SYNC_DATA_H diff --git a/include/aeffectx.h b/include/aeffectx.h index 188feae9f..a7f6002b8 100644 --- a/include/aeffectx.h +++ b/include/aeffectx.h @@ -22,8 +22,8 @@ * */ -#ifndef AEFFECTX_H -#define AEFFECTX_H +#ifndef LMMS_AEFFECTX_H +#define LMMS_AEFFECTX_H #include #include @@ -297,4 +297,4 @@ public: using audioMasterCallback = intptr_t (VST_CALL_CONV*)(AEffect*, int32_t, int32_t, intptr_t, void*, float); -#endif +#endif // LMMS_AEFFECTX_H diff --git a/include/base64.h b/include/base64.h index 01116e4cd..42066d564 100644 --- a/include/base64.h +++ b/include/base64.h @@ -53,4 +53,4 @@ namespace lmms::base64 } // namespace lmms::base64 -#endif +#endif // LMMS_BASE64_H diff --git a/include/debug.h b/include/debug.h index efabd4522..7cf51acaa 100644 --- a/include/debug.h +++ b/include/debug.h @@ -38,4 +38,4 @@ #include -#endif +#endif // LMMS_DEBUG_H diff --git a/include/denormals.h b/include/denormals.h index cfb0d5c92..92b84c7dd 100644 --- a/include/denormals.h +++ b/include/denormals.h @@ -35,7 +35,7 @@ int inline can_we_daz() #endif // __SSE__ -// Set denormal protection for this thread. +// Set denormal protection for this thread. void inline disable_denormals() { #ifdef __SSE__ @@ -50,4 +50,4 @@ void inline disable_denormals() } // namespace lmms -#endif +#endif // LMMS_DENORMALS_H diff --git a/include/embed.h b/include/embed.h index b3d1cbc21..7d69f7c7d 100644 --- a/include/embed.h +++ b/include/embed.h @@ -139,4 +139,4 @@ public: } // namespace lmms -#endif +#endif // LMMS_EMBED_H diff --git a/include/endian_handling.h b/include/endian_handling.h index 96bf11704..7ddb22f22 100644 --- a/include/endian_handling.h +++ b/include/endian_handling.h @@ -57,4 +57,4 @@ inline int32_t swap32IfBE( int32_t i ) } // namespace lmms -#endif +#endif // LMMS_ENDIAN_HANDLING_H diff --git a/include/fenv.h b/include/fenv.h index c9cc508f5..665d88155 100644 --- a/include/fenv.h +++ b/include/fenv.h @@ -45,4 +45,4 @@ inline int fedisableexcept(unsigned int excepts) return fesetenv(&fenv) ? -1 : old_excepts; } -#endif +#endif // defined(__APPLE__) && defined(__MACH__) diff --git a/include/fft_helpers.h b/include/fft_helpers.h index ab4238409..2d2a8d19e 100644 --- a/include/fft_helpers.h +++ b/include/fft_helpers.h @@ -108,4 +108,4 @@ int LMMS_EXPORT compressbands(const float * _absspec_buffer, float * _compressed } // namespace lmms -#endif +#endif // LMMS_FFT_HELPERS_H diff --git a/include/gui_templates.h b/include/gui_templates.h index 7a61ccfed..c0afbdfc0 100644 --- a/include/gui_templates.h +++ b/include/gui_templates.h @@ -68,4 +68,4 @@ inline QFont pointSizeF( QFont _f, float SIZE ) } // namespace lmms -#endif +#endif // LMMS_GUI_TEMPLATES_H diff --git a/include/interpolation.h b/include/interpolation.h index 9f3b3913d..fd2c29a04 100644 --- a/include/interpolation.h +++ b/include/interpolation.h @@ -139,4 +139,4 @@ inline float lagrangeInterpolate( float v0, float v1, float v2, float v3, float } // namespace lmms -#endif +#endif // LMMS_INTERPOLATION_H diff --git a/include/lmms_basics.h b/include/lmms_basics.h index 71cc4ce53..b566fa781 100644 --- a/include/lmms_basics.h +++ b/include/lmms_basics.h @@ -145,4 +145,4 @@ constexpr const char* UI_CTRL_KEY = } // namespace lmms -#endif +#endif // LMMS_TYPES_H diff --git a/include/lmms_constants.h b/include/lmms_constants.h index 7796f6bdf..e6fce9f4d 100644 --- a/include/lmms_constants.h +++ b/include/lmms_constants.h @@ -103,4 +103,4 @@ constexpr int ARANGE_SILENT_END = -10; } // namespace lmms -#endif +#endif // LMMS_CONSTANTS_H diff --git a/include/lmms_math.h b/include/lmms_math.h index a010a9d3e..1f896a683 100644 --- a/include/lmms_math.h +++ b/include/lmms_math.h @@ -328,4 +328,4 @@ static inline T absMin( T a, T b ) } // namespace lmms -#endif +#endif // LMMS_MATH_H diff --git a/include/panning.h b/include/panning.h index 52698677c..56ca04eee 100644 --- a/include/panning.h +++ b/include/panning.h @@ -56,4 +56,4 @@ inline int panningToMidi( panning_t _p ) } // namespace lmms -#endif +#endif // LMMS_PANNING_H diff --git a/include/panning_constants.h b/include/panning_constants.h index 6e894e9d8..8f40219f8 100644 --- a/include/panning_constants.h +++ b/include/panning_constants.h @@ -38,4 +38,4 @@ constexpr panning_t DefaultPanning = PanningCenter; } // namespace lmms -#endif +#endif // LMMS_PANNING_CONSTANTS_H diff --git a/include/shared_object.h b/include/shared_object.h index dfc94b96a..e9fdb57a3 100644 --- a/include/shared_object.h +++ b/include/shared_object.h @@ -86,4 +86,4 @@ private: } // namespace lmms -#endif +#endif // LMMS_SHARED_OBJECT_H diff --git a/include/versioninfo.h b/include/versioninfo.h index de852b59c..f224b62c5 100644 --- a/include/versioninfo.h +++ b/include/versioninfo.h @@ -51,4 +51,4 @@ constexpr const char* LMMS_BUILDCONF_PLATFORM = "win32"; constexpr const char* LMMS_BUILDCONF_PLATFORM = "Haiku"; #endif -#endif +#endif // LMMS_VERSION_INFO_H diff --git a/include/volume.h b/include/volume.h index 4d26cc815..382f76780 100644 --- a/include/volume.h +++ b/include/volume.h @@ -43,4 +43,4 @@ struct StereoVolumeVector } // namespace lmms -#endif +#endif // LMMS_VOLUME_H From d89f53b4b0d71be4b128cc790adfa2fbffa7acde Mon Sep 17 00:00:00 2001 From: Dalton Messmer Date: Sat, 7 Jan 2023 21:12:23 -0500 Subject: [PATCH 5/5] Fix mistakes --- include/Editor.h | 6 +++--- include/Lv2ViewBase.h | 6 +++--- include/aeffectx.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/Editor.h b/include/Editor.h index c5e9a2d05..681bce46c 100644 --- a/include/Editor.h +++ b/include/Editor.h @@ -22,8 +22,8 @@ * */ -#ifndef LMMS_EDITOR_H -#define LMMS_EDITOR_H +#ifndef LMMS_GUI_EDITOR_H +#define LMMS_GUI_EDITOR_H #include #include @@ -113,4 +113,4 @@ protected: } // namespace lmms::gui -#endif // LMMS_EDITOR_H +#endif // LMMS_GUI_EDITOR_H diff --git a/include/Lv2ViewBase.h b/include/Lv2ViewBase.h index f6d97d6aa..d27f35cec 100644 --- a/include/Lv2ViewBase.h +++ b/include/Lv2ViewBase.h @@ -22,8 +22,8 @@ * */ -#ifndef LMMS_LV2_VIEW_BASE_H -#define LMMS_LV2_VIEW_BASE_H +#ifndef LMMS_GUI_LV2_VIEW_BASE_H +#define LMMS_GUI_LV2_VIEW_BASE_H #include "lmmsconfig.h" @@ -109,4 +109,4 @@ private: #endif // LMMS_HAVE_LV2 -#endif // LMMS_LV2_VIEW_BASE_H +#endif // LMMS_GUI_LV2_VIEW_BASE_H diff --git a/include/aeffectx.h b/include/aeffectx.h index a7f6002b8..2c69464cc 100644 --- a/include/aeffectx.h +++ b/include/aeffectx.h @@ -22,8 +22,8 @@ * */ -#ifndef LMMS_AEFFECTX_H -#define LMMS_AEFFECTX_H +#ifndef AEFFECTX_H +#define AEFFECTX_H #include #include @@ -297,4 +297,4 @@ public: using audioMasterCallback = intptr_t (VST_CALL_CONV*)(AEffect*, int32_t, int32_t, intptr_t, void*, float); -#endif // LMMS_AEFFECTX_H +#endif // AEFFECTX_H