From a658ad41de36dcf6bd5497e8ea089842072ff2e9 Mon Sep 17 00:00:00 2001 From: jules Date: Wed, 25 Jul 2018 12:18:43 +0100 Subject: [PATCH] Removed some erroneous noexcepts --- modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp | 4 ++-- modules/juce_audio_basics/mpe/juce_MPEInstrument.h | 4 ++-- modules/juce_gui_basics/menus/juce_MenuBarModel.cpp | 6 +++--- modules/juce_gui_basics/menus/juce_MenuBarModel.h | 6 +++--- modules/juce_gui_extra/code_editor/juce_CodeDocument.cpp | 4 ++-- modules/juce_gui_extra/code_editor/juce_CodeDocument.h | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp b/modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp index b2f2cb6a6d..f709301afd 100644 --- a/modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp +++ b/modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp @@ -129,12 +129,12 @@ void MPEInstrument::setTimbreTrackingMode (TrackingMode modeToUse) } //============================================================================== -void MPEInstrument::addListener (Listener* const listenerToAdd) noexcept +void MPEInstrument::addListener (Listener* listenerToAdd) { listeners.add (listenerToAdd); } -void MPEInstrument::removeListener (Listener* const listenerToRemove) noexcept +void MPEInstrument::removeListener (Listener* listenerToRemove) { listeners.remove (listenerToRemove); } diff --git a/modules/juce_audio_basics/mpe/juce_MPEInstrument.h b/modules/juce_audio_basics/mpe/juce_MPEInstrument.h index 4582065df3..61f4d6fa93 100644 --- a/modules/juce_audio_basics/mpe/juce_MPEInstrument.h +++ b/modules/juce_audio_basics/mpe/juce_MPEInstrument.h @@ -286,10 +286,10 @@ public: //============================================================================== /** Adds a listener. */ - void addListener (Listener* listenerToAdd) noexcept; + void addListener (Listener* listenerToAdd); /** Removes a listener. */ - void removeListener (Listener* listenerToRemove) noexcept; + void removeListener (Listener* listenerToRemove); //============================================================================== /** Puts the instrument into legacy mode. diff --git a/modules/juce_gui_basics/menus/juce_MenuBarModel.cpp b/modules/juce_gui_basics/menus/juce_MenuBarModel.cpp index 0c599e43f8..e72722479b 100644 --- a/modules/juce_gui_basics/menus/juce_MenuBarModel.cpp +++ b/modules/juce_gui_basics/menus/juce_MenuBarModel.cpp @@ -43,7 +43,7 @@ void MenuBarModel::menuItemsChanged() triggerAsyncUpdate(); } -void MenuBarModel::setApplicationCommandManagerToWatch (ApplicationCommandManager* const newManager) noexcept +void MenuBarModel::setApplicationCommandManagerToWatch (ApplicationCommandManager* newManager) { if (manager != newManager) { @@ -57,12 +57,12 @@ void MenuBarModel::setApplicationCommandManagerToWatch (ApplicationCommandManage } } -void MenuBarModel::addListener (Listener* const newListener) noexcept +void MenuBarModel::addListener (Listener* newListener) { listeners.add (newListener); } -void MenuBarModel::removeListener (Listener* const listenerToRemove) noexcept +void MenuBarModel::removeListener (Listener* listenerToRemove) { // Trying to remove a listener that isn't on the list! // If this assertion happens because this object is a dangling pointer, make sure you've not diff --git a/modules/juce_gui_basics/menus/juce_MenuBarModel.h b/modules/juce_gui_basics/menus/juce_MenuBarModel.h index 792337d1f0..245836d2a3 100644 --- a/modules/juce_gui_basics/menus/juce_MenuBarModel.h +++ b/modules/juce_gui_basics/menus/juce_MenuBarModel.h @@ -69,7 +69,7 @@ public: This will also allow it to flash a menu name when a command from that menu is invoked using a keystroke. */ - void setApplicationCommandManagerToWatch (ApplicationCommandManager* manager) noexcept; + void setApplicationCommandManagerToWatch (ApplicationCommandManager* manager); //============================================================================== /** A class to receive callbacks when a MenuBarModel changes. @@ -104,12 +104,12 @@ public: @see removeListener */ - void addListener (Listener* listenerToAdd) noexcept; + void addListener (Listener* listenerToAdd); /** Removes a listener. @see addListener */ - void removeListener (Listener* listenerToRemove) noexcept; + void removeListener (Listener* listenerToRemove); //============================================================================== /** This method must return a list of the names of the menus. */ diff --git a/modules/juce_gui_extra/code_editor/juce_CodeDocument.cpp b/modules/juce_gui_extra/code_editor/juce_CodeDocument.cpp index bfe6d0e6f3..165a405f37 100644 --- a/modules/juce_gui_extra/code_editor/juce_CodeDocument.cpp +++ b/modules/juce_gui_extra/code_editor/juce_CodeDocument.cpp @@ -755,8 +755,8 @@ void CodeDocument::checkLastLineStatus() } //============================================================================== -void CodeDocument::addListener (CodeDocument::Listener* l) noexcept { listeners.add (l); } -void CodeDocument::removeListener (CodeDocument::Listener* l) noexcept { listeners.remove (l); } +void CodeDocument::addListener (CodeDocument::Listener* l) { listeners.add (l); } +void CodeDocument::removeListener (CodeDocument::Listener* l) { listeners.remove (l); } //============================================================================== struct CodeDocument::InsertAction : public UndoableAction diff --git a/modules/juce_gui_extra/code_editor/juce_CodeDocument.h b/modules/juce_gui_extra/code_editor/juce_CodeDocument.h index 99ad87a770..43eeccdf8a 100644 --- a/modules/juce_gui_extra/code_editor/juce_CodeDocument.h +++ b/modules/juce_gui_extra/code_editor/juce_CodeDocument.h @@ -340,12 +340,12 @@ public: If the listener is already registered, this method has no effect. @see removeListener */ - void addListener (Listener* listener) noexcept; + void addListener (Listener* listener); /** Deregisters a listener. @see addListener */ - void removeListener (Listener* listener) noexcept; + void removeListener (Listener* listener); //============================================================================== /** Iterates the text in a CodeDocument.