From db097f71014aa19663b3cf1ad5866c605e85da57 Mon Sep 17 00:00:00 2001 From: Michael Hetrick Date: Wed, 29 Nov 2017 10:42:58 -0600 Subject: [PATCH] Replace deprecated pushChild with addChild --- src/Braids.cpp | 12 ++++++------ src/Branches.cpp | 8 ++++---- src/Clouds.cpp | 40 ++++++++++++++++++++-------------------- src/Elements.cpp | 10 +++++----- src/Frames.cpp | 38 +++++++++++++++++++------------------- src/Rings.cpp | 22 +++++++++++----------- src/Tides.cpp | 4 ++-- 7 files changed, 67 insertions(+), 67 deletions(-) diff --git a/src/Braids.cpp b/src/Braids.cpp index 5d4540e..4d22b90 100644 --- a/src/Braids.cpp +++ b/src/Braids.cpp @@ -341,12 +341,12 @@ Menu *BraidsWidget::createContextMenu() { Braids *braids = dynamic_cast(module); assert(braids); - menu->pushChild(construct()); - menu->pushChild(construct(&MenuEntry::text, "Options")); - menu->pushChild(construct(&MenuEntry::text, "META", &BraidsSettingItem::setting, &braids->settings.meta_modulation)); - menu->pushChild(construct(&MenuEntry::text, "DRFT", &BraidsSettingItem::setting, &braids->settings.vco_drift, &BraidsSettingItem::onValue, 4)); - menu->pushChild(construct(&MenuEntry::text, "SIGN", &BraidsSettingItem::setting, &braids->settings.signature, &BraidsSettingItem::onValue, 4)); - menu->pushChild(construct(&MenuEntry::text, "Low CPU", &BraidsLowCpuItem::braids, braids)); + menu->addChild(construct()); + menu->addChild(construct(&MenuEntry::text, "Options")); + menu->addChild(construct(&MenuEntry::text, "META", &BraidsSettingItem::setting, &braids->settings.meta_modulation)); + menu->addChild(construct(&MenuEntry::text, "DRFT", &BraidsSettingItem::setting, &braids->settings.vco_drift, &BraidsSettingItem::onValue, 4)); + menu->addChild(construct(&MenuEntry::text, "SIGN", &BraidsSettingItem::setting, &braids->settings.signature, &BraidsSettingItem::onValue, 4)); + menu->addChild(construct(&MenuEntry::text, "Low CPU", &BraidsLowCpuItem::braids, braids)); return menu; } diff --git a/src/Branches.cpp b/src/Branches.cpp index 5f7e23a..8355872 100644 --- a/src/Branches.cpp +++ b/src/Branches.cpp @@ -141,11 +141,11 @@ Menu *BranchesWidget::createContextMenu() { Branches *branches = dynamic_cast(module); assert(branches); - menu->pushChild(construct()); + menu->addChild(construct()); - menu->pushChild(construct(&MenuEntry::text, "Channels")); - menu->pushChild(construct(&MenuEntry::text, "Channel 1 mode", &BranchesModeItem::branches, branches, &BranchesModeItem::channel, 0)); - menu->pushChild(construct(&MenuEntry::text, "Channel 2 mode", &BranchesModeItem::branches, branches, &BranchesModeItem::channel, 1)); + menu->addChild(construct(&MenuEntry::text, "Channels")); + menu->addChild(construct(&MenuEntry::text, "Channel 1 mode", &BranchesModeItem::branches, branches, &BranchesModeItem::channel, 0)); + menu->addChild(construct(&MenuEntry::text, "Channel 2 mode", &BranchesModeItem::branches, branches, &BranchesModeItem::channel, 1)); return menu; } diff --git a/src/Clouds.cpp b/src/Clouds.cpp index 052d6b7..0ce210c 100644 --- a/src/Clouds.cpp +++ b/src/Clouds.cpp @@ -374,26 +374,26 @@ Menu *CloudsWidget::createContextMenu() { Menu *menu = ModuleWidget::createContextMenu(); Clouds *module = dynamic_cast(this->module); - menu->pushChild(construct()); - menu->pushChild(construct(&MenuEntry::text, "Blend knob")); - menu->pushChild(construct(&MenuEntry::text, "Wet/dry", &CloudsBlendItem::module, module, &CloudsBlendItem::blendMode, 0)); - menu->pushChild(construct(&MenuEntry::text, "Spread", &CloudsBlendItem::module, module, &CloudsBlendItem::blendMode, 1)); - menu->pushChild(construct(&MenuEntry::text, "Feedback", &CloudsBlendItem::module, module, &CloudsBlendItem::blendMode, 2)); - menu->pushChild(construct(&MenuEntry::text, "Reverb", &CloudsBlendItem::module, module, &CloudsBlendItem::blendMode, 3)); - - menu->pushChild(construct()); - menu->pushChild(construct(&MenuEntry::text, "Alternative mode")); - menu->pushChild(construct(&MenuEntry::text, "Granular", &CloudsPlaybackItem::module, module, &CloudsPlaybackItem::playback, clouds::PLAYBACK_MODE_GRANULAR)); - menu->pushChild(construct(&MenuEntry::text, "Pitch-shifter/time-stretcher", &CloudsPlaybackItem::module, module, &CloudsPlaybackItem::playback, clouds::PLAYBACK_MODE_STRETCH)); - menu->pushChild(construct(&MenuEntry::text, "Looping delay", &CloudsPlaybackItem::module, module, &CloudsPlaybackItem::playback, clouds::PLAYBACK_MODE_LOOPING_DELAY)); - menu->pushChild(construct(&MenuEntry::text, "Spectral madness", &CloudsPlaybackItem::module, module, &CloudsPlaybackItem::playback, clouds::PLAYBACK_MODE_SPECTRAL)); - - menu->pushChild(construct()); - menu->pushChild(construct(&MenuEntry::text, "Quality")); - menu->pushChild(construct(&MenuEntry::text, "1s 32kHz 16-bit stereo", &CloudsQualityItem::module, module, &CloudsQualityItem::quality, 0)); - menu->pushChild(construct(&MenuEntry::text, "2s 32kHz 16-bit mono", &CloudsQualityItem::module, module, &CloudsQualityItem::quality, 1)); - menu->pushChild(construct(&MenuEntry::text, "4s 16kHz 8-bit µ-law stereo", &CloudsQualityItem::module, module, &CloudsQualityItem::quality, 2)); - menu->pushChild(construct(&MenuEntry::text, "8s 16kHz 8-bit µ-law mono", &CloudsQualityItem::module, module, &CloudsQualityItem::quality, 3)); + menu->addChild(construct()); + menu->addChild(construct(&MenuEntry::text, "Blend knob")); + menu->addChild(construct(&MenuEntry::text, "Wet/dry", &CloudsBlendItem::module, module, &CloudsBlendItem::blendMode, 0)); + menu->addChild(construct(&MenuEntry::text, "Spread", &CloudsBlendItem::module, module, &CloudsBlendItem::blendMode, 1)); + menu->addChild(construct(&MenuEntry::text, "Feedback", &CloudsBlendItem::module, module, &CloudsBlendItem::blendMode, 2)); + menu->addChild(construct(&MenuEntry::text, "Reverb", &CloudsBlendItem::module, module, &CloudsBlendItem::blendMode, 3)); + + menu->addChild(construct()); + menu->addChild(construct(&MenuEntry::text, "Alternative mode")); + menu->addChild(construct(&MenuEntry::text, "Granular", &CloudsPlaybackItem::module, module, &CloudsPlaybackItem::playback, clouds::PLAYBACK_MODE_GRANULAR)); + menu->addChild(construct(&MenuEntry::text, "Pitch-shifter/time-stretcher", &CloudsPlaybackItem::module, module, &CloudsPlaybackItem::playback, clouds::PLAYBACK_MODE_STRETCH)); + menu->addChild(construct(&MenuEntry::text, "Looping delay", &CloudsPlaybackItem::module, module, &CloudsPlaybackItem::playback, clouds::PLAYBACK_MODE_LOOPING_DELAY)); + menu->addChild(construct(&MenuEntry::text, "Spectral madness", &CloudsPlaybackItem::module, module, &CloudsPlaybackItem::playback, clouds::PLAYBACK_MODE_SPECTRAL)); + + menu->addChild(construct()); + menu->addChild(construct(&MenuEntry::text, "Quality")); + menu->addChild(construct(&MenuEntry::text, "1s 32kHz 16-bit stereo", &CloudsQualityItem::module, module, &CloudsQualityItem::quality, 0)); + menu->addChild(construct(&MenuEntry::text, "2s 32kHz 16-bit mono", &CloudsQualityItem::module, module, &CloudsQualityItem::quality, 1)); + menu->addChild(construct(&MenuEntry::text, "4s 16kHz 8-bit µ-law stereo", &CloudsQualityItem::module, module, &CloudsQualityItem::quality, 2)); + menu->addChild(construct(&MenuEntry::text, "8s 16kHz 8-bit µ-law mono", &CloudsQualityItem::module, module, &CloudsQualityItem::quality, 3)); return menu; } diff --git a/src/Elements.cpp b/src/Elements.cpp index 2a0b3d6..80a476d 100644 --- a/src/Elements.cpp +++ b/src/Elements.cpp @@ -316,11 +316,11 @@ Menu *ElementsWidget::createContextMenu() { Elements *elements = dynamic_cast(module); assert(elements); - menu->pushChild(construct()); - menu->pushChild(construct(&MenuEntry::text, "Alternative models")); - menu->pushChild(construct(&MenuEntry::text, "Original", &ElementsModalItem::elements, elements, &ElementsModalItem::model, 0)); - menu->pushChild(construct(&MenuEntry::text, "Non-linear string", &ElementsModalItem::elements, elements, &ElementsModalItem::model, 1)); - menu->pushChild(construct(&MenuEntry::text, "Chords", &ElementsModalItem::elements, elements, &ElementsModalItem::model, 2)); + menu->addChild(construct()); + menu->addChild(construct(&MenuEntry::text, "Alternative models")); + menu->addChild(construct(&MenuEntry::text, "Original", &ElementsModalItem::elements, elements, &ElementsModalItem::model, 0)); + menu->addChild(construct(&MenuEntry::text, "Non-linear string", &ElementsModalItem::elements, elements, &ElementsModalItem::model, 1)); + menu->addChild(construct(&MenuEntry::text, "Chords", &ElementsModalItem::elements, elements, &ElementsModalItem::model, 2)); return menu; } diff --git a/src/Frames.cpp b/src/Frames.cpp index 5b423f1..8cc0969 100644 --- a/src/Frames.cpp +++ b/src/Frames.cpp @@ -376,17 +376,17 @@ struct FramesChannelSettingsItem : MenuItem { Menu *menu = new Menu(); // TODO - menu->pushChild(construct(&MenuEntry::text, "Interpolation Curve")); - menu->pushChild(construct(&MenuEntry::text, "Step", &FramesCurveItem::frames, frames, &FramesCurveItem::channel, channel, &FramesCurveItem::curve, frames::EASING_CURVE_STEP)); - menu->pushChild(construct(&MenuEntry::text, "Linear", &FramesCurveItem::frames, frames, &FramesCurveItem::channel, channel, &FramesCurveItem::curve, frames::EASING_CURVE_LINEAR)); - menu->pushChild(construct(&MenuEntry::text, "Accelerating", &FramesCurveItem::frames, frames, &FramesCurveItem::channel, channel, &FramesCurveItem::curve, frames::EASING_CURVE_IN_QUARTIC)); - menu->pushChild(construct(&MenuEntry::text, "Decelerating", &FramesCurveItem::frames, frames, &FramesCurveItem::channel, channel, &FramesCurveItem::curve, frames::EASING_CURVE_OUT_QUARTIC)); - menu->pushChild(construct(&MenuEntry::text, "Smooth Departure/Arrival", &FramesCurveItem::frames, frames, &FramesCurveItem::channel, channel, &FramesCurveItem::curve, frames::EASING_CURVE_SINE)); - menu->pushChild(construct(&MenuEntry::text, "Bouncing", &FramesCurveItem::frames, frames, &FramesCurveItem::channel, channel, &FramesCurveItem::curve, frames::EASING_CURVE_BOUNCE)); - menu->pushChild(construct()); - menu->pushChild(construct(&MenuEntry::text, "Response Curve")); - menu->pushChild(construct(&MenuEntry::text, "Linear", &FramesResponseItem::frames, frames, &FramesResponseItem::channel, channel, &FramesResponseItem::response, 0)); - menu->pushChild(construct(&MenuEntry::text, "Exponential", &FramesResponseItem::frames, frames, &FramesResponseItem::channel, channel, &FramesResponseItem::response, 255)); + menu->addChild(construct(&MenuEntry::text, "Interpolation Curve")); + menu->addChild(construct(&MenuEntry::text, "Step", &FramesCurveItem::frames, frames, &FramesCurveItem::channel, channel, &FramesCurveItem::curve, frames::EASING_CURVE_STEP)); + menu->addChild(construct(&MenuEntry::text, "Linear", &FramesCurveItem::frames, frames, &FramesCurveItem::channel, channel, &FramesCurveItem::curve, frames::EASING_CURVE_LINEAR)); + menu->addChild(construct(&MenuEntry::text, "Accelerating", &FramesCurveItem::frames, frames, &FramesCurveItem::channel, channel, &FramesCurveItem::curve, frames::EASING_CURVE_IN_QUARTIC)); + menu->addChild(construct(&MenuEntry::text, "Decelerating", &FramesCurveItem::frames, frames, &FramesCurveItem::channel, channel, &FramesCurveItem::curve, frames::EASING_CURVE_OUT_QUARTIC)); + menu->addChild(construct(&MenuEntry::text, "Smooth Departure/Arrival", &FramesCurveItem::frames, frames, &FramesCurveItem::channel, channel, &FramesCurveItem::curve, frames::EASING_CURVE_SINE)); + menu->addChild(construct(&MenuEntry::text, "Bouncing", &FramesCurveItem::frames, frames, &FramesCurveItem::channel, channel, &FramesCurveItem::curve, frames::EASING_CURVE_BOUNCE)); + menu->addChild(construct()); + menu->addChild(construct(&MenuEntry::text, "Response Curve")); + menu->addChild(construct(&MenuEntry::text, "Linear", &FramesResponseItem::frames, frames, &FramesResponseItem::channel, channel, &FramesResponseItem::response, 0)); + menu->addChild(construct(&MenuEntry::text, "Exponential", &FramesResponseItem::frames, frames, &FramesResponseItem::channel, channel, &FramesResponseItem::response, 255)); return menu; } @@ -420,17 +420,17 @@ Menu *FramesWidget::createContextMenu() { Frames *frames = dynamic_cast(module); assert(frames); - menu->pushChild(construct()); - menu->pushChild(construct(&MenuEntry::text, "Channel Settings")); + menu->addChild(construct()); + menu->addChild(construct(&MenuEntry::text, "Channel Settings")); for (int i = 0; i < 4; i++) { - menu->pushChild(construct(&MenuItem::text, stringf("Channel %d", i + 1), &FramesChannelSettingsItem::frames, frames, &FramesChannelSettingsItem::channel, i)); + menu->addChild(construct(&MenuItem::text, stringf("Channel %d", i + 1), &FramesChannelSettingsItem::frames, frames, &FramesChannelSettingsItem::channel, i)); } - menu->pushChild(construct(&MenuItem::text, "Clear Keyframes", &FramesClearItem::frames, frames)); + menu->addChild(construct(&MenuItem::text, "Clear Keyframes", &FramesClearItem::frames, frames)); - menu->pushChild(construct()); - menu->pushChild(construct(&MenuEntry::text, "Mode")); - menu->pushChild(construct(&MenuItem::text, "Keyframer", &FramesModeItem::frames, frames, &FramesModeItem::poly_lfo_mode, false)); - menu->pushChild(construct(&MenuItem::text, "Poly LFO", &FramesModeItem::frames, frames, &FramesModeItem::poly_lfo_mode, true)); + menu->addChild(construct()); + menu->addChild(construct(&MenuEntry::text, "Mode")); + menu->addChild(construct(&MenuItem::text, "Keyframer", &FramesModeItem::frames, frames, &FramesModeItem::poly_lfo_mode, false)); + menu->addChild(construct(&MenuItem::text, "Poly LFO", &FramesModeItem::frames, frames, &FramesModeItem::poly_lfo_mode, true)); return menu; } diff --git a/src/Rings.cpp b/src/Rings.cpp index cd76fba..1bcc96c 100644 --- a/src/Rings.cpp +++ b/src/Rings.cpp @@ -327,17 +327,17 @@ Menu *RingsWidget::createContextMenu() { Rings *rings = dynamic_cast(module); assert(rings); - menu->pushChild(construct()); - menu->pushChild(construct(&MenuLabel::text, "Resonator")); - menu->pushChild(construct(&MenuEntry::text, "Modal resonator", &RingsModelItem::rings, rings, &RingsModelItem::model, rings::RESONATOR_MODEL_MODAL)); - menu->pushChild(construct(&MenuEntry::text, "Sympathetic strings", &RingsModelItem::rings, rings, &RingsModelItem::model, rings::RESONATOR_MODEL_SYMPATHETIC_STRING)); - menu->pushChild(construct(&MenuEntry::text, "Modulated/inharmonic string", &RingsModelItem::rings, rings, &RingsModelItem::model, rings::RESONATOR_MODEL_STRING)); - menu->pushChild(construct(&MenuEntry::text, "FM voice", &RingsModelItem::rings, rings, &RingsModelItem::model, rings::RESONATOR_MODEL_FM_VOICE)); - menu->pushChild(construct(&MenuEntry::text, "Quantized sympathetic strings", &RingsModelItem::rings, rings, &RingsModelItem::model, rings::RESONATOR_MODEL_SYMPATHETIC_STRING_QUANTIZED)); - menu->pushChild(construct(&MenuEntry::text, "Reverb string", &RingsModelItem::rings, rings, &RingsModelItem::model, rings::RESONATOR_MODEL_STRING_AND_REVERB)); - - menu->pushChild(construct()); - menu->pushChild(construct(&MenuEntry::text, "Disastrous Peace", &RingsEasterEggItem::rings, rings)); + menu->addChild(construct()); + menu->addChild(construct(&MenuLabel::text, "Resonator")); + menu->addChild(construct(&MenuEntry::text, "Modal resonator", &RingsModelItem::rings, rings, &RingsModelItem::model, rings::RESONATOR_MODEL_MODAL)); + menu->addChild(construct(&MenuEntry::text, "Sympathetic strings", &RingsModelItem::rings, rings, &RingsModelItem::model, rings::RESONATOR_MODEL_SYMPATHETIC_STRING)); + menu->addChild(construct(&MenuEntry::text, "Modulated/inharmonic string", &RingsModelItem::rings, rings, &RingsModelItem::model, rings::RESONATOR_MODEL_STRING)); + menu->addChild(construct(&MenuEntry::text, "FM voice", &RingsModelItem::rings, rings, &RingsModelItem::model, rings::RESONATOR_MODEL_FM_VOICE)); + menu->addChild(construct(&MenuEntry::text, "Quantized sympathetic strings", &RingsModelItem::rings, rings, &RingsModelItem::model, rings::RESONATOR_MODEL_SYMPATHETIC_STRING_QUANTIZED)); + menu->addChild(construct(&MenuEntry::text, "Reverb string", &RingsModelItem::rings, rings, &RingsModelItem::model, rings::RESONATOR_MODEL_STRING_AND_REVERB)); + + menu->addChild(construct()); + menu->addChild(construct(&MenuEntry::text, "Disastrous Peace", &RingsEasterEggItem::rings, rings)); return menu; } \ No newline at end of file diff --git a/src/Tides.cpp b/src/Tides.cpp index 15ba962..508c6f8 100644 --- a/src/Tides.cpp +++ b/src/Tides.cpp @@ -275,8 +275,8 @@ Menu *TidesWidget::createContextMenu() { Tides *tides = dynamic_cast(module); assert(tides); - menu->pushChild(construct()); - menu->pushChild(construct(&MenuEntry::text, "Sheep", &TidesSheepItem::tides, tides)); + menu->addChild(construct()); + menu->addChild(construct(&MenuEntry::text, "Sheep", &TidesSheepItem::tides, tides)); return menu; }