mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Got rid of some methods which had inexplicably ended up marked both 'virtual' and 'override'.

Browse source
This commit is contained in:
jules 2019-01-18 09:09:06 +00:00
parent cdb55f70c2
commit da2b10ada6
19 changed files with 47 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/BLOCKS/BlocksMonitorDemo.h
View file

@ -112,7 +112,7 @@ public:
}
/** Subclasses should override this to paint the Block object on the screen */
virtual void paint (Graphics&) override = 0;
void paint (Graphics&) override = 0;
/** Subclasses can override this to receive button down events from the Block */
virtual void handleButtonPressed (ControlButton::ButtonFunction, uint32) {}
@ -446,7 +446,7 @@ private:
{}
/** Subclasses should override this to paint the button on the screen */
virtual void paint (Graphics&) override = 0;
void paint (Graphics&) override = 0;
/** Sets the colour of the button */
void setColour (Colour c) { componentColour = c; }

2
examples/BLOCKS/BlocksSynthDemo.h
View file

@ -122,7 +122,7 @@ public:
}
/** Subclasses should override this to say whether they can play the given sound */
virtual bool canPlaySound (SynthesiserSound*) override = 0;
bool canPlaySound (SynthesiserSound*) override = 0;
/** Subclasses should override this to render a waveshape */
virtual double renderWaveShape (const double currentPhase) = 0;

2
extras/Projucer/Source/LiveBuildEngine/UI/jucer_ErrorListComponent.h
View file

@ -234,7 +234,7 @@ private:
bool mightContainSubItems() override { return getNumSubItems() != 0; }
String getUniqueName() const override { return uniqueID; }
void paintContent (Graphics& g, const Rectangle<int>& area) override
void paintContent (Graphics& g, Rectangle<int> area) override
{
jassert (area.getWidth() >= 0);

2
extras/Projucer/Source/Utility/UI/jucer_JucerTreeViewBase.cpp
View file

@ -118,7 +118,7 @@ Colour JucerTreeViewBase::getContentColour (bool isIcon) const
return getOwnerView()->findColour (isIcon ? treeIconColourId : defaultTextColourId);
}
void JucerTreeViewBase::paintContent (Graphics& g, const Rectangle<int>& area)
void JucerTreeViewBase::paintContent (Graphics& g, Rectangle<int> area)
{
g.setFont (getFont());
g.setColour (getContentColour (false));

7
extras/Projucer/Source/Utility/UI/jucer_JucerTreeViewBase.h
View file

@ -45,6 +45,8 @@ public:
void itemClicked (const MouseEvent& e) override;
void itemSelectionChanged (bool isNowSelected) override;
void itemDoubleClicked (const MouseEvent&) override;
Component* createItemComponent() override;
String getTooltip() override { return {}; }
void cancelDelayedSelectionTimer();
@ -59,12 +61,11 @@ public:
virtual Icon getIcon() const = 0;
virtual bool isIconCrossedOut() const { return false; }
virtual void paintIcon (Graphics& g, Rectangle<float> area);
virtual void paintContent (Graphics& g, const Rectangle<int>& area);
virtual void paintContent (Graphics& g, Rectangle<int> area);
virtual int getRightHandButtonSpace() { return 0; }
virtual Colour getContentColour (bool isIcon) const;
virtual int getMillisecsAllowedForDragGesture() { return 120; }
virtual File getDraggableFile() const { return {}; }
virtual Component* createItemComponent() override;
void refreshSubItems();
virtual void deleteItem();
@ -79,8 +80,6 @@ public:
virtual void handlePopupMenuResult (int resultCode);
virtual void setSearchFilter (const String&) {}
String getTooltip() override { return {}; }
//==============================================================================
// To handle situations where an item gets deleted before openness is
// restored for it, this OpennessRestorer keeps only a pointer to the

2
modules/juce_audio_basics/buffers/juce_AudioDataConverters.cpp
View file

@ -479,7 +479,7 @@ public:
static void test (UnitTest& unitTest, bool inPlace, Random& r)
{
constexpr int numSamples = 2048;
const int numSamples = 2048;
int32 original[numSamples], converted[numSamples], reversed[numSamples];
{

16
modules/juce_audio_basics/mpe/juce_MPESynthesiser.h
View file

@ -188,7 +188,7 @@ protected:
renderNextBlock(). Do not call it yourself, otherwise the internal MPE note state
will become inconsistent.
*/
virtual void noteAdded (MPENote newNote) override;
void noteAdded (MPENote newNote) override;
/** Stops playing a note.
@ -203,7 +203,7 @@ protected:
renderNextBlock(). Do not call it yourself, otherwise the internal MPE note state
will become inconsistent.
*/
virtual void noteReleased (MPENote finishedNote) override;
void noteReleased (MPENote finishedNote) override;
/** Will find any voice that is currently playing changedNote, update its
currently playing note, and call its notePressureChanged method.
@ -211,7 +211,7 @@ protected:
This method will be called automatically according to the midi data passed into
renderNextBlock(). Do not call it yourself.
*/
virtual void notePressureChanged (MPENote changedNote) override;
void notePressureChanged (MPENote changedNote) override;
/** Will find any voice that is currently playing changedNote, update its
currently playing note, and call its notePitchbendChanged method.
@ -219,7 +219,7 @@ protected:
This method will be called automatically according to the midi data passed into
renderNextBlock(). Do not call it yourself.
*/
virtual void notePitchbendChanged (MPENote changedNote) override;
void notePitchbendChanged (MPENote changedNote) override;
/** Will find any voice that is currently playing changedNote, update its
currently playing note, and call its noteTimbreChanged method.
@ -227,7 +227,7 @@ protected:
This method will be called automatically according to the midi data passed into
renderNextBlock(). Do not call it yourself.
*/
virtual void noteTimbreChanged (MPENote changedNote) override;
void noteTimbreChanged (MPENote changedNote) override;
/** Will find any voice that is currently playing changedNote, update its
currently playing note, and call its noteKeyStateChanged method.
@ -235,14 +235,14 @@ protected:
This method will be called automatically according to the midi data passed into
renderNextBlock(). Do not call it yourself.
*/
virtual void noteKeyStateChanged (MPENote changedNote) override;
void noteKeyStateChanged (MPENote changedNote) override;
//==============================================================================
/** This will simply call renderNextBlock for each currently active
voice and fill the buffer with the sum.
Override this method if you need to do more work to render your audio.
*/
virtual void renderNextSubBlock (AudioBuffer<float>& outputAudio,
void renderNextSubBlock (AudioBuffer<float>& outputAudio,
int startSample,
int numSamples) override;
@ -250,7 +250,7 @@ protected:
voice and fill the buffer with the sum. (souble-precision version)
Override this method if you need to do more work to render your audio.
*/
virtual void renderNextSubBlock (AudioBuffer<double>& outputAudio,
void renderNextSubBlock (AudioBuffer<double>& outputAudio,
int startSample,
int numSamples) override;

4
modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm
View file

@ -333,7 +333,7 @@ public:
auValueStrings = Parameter::getAllValueStrings();
}
virtual float getValue() const override
float getValue() const override
{
const ScopedLock sl (pluginInstance.lock);
@ -348,7 +348,7 @@ public:
return value;
}
virtual void setValue (float newValue) override
void setValue (float newValue) override
{
const ScopedLock sl (pluginInstance.lock);

4
modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.cpp
View file

@ -423,7 +423,7 @@ private:
reset();
}
virtual float getValue() const override
float getValue() const override
{
if (pluginInstance.plugin != nullptr)
{
@ -450,7 +450,7 @@ private:
return {};
}
virtual void setValue (float newValue) override
void setValue (float newValue) override
{
if (auto* interface = pluginInstance.plugin)
{

4
modules/juce_audio_processors/format_types/juce_VST3PluginFormat.cpp
View file

@ -1610,7 +1610,7 @@ public:
{
}
virtual float getValue() const override
float getValue() const override
{
if (pluginInstance.editController != nullptr)
{
@ -1622,7 +1622,7 @@ public:
return 0.0f;
}
virtual void setValue (float newValue) override
void setValue (float newValue) override
{
if (pluginInstance.editController != nullptr)
{

4
modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
View file

@ -861,7 +861,7 @@ struct VSTPluginInstance : public AudioPluginInstance,
{
}
virtual float getValue() const override
float getValue() const override
{
if (auto* effect = pluginInstance.vstEffect)
{
@ -873,7 +873,7 @@ struct VSTPluginInstance : public AudioPluginInstance,
return 0.0f;
}
virtual void setValue (float newValue) override
void setValue (float newValue) override
{
if (auto* effect = pluginInstance.vstEffect)
{

2
modules/juce_blocks_basics/littlefoot/juce_LittleFootCompiler.h
View file

@ -1318,7 +1318,7 @@ private:
{
Expression (const CodeLocation& l, BlockPtr parent) noexcept : Statement (l, parent) {}
virtual Type getType (CodeGenerator&) const = 0;
virtual ExpPtr simplify (SyntaxTreeBuilder&) override { return this; }
ExpPtr simplify (SyntaxTreeBuilder&) override { return this; }
virtual String getIdentifier() const { location.throwError ("This operator requires an assignable variable"); return {}; }
};

2
modules/juce_data_structures/values/juce_Value.h
View file

@ -180,7 +180,7 @@ public:
{
public:
ValueSource();
virtual ~ValueSource() override;
~ValueSource() override;
/** Returns the current value of this object. */
virtual var getValue() const = 0;

2
modules/juce_gui_basics/buttons/juce_Button.h
View file

@ -54,7 +54,7 @@ protected:
public:
/** Destructor. */
virtual ~Button() override;
~Button() override;
//==============================================================================
/** Changes the button's text.

2
modules/juce_gui_basics/commands/juce_ApplicationCommandManager.h
View file

@ -102,7 +102,7 @@ public:
Make sure that you don't delete this if pointers to it are still being used by
objects such as PopupMenus or Buttons.
*/
virtual ~ApplicationCommandManager() override;
~ApplicationCommandManager() override;
//==============================================================================
/** Clears the current list of all commands.

18
modules/juce_gui_basics/components/juce_Component.h
View file

@ -1480,7 +1480,7 @@ public:
the source component in which it occurred
@see mouseEnter, mouseExit, mouseDrag, contains
*/
virtual void mouseMove (const MouseEvent& event) override;
void mouseMove (const MouseEvent& event) override;
/** Called when the mouse first enters a component.
@ -1496,7 +1496,7 @@ public:
the source component in which it occurred
@see mouseExit, mouseDrag, mouseMove, contains
*/
virtual void mouseEnter (const MouseEvent& event) override;
void mouseEnter (const MouseEvent& event) override;
/** Called when the mouse moves out of a component.
@ -1511,7 +1511,7 @@ public:
the source component in which it occurred
@see mouseEnter, mouseDrag, mouseMove, contains
*/
virtual void mouseExit (const MouseEvent& event) override;
void mouseExit (const MouseEvent& event) override;
/** Called when a mouse button is pressed.
@ -1526,7 +1526,7 @@ public:
the source component in which it occurred
@see mouseUp, mouseDrag, mouseDoubleClick, contains
*/
virtual void mouseDown (const MouseEvent& event) override;
void mouseDown (const MouseEvent& event) override;
/** Called when the mouse is moved while a button is held down.
@ -1538,7 +1538,7 @@ public:
the source component in which it occurred
@see mouseDown, mouseUp, mouseMove, contains, setDragRepeatInterval
*/
virtual void mouseDrag (const MouseEvent& event) override;
void mouseDrag (const MouseEvent& event) override;
/** Called when a mouse button is released.
@ -1553,7 +1553,7 @@ public:
the source component in which it occurred
@see mouseDown, mouseDrag, mouseDoubleClick, contains
*/
virtual void mouseUp (const MouseEvent& event) override;
void mouseUp (const MouseEvent& event) override;
/** Called when a mouse button has been double-clicked on a component.
@ -1565,7 +1565,7 @@ public:
the source component in which it occurred
@see mouseDown, mouseUp
*/
virtual void mouseDoubleClick (const MouseEvent& event) override;
void mouseDoubleClick (const MouseEvent& event) override;
/** Called when the mouse-wheel is moved.
@ -1582,7 +1582,7 @@ public:
@param event details about the mouse event
@param wheel details about the mouse wheel movement
*/
virtual void mouseWheelMove (const MouseEvent& event,
void mouseWheelMove (const MouseEvent& event,
const MouseWheelDetails& wheel) override;
/** Called when a pinch-to-zoom mouse-gesture is used.
@ -1596,7 +1596,7 @@ public:
should be changed. A value of 1.0 would indicate no change,
values greater than 1.0 mean it should be enlarged.
*/
virtual void mouseMagnify (const MouseEvent& event, float scaleFactor) override;
void mouseMagnify (const MouseEvent& event, float scaleFactor) override;
//==============================================================================
/** Ensures that a non-stop stream of mouse-drag events will be sent during the

2
modules/juce_gui_basics/drawables/juce_Drawable.h
View file

@ -47,7 +47,7 @@ protected:
public:
/** Destructor. */
virtual ~Drawable() override;
~Drawable() override;
//==============================================================================
/** Creates a deep copy of this Drawable object.

2
modules/juce_gui_basics/menus/juce_MenuBarModel.h
View file

@ -46,7 +46,7 @@ public:
MenuBarModel() noexcept;
/** Destructor. */
virtual ~MenuBarModel() override;
~MenuBarModel() override;
//==============================================================================
/** Call this when some of your menu items have changed.

4
modules/juce_gui_basics/widgets/juce_ComboBox.h
View file

@ -58,10 +58,10 @@ public:
@param componentName the name to set for the component (see Component::setName())
*/
explicit ComboBox (const String& componentName = String());
explicit ComboBox (const String& componentName = {});
/** Destructor. */
virtual ~ComboBox() override;
~ComboBox() override;
//==============================================================================
/** Sets whether the text in the combo-box is editable.