diff --git a/extras/Introjucer/Source/Application/jucer_AppearanceSettings.cpp b/extras/Introjucer/Source/Application/jucer_AppearanceSettings.cpp index 4be1b6153e..f2ed9902cb 100644 --- a/extras/Introjucer/Source/Application/jucer_AppearanceSettings.cpp +++ b/extras/Introjucer/Source/Application/jucer_AppearanceSettings.cpp @@ -307,7 +307,7 @@ struct AppearanceEditor getLookAndFeel().drawSpinningWaitAnimation (g, Colours::white, (getWidth() - size) / 2, getHeight() / 2 - 50, size, size); } - void timerCallback() + void timerCallback() override { repaint(); diff --git a/extras/Introjucer/Source/Application/jucer_Application.h b/extras/Introjucer/Source/Application/jucer_Application.h index 23309f277d..a33b8395bb 100644 --- a/extras/Introjucer/Source/Application/jucer_Application.h +++ b/extras/Introjucer/Source/Application/jucer_Application.h @@ -595,7 +595,7 @@ private: public: AsyncQuitRetrier() { startTimer (500); } - void timerCallback() + void timerCallback() override { stopTimer(); delete this; diff --git a/extras/Introjucer/Source/Application/jucer_JuceUpdater.cpp b/extras/Introjucer/Source/Application/jucer_JuceUpdater.cpp index 24cc547ce5..02e8b3d8b1 100644 --- a/extras/Introjucer/Source/Application/jucer_JuceUpdater.cpp +++ b/extras/Introjucer/Source/Application/jucer_JuceUpdater.cpp @@ -146,7 +146,7 @@ public: stopThread (10000); } - void run() + void run() override { if (downloaded.loadFromWebsite()) triggerAsyncUpdate(); @@ -156,7 +156,7 @@ public: "Couldn't connect to the JUCE webserver!"); } - void handleAsyncUpdate() + void handleAsyncUpdate() override { owner.backgroundUpdateComplete (downloaded); } @@ -346,7 +346,7 @@ public: { } - void run() + void run() override { for (int i = 0; i < itemsToInstall.size(); ++i) { diff --git a/extras/Introjucer/Source/ComponentEditor/jucer_JucerDocument.h b/extras/Introjucer/Source/ComponentEditor/jucer_JucerDocument.h index 7b9612908a..cbb5c39005 100644 --- a/extras/Introjucer/Source/ComponentEditor/jucer_JucerDocument.h +++ b/extras/Introjucer/Source/ComponentEditor/jucer_JucerDocument.h @@ -163,7 +163,7 @@ private: ScopedPointer currentXML; ScopedPointer userDocChangeTimer; - void timerCallback(); + void timerCallback() override; void codeDocumentTextInserted (const String& newText, int insertIndex); void codeDocumentTextDeleted (int startIndex, int endIndex); void userEditedCpp(); diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h index c8ae02f3f8..343676f48c 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h @@ -54,7 +54,7 @@ public: saver (ps), result (Result::ok()) {} - void run() + void run() override { setProgress (-1); result = saver.save (false); diff --git a/extras/Introjucer/Source/Project/jucer_ModulesPanel.h b/extras/Introjucer/Source/Project/jucer_ModulesPanel.h index 3c5b53e3f7..a6a95fb3d0 100644 --- a/extras/Introjucer/Source/Project/jucer_ModulesPanel.h +++ b/extras/Introjucer/Source/Project/jucer_ModulesPanel.h @@ -490,7 +490,7 @@ public: refresh(); } - void timerCallback() + void timerCallback() override { refresh(); } diff --git a/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp b/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp index ac4a0af93b..92f7e55bdb 100644 --- a/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp +++ b/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp @@ -400,7 +400,7 @@ public: startTimer (500); } - void timerCallback() + void timerCallback() override { stopTimer(); commandManager->invoke (info, true); diff --git a/extras/Introjucer/Source/Utility/jucer_MiscUtilities.h b/extras/Introjucer/Source/Utility/jucer_MiscUtilities.h index 914436e239..20b5fe8d09 100644 --- a/extras/Introjucer/Source/Utility/jucer_MiscUtilities.h +++ b/extras/Introjucer/Source/Utility/jucer_MiscUtilities.h @@ -96,8 +96,8 @@ class RolloverHelpComp : public Component, public: RolloverHelpComp(); - void paint (Graphics& g); - void timerCallback(); + void paint (Graphics&) override; + void timerCallback() override; private: Component* lastComp; diff --git a/extras/JuceDemo/Source/demos/ThreadingDemo.cpp b/extras/JuceDemo/Source/demos/ThreadingDemo.cpp index 94ddd4d3a3..1d5407b550 100644 --- a/extras/JuceDemo/Source/demos/ThreadingDemo.cpp +++ b/extras/JuceDemo/Source/demos/ThreadingDemo.cpp @@ -135,7 +135,7 @@ public: stopThread (2000); } - void run() + void run() override { // this is the code that runs this thread - we'll loop continuously, // updating the co-ordinates of our blob. diff --git a/extras/JuceDemo/Source/demos/WidgetsDemo.cpp b/extras/JuceDemo/Source/demos/WidgetsDemo.cpp index 2eecd1c63d..bba5543246 100644 --- a/extras/JuceDemo/Source/demos/WidgetsDemo.cpp +++ b/extras/JuceDemo/Source/demos/WidgetsDemo.cpp @@ -963,7 +963,7 @@ public: setStatusMessage ("Getting ready..."); } - void run() + void run() override { setProgress (-1.0); // setting a value beyond the range 0 -> 1 will show a spinning bar.. setStatusMessage ("Preparing to do some stuff..."); diff --git a/modules/juce_audio_devices/midi_io/juce_MidiOutput.h b/modules/juce_audio_devices/midi_io/juce_MidiOutput.h index 7c8dd8c630..1f979d3823 100644 --- a/modules/juce_audio_devices/midi_io/juce_MidiOutput.h +++ b/modules/juce_audio_devices/midi_io/juce_MidiOutput.h @@ -137,7 +137,7 @@ protected: PendingMessage* firstMessage; MidiOutput(); - void run(); + void run() override; private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MidiOutput) diff --git a/modules/juce_audio_devices/native/juce_android_Audio.cpp b/modules/juce_audio_devices/native/juce_android_Audio.cpp index 97d1047a22..31d4f62545 100644 --- a/modules/juce_audio_devices/native/juce_android_Audio.cpp +++ b/modules/juce_audio_devices/native/juce_android_Audio.cpp @@ -277,7 +277,7 @@ public: } } - void run() + void run() override { JNIEnv* env = getEnv(); jshortArray audioBuffer = env->NewShortArray (actualBufferSize * jmax (numDeviceOutputChannels, numDeviceInputChannels)); diff --git a/modules/juce_audio_devices/native/juce_android_OpenSL.cpp b/modules/juce_audio_devices/native/juce_android_OpenSL.cpp index 7ad9fad164..d15629bc9f 100644 --- a/modules/juce_audio_devices/native/juce_android_OpenSL.cpp +++ b/modules/juce_audio_devices/native/juce_android_OpenSL.cpp @@ -172,7 +172,7 @@ public: oldCallback->audioDeviceStopped(); } - void run() + void run() override { if (recorder != nullptr) recorder->start(); if (player != nullptr) player->start(); diff --git a/modules/juce_audio_devices/native/juce_linux_ALSA.cpp b/modules/juce_audio_devices/native/juce_linux_ALSA.cpp index 958a47c8d1..2a31f715e3 100644 --- a/modules/juce_audio_devices/native/juce_linux_ALSA.cpp +++ b/modules/juce_audio_devices/native/juce_linux_ALSA.cpp @@ -628,7 +628,7 @@ public: callback = newCallback; } - void run() + void run() override { while (! threadShouldExit()) { diff --git a/modules/juce_audio_devices/native/juce_linux_Midi.cpp b/modules/juce_audio_devices/native/juce_linux_Midi.cpp index 81d75d28d0..9aa6586802 100644 --- a/modules/juce_audio_devices/native/juce_linux_Midi.cpp +++ b/modules/juce_audio_devices/native/juce_linux_Midi.cpp @@ -124,7 +124,7 @@ private: jassert (client.input && client.get() != nullptr); } - void run() + void run() override { const int maxEventSize = 16 * 1024; snd_midi_event_t* midiParser; diff --git a/modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm b/modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm index 1373393e6e..2782ba5ff9 100644 --- a/modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm +++ b/modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm @@ -291,7 +291,7 @@ public: stopTimer(); } - void timerCallback() + void timerCallback() override { const DiskState state = getDiskState(); diff --git a/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp b/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp index e6751a861d..ef227df7e3 100644 --- a/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp +++ b/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp @@ -759,7 +759,7 @@ public: startTimer (100); } - void timerCallback() + void timerCallback() override { stopTimer(); JUCE_COREAUDIOLOG ("CoreAudio device changed callback"); diff --git a/modules/juce_audio_devices/native/juce_win32_ASIO.cpp b/modules/juce_audio_devices/native/juce_win32_ASIO.cpp index 39491df2aa..8fa3bfb833 100644 --- a/modules/juce_audio_devices/native/juce_win32_ASIO.cpp +++ b/modules/juce_audio_devices/native/juce_win32_ASIO.cpp @@ -821,7 +821,7 @@ public: startTimer (500); } - void timerCallback() + void timerCallback() override { if (! insideControlPanelModalLoop) { diff --git a/modules/juce_audio_devices/native/juce_win32_AudioCDBurner.cpp b/modules/juce_audio_devices/native/juce_win32_AudioCDBurner.cpp index 05802ff771..e17079791f 100644 --- a/modules/juce_audio_devices/native/juce_win32_AudioCDBurner.cpp +++ b/modules/juce_audio_devices/native/juce_win32_AudioCDBurner.cpp @@ -203,7 +203,7 @@ public: && SUCCEEDED (discRecorder->SetRecorderProperties (prop)); } - void timerCallback() + void timerCallback() override { const DiskState state = getDiskState(); diff --git a/modules/juce_audio_devices/native/juce_win32_DirectSound.cpp b/modules/juce_audio_devices/native/juce_win32_DirectSound.cpp index 30a995a4ae..2546f9930a 100644 --- a/modules/juce_audio_devices/native/juce_win32_DirectSound.cpp +++ b/modules/juce_audio_devices/native/juce_win32_DirectSound.cpp @@ -910,7 +910,7 @@ private: } public: - void run() + void run() override { while (! threadShouldExit()) { diff --git a/modules/juce_audio_devices/native/juce_win32_WASAPI.cpp b/modules/juce_audio_devices/native/juce_win32_WASAPI.cpp index 4981937fe1..7482ec123b 100644 --- a/modules/juce_audio_devices/native/juce_win32_WASAPI.cpp +++ b/modules/juce_audio_devices/native/juce_win32_WASAPI.cpp @@ -1054,7 +1054,7 @@ public: } } - void run() + void run() override { setMMThreadPriority(); @@ -1178,7 +1178,7 @@ private: } //============================================================================== - void handleAsyncUpdate() + void handleAsyncUpdate() override { stop(); diff --git a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp index a51ac6788d..e2fc186103 100644 --- a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp @@ -324,12 +324,12 @@ struct AAXClasses } } - void paint (Graphics& g) + void paint (Graphics& g) override { g.fillAll (Colours::black); } - void childBoundsChanged (Component*) + void childBoundsChanged (Component*) override { if (pluginEditor != nullptr) { diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp index f8848fd17e..39ee1dc2f9 100644 --- a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp @@ -235,7 +235,7 @@ public: } } - void timerCallback() + void timerCallback() override { if (! juce::Component::isMouseButtonDownAnywhere()) { @@ -499,7 +499,7 @@ protected: midiEvents.ensureSize (2048); } - void handleAsyncUpdate() + void handleAsyncUpdate() override { if (! prepared) { diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp index 9625fd08d6..b5ddcf6152 100644 --- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp @@ -280,7 +280,7 @@ public: clearSingletonInstance(); } - void run() + void run() override { initialiseJuce_GUI(); initialised = true; @@ -1038,7 +1038,7 @@ public: return 0; } - void timerCallback() + void timerCallback() override { if (shouldDeleteEditor) { @@ -1353,9 +1353,9 @@ public: // have been transferred to another parent which takes over ownership. } - void paint (Graphics&) {} + void paint (Graphics&) override {} - void paintOverChildren (Graphics&) + void paintOverChildren (Graphics&) override { // this causes an async call to masterIdle() to help // creaky old DAWs like Nuendo repaint themselves while we're @@ -1365,7 +1365,7 @@ public: } #if JUCE_MAC - bool keyPressed (const KeyPress&) + bool keyPressed (const KeyPress&) override { // If we have an unused keypress, move the key-focus to a host window // and re-inject the event.. @@ -1378,13 +1378,13 @@ public: return dynamic_cast (getChildComponent (0)); } - void resized() + void resized() override { if (Component* const editor = getChildComponent(0)) editor->setBounds (getLocalBounds()); } - void childBoundsChanged (Component* child) + void childBoundsChanged (Component* child) override { child->setTopLeftPosition (0, 0); @@ -1408,18 +1408,18 @@ public: #endif } - void handleAsyncUpdate() + void handleAsyncUpdate() override { wrapper.tryMasterIdle(); } #if JUCE_WINDOWS - void mouseDown (const MouseEvent&) + void mouseDown (const MouseEvent&) override { broughtToFront(); } - void broughtToFront() + void broughtToFront() override { // for hosts like nuendo, need to also pop the MDI container to the // front when our comp is clicked on. diff --git a/modules/juce_audio_plugin_client/utility/juce_FakeMouseMoveGenerator.h b/modules/juce_audio_plugin_client/utility/juce_FakeMouseMoveGenerator.h index 9f5c45cd04..b2cae5e09d 100644 --- a/modules/juce_audio_plugin_client/utility/juce_FakeMouseMoveGenerator.h +++ b/modules/juce_audio_plugin_client/utility/juce_FakeMouseMoveGenerator.h @@ -37,7 +37,7 @@ public: startTimer (1000 / 30); } - void timerCallback() + void timerCallback() override { // workaround for carbon windows not getting mouse-moves.. const Point screenPos (Desktop::getInstance().getMainMouseSource().getScreenPosition()); diff --git a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm index 40a40ede77..a1daeb27b2 100644 --- a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm +++ b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm @@ -1286,23 +1286,23 @@ public: bool isValid() const { return wrapper.getView() != nil; } - void paint (Graphics& g) + void paint (Graphics& g) override { g.fillAll (Colours::white); } - void resized() + void resized() override { wrapper.setSize (getWidth(), getHeight()); } - void timerCallback() + void timerCallback() override { wrapper.resizeToFitView(); startTimer (jmin (713, getTimerInterval() + 51)); } - void childBoundsChanged (Component* child) + void childBoundsChanged (Component* child) override { setSize (wrapper.getWidth(), wrapper.getHeight()); startTimer (70); @@ -1424,20 +1424,20 @@ public: bool isValid() const noexcept { return audioComponent != nullptr; } //============================================================================== - void paint (Graphics& g) + void paint (Graphics& g) override { g.fillAll (Colours::black); } - void resized() + void resized() override { if (innerWrapper != nullptr) innerWrapper->setSize (getWidth(), getHeight()); } //============================================================================== - bool keyStateChanged (bool) { return false; } - bool keyPressed (const KeyPress&) { return false; } + bool keyStateChanged (bool) override { return false; } + bool keyPressed (const KeyPress&) override { return false; } //============================================================================== AudioUnit getAudioUnit() const { return plugin.audioUnit; } diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp index 65afa0a185..99e47760f8 100644 --- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp +++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp @@ -1232,13 +1232,13 @@ public: void setCurrentProgramStateInformation (const void* data, int size) { loadFromFXBFile (data, size); } //============================================================================== - void timerCallback() + void timerCallback() override { if (dispatch (effIdle, 0, 0, 0, 0) == 0) stopTimer(); } - void handleAsyncUpdate() + void handleAsyncUpdate() override { // indicates that something about the plugin has changed.. updateHostDisplay(); @@ -2006,12 +2006,12 @@ public: //============================================================================== #if JUCE_MAC - void paint (Graphics& g) + void paint (Graphics& g) override { g.fillAll (Colours::black); } #else - void paint (Graphics& g) + void paint (Graphics& g) override { if (isOpen) { @@ -2046,7 +2046,7 @@ public: #endif //============================================================================== - void timerCallback() + void timerCallback() override { if (isShowing()) { diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h b/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h index 3481b19c4b..f0cf0c4ded 100644 --- a/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h +++ b/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h @@ -405,7 +405,7 @@ private: MidiBuffer* currentMidiInputBuffer; MidiBuffer currentMidiOutputBuffer; - void handleAsyncUpdate(); + void handleAsyncUpdate() override; void clearRenderingSequence(); void buildRenderingSequence(); bool isAnInputTo (uint32 possibleInputId, uint32 possibleDestinationId, int recursionCheck) const; diff --git a/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.cpp b/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.cpp index 1512f4aa0d..1b584e8376 100644 --- a/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.cpp +++ b/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.cpp @@ -58,7 +58,7 @@ public: paramHasChanged = true; } - void timerCallback() + void timerCallback() override { if (paramHasChanged) { diff --git a/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.h b/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.h index 792b2a7961..4c3f8be0d1 100644 --- a/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.h +++ b/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.h @@ -46,8 +46,8 @@ public: ~GenericAudioProcessorEditor(); //============================================================================== - void paint (Graphics& g); - void resized(); + void paint (Graphics&) override; + void resized() override; private: //============================================================================== diff --git a/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp b/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp index cc612ecbb7..ce153b96cf 100644 --- a/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp +++ b/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp @@ -351,7 +351,7 @@ private: : StringArray()); } - void timerCallback() + void timerCallback() override { if (pool == nullptr) { diff --git a/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp b/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp index 99af694e2f..aec819fcbc 100644 --- a/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp +++ b/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp @@ -39,7 +39,7 @@ public: manager->enableInputLevelMeasurement (false); } - void timerCallback() + void timerCallback() override { const float newLevel = (float) manager->getCurrentInputLevel(); @@ -50,7 +50,7 @@ public: } } - void paint (Graphics& g) + void paint (Graphics& g) override { getLookAndFeel().drawLevelMeter (g, getWidth(), getHeight(), (float) exp (log (level) / 3.0)); // (add a bit of a skew to make the level more obvious) @@ -134,7 +134,7 @@ public: flipEnablement (row); } - void paint (Graphics& g) + void paint (Graphics& g) override { ListBox::paint (g); @@ -778,7 +778,7 @@ public: flipEnablement (row); } - void paint (Graphics& g) + void paint (Graphics& g) override { ListBox::paint (g); diff --git a/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h b/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h index 12e1ca8f90..b8c05a641e 100644 --- a/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h +++ b/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h @@ -60,14 +60,14 @@ public: are shown, with an "advanced" button that shows the rest of them */ AudioDeviceSelectorComponent (AudioDeviceManager& deviceManager, - const int minAudioInputChannels, - const int maxAudioInputChannels, - const int minAudioOutputChannels, - const int maxAudioOutputChannels, - const bool showMidiInputOptions, - const bool showMidiOutputSelector, - const bool showChannelsAsStereoPairs, - const bool hideAdvancedOptionsWithButton); + int minAudioInputChannels, + int maxAudioInputChannels, + int minAudioOutputChannels, + int maxAudioOutputChannels, + bool showMidiInputOptions, + bool showMidiOutputSelector, + bool showChannelsAsStereoPairs, + bool hideAdvancedOptionsWithButton); /** Destructor */ ~AudioDeviceSelectorComponent(); @@ -77,9 +77,9 @@ public: //============================================================================== /** @internal */ - void resized(); + void resized() override; /** @internal */ - void childBoundsChanged (Component*); + void childBoundsChanged (Component*) override; private: //============================================================================== diff --git a/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h b/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h index c1f27219ac..c725b8f1be 100644 --- a/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h +++ b/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h @@ -264,35 +264,35 @@ public: //============================================================================== /** @internal */ - void paint (Graphics&); + void paint (Graphics&) override; /** @internal */ - void resized(); + void resized() override; /** @internal */ - void mouseMove (const MouseEvent&); + void mouseMove (const MouseEvent&) override; /** @internal */ - void mouseDrag (const MouseEvent&); + void mouseDrag (const MouseEvent&) override; /** @internal */ - void mouseDown (const MouseEvent&); + void mouseDown (const MouseEvent&) override; /** @internal */ - void mouseUp (const MouseEvent&); + void mouseUp (const MouseEvent&) override; /** @internal */ - void mouseEnter (const MouseEvent&); + void mouseEnter (const MouseEvent&) override; /** @internal */ - void mouseExit (const MouseEvent&); + void mouseExit (const MouseEvent&) override; /** @internal */ - void mouseWheelMove (const MouseEvent&, const MouseWheelDetails&); + void mouseWheelMove (const MouseEvent&, const MouseWheelDetails&) override; /** @internal */ - void timerCallback(); + void timerCallback() override; /** @internal */ - bool keyStateChanged (bool isKeyDown); + bool keyStateChanged (bool isKeyDown) override; /** @internal */ - void focusLost (FocusChangeType); + void focusLost (FocusChangeType) override; /** @internal */ - void handleNoteOn (MidiKeyboardState*, int midiChannel, int midiNoteNumber, float velocity); + void handleNoteOn (MidiKeyboardState*, int midiChannel, int midiNoteNumber, float velocity) override; /** @internal */ - void handleNoteOff (MidiKeyboardState*, int midiChannel, int midiNoteNumber); + void handleNoteOff (MidiKeyboardState*, int midiChannel, int midiNoteNumber) override; /** @internal */ - void colourChanged(); + void colourChanged() override; protected: //============================================================================== diff --git a/modules/juce_browser_plugin/wrapper/juce_ActiveX_GlueCode.cpp b/modules/juce_browser_plugin/wrapper/juce_ActiveX_GlueCode.cpp index 9ca76f1bf0..f9a7ddd3aa 100644 --- a/modules/juce_browser_plugin/wrapper/juce_ActiveX_GlueCode.cpp +++ b/modules/juce_browser_plugin/wrapper/juce_ActiveX_GlueCode.cpp @@ -447,13 +447,13 @@ public: } //============================================================================== - void paint (Graphics& g) + void paint (Graphics& g) override { if (child == nullptr || ! child->isOpaque()) g.fillAll (Colours::white); } - void resized() + void resized() override { if (child != nullptr) child->setBounds (getLocalBounds()); diff --git a/modules/juce_browser_plugin/wrapper/juce_NPAPI_GlueCode.cpp b/modules/juce_browser_plugin/wrapper/juce_NPAPI_GlueCode.cpp index 6e1ce770e8..8074f52901 100644 --- a/modules/juce_browser_plugin/wrapper/juce_NPAPI_GlueCode.cpp +++ b/modules/juce_browser_plugin/wrapper/juce_NPAPI_GlueCode.cpp @@ -286,13 +286,13 @@ public: } //============================================================================== - void paint (Graphics& g) + void paint (Graphics& g) override { if (child == nullptr || ! child->isOpaque()) g.fillAll (Colours::white); } - void resized() + void resized() override { if (child != nullptr && ! isFirefox4) child->setBounds (getLocalBounds()); diff --git a/modules/juce_core/native/juce_mac_Network.mm b/modules/juce_core/native/juce_mac_Network.mm index c178db6a95..a9611fa086 100644 --- a/modules/juce_core/native/juce_mac_Network.mm +++ b/modules/juce_core/native/juce_mac_Network.mm @@ -226,7 +226,7 @@ public: signalThreadShouldExit(); } - void run() + void run() override { connection = [[NSURLConnection alloc] initWithRequest: request delegate: delegate]; diff --git a/modules/juce_core/threads/juce_ThreadPool.cpp b/modules/juce_core/threads/juce_ThreadPool.cpp index c5ee71bea6..257572a541 100644 --- a/modules/juce_core/threads/juce_ThreadPool.cpp +++ b/modules/juce_core/threads/juce_ThreadPool.cpp @@ -67,7 +67,7 @@ public: { } - void run() + void run() override { while (! threadShouldExit()) { diff --git a/modules/juce_core/threads/juce_TimeSliceThread.h b/modules/juce_core/threads/juce_TimeSliceThread.h index d59fbb7d1c..314a019d6b 100644 --- a/modules/juce_core/threads/juce_TimeSliceThread.h +++ b/modules/juce_core/threads/juce_TimeSliceThread.h @@ -134,7 +134,7 @@ public: //============================================================================== #ifndef DOXYGEN - void run(); + void run() override; #endif //============================================================================== diff --git a/modules/juce_data_structures/app_properties/juce_PropertiesFile.h b/modules/juce_data_structures/app_properties/juce_PropertiesFile.h index 648b0aa0b5..d34231f8e1 100644 --- a/modules/juce_data_structures/app_properties/juce_PropertiesFile.h +++ b/modules/juce_data_structures/app_properties/juce_PropertiesFile.h @@ -230,7 +230,7 @@ private: typedef const ScopedPointer ProcessScopedLock; InterProcessLock::ScopedLockType* createProcessLock() const; - void timerCallback(); + void timerCallback() override; bool saveAsXml(); bool saveAsBinary(); bool loadAsXml(); diff --git a/modules/juce_data_structures/values/juce_Value.cpp b/modules/juce_data_structures/values/juce_Value.cpp index f760187974..477936ea5e 100644 --- a/modules/juce_data_structures/values/juce_Value.cpp +++ b/modules/juce_data_structures/values/juce_Value.cpp @@ -52,7 +52,7 @@ private: SourceSet sourcesNeedingAnUpdate; SourceSet* sourcesBeingIterated; - void handleAsyncUpdate() + void handleAsyncUpdate() override { const ReferenceCountedObjectPtr localRef (this); diff --git a/modules/juce_events/broadcasters/juce_ChangeBroadcaster.h b/modules/juce_events/broadcasters/juce_ChangeBroadcaster.h index 39b6de85e9..ccca158b84 100644 --- a/modules/juce_events/broadcasters/juce_ChangeBroadcaster.h +++ b/modules/juce_events/broadcasters/juce_ChangeBroadcaster.h @@ -91,7 +91,7 @@ private: { public: ChangeBroadcasterCallback(); - void handleAsyncUpdate(); + void handleAsyncUpdate() override; ChangeBroadcaster* owner; }; diff --git a/modules/juce_events/interprocess/juce_InterprocessConnection.h b/modules/juce_events/interprocess/juce_InterprocessConnection.h index 9a1d319ce7..4ecf3daf85 100644 --- a/modules/juce_events/interprocess/juce_InterprocessConnection.h +++ b/modules/juce_events/interprocess/juce_InterprocessConnection.h @@ -194,7 +194,7 @@ private: void connectionLostInt(); void deliverDataInt (const MemoryBlock&); bool readNextMessageInt(); - void run(); + void run() override; JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (InterprocessConnection) }; diff --git a/modules/juce_events/interprocess/juce_InterprocessConnectionServer.h b/modules/juce_events/interprocess/juce_InterprocessConnectionServer.h index dbb34df107..40bb3759b5 100644 --- a/modules/juce_events/interprocess/juce_InterprocessConnectionServer.h +++ b/modules/juce_events/interprocess/juce_InterprocessConnectionServer.h @@ -86,7 +86,7 @@ private: //============================================================================== ScopedPointer socket; - void run(); + void run() override; JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (InterprocessConnectionServer) }; diff --git a/modules/juce_events/native/juce_win32_HiddenMessageWindow.h b/modules/juce_events/native/juce_win32_HiddenMessageWindow.h index 8b5ab8a21b..c451231c4f 100644 --- a/modules/juce_events/native/juce_win32_HiddenMessageWindow.h +++ b/modules/juce_events/native/juce_win32_HiddenMessageWindow.h @@ -128,7 +128,7 @@ private: return DefWindowProc (h, message, wParam, lParam); } - void timerCallback() + void timerCallback() override { stopTimer(); systemDeviceChanged(); diff --git a/modules/juce_events/timers/juce_MultiTimer.cpp b/modules/juce_events/timers/juce_MultiTimer.cpp index 29a411a7a7..c054cabfc7 100644 --- a/modules/juce_events/timers/juce_MultiTimer.cpp +++ b/modules/juce_events/timers/juce_MultiTimer.cpp @@ -31,7 +31,7 @@ public: { } - void timerCallback() + void timerCallback() override { owner.timerCallback (timerId); } diff --git a/modules/juce_events/timers/juce_Timer.cpp b/modules/juce_events/timers/juce_Timer.cpp index af011f5aca..e0bbadb024 100644 --- a/modules/juce_events/timers/juce_Timer.cpp +++ b/modules/juce_events/timers/juce_Timer.cpp @@ -46,7 +46,7 @@ public: instance = nullptr; } - void run() + void run() override { uint32 lastTime = Time::getMillisecondCounter(); MessageManager::MessageBase::Ptr messageToSend (new CallTimersMessage()); @@ -192,7 +192,7 @@ private: { CallTimersMessage() {} - void messageCallback() + void messageCallback() override { if (instance != nullptr) instance->callTimers(); @@ -272,7 +272,7 @@ private: return firstTimer != nullptr ? firstTimer->countdownMs : 1000; } - void handleAsyncUpdate() + void handleAsyncUpdate() override { startThread (7); } diff --git a/modules/juce_graphics/images/juce_ImageCache.cpp b/modules/juce_graphics/images/juce_ImageCache.cpp index c964513ac6..992ff328b9 100644 --- a/modules/juce_graphics/images/juce_ImageCache.cpp +++ b/modules/juce_graphics/images/juce_ImageCache.cpp @@ -67,7 +67,7 @@ public: } } - void timerCallback() + void timerCallback() override { const uint32 now = Time::getApproximateMillisecondCounter(); diff --git a/modules/juce_gui_basics/buttons/juce_Button.h b/modules/juce_gui_basics/buttons/juce_Button.h index edabc05e98..3ceac62a14 100644 --- a/modules/juce_gui_basics/buttons/juce_Button.h +++ b/modules/juce_gui_basics/buttons/juce_Button.h @@ -404,43 +404,43 @@ protected: /** @internal */ virtual void internalClickCallback (const ModifierKeys&); /** @internal */ - void handleCommandMessage (int commandId); + void handleCommandMessage (int commandId) override; /** @internal */ - void mouseEnter (const MouseEvent&); + void mouseEnter (const MouseEvent&) override; /** @internal */ - void mouseExit (const MouseEvent&); + void mouseExit (const MouseEvent&) override; /** @internal */ - void mouseDown (const MouseEvent&); + void mouseDown (const MouseEvent&) override; /** @internal */ - void mouseDrag (const MouseEvent&); + void mouseDrag (const MouseEvent&) override; /** @internal */ - void mouseUp (const MouseEvent&); + void mouseUp (const MouseEvent&) override; /** @internal */ - bool keyPressed (const KeyPress&); + bool keyPressed (const KeyPress&) override; /** @internal */ - bool keyPressed (const KeyPress&, Component*); + bool keyPressed (const KeyPress&, Component*) override; /** @internal */ - bool keyStateChanged (bool isKeyDown, Component*); + bool keyStateChanged (bool isKeyDown, Component*) override; /** @internal */ using Component::keyStateChanged; /** @internal */ - void paint (Graphics&); + void paint (Graphics&) override; /** @internal */ - void parentHierarchyChanged(); + void parentHierarchyChanged() override; /** @internal */ - void visibilityChanged(); + void visibilityChanged() override; /** @internal */ - void focusGained (FocusChangeType); + void focusGained (FocusChangeType) override; /** @internal */ - void focusLost (FocusChangeType); + void focusLost (FocusChangeType) override; /** @internal */ - void enablementChanged(); + void enablementChanged() override; /** @internal */ - void applicationCommandInvoked (const ApplicationCommandTarget::InvocationInfo&); + void applicationCommandInvoked (const ApplicationCommandTarget::InvocationInfo&) override; /** @internal */ - void applicationCommandListChanged(); + void applicationCommandListChanged() override; /** @internal */ - void valueChanged (Value&); + void valueChanged (Value&) override; private: //============================================================================== diff --git a/modules/juce_gui_basics/buttons/juce_DrawableButton.h b/modules/juce_gui_basics/buttons/juce_DrawableButton.h index 4df7c25fc9..a0f9178342 100644 --- a/modules/juce_gui_basics/buttons/juce_DrawableButton.h +++ b/modules/juce_gui_basics/buttons/juce_DrawableButton.h @@ -160,15 +160,15 @@ public: //============================================================================== /** @internal */ - void paintButton (Graphics&, bool isMouseOverButton, bool isButtonDown); + void paintButton (Graphics&, bool isMouseOverButton, bool isButtonDown) override; /** @internal */ - void buttonStateChanged(); + void buttonStateChanged() override; /** @internal */ - void resized(); + void resized() override; /** @internal */ - void enablementChanged(); + void enablementChanged() override; /** @internal */ - void colourChanged(); + void colourChanged() override; private: //============================================================================== diff --git a/modules/juce_gui_basics/commands/juce_ApplicationCommandManager.h b/modules/juce_gui_basics/commands/juce_ApplicationCommandManager.h index a40dda4bc6..5548323246 100644 --- a/modules/juce_gui_basics/commands/juce_ApplicationCommandManager.h +++ b/modules/juce_gui_basics/commands/juce_ApplicationCommandManager.h @@ -311,8 +311,8 @@ private: ApplicationCommandTarget* firstTarget; void sendListenerInvokeCallback (const ApplicationCommandTarget::InvocationInfo&); - void handleAsyncUpdate(); - void globalFocusChanged (Component*); + void handleAsyncUpdate() override; + void globalFocusChanged (Component*) override; #if JUCE_CATCH_DEPRECATED_CODE_MISUSE // This is just here to cause a compile error in old code that hasn't been changed to use the new diff --git a/modules/juce_gui_basics/components/juce_Component.cpp b/modules/juce_gui_basics/components/juce_Component.cpp index 92eb3facce..4f6c97c6eb 100644 --- a/modules/juce_gui_basics/components/juce_Component.cpp +++ b/modules/juce_gui_basics/components/juce_Component.cpp @@ -690,7 +690,7 @@ class StandardCachedComponentImage : public CachedComponentImage public: StandardCachedComponentImage (Component& c) noexcept : owner (c) {} - void paint (Graphics& g) + void paint (Graphics& g) override { const Rectangle bounds (owner.getLocalBounds()); diff --git a/modules/juce_gui_basics/components/juce_Component.h b/modules/juce_gui_basics/components/juce_Component.h index 5e0736ca15..5b22678198 100644 --- a/modules/juce_gui_basics/components/juce_Component.h +++ b/modules/juce_gui_basics/components/juce_Component.h @@ -1453,7 +1453,7 @@ public: the source component in which it occurred @see mouseEnter, mouseExit, mouseDrag, contains */ - virtual void mouseMove (const MouseEvent& event); + virtual void mouseMove (const MouseEvent& event) override; /** Called when the mouse first enters a component. @@ -1469,7 +1469,7 @@ public: the source component in which it occurred @see mouseExit, mouseDrag, mouseMove, contains */ - virtual void mouseEnter (const MouseEvent& event); + virtual void mouseEnter (const MouseEvent& event) override; /** Called when the mouse moves out of a component. @@ -1484,7 +1484,7 @@ public: the source component in which it occurred @see mouseEnter, mouseDrag, mouseMove, contains */ - virtual void mouseExit (const MouseEvent& event); + virtual void mouseExit (const MouseEvent& event) override; /** Called when a mouse button is pressed. @@ -1499,7 +1499,7 @@ public: the source component in which it occurred @see mouseUp, mouseDrag, mouseDoubleClick, contains */ - virtual void mouseDown (const MouseEvent& event); + virtual void mouseDown (const MouseEvent& event) override; /** Called when the mouse is moved while a button is held down. @@ -1511,7 +1511,7 @@ public: the source component in which it occurred @see mouseDown, mouseUp, mouseMove, contains, setDragRepeatInterval */ - virtual void mouseDrag (const MouseEvent& event); + virtual void mouseDrag (const MouseEvent& event) override; /** Called when a mouse button is released. @@ -1526,7 +1526,7 @@ public: the source component in which it occurred @see mouseDown, mouseDrag, mouseDoubleClick, contains */ - virtual void mouseUp (const MouseEvent& event); + virtual void mouseUp (const MouseEvent& event) override; /** Called when a mouse button has been double-clicked on a component. @@ -1538,7 +1538,7 @@ public: the source component in which it occurred @see mouseDown, mouseUp */ - virtual void mouseDoubleClick (const MouseEvent& event); + virtual void mouseDoubleClick (const MouseEvent& event) override; /** Called when the mouse-wheel is moved. @@ -1556,7 +1556,7 @@ public: @param wheel details about the mouse wheel movement */ virtual void mouseWheelMove (const MouseEvent& event, - const MouseWheelDetails& wheel); + const MouseWheelDetails& wheel) override; /** Called when a pinch-to-zoom mouse-gesture is used. diff --git a/modules/juce_gui_basics/components/juce_Desktop.cpp b/modules/juce_gui_basics/components/juce_Desktop.cpp index 72b701ed8f..30d4d536f3 100644 --- a/modules/juce_gui_basics/components/juce_Desktop.cpp +++ b/modules/juce_gui_basics/components/juce_Desktop.cpp @@ -192,7 +192,7 @@ class MouseDragAutoRepeater : public Timer public: MouseDragAutoRepeater() {} - void timerCallback() + void timerCallback() override { Desktop& desktop = Desktop::getInstance(); int numMiceDown = 0; diff --git a/modules/juce_gui_basics/components/juce_Desktop.h b/modules/juce_gui_basics/components/juce_Desktop.h index e3e12737d9..3a36008e3b 100644 --- a/modules/juce_gui_basics/components/juce_Desktop.h +++ b/modules/juce_gui_basics/components/juce_Desktop.h @@ -411,7 +411,7 @@ private: ComponentAnimator animator; - void timerCallback(); + void timerCallback() override; void resetTimer(); ListenerList & getMouseListeners(); @@ -422,7 +422,7 @@ private: void setKioskComponent (Component*, bool enableOrDisable, bool allowMenusAndBars); void triggerFocusCallback(); - void handleAsyncUpdate(); + void handleAsyncUpdate() override; Desktop(); ~Desktop(); diff --git a/modules/juce_gui_basics/components/juce_ModalComponentManager.h b/modules/juce_gui_basics/components/juce_ModalComponentManager.h index bb13839534..a4cad9385b 100644 --- a/modules/juce_gui_basics/components/juce_ModalComponentManager.h +++ b/modules/juce_gui_basics/components/juce_ModalComponentManager.h @@ -127,7 +127,7 @@ protected: ~ModalComponentManager(); /** @internal */ - void handleAsyncUpdate(); + void handleAsyncUpdate() override; private: //============================================================================== diff --git a/modules/juce_gui_basics/drawables/juce_DrawableImage.h b/modules/juce_gui_basics/drawables/juce_DrawableImage.h index 8f7b032cdd..103e15fa4e 100644 --- a/modules/juce_gui_basics/drawables/juce_DrawableImage.h +++ b/modules/juce_gui_basics/drawables/juce_DrawableImage.h @@ -83,17 +83,17 @@ public: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** @internal */ - bool hitTest (int x, int y); + bool hitTest (int x, int y) override; /** @internal */ - Drawable* createCopy() const; + Drawable* createCopy() const override; /** @internal */ - Rectangle getDrawableBounds() const; + Rectangle getDrawableBounds() const override; /** @internal */ void refreshFromValueTree (const ValueTree& tree, ComponentBuilder& builder); /** @internal */ - ValueTree createValueTree (ComponentBuilder::ImageProvider* imageProvider) const; + ValueTree createValueTree (ComponentBuilder::ImageProvider* imageProvider) const override; /** @internal */ static const Identifier valueTreeType; diff --git a/modules/juce_gui_basics/drawables/juce_DrawableShape.h b/modules/juce_gui_basics/drawables/juce_DrawableShape.h index b6fe6ac41f..cff3fc4575 100644 --- a/modules/juce_gui_basics/drawables/juce_DrawableShape.h +++ b/modules/juce_gui_basics/drawables/juce_DrawableShape.h @@ -145,11 +145,11 @@ public: }; /** @internal */ - Rectangle getDrawableBounds() const; + Rectangle getDrawableBounds() const override; /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** @internal */ - bool hitTest (int x, int y); + bool hitTest (int x, int y) override; protected: //============================================================================== diff --git a/modules/juce_gui_basics/drawables/juce_DrawableText.h b/modules/juce_gui_basics/drawables/juce_DrawableText.h index 8fb002feaf..7930f77c80 100644 --- a/modules/juce_gui_basics/drawables/juce_DrawableText.h +++ b/modules/juce_gui_basics/drawables/juce_DrawableText.h @@ -90,17 +90,17 @@ public: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** @internal */ - Drawable* createCopy() const; + Drawable* createCopy() const override; /** @internal */ void refreshFromValueTree (const ValueTree& tree, ComponentBuilder& builder); /** @internal */ - ValueTree createValueTree (ComponentBuilder::ImageProvider* imageProvider) const; + ValueTree createValueTree (ComponentBuilder::ImageProvider* imageProvider) const override; /** @internal */ static const Identifier valueTreeType; /** @internal */ - Rectangle getDrawableBounds() const; + Rectangle getDrawableBounds() const override; //============================================================================== /** Internally-used class for wrapping a DrawableText's state into a ValueTree. */ diff --git a/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.h b/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.h index 10140b715f..1122b80569 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.h +++ b/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.h @@ -179,33 +179,33 @@ public: //============================================================================== /** @internal */ - void resized(); + void resized() override; /** @internal */ - void buttonClicked (Button*); + void buttonClicked (Button*) override; /** @internal */ - void comboBoxChanged (ComboBox*); + void comboBoxChanged (ComboBox*) override; /** @internal */ - void textEditorTextChanged (TextEditor&); + void textEditorTextChanged (TextEditor&) override; /** @internal */ - void textEditorReturnKeyPressed (TextEditor&); + void textEditorReturnKeyPressed (TextEditor&) override; /** @internal */ - void textEditorEscapeKeyPressed (TextEditor&); + void textEditorEscapeKeyPressed (TextEditor&) override; /** @internal */ - void textEditorFocusLost (TextEditor&); + void textEditorFocusLost (TextEditor&) override; /** @internal */ - bool keyPressed (const KeyPress&); + bool keyPressed (const KeyPress&) override; /** @internal */ - void selectionChanged(); + void selectionChanged() override; /** @internal */ - void fileClicked (const File&, const MouseEvent&); + void fileClicked (const File&, const MouseEvent&) override; /** @internal */ - void fileDoubleClicked (const File&); + void fileDoubleClicked (const File&) override; /** @internal */ - void browserRootChanged (const File&); + void browserRootChanged (const File&) override; /** @internal */ - bool isFileSuitable (const File&) const; + bool isFileSuitable (const File&) const override; /** @internal */ - bool isDirectorySuitable (const File&) const; + bool isDirectorySuitable (const File&) const override; /** @internal */ FilePreviewComponent* getPreviewComponent() const noexcept; diff --git a/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp b/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp index c1448135d2..0d8cc58b47 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp @@ -46,13 +46,13 @@ public: setInterceptsMouseClicks (false, true); } - void paint (Graphics& g) + void paint (Graphics& g) override { text.draw (g, getLocalBounds().reduced (6) .removeFromTop ((int) text.getHeight()).toFloat()); } - void resized() + void resized() override { const int buttonHeight = 26; diff --git a/modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp index f5d3dc6481..21a64ea546 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp @@ -102,7 +102,7 @@ public: } //============================================================================== - void paint (Graphics& g) + void paint (Graphics& g) override { getLookAndFeel().drawFileBrowserRow (g, getWidth(), getHeight(), file.getFileName(), @@ -111,13 +111,13 @@ public: index, owner); } - void mouseDown (const MouseEvent& e) + void mouseDown (const MouseEvent& e) override { owner.selectRowsBasedOnModifierKeys (index, e.mods, false); owner.sendMouseClickMessage (file, e); } - void mouseDoubleClick (const MouseEvent&) + void mouseDoubleClick (const MouseEvent&) override { owner.sendDoubleClickMessage (file); } @@ -168,13 +168,13 @@ public: } } - int useTimeSlice() + int useTimeSlice() override { updateIcon (false); return -1; } - void handleAsyncUpdate() + void handleAsyncUpdate() override { repaint(); } diff --git a/modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.h b/modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.h index 2ec505a05a..b27c3ed5f8 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.h +++ b/modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.h @@ -80,28 +80,27 @@ public: //============================================================================== /** @internal */ - int getNumRows(); + int getNumRows() override; /** @internal */ - void paintListBoxItem (int rowNumber, Graphics& g, int width, int height, bool rowIsSelected); + void paintListBoxItem (int rowNumber, Graphics& g, int width, int height, bool rowIsSelected) override; /** @internal */ - void deleteKeyPressed (int lastRowSelected); + void deleteKeyPressed (int lastRowSelected) override; /** @internal */ - void returnKeyPressed (int lastRowSelected); + void returnKeyPressed (int lastRowSelected) override; /** @internal */ - void listBoxItemDoubleClicked (int row, const MouseEvent&); + void listBoxItemDoubleClicked (int row, const MouseEvent&) override; /** @internal */ - void selectedRowsChanged (int lastRowSelected); + void selectedRowsChanged (int lastRowSelected) override; /** @internal */ - void resized(); + void resized() override; /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** @internal */ - bool isInterestedInFileDrag (const StringArray& files); + bool isInterestedInFileDrag (const StringArray&) override; /** @internal */ - void filesDropped (const StringArray& files, int, int); + void filesDropped (const StringArray& files, int, int) override; /** @internal */ - void buttonClicked (Button* button); - + void buttonClicked (Button*) override; private: //============================================================================== diff --git a/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp index 98c6b6c411..a8f2d0da6b 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp @@ -66,13 +66,13 @@ public: } //============================================================================== - bool mightContainSubItems() { return isDirectory; } - String getUniqueName() const { return file.getFullPathName(); } - int getItemHeight() const { return 22; } + bool mightContainSubItems() override { return isDirectory; } + String getUniqueName() const override { return file.getFullPathName(); } + int getItemHeight() const override { return 22; } - var getDragSourceDescription() { return owner.getDragAndDropDescription(); } + var getDragSourceDescription() override { return owner.getDragAndDropDescription(); } - void itemOpennessChanged (bool isNowOpen) + void itemOpennessChanged (bool isNowOpen) override { if (isNowOpen) { @@ -150,7 +150,7 @@ public: return false; } - void changeListenerCallback (ChangeBroadcaster*) + void changeListenerCallback (ChangeBroadcaster*) override { rebuildItemsFromContentList(); } @@ -167,7 +167,7 @@ public: } } - void paintItem (Graphics& g, int width, int height) + void paintItem (Graphics& g, int width, int height) override { if (file != File::nonexistent) { @@ -184,30 +184,30 @@ public: indexInContentsList, owner); } - void itemClicked (const MouseEvent& e) + void itemClicked (const MouseEvent& e) override { owner.sendMouseClickMessage (file, e); } - void itemDoubleClicked (const MouseEvent& e) + void itemDoubleClicked (const MouseEvent& e) override { TreeViewItem::itemDoubleClicked (e); owner.sendDoubleClickMessage (file); } - void itemSelectionChanged (bool) + void itemSelectionChanged (bool) override { owner.sendSelectionChangeMessage(); } - int useTimeSlice() + int useTimeSlice() override { updateIcon (false); return -1; } - void handleAsyncUpdate() + void handleAsyncUpdate() override { owner.repaint(); } diff --git a/modules/juce_gui_basics/filebrowser/juce_FilenameComponent.h b/modules/juce_gui_basics/filebrowser/juce_FilenameComponent.h index 8ac09c4551..50c6570615 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FilenameComponent.h +++ b/modules/juce_gui_basics/filebrowser/juce_FilenameComponent.h @@ -180,19 +180,19 @@ public: //============================================================================== /** @internal */ - void paintOverChildren (Graphics& g); + void paintOverChildren (Graphics&) override; /** @internal */ - void resized(); + void resized() override; /** @internal */ - void lookAndFeelChanged(); + void lookAndFeelChanged() override; /** @internal */ - bool isInterestedInFileDrag (const StringArray& files); + bool isInterestedInFileDrag (const StringArray&) override; /** @internal */ - void filesDropped (const StringArray& files, int, int); + void filesDropped (const StringArray&, int, int) override; /** @internal */ - void fileDragEnter (const StringArray& files, int, int); + void fileDragEnter (const StringArray&, int, int) override; /** @internal */ - void fileDragExit (const StringArray& files); + void fileDragExit (const StringArray&) override; private: //============================================================================== @@ -205,9 +205,9 @@ private: ListenerList listeners; File defaultBrowseFile; - void comboBoxChanged (ComboBox*); - void buttonClicked (Button* button); - void handleAsyncUpdate(); + void comboBoxChanged (ComboBox*) override; + void buttonClicked (Button* button) override; + void handleAsyncUpdate() override; JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FilenameComponent) }; diff --git a/modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.h b/modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.h index 10b643aec6..025af11c2d 100644 --- a/modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.h +++ b/modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.h @@ -48,11 +48,11 @@ public: //============================================================================== /** @internal */ - void selectedFileChanged (const File& newSelectedFile); + void selectedFileChanged (const File& newSelectedFile) override; /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** @internal */ - void timerCallback(); + void timerCallback() override; private: File fileToLoad; diff --git a/modules/juce_gui_basics/keyboard/juce_CaretComponent.h b/modules/juce_gui_basics/keyboard/juce_CaretComponent.h index 05b98c97bb..1018d494b3 100644 --- a/modules/juce_gui_basics/keyboard/juce_CaretComponent.h +++ b/modules/juce_gui_basics/keyboard/juce_CaretComponent.h @@ -67,13 +67,13 @@ public: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; private: Component* owner; bool shouldBeShown() const; - void timerCallback(); + void timerCallback() override; JUCE_DECLARE_NON_COPYABLE (CaretComponent) }; diff --git a/modules/juce_gui_basics/layout/juce_ComponentAnimator.cpp b/modules/juce_gui_basics/layout/juce_ComponentAnimator.cpp index 4ad50cdd70..c0bc26d659 100644 --- a/modules/juce_gui_basics/layout/juce_ComponentAnimator.cpp +++ b/modules/juce_gui_basics/layout/juce_ComponentAnimator.cpp @@ -154,7 +154,7 @@ public: toBehind (&c); } - void paint (Graphics& g) + void paint (Graphics& g) override { g.setOpacity (1.0f); g.drawImage (image, 0, 0, getWidth(), getHeight(), diff --git a/modules/juce_gui_basics/layout/juce_ConcertinaPanel.cpp b/modules/juce_gui_basics/layout/juce_ConcertinaPanel.cpp index b5440029d3..c50271ea99 100644 --- a/modules/juce_gui_basics/layout/juce_ConcertinaPanel.cpp +++ b/modules/juce_gui_basics/layout/juce_ConcertinaPanel.cpp @@ -217,7 +217,7 @@ public: addAndMakeVisible (comp); } - void paint (Graphics& g) + void paint (Graphics& g) override { const Rectangle area (getWidth(), getHeaderSize()); g.reduceClipRegion (area); @@ -226,18 +226,18 @@ public: getPanel(), *component); } - void resized() + void resized() override { component->setBounds (getLocalBounds().withTop (getHeaderSize())); } - void mouseDown (const MouseEvent&) + void mouseDown (const MouseEvent&) override { mouseDownY = getY(); dragStartSizes = getPanel().getFittedSizes(); } - void mouseDrag (const MouseEvent& e) + void mouseDrag (const MouseEvent& e) override { ConcertinaPanel& panel = getPanel(); panel.setLayout (dragStartSizes.withMovedPanel (panel.holders.indexOf (this), @@ -245,7 +245,7 @@ public: panel.getHeight()), false); } - void mouseDoubleClick (const MouseEvent&) + void mouseDoubleClick (const MouseEvent&) override { getPanel().panelHeaderDoubleClicked (component); } diff --git a/modules/juce_gui_basics/layout/juce_ConcertinaPanel.h b/modules/juce_gui_basics/layout/juce_ConcertinaPanel.h index 626e7861a6..b53ede90e3 100644 --- a/modules/juce_gui_basics/layout/juce_ConcertinaPanel.h +++ b/modules/juce_gui_basics/layout/juce_ConcertinaPanel.h @@ -93,7 +93,7 @@ public: void setPanelHeaderSize (Component* panelComponent, int headerSize); private: - void resized(); + void resized() override; class PanelHolder; struct PanelSizes; diff --git a/modules/juce_gui_basics/layout/juce_GroupComponent.h b/modules/juce_gui_basics/layout/juce_GroupComponent.h index fae94748a8..d2c0dfb820 100644 --- a/modules/juce_gui_basics/layout/juce_GroupComponent.h +++ b/modules/juce_gui_basics/layout/juce_GroupComponent.h @@ -86,11 +86,11 @@ public: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** @internal */ - void enablementChanged(); + void enablementChanged() override; /** @internal */ - void colourChanged(); + void colourChanged() override; private: String text; diff --git a/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.h b/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.h index fdaf50be63..00ded3ccc7 100644 --- a/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.h +++ b/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.h @@ -277,11 +277,11 @@ public: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** @internal */ - void resized(); + void resized() override; /** @internal */ - void componentNameChanged (Component&); + void componentNameChanged (Component&) override; private: //============================================================================== diff --git a/modules/juce_gui_basics/layout/juce_ResizableBorderComponent.h b/modules/juce_gui_basics/layout/juce_ResizableBorderComponent.h index 8129147a16..4288b200c4 100644 --- a/modules/juce_gui_basics/layout/juce_ResizableBorderComponent.h +++ b/modules/juce_gui_basics/layout/juce_ResizableBorderComponent.h @@ -167,19 +167,19 @@ public: protected: /** @internal */ - void paint (Graphics&); + void paint (Graphics&) override; /** @internal */ - void mouseEnter (const MouseEvent&); + void mouseEnter (const MouseEvent&) override; /** @internal */ - void mouseMove (const MouseEvent&); + void mouseMove (const MouseEvent&) override; /** @internal */ - void mouseDown (const MouseEvent&); + void mouseDown (const MouseEvent&) override; /** @internal */ - void mouseDrag (const MouseEvent&); + void mouseDrag (const MouseEvent&) override; /** @internal */ - void mouseUp (const MouseEvent&); + void mouseUp (const MouseEvent&) override; /** @internal */ - bool hitTest (int x, int y); + bool hitTest (int x, int y) override; private: WeakReference component; diff --git a/modules/juce_gui_basics/layout/juce_ResizableCornerComponent.h b/modules/juce_gui_basics/layout/juce_ResizableCornerComponent.h index a18eac4230..0aed7e6ae9 100644 --- a/modules/juce_gui_basics/layout/juce_ResizableCornerComponent.h +++ b/modules/juce_gui_basics/layout/juce_ResizableCornerComponent.h @@ -70,15 +70,15 @@ public: protected: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** @internal */ - void mouseDown (const MouseEvent& e); + void mouseDown (const MouseEvent&) override; /** @internal */ - void mouseDrag (const MouseEvent& e); + void mouseDrag (const MouseEvent&) override; /** @internal */ - void mouseUp (const MouseEvent& e); + void mouseUp (const MouseEvent&) override; /** @internal */ - bool hitTest (int x, int y); + bool hitTest (int x, int y) override; private: //============================================================================== diff --git a/modules/juce_gui_basics/layout/juce_ResizableEdgeComponent.h b/modules/juce_gui_basics/layout/juce_ResizableEdgeComponent.h index c8cdfa2246..0dbf907096 100644 --- a/modules/juce_gui_basics/layout/juce_ResizableEdgeComponent.h +++ b/modules/juce_gui_basics/layout/juce_ResizableEdgeComponent.h @@ -80,13 +80,13 @@ public: protected: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** @internal */ - void mouseDown (const MouseEvent& e); + void mouseDown (const MouseEvent&) override; /** @internal */ - void mouseDrag (const MouseEvent& e); + void mouseDrag (const MouseEvent&) override; /** @internal */ - void mouseUp (const MouseEvent& e); + void mouseUp (const MouseEvent&) override; private: WeakReference component; diff --git a/modules/juce_gui_basics/layout/juce_ScrollBar.h b/modules/juce_gui_basics/layout/juce_ScrollBar.h index 1e875c611c..a4cc6a38be 100644 --- a/modules/juce_gui_basics/layout/juce_ScrollBar.h +++ b/modules/juce_gui_basics/layout/juce_ScrollBar.h @@ -296,21 +296,21 @@ public: //============================================================================== /** @internal */ - bool keyPressed (const KeyPress&); + bool keyPressed (const KeyPress&) override; /** @internal */ - void mouseWheelMove (const MouseEvent&, const MouseWheelDetails&); + void mouseWheelMove (const MouseEvent&, const MouseWheelDetails&) override; /** @internal */ - void lookAndFeelChanged(); + void lookAndFeelChanged() override; /** @internal */ - void mouseDown (const MouseEvent&); + void mouseDown (const MouseEvent&) override; /** @internal */ - void mouseDrag (const MouseEvent&); + void mouseDrag (const MouseEvent&) override; /** @internal */ - void mouseUp (const MouseEvent&); + void mouseUp (const MouseEvent&) override; /** @internal */ - void paint (Graphics&); + void paint (Graphics&) override; /** @internal */ - void resized(); + void resized() override; private: //============================================================================== @@ -325,9 +325,9 @@ private: ScopedPointer upButton, downButton; ListenerList listeners; - void handleAsyncUpdate(); + void handleAsyncUpdate() override; void updateThumbPosition(); - void timerCallback(); + void timerCallback() override; JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ScrollBar) }; diff --git a/modules/juce_gui_basics/layout/juce_StretchableLayoutResizerBar.h b/modules/juce_gui_basics/layout/juce_StretchableLayoutResizerBar.h index cf500aab56..6735212b75 100644 --- a/modules/juce_gui_basics/layout/juce_StretchableLayoutResizerBar.h +++ b/modules/juce_gui_basics/layout/juce_StretchableLayoutResizerBar.h @@ -77,11 +77,11 @@ public: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** @internal */ - void mouseDown (const MouseEvent& e); + void mouseDown (const MouseEvent&) override; /** @internal */ - void mouseDrag (const MouseEvent& e); + void mouseDrag (const MouseEvent&) override; private: diff --git a/modules/juce_gui_basics/layout/juce_TabbedButtonBar.cpp b/modules/juce_gui_basics/layout/juce_TabbedButtonBar.cpp index 78da7c5d77..9f76dbb3df 100644 --- a/modules/juce_gui_basics/layout/juce_TabbedButtonBar.cpp +++ b/modules/juce_gui_basics/layout/juce_TabbedButtonBar.cpp @@ -157,17 +157,17 @@ public: setInterceptsMouseClicks (false, false); } - void paint (Graphics& g) + void paint (Graphics& g) override { getLookAndFeel().drawTabAreaBehindFrontButton (owner, g, getWidth(), getHeight()); } - void enablementChanged() + void enablementChanged() override { repaint(); } - void buttonClicked (Button*) + void buttonClicked (Button*) override { owner.showExtraItemsMenu(); } diff --git a/modules/juce_gui_basics/layout/juce_TabbedComponent.h b/modules/juce_gui_basics/layout/juce_TabbedComponent.h index 11ac0da253..0c983d8bc4 100644 --- a/modules/juce_gui_basics/layout/juce_TabbedComponent.h +++ b/modules/juce_gui_basics/layout/juce_TabbedComponent.h @@ -187,11 +187,11 @@ public: //============================================================================== /** @internal */ - void paint (Graphics&); + void paint (Graphics&) override; /** @internal */ - void resized(); + void resized() override; /** @internal */ - void lookAndFeelChanged(); + void lookAndFeelChanged() override; protected: //============================================================================== diff --git a/modules/juce_gui_basics/menus/juce_MenuBarComponent.h b/modules/juce_gui_basics/menus/juce_MenuBarComponent.h index d8ca2a42de..96aa645996 100644 --- a/modules/juce_gui_basics/menus/juce_MenuBarComponent.h +++ b/modules/juce_gui_basics/menus/juce_MenuBarComponent.h @@ -73,30 +73,29 @@ public: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** @internal */ - void resized(); + void resized() override; /** @internal */ - void mouseEnter (const MouseEvent& e); + void mouseEnter (const MouseEvent&) override; /** @internal */ - void mouseExit (const MouseEvent& e); + void mouseExit (const MouseEvent&) override; /** @internal */ - void mouseDown (const MouseEvent& e); + void mouseDown (const MouseEvent&) override; /** @internal */ - void mouseDrag (const MouseEvent& e); + void mouseDrag (const MouseEvent&) override; /** @internal */ - void mouseUp (const MouseEvent& e); + void mouseUp (const MouseEvent&) override; /** @internal */ - void mouseMove (const MouseEvent& e); + void mouseMove (const MouseEvent&) override; /** @internal */ - void handleCommandMessage (int commandId); + void handleCommandMessage (int commandId) override; /** @internal */ - bool keyPressed (const KeyPress& key); + bool keyPressed (const KeyPress&) override; /** @internal */ - void menuBarItemsChanged (MenuBarModel* menuBarModel); + void menuBarItemsChanged (MenuBarModel*) override; /** @internal */ - void menuCommandInvoked (MenuBarModel* menuBarModel, - const ApplicationCommandTarget::InvocationInfo& info); + void menuCommandInvoked (MenuBarModel*, const ApplicationCommandTarget::InvocationInfo&) override; private: //============================================================================== @@ -111,7 +110,7 @@ private: void setItemUnderMouse (int index); void setOpenItem (int index); void updateItemUnderMouse (Point); - void timerCallback(); + void timerCallback() override; void repaintMenuItem (int index); void menuDismissed (int topLevelIndex, int itemId); static void menuBarMenuDismissedCallback (int, MenuBarComponent*, int); diff --git a/modules/juce_gui_basics/menus/juce_MenuBarModel.h b/modules/juce_gui_basics/menus/juce_MenuBarModel.h index 68846db4e5..de6681bd47 100644 --- a/modules/juce_gui_basics/menus/juce_MenuBarModel.h +++ b/modules/juce_gui_basics/menus/juce_MenuBarModel.h @@ -166,11 +166,11 @@ public: //============================================================================== /** @internal */ - void applicationCommandInvoked (const ApplicationCommandTarget::InvocationInfo& info); + void applicationCommandInvoked (const ApplicationCommandTarget::InvocationInfo& info) override; /** @internal */ - void applicationCommandListChanged(); + void applicationCommandListChanged() override; /** @internal */ - void handleAsyncUpdate(); + void handleAsyncUpdate() override; private: ApplicationCommandManager* manager; diff --git a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp index 5a56218630..11e9764444 100644 --- a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp +++ b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp @@ -153,7 +153,7 @@ public: idealWidth, idealHeight); } - void paint (Graphics& g) + void paint (Graphics& g) override { if (itemInfo.customComp == nullptr) { @@ -180,7 +180,7 @@ public: } } - void resized() + void resized() override { if (Component* const child = getChildComponent (0)) child->setBounds (getLocalBounds().reduced (2, 0)); @@ -290,7 +290,7 @@ public: } //============================================================================== - void paint (Graphics& g) + void paint (Graphics& g) override { if (isOpaque()) g.fillAll (Colours::white); @@ -298,7 +298,7 @@ public: getLookAndFeel().drawPopupMenuBackground (g, getWidth(), getHeight()); } - void paintOverChildren (Graphics& g) + void paintOverChildren (Graphics& g) override { if (canScroll()) { @@ -362,18 +362,18 @@ public: } //============================================================================== - void mouseMove (const MouseEvent&) { timerCallback(); } - void mouseDown (const MouseEvent&) { timerCallback(); } - void mouseDrag (const MouseEvent&) { timerCallback(); } - void mouseUp (const MouseEvent&) { timerCallback(); } + void mouseMove (const MouseEvent&) override { timerCallback(); } + void mouseDown (const MouseEvent&) override { timerCallback(); } + void mouseDrag (const MouseEvent&) override { timerCallback(); } + void mouseUp (const MouseEvent&) override { timerCallback(); } - void mouseWheelMove (const MouseEvent&, const MouseWheelDetails& wheel) + void mouseWheelMove (const MouseEvent&, const MouseWheelDetails& wheel) override { alterChildYPos (roundToInt (-10.0f * wheel.deltaY * PopupMenuSettings::scrollZone)); lastMousePos = Point (-1, -1); } - bool keyPressed (const KeyPress& key) + bool keyPressed (const KeyPress& key) override { if (key.isKeyCode (KeyPress::downKey)) { @@ -432,7 +432,7 @@ public: return true; } - void inputAttemptWhenModal() + void inputAttemptWhenModal() override { WeakReference deletionChecker (this); @@ -461,7 +461,7 @@ public: } } - void handleCommandMessage (int commandId) + void handleCommandMessage (int commandId) override { Component::handleCommandMessage (commandId); @@ -470,7 +470,7 @@ public: } //============================================================================== - void timerCallback() + void timerCallback() override { if (! isVisible()) return; @@ -1303,7 +1303,7 @@ public: setName (name); } - void paint (Graphics& g) + void paint (Graphics& g) override { g.setFont (getLookAndFeel().getPopupMenuFont().boldened()); g.setColour (findColour (PopupMenu::headerTextColourId)); diff --git a/modules/juce_gui_basics/misc/juce_BubbleComponent.h b/modules/juce_gui_basics/misc/juce_BubbleComponent.h index d38ddceb53..1cc98f80d3 100644 --- a/modules/juce_gui_basics/misc/juce_BubbleComponent.h +++ b/modules/juce_gui_basics/misc/juce_BubbleComponent.h @@ -152,7 +152,7 @@ protected: public: /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; private: Rectangle content; diff --git a/modules/juce_gui_basics/misc/juce_DropShadower.cpp b/modules/juce_gui_basics/misc/juce_DropShadower.cpp index eff3a0f79f..871cbc1504 100644 --- a/modules/juce_gui_basics/misc/juce_DropShadower.cpp +++ b/modules/juce_gui_basics/misc/juce_DropShadower.cpp @@ -44,13 +44,13 @@ public: } } - void paint (Graphics& g) + void paint (Graphics& g) override { if (Component* c = target) shadow.drawForRectangle (g, getLocalArea (c, c->getLocalBounds())); } - void resized() + void resized() override { repaint(); // (needed for correct repainting) } diff --git a/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp b/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp index 5ea9865c66..ac84233051 100644 --- a/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp +++ b/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp @@ -72,7 +72,7 @@ public: } } - void paint (Graphics& g) + void paint (Graphics& g) override { if (isOpaque()) g.fillAll (Colours::white); @@ -81,7 +81,7 @@ public: g.drawImageAt (image, 0, 0); } - void mouseUp (const MouseEvent& e) + void mouseUp (const MouseEvent& e) override { if (e.originalComponent != this) { @@ -114,7 +114,7 @@ public: } } - void mouseDrag (const MouseEvent& e) + void mouseDrag (const MouseEvent& e) override { if (e.originalComponent != this) updateLocation (true, e.getScreenPosition()); @@ -157,7 +157,7 @@ public: } } - void timerCallback() + void timerCallback() override { if (sourceDetails.sourceComponent == nullptr) { diff --git a/modules/juce_gui_basics/mouse/juce_LassoComponent.h b/modules/juce_gui_basics/mouse/juce_LassoComponent.h index 7bfc3a4cb2..d9f3da2fc8 100644 --- a/modules/juce_gui_basics/mouse/juce_LassoComponent.h +++ b/modules/juce_gui_basics/mouse/juce_LassoComponent.h @@ -207,7 +207,7 @@ public: //============================================================================== /** @internal */ - void paint (Graphics& g) + void paint (Graphics& g) override { getLookAndFeel().drawLasso (g, *this); @@ -218,7 +218,7 @@ public: } /** @internal */ - bool hitTest (int, int) { return false; } + bool hitTest (int, int) override { return false; } private: //============================================================================== diff --git a/modules/juce_gui_basics/mouse/juce_MouseInputSource.cpp b/modules/juce_gui_basics/mouse/juce_MouseInputSource.cpp index 56f7e8b82c..373224748a 100644 --- a/modules/juce_gui_basics/mouse/juce_MouseInputSource.cpp +++ b/modules/juce_gui_basics/mouse/juce_MouseInputSource.cpp @@ -362,7 +362,7 @@ public: triggerAsyncUpdate(); } - void handleAsyncUpdate() + void handleAsyncUpdate() override { setScreenPos (lastScreenPos, jmax (lastTime, Time::getCurrentTime()), true); } diff --git a/modules/juce_gui_basics/native/juce_linux_Windowing.cpp b/modules/juce_gui_basics/native/juce_linux_Windowing.cpp index 4977eccd57..cd519a5dc7 100644 --- a/modules/juce_gui_basics/native/juce_linux_Windowing.cpp +++ b/modules/juce_gui_basics/native/juce_linux_Windowing.cpp @@ -1805,7 +1805,7 @@ private: #endif } - void timerCallback() + void timerCallback() override { #if JUCE_USE_XSHM if (shmPaintsPending != 0) diff --git a/modules/juce_gui_basics/native/juce_mac_Windowing.mm b/modules/juce_gui_basics/native/juce_mac_Windowing.mm index 0af0b84cf6..e248195416 100644 --- a/modules/juce_gui_basics/native/juce_mac_Windowing.mm +++ b/modules/juce_gui_basics/native/juce_mac_Windowing.mm @@ -72,7 +72,7 @@ private: const char* button2; const char* button3; - void handleAsyncUpdate() + void handleAsyncUpdate() override { const int result = getResult(); @@ -250,7 +250,7 @@ public: timerCallback(); } - void timerCallback() + void timerCallback() override { if (Process::isForegroundProcess()) { @@ -291,7 +291,7 @@ public: timerCallback(); } - void timerCallback() + void timerCallback() override { if (Process::isForegroundProcess()) UpdateSystemActivity (1 /*UsrActivity*/); diff --git a/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp b/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp index a3b97aee8b..da839eb6fa 100644 --- a/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp +++ b/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp @@ -101,12 +101,12 @@ namespace FileChooserHelpers setSize (jlimit (20, 800, customComp->getWidth()), customComp->getHeight()); } - void paint (Graphics& g) + void paint (Graphics& g) override { g.fillAll (Colours::lightgrey); } - void resized() + void resized() override { if (Component* const c = getChildComponent(0)) c->setBounds (getLocalBounds()); diff --git a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp index d34295ee5a..36a7805957 100644 --- a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp +++ b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp @@ -1123,7 +1123,7 @@ private: return image; } - void timerCallback() + void timerCallback() override { stopTimer(); image = Image::null; @@ -2923,7 +2923,7 @@ public: return (r == IDYES || r == IDOK) ? 1 : (r == IDNO ? 2 : 0); } - void handleAsyncUpdate() + void handleAsyncUpdate() override { const int result = getResult(); @@ -3040,7 +3040,7 @@ public: timerCallback(); } - void timerCallback() + void timerCallback() override { if (Process::isForegroundProcess()) { diff --git a/modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.h b/modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.h index 398b8f6214..74ba287519 100644 --- a/modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.h +++ b/modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.h @@ -79,11 +79,11 @@ public: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** @internal */ - void refresh(); + void refresh() override; /** @internal */ - void buttonClicked (Button*); + void buttonClicked (Button*) override; private: ToggleButton button; diff --git a/modules/juce_gui_basics/properties/juce_PropertyComponent.h b/modules/juce_gui_basics/properties/juce_PropertyComponent.h index 07cef047fd..c880e8bdfc 100644 --- a/modules/juce_gui_basics/properties/juce_PropertyComponent.h +++ b/modules/juce_gui_basics/properties/juce_PropertyComponent.h @@ -96,15 +96,15 @@ public: @see LookAndFeel::drawPropertyComponentBackground(), LookAndFeel::drawPropertyComponentLabel() */ - void paint (Graphics& g); + void paint (Graphics&) override; /** The default resize method positions any child component to the right of this one, based on the look and feel's default label size. */ - void resized(); + void resized() override; /** By default, this just repaints the component. */ - void enablementChanged(); + void enablementChanged() override; protected: /** Used by the PropertyPanel to determine how high this component needs to be. diff --git a/modules/juce_gui_basics/properties/juce_PropertyPanel.cpp b/modules/juce_gui_basics/properties/juce_PropertyPanel.cpp index c9b1f7f007..f8a9f72617 100644 --- a/modules/juce_gui_basics/properties/juce_PropertyPanel.cpp +++ b/modules/juce_gui_basics/properties/juce_PropertyPanel.cpp @@ -46,13 +46,13 @@ public: propertyComps.clear(); } - void paint (Graphics& g) + void paint (Graphics& g) override { if (titleHeight > 0) getLookAndFeel().drawPropertyPanelSectionHeader (g, getName(), isOpen(), getWidth(), titleHeight); } - void resized() + void resized() override { int y = titleHeight; @@ -102,7 +102,7 @@ public: propertyComps.getUnchecked (i)->refresh(); } - void mouseUp (const MouseEvent& e) + void mouseUp (const MouseEvent& e) override { if (e.getMouseDownX() < titleHeight && e.x < titleHeight @@ -113,7 +113,7 @@ public: } } - void mouseDoubleClick (const MouseEvent& e) + void mouseDoubleClick (const MouseEvent& e) override { if (e.y < titleHeight) setOpen (! isOpen()); @@ -133,7 +133,7 @@ class PropertyPanel::PropertyHolderComponent : public Component public: PropertyHolderComponent() {} - void paint (Graphics&) {} + void paint (Graphics&) override {} void updateLayout (int width) { diff --git a/modules/juce_gui_basics/properties/juce_PropertyPanel.h b/modules/juce_gui_basics/properties/juce_PropertyPanel.h index 68880e9ee5..883bcbae03 100644 --- a/modules/juce_gui_basics/properties/juce_PropertyPanel.h +++ b/modules/juce_gui_basics/properties/juce_PropertyPanel.h @@ -144,9 +144,9 @@ public: //============================================================================== /** @internal */ - void paint (Graphics&); + void paint (Graphics&) override; /** @internal */ - void resized(); + void resized() override; private: class SectionComponent; diff --git a/modules/juce_gui_basics/widgets/juce_ComboBox.h b/modules/juce_gui_basics/widgets/juce_ComboBox.h index fbceb539de..cc5cb743dd 100644 --- a/modules/juce_gui_basics/widgets/juce_ComboBox.h +++ b/modules/juce_gui_basics/widgets/juce_ComboBox.h @@ -339,37 +339,37 @@ public: //============================================================================== /** @internal */ - void labelTextChanged (Label*); + void labelTextChanged (Label*) override; /** @internal */ - void enablementChanged(); + void enablementChanged() override; /** @internal */ - void colourChanged(); + void colourChanged() override; /** @internal */ - void focusGained (Component::FocusChangeType cause); + void focusGained (Component::FocusChangeType) override; /** @internal */ - void focusLost (Component::FocusChangeType cause); + void focusLost (Component::FocusChangeType) override; /** @internal */ - void handleAsyncUpdate(); + void handleAsyncUpdate() override; /** @internal */ - String getTooltip() { return label->getTooltip(); } + String getTooltip() override { return label->getTooltip(); } /** @internal */ - void mouseDown (const MouseEvent&); + void mouseDown (const MouseEvent&) override; /** @internal */ - void mouseDrag (const MouseEvent&); + void mouseDrag (const MouseEvent&) override; /** @internal */ - void mouseUp (const MouseEvent&); + void mouseUp (const MouseEvent&) override; /** @internal */ - void lookAndFeelChanged(); + void lookAndFeelChanged() override; /** @internal */ - void paint (Graphics&); + void paint (Graphics&) override; /** @internal */ - void resized(); + void resized() override; /** @internal */ - bool keyStateChanged (bool isKeyDown); + bool keyStateChanged (bool) override; /** @internal */ - bool keyPressed (const KeyPress&); + bool keyPressed (const KeyPress&) override; /** @internal */ - void valueChanged (Value&); + void valueChanged (Value&) override; private: //============================================================================== diff --git a/modules/juce_gui_basics/widgets/juce_ImageComponent.cpp b/modules/juce_gui_basics/widgets/juce_ImageComponent.cpp index 4a6fca5379..90e6a5d17f 100644 --- a/modules/juce_gui_basics/widgets/juce_ImageComponent.cpp +++ b/modules/juce_gui_basics/widgets/juce_ImageComponent.cpp @@ -65,7 +65,7 @@ const Image& ImageComponent::getImage() const return image; } -const RectanglePlacement ImageComponent::getImagePlacement() const +RectanglePlacement ImageComponent::getImagePlacement() const { return placement; } diff --git a/modules/juce_gui_basics/widgets/juce_ImageComponent.h b/modules/juce_gui_basics/widgets/juce_ImageComponent.h index d65ddebd0c..186fde6ebe 100644 --- a/modules/juce_gui_basics/widgets/juce_ImageComponent.h +++ b/modules/juce_gui_basics/widgets/juce_ImageComponent.h @@ -64,11 +64,11 @@ public: void setImagePlacement (const RectanglePlacement& newPlacement); /** Returns the current image placement. */ - const RectanglePlacement getImagePlacement() const; + RectanglePlacement getImagePlacement() const; //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; private: Image image; diff --git a/modules/juce_gui_basics/widgets/juce_Label.h b/modules/juce_gui_basics/widgets/juce_Label.h index 1e80c8826e..064d7c0854 100644 --- a/modules/juce_gui_basics/widgets/juce_Label.h +++ b/modules/juce_gui_basics/widgets/juce_Label.h @@ -274,39 +274,39 @@ protected: //============================================================================== /** @internal */ - void paint (Graphics&); + void paint (Graphics&) override; /** @internal */ - void resized(); + void resized() override; /** @internal */ - void mouseUp (const MouseEvent&); + void mouseUp (const MouseEvent&) override; /** @internal */ - void mouseDoubleClick (const MouseEvent&); + void mouseDoubleClick (const MouseEvent&) override; /** @internal */ - void componentMovedOrResized (Component&, bool wasMoved, bool wasResized); + void componentMovedOrResized (Component&, bool wasMoved, bool wasResized) override; /** @internal */ - void componentParentHierarchyChanged (Component&); + void componentParentHierarchyChanged (Component&) override; /** @internal */ - void componentVisibilityChanged (Component&); + void componentVisibilityChanged (Component&) override; /** @internal */ - void inputAttemptWhenModal(); + void inputAttemptWhenModal() override; /** @internal */ - void focusGained (FocusChangeType); + void focusGained (FocusChangeType) override; /** @internal */ - void enablementChanged(); + void enablementChanged() override; /** @internal */ - KeyboardFocusTraverser* createFocusTraverser(); + KeyboardFocusTraverser* createFocusTraverser() override; /** @internal */ - void textEditorTextChanged (TextEditor&); + void textEditorTextChanged (TextEditor&) override; /** @internal */ - void textEditorReturnKeyPressed (TextEditor&); + void textEditorReturnKeyPressed (TextEditor&) override; /** @internal */ - void textEditorEscapeKeyPressed (TextEditor&); + void textEditorEscapeKeyPressed (TextEditor&) override; /** @internal */ - void textEditorFocusLost (TextEditor&); + void textEditorFocusLost (TextEditor&) override; /** @internal */ - void colourChanged(); + void colourChanged() override; /** @internal */ - void valueChanged (Value&); + void valueChanged (Value&) override; /** @internal */ void callChangeListeners(); diff --git a/modules/juce_gui_basics/widgets/juce_ListBox.h b/modules/juce_gui_basics/widgets/juce_ListBox.h index 01c0e9cb73..5803e17465 100644 --- a/modules/juce_gui_basics/widgets/juce_ListBox.h +++ b/modules/juce_gui_basics/widgets/juce_ListBox.h @@ -526,23 +526,23 @@ public: //============================================================================== /** @internal */ - bool keyPressed (const KeyPress&); + bool keyPressed (const KeyPress&) override; /** @internal */ - bool keyStateChanged (bool isKeyDown); + bool keyStateChanged (bool isKeyDown) override; /** @internal */ - void paint (Graphics&); + void paint (Graphics&) override; /** @internal */ - void paintOverChildren (Graphics&); + void paintOverChildren (Graphics&) override; /** @internal */ - void resized(); + void resized() override; /** @internal */ - void visibilityChanged(); + void visibilityChanged() override; /** @internal */ - void mouseWheelMove (const MouseEvent&, const MouseWheelDetails&); + void mouseWheelMove (const MouseEvent&, const MouseWheelDetails&) override; /** @internal */ - void mouseUp (const MouseEvent&); + void mouseUp (const MouseEvent&) override; /** @internal */ - void colourChanged(); + void colourChanged() override; /** @internal */ void startDragAndDrop (const MouseEvent&, const var& dragDescription, bool allowDraggingToOtherWindows); diff --git a/modules/juce_gui_basics/widgets/juce_ProgressBar.h b/modules/juce_gui_basics/widgets/juce_ProgressBar.h index 46062fb22d..5535775ff6 100644 --- a/modules/juce_gui_basics/widgets/juce_ProgressBar.h +++ b/modules/juce_gui_basics/widgets/juce_ProgressBar.h @@ -95,13 +95,13 @@ public: protected: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** @internal */ - void lookAndFeelChanged(); + void lookAndFeelChanged() override; /** @internal */ - void visibilityChanged(); + void visibilityChanged() override; /** @internal */ - void colourChanged(); + void colourChanged() override; private: double& progress; @@ -110,7 +110,7 @@ private: String displayedMessage, currentMessage; uint32 lastCallbackTime; - void timerCallback(); + void timerCallback() override; JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ProgressBar) }; diff --git a/modules/juce_gui_basics/widgets/juce_Slider.cpp b/modules/juce_gui_basics/widgets/juce_Slider.cpp index 57d97e23e0..f7d8e7e205 100644 --- a/modules/juce_gui_basics/widgets/juce_Slider.cpp +++ b/modules/juce_gui_basics/widgets/juce_Slider.cpp @@ -329,7 +329,7 @@ public: } } - void handleAsyncUpdate() + void handleAsyncUpdate() override { cancelPendingUpdate(); @@ -1284,7 +1284,7 @@ public: repaint(); } - void timerCallback() + void timerCallback() override { owner.pimpl->popupDisplay = nullptr; } diff --git a/modules/juce_gui_basics/widgets/juce_Slider.h b/modules/juce_gui_basics/widgets/juce_Slider.h index 8a973dfbe4..0054dc3b97 100644 --- a/modules/juce_gui_basics/widgets/juce_Slider.h +++ b/modules/juce_gui_basics/widgets/juce_Slider.h @@ -772,29 +772,29 @@ public: protected: //============================================================================== /** @internal */ - void paint (Graphics&); + void paint (Graphics&) override; /** @internal */ - void resized(); + void resized() override; /** @internal */ - void mouseDown (const MouseEvent&); + void mouseDown (const MouseEvent&) override; /** @internal */ - void mouseUp (const MouseEvent&); + void mouseUp (const MouseEvent&) override; /** @internal */ - void mouseDrag (const MouseEvent&); + void mouseDrag (const MouseEvent&) override; /** @internal */ - void mouseDoubleClick (const MouseEvent&); + void mouseDoubleClick (const MouseEvent&) override; /** @internal */ - void mouseWheelMove (const MouseEvent&, const MouseWheelDetails&); + void mouseWheelMove (const MouseEvent&, const MouseWheelDetails&) override; /** @internal */ - void modifierKeysChanged (const ModifierKeys&); + void modifierKeysChanged (const ModifierKeys&) override; /** @internal */ - void lookAndFeelChanged(); + void lookAndFeelChanged() override; /** @internal */ - void enablementChanged(); + void enablementChanged() override; /** @internal */ - void focusOfChildComponentChanged (FocusChangeType); + void focusOfChildComponentChanged (FocusChangeType) override; /** @internal */ - void colourChanged(); + void colourChanged() override; /** Returns the best number of decimal places to use when displaying numbers. This is calculated from the slider's interval setting. diff --git a/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.cpp b/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.cpp index 8f7e3baff3..4c43a352cf 100644 --- a/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.cpp +++ b/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.cpp @@ -33,7 +33,7 @@ public: setAlwaysOnTop (true); } - void paint (Graphics& g) + void paint (Graphics& g) override { g.drawImageAt (image, 0, 0); } diff --git a/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.h b/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.h index 35d4681205..472d73cb7d 100644 --- a/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.h +++ b/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.h @@ -372,23 +372,23 @@ public: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** @internal */ - void resized(); + void resized() override; /** @internal */ - void mouseMove (const MouseEvent&); + void mouseMove (const MouseEvent&) override; /** @internal */ - void mouseEnter (const MouseEvent&); + void mouseEnter (const MouseEvent&) override; /** @internal */ - void mouseExit (const MouseEvent&); + void mouseExit (const MouseEvent&) override; /** @internal */ - void mouseDown (const MouseEvent&); + void mouseDown (const MouseEvent&) override; /** @internal */ - void mouseDrag (const MouseEvent&); + void mouseDrag (const MouseEvent&) override; /** @internal */ - void mouseUp (const MouseEvent&); + void mouseUp (const MouseEvent&) override; /** @internal */ - MouseCursor getMouseCursor(); + MouseCursor getMouseCursor() override; /** Can be overridden for more control over the pop-up menu behaviour. */ virtual void showColumnChooserMenu (int columnIdClicked); @@ -415,7 +415,7 @@ private: ColumnInfo* getInfoForId (int columnId) const; int visibleIndexToTotalIndex (int visibleIndex) const; void sendColumnsChanged(); - void handleAsyncUpdate(); + void handleAsyncUpdate() override; void beginDrag (const MouseEvent&); void endDrag (int finalIndex); int getResizeDraggerAt (int mouseX) const; diff --git a/modules/juce_gui_basics/widgets/juce_TableListBox.cpp b/modules/juce_gui_basics/widgets/juce_TableListBox.cpp index 748cf13310..0b49d1cc73 100644 --- a/modules/juce_gui_basics/widgets/juce_TableListBox.cpp +++ b/modules/juce_gui_basics/widgets/juce_TableListBox.cpp @@ -30,7 +30,7 @@ public: { } - void paint (Graphics& g) + void paint (Graphics& g) override { if (TableListBoxModel* const tableModel = owner.getModel()) { @@ -105,7 +105,7 @@ public: } } - void resized() + void resized() override { for (int i = columnComponents.size(); --i >= 0;) resizeCustomComp (i); @@ -118,7 +118,7 @@ public: .withY (0).withHeight (getHeight())); } - void mouseDown (const MouseEvent& e) + void mouseDown (const MouseEvent& e) override { isDragging = false; selectRowOnMouseUp = false; @@ -142,7 +142,7 @@ public: } } - void mouseDrag (const MouseEvent& e) + void mouseDrag (const MouseEvent& e) override { if (isEnabled() && owner.getModel() != nullptr && ! (e.mouseWasClicked() || isDragging)) { @@ -161,7 +161,7 @@ public: } } - void mouseUp (const MouseEvent& e) + void mouseUp (const MouseEvent& e) override { if (selectRowOnMouseUp && e.mouseWasClicked() && isEnabled()) { @@ -175,7 +175,7 @@ public: } } - void mouseDoubleClick (const MouseEvent& e) + void mouseDoubleClick (const MouseEvent& e) override { const int columnId = owner.getHeader().getColumnIdAtX (e.x); @@ -184,7 +184,7 @@ public: m->cellDoubleClicked (row, columnId, e); } - String getTooltip() + String getTooltip() override { const int columnId = owner.getHeader().getColumnIdAtX (getMouseXYRelative().getX()); diff --git a/modules/juce_gui_basics/widgets/juce_TextEditor.cpp b/modules/juce_gui_basics/widgets/juce_TextEditor.cpp index 84596312fa..eb5a5f1dc3 100644 --- a/modules/juce_gui_basics/widgets/juce_TextEditor.cpp +++ b/modules/juce_gui_basics/widgets/juce_TextEditor.cpp @@ -844,7 +844,7 @@ public: owner.getTextValue().removeListener (this); } - void paint (Graphics& g) + void paint (Graphics& g) override { owner.drawContent (g); } @@ -854,12 +854,12 @@ public: startTimer (350); } - void timerCallback() + void timerCallback() override { owner.timerCallbackInt(); } - void valueChanged (Value&) + void valueChanged (Value&) override { owner.textWasChangedByValue(); } @@ -879,7 +879,7 @@ public: { } - void visibleAreaChanged (const Rectangle&) + void visibleAreaChanged (const Rectangle&) override { if (! rentrant) // it's rare, but possible to get into a feedback loop as the viewport's scrollbars // appear and disappear, causing the wrap width to change. diff --git a/modules/juce_gui_basics/widgets/juce_TextEditor.h b/modules/juce_gui_basics/widgets/juce_TextEditor.h index 1d47485b07..2231088efd 100644 --- a/modules/juce_gui_basics/widgets/juce_TextEditor.h +++ b/modules/juce_gui_basics/widgets/juce_TextEditor.h @@ -588,39 +588,39 @@ public: //============================================================================== /** @internal */ - void paint (Graphics&); + void paint (Graphics&) override; /** @internal */ - void paintOverChildren (Graphics&); + void paintOverChildren (Graphics&) override; /** @internal */ - void mouseDown (const MouseEvent&); + void mouseDown (const MouseEvent&) override; /** @internal */ - void mouseUp (const MouseEvent&); + void mouseUp (const MouseEvent&) override; /** @internal */ - void mouseDrag (const MouseEvent&); + void mouseDrag (const MouseEvent&) override; /** @internal */ - void mouseDoubleClick (const MouseEvent&); + void mouseDoubleClick (const MouseEvent&) override; /** @internal */ - void mouseWheelMove (const MouseEvent&, const MouseWheelDetails&); + void mouseWheelMove (const MouseEvent&, const MouseWheelDetails&) override; /** @internal */ - bool keyPressed (const KeyPress&); + bool keyPressed (const KeyPress&) override; /** @internal */ - bool keyStateChanged (bool isKeyDown); + bool keyStateChanged (bool) override; /** @internal */ - void focusGained (FocusChangeType); + void focusGained (FocusChangeType) override; /** @internal */ - void focusLost (FocusChangeType); + void focusLost (FocusChangeType) override; /** @internal */ - void resized(); + void resized() override; /** @internal */ - void enablementChanged(); + void enablementChanged() override; /** @internal */ - void colourChanged(); + void colourChanged() override; /** @internal */ - void lookAndFeelChanged(); + void lookAndFeelChanged() override; /** @internal */ - bool isTextInputActive() const; + bool isTextInputActive() const override; /** @internal */ - void setTemporaryUnderlining (const Array >&); + void setTemporaryUnderlining (const Array >&) override; protected: //============================================================================== diff --git a/modules/juce_gui_basics/widgets/juce_Toolbar.cpp b/modules/juce_gui_basics/widgets/juce_Toolbar.cpp index 57599aef30..c6d36c032b 100644 --- a/modules/juce_gui_basics/widgets/juce_Toolbar.cpp +++ b/modules/juce_gui_basics/widgets/juce_Toolbar.cpp @@ -57,11 +57,11 @@ public: return true; } - void paintButtonArea (Graphics&, int, int, bool, bool) + void paintButtonArea (Graphics&, int, int, bool, bool) override { } - void contentAreaChanged (const Rectangle&) + void contentAreaChanged (const Rectangle&) override { } @@ -70,7 +70,7 @@ public: return fixedSize <= 0 ? 0 : 1; } - void paint (Graphics& g) + void paint (Graphics& g) override { const int w = getWidth(); const int h = getHeight(); @@ -652,7 +652,7 @@ public: toolbar->setEditingActive (false); } - void closeButtonPressed() + void closeButtonPressed() override { setVisible (false); } @@ -750,7 +750,7 @@ private: setSize (500, 300); } - void comboBoxChanged (ComboBox*) + void comboBoxChanged (ComboBox*) override { switch (styleBox.getSelectedId()) { @@ -762,12 +762,12 @@ private: palette.resized(); // to make it update the styles } - void buttonClicked (Button*) + void buttonClicked (Button*) override { toolbar->addDefaultItems (factory); } - void paint (Graphics& g) + void paint (Graphics& g) override { Colour background; @@ -778,7 +778,7 @@ private: g.fillRect (palette.getX(), palette.getBottom() - 1, palette.getWidth(), 1); } - void resized() + void resized() override { palette.setBounds (0, 0, getWidth(), getHeight() - 120); styleBox.setBounds (10, getHeight() - 110, 200, 22); diff --git a/modules/juce_gui_basics/widgets/juce_Toolbar.h b/modules/juce_gui_basics/widgets/juce_Toolbar.h index 3aaa3bd094..83638f6776 100644 --- a/modules/juce_gui_basics/widgets/juce_Toolbar.h +++ b/modules/juce_gui_basics/widgets/juce_Toolbar.h @@ -270,19 +270,19 @@ public: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** @internal */ - void resized(); + void resized() override; /** @internal */ - void mouseDown (const MouseEvent&); + void mouseDown (const MouseEvent&) override; /** @internal */ - bool isInterestedInDragSource (const SourceDetails&); + bool isInterestedInDragSource (const SourceDetails&) override; /** @internal */ - void itemDragMove (const SourceDetails&); + void itemDragMove (const SourceDetails&) override; /** @internal */ - void itemDragExit (const SourceDetails&); + void itemDragExit (const SourceDetails&) override; /** @internal */ - void itemDropped (const SourceDetails&); + void itemDropped (const SourceDetails&) override; /** @internal */ void updateAllItemPositions (bool animate); /** @internal */ @@ -301,7 +301,7 @@ private: class Spacer; class CustomisationDialog; - void buttonClicked (Button*); + void buttonClicked (Button*) override; void addItemInternal (ToolbarItemFactory& factory, int itemId, int insertIndex); ToolbarItemComponent* getNextActiveComponent (int index, int delta) const; diff --git a/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.cpp b/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.cpp index 2887a11f5b..9c4b1ea740 100644 --- a/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.cpp +++ b/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.cpp @@ -42,7 +42,7 @@ public: setMouseCursor (MouseCursor::DraggingHandCursor); } - void paint (Graphics& g) + void paint (Graphics& g) override { if (ToolbarItemComponent* const tc = getToolbarItemComponent()) { @@ -56,7 +56,7 @@ public: } } - void mouseDown (const MouseEvent& e) + void mouseDown (const MouseEvent& e) override { isDragging = false; @@ -67,7 +67,7 @@ public: } } - void mouseDrag (const MouseEvent& e) + void mouseDrag (const MouseEvent& e) override { if (! (isDragging || e.mouseWasClicked())) { @@ -88,7 +88,7 @@ public: } } - void mouseUp (const MouseEvent&) + void mouseUp (const MouseEvent&) override { isDragging = false; @@ -103,7 +103,7 @@ public: } } - void parentSizeChanged() + void parentSizeChanged() override { setBounds (0, 0, getParentWidth(), getParentHeight()); } diff --git a/modules/juce_gui_basics/widgets/juce_TreeView.cpp b/modules/juce_gui_basics/widgets/juce_TreeView.cpp index b19dbda31c..06d212281c 100644 --- a/modules/juce_gui_basics/widgets/juce_TreeView.cpp +++ b/modules/juce_gui_basics/widgets/juce_TreeView.cpp @@ -35,7 +35,7 @@ public: { } - void mouseDown (const MouseEvent& e) + void mouseDown (const MouseEvent& e) override { updateButtonUnderMouse (e); @@ -73,7 +73,7 @@ public: } } - void mouseUp (const MouseEvent& e) + void mouseUp (const MouseEvent& e) override { updateButtonUnderMouse (e); @@ -85,7 +85,7 @@ public: } } - void mouseDoubleClick (const MouseEvent& e) + void mouseDoubleClick (const MouseEvent& e) override { if (e.getNumberOfClicks() != 3 && isEnabled()) // ignore triple clicks { @@ -96,7 +96,7 @@ public: } } - void mouseDrag (const MouseEvent& e) + void mouseDrag (const MouseEvent& e) override { if (isEnabled() && ! (isDragging || e.mouseWasClicked() @@ -134,10 +134,10 @@ public: } } - void mouseMove (const MouseEvent& e) { updateButtonUnderMouse (e); } - void mouseExit (const MouseEvent& e) { updateButtonUnderMouse (e); } + void mouseMove (const MouseEvent& e) override { updateButtonUnderMouse (e); } + void mouseExit (const MouseEvent& e) override { updateButtonUnderMouse (e); } - void paint (Graphics& g) + void paint (Graphics& g) override { if (owner.rootItem != nullptr) { @@ -238,12 +238,12 @@ public: return item == buttonUnderMouse; } - void resized() + void resized() override { owner.itemsChanged(); } - String getTooltip() + String getTooltip() override { Rectangle pos; if (TreeViewItem* const item = findItemAt (getMouseXYRelative().y, pos)) @@ -382,7 +382,7 @@ private: return false; } - void handleAsyncUpdate() + void handleAsyncUpdate() override { owner.recalculateIfNeeded(); } @@ -421,7 +421,7 @@ public: return static_cast (getViewedComponent()); } - bool keyPressed (const KeyPress& key) + bool keyPressed (const KeyPress& key) override { Component* const tree = getParentComponent(); @@ -941,7 +941,7 @@ public: width - (insertPos.pos.x - offset), getHeight()); } - void paint (Graphics& g) + void paint (Graphics& g) override { Path p; const float h = (float) getHeight(); @@ -977,7 +977,7 @@ public: setBounds (r); } - void paint (Graphics& g) + void paint (Graphics& g) override { g.setColour (findColour (TreeView::dragAndDropIndicatorColourId, true)); g.drawRoundedRectangle (1.0f, 1.0f, getWidth() - 2.0f, getHeight() - 2.0f, 3.0f, 2.0f); diff --git a/modules/juce_gui_basics/widgets/juce_TreeView.h b/modules/juce_gui_basics/widgets/juce_TreeView.h index 1de6902e81..98e9a13373 100644 --- a/modules/juce_gui_basics/widgets/juce_TreeView.h +++ b/modules/juce_gui_basics/widgets/juce_TreeView.h @@ -789,35 +789,35 @@ public: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** @internal */ - void resized(); + void resized() override; /** @internal */ - bool keyPressed (const KeyPress& key); + bool keyPressed (const KeyPress&) override; /** @internal */ - void colourChanged(); + void colourChanged() override; /** @internal */ - void enablementChanged(); + void enablementChanged() override; /** @internal */ - bool isInterestedInFileDrag (const StringArray& files); + bool isInterestedInFileDrag (const StringArray& files) override; /** @internal */ - void fileDragEnter (const StringArray& files, int x, int y); + void fileDragEnter (const StringArray& files, int x, int y) override; /** @internal */ - void fileDragMove (const StringArray& files, int x, int y); + void fileDragMove (const StringArray& files, int x, int y) override; /** @internal */ - void fileDragExit (const StringArray& files); + void fileDragExit (const StringArray& files) override; /** @internal */ - void filesDropped (const StringArray& files, int x, int y); + void filesDropped (const StringArray& files, int x, int y) override; /** @internal */ - bool isInterestedInDragSource (const SourceDetails&); + bool isInterestedInDragSource (const SourceDetails&) override; /** @internal */ - void itemDragEnter (const SourceDetails&); + void itemDragEnter (const SourceDetails&) override; /** @internal */ - void itemDragMove (const SourceDetails&); + void itemDragMove (const SourceDetails&) override; /** @internal */ - void itemDragExit (const SourceDetails&); + void itemDragExit (const SourceDetails&) override; /** @internal */ - void itemDropped (const SourceDetails&); + void itemDropped (const SourceDetails&) override; private: class ContentComponent; diff --git a/modules/juce_gui_basics/windows/juce_AlertWindow.h b/modules/juce_gui_basics/windows/juce_AlertWindow.h index af0b622d90..75eb6fac7b 100644 --- a/modules/juce_gui_basics/windows/juce_AlertWindow.h +++ b/modules/juce_gui_basics/windows/juce_AlertWindow.h @@ -427,21 +427,21 @@ public: protected: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** @internal */ - void mouseDown (const MouseEvent& e); + void mouseDown (const MouseEvent&) override; /** @internal */ - void mouseDrag (const MouseEvent& e); + void mouseDrag (const MouseEvent&) override; /** @internal */ - bool keyPressed (const KeyPress& key); + bool keyPressed (const KeyPress&) override; /** @internal */ - void buttonClicked (Button* button); + void buttonClicked (Button*) override; /** @internal */ - void lookAndFeelChanged(); + void lookAndFeelChanged() override; /** @internal */ - void userTriedToCloseWindow(); + void userTriedToCloseWindow() override; /** @internal */ - int getDesktopWindowStyleFlags() const; + int getDesktopWindowStyleFlags() const override; private: //============================================================================== diff --git a/modules/juce_gui_basics/windows/juce_CallOutBox.h b/modules/juce_gui_basics/windows/juce_CallOutBox.h index 56c5af077c..36b9488a7e 100644 --- a/modules/juce_gui_basics/windows/juce_CallOutBox.h +++ b/modules/juce_gui_basics/windows/juce_CallOutBox.h @@ -116,21 +116,21 @@ public: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** @internal */ - void resized(); + void resized() override; /** @internal */ - void moved(); + void moved() override; /** @internal */ - void childBoundsChanged (Component*); + void childBoundsChanged (Component*) override; /** @internal */ - bool hitTest (int x, int y); + bool hitTest (int x, int y) override; /** @internal */ - void inputAttemptWhenModal(); + void inputAttemptWhenModal() override; /** @internal */ - bool keyPressed (const KeyPress& key); + bool keyPressed (const KeyPress&) override; /** @internal */ - void handleCommandMessage (int commandId); + void handleCommandMessage (int commandId) override; private: //============================================================================== diff --git a/modules/juce_gui_basics/windows/juce_DialogWindow.h b/modules/juce_gui_basics/windows/juce_DialogWindow.h index cbbe577ed9..f5062a8da9 100644 --- a/modules/juce_gui_basics/windows/juce_DialogWindow.h +++ b/modules/juce_gui_basics/windows/juce_DialogWindow.h @@ -250,9 +250,9 @@ public: protected: //============================================================================== /** @internal */ - void resized(); + void resized() override; /** @internal */ - bool keyPressed (const KeyPress&); + bool keyPressed (const KeyPress&) override; private: bool escapeKeyTriggersCloseButton; diff --git a/modules/juce_gui_basics/windows/juce_DocumentWindow.h b/modules/juce_gui_basics/windows/juce_DocumentWindow.h index 6b6d638496..cb4fdfdaed 100644 --- a/modules/juce_gui_basics/windows/juce_DocumentWindow.h +++ b/modules/juce_gui_basics/windows/juce_DocumentWindow.h @@ -230,25 +230,25 @@ public: //============================================================================== #ifndef DOXYGEN /** @internal */ - void paint (Graphics&); + void paint (Graphics&) override; /** @internal */ - void resized(); + void resized() override; /** @internal */ - void lookAndFeelChanged(); + void lookAndFeelChanged() override; /** @internal */ - BorderSize getBorderThickness(); + BorderSize getBorderThickness() override; /** @internal */ - BorderSize getContentComponentBorder(); + BorderSize getContentComponentBorder() override; /** @internal */ - void mouseDoubleClick (const MouseEvent&); + void mouseDoubleClick (const MouseEvent&) override; /** @internal */ - void userTriedToCloseWindow(); + void userTriedToCloseWindow() override; /** @internal */ - void activeWindowStatusChanged(); + void activeWindowStatusChanged() override; /** @internal */ - int getDesktopWindowStyleFlags() const; + int getDesktopWindowStyleFlags() const override; /** @internal */ - void parentHierarchyChanged(); + void parentHierarchyChanged() override; /** @internal */ Rectangle getTitleBarArea(); #endif diff --git a/modules/juce_gui_basics/windows/juce_ResizableWindow.h b/modules/juce_gui_basics/windows/juce_ResizableWindow.h index bb9dae4d50..b0cc95b702 100644 --- a/modules/juce_gui_basics/windows/juce_ResizableWindow.h +++ b/modules/juce_gui_basics/windows/juce_ResizableWindow.h @@ -321,27 +321,27 @@ public: protected: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** (if overriding this, make sure you call ResizableWindow::moved() in your subclass) */ - void moved(); + void moved() override; /** (if overriding this, make sure you call ResizableWindow::resized() in your subclass) */ - void resized(); + void resized() override; /** @internal */ - void mouseDown (const MouseEvent& e); + void mouseDown (const MouseEvent&) override; /** @internal */ - void mouseDrag (const MouseEvent& e); + void mouseDrag (const MouseEvent&) override; /** @internal */ - void lookAndFeelChanged(); + void lookAndFeelChanged() override; /** @internal */ - void childBoundsChanged (Component* child); + void childBoundsChanged (Component*) override; /** @internal */ - void parentSizeChanged(); + void parentSizeChanged() override; /** @internal */ - void visibilityChanged(); + void visibilityChanged() override; /** @internal */ - void activeWindowStatusChanged(); + void activeWindowStatusChanged() override; /** @internal */ - int getDesktopWindowStyleFlags() const; + int getDesktopWindowStyleFlags() const override; #if JUCE_DEBUG /** Overridden to warn people about adding components directly to this component diff --git a/modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.h b/modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.h index f4713cca25..40c734e227 100644 --- a/modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.h +++ b/modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.h @@ -133,17 +133,15 @@ public: */ void setProgress (double newProgress); - /** The thread can call this to change the message that's displayed in the dialog box. - */ + /** The thread can call this to change the message that's displayed in the dialog box. */ void setStatusMessage (const String& newStatusMessage); - /** Returns the AlertWindow that is being used. - */ + /** Returns the AlertWindow that is being used. */ AlertWindow* getAlertWindow() const noexcept { return alertWindow; } private: //============================================================================== - void timerCallback(); + void timerCallback() override; double progress; ScopedPointer alertWindow; diff --git a/modules/juce_gui_basics/windows/juce_TooltipWindow.h b/modules/juce_gui_basics/windows/juce_TooltipWindow.h index d2bd70a3da..3faa98a2d6 100644 --- a/modules/juce_gui_basics/windows/juce_TooltipWindow.h +++ b/modules/juce_gui_basics/windows/juce_TooltipWindow.h @@ -104,12 +104,12 @@ private: bool changedCompsSinceShown; String tipShowing, lastTipUnderMouse; - void paint (Graphics& g); - void mouseEnter (const MouseEvent& e); - void timerCallback(); + void paint (Graphics&) override; + void mouseEnter (const MouseEvent&) override; + void timerCallback() override; - static String getTipFor (Component* c); - void showFor (const String& tip); + static String getTipFor (Component*); + void showFor (const String&); void hide(); JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TooltipWindow) diff --git a/modules/juce_gui_basics/windows/juce_TopLevelWindow.cpp b/modules/juce_gui_basics/windows/juce_TopLevelWindow.cpp index 3fee0efc24..fc2ad4cc61 100644 --- a/modules/juce_gui_basics/windows/juce_TopLevelWindow.cpp +++ b/modules/juce_gui_basics/windows/juce_TopLevelWindow.cpp @@ -106,7 +106,7 @@ public: private: TopLevelWindow* currentActive; - void timerCallback() + void timerCallback() override { checkFocus(); } diff --git a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp index d2fb441efe..92a5f872d1 100644 --- a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp +++ b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp @@ -293,7 +293,7 @@ class CodeEditorComponent::GutterComponent : public Component public: GutterComponent() : lastNumLines (0) {} - void paint (Graphics& g) + void paint (Graphics& g) override { jassert (dynamic_cast (getParentComponent()) != nullptr); const CodeEditorComponent& editor = *static_cast (getParentComponent()); diff --git a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h index 3cc9f4e6f4..24f7518dc9 100644 --- a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h +++ b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h @@ -232,7 +232,7 @@ public: The token type values are dependent on the tokeniser being used. @see setColourScheme */ - Colour getColourForTokenType (const int tokenType) const; + Colour getColourForTokenType (int tokenType) const; //============================================================================== /** A set of colour IDs to use to change the colour of various aspects of the editor. @@ -311,37 +311,37 @@ public: //============================================================================== /** @internal */ - void paint (Graphics&); + void paint (Graphics&) override; /** @internal */ - void resized(); + void resized() override; /** @internal */ - bool keyPressed (const KeyPress&); + bool keyPressed (const KeyPress&) override; /** @internal */ - void mouseDown (const MouseEvent&); + void mouseDown (const MouseEvent&) override; /** @internal */ - void mouseDrag (const MouseEvent&); + void mouseDrag (const MouseEvent&) override; /** @internal */ - void mouseUp (const MouseEvent&); + void mouseUp (const MouseEvent&) override; /** @internal */ - void mouseDoubleClick (const MouseEvent&); + void mouseDoubleClick (const MouseEvent&) override; /** @internal */ - void mouseWheelMove (const MouseEvent&, const MouseWheelDetails&); + void mouseWheelMove (const MouseEvent&, const MouseWheelDetails&) override; /** @internal */ - void focusGained (FocusChangeType); + void focusGained (FocusChangeType) override; /** @internal */ - void focusLost (FocusChangeType); + void focusLost (FocusChangeType) override; /** @internal */ - bool isTextInputActive() const; + bool isTextInputActive() const override; /** @internal */ - void setTemporaryUnderlining (const Array >&); + void setTemporaryUnderlining (const Array >&) override; /** @internal */ - ApplicationCommandTarget* getNextCommandTarget(); + ApplicationCommandTarget* getNextCommandTarget() override; /** @internal */ - void getAllCommands (Array&); + void getAllCommands (Array&) override; /** @internal */ - void getCommandInfo (CommandID, ApplicationCommandInfo&); + void getCommandInfo (CommandID, ApplicationCommandInfo&) override; /** @internal */ - bool perform (const InvocationInfo&); + bool perform (const InvocationInfo&) override; private: //============================================================================== diff --git a/modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h b/modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h index 22c046ee93..3acd16df75 100644 --- a/modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h +++ b/modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h @@ -106,7 +106,7 @@ public: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; private: class Pimpl; diff --git a/modules/juce_gui_extra/embedding/juce_NSViewComponent.h b/modules/juce_gui_extra/embedding/juce_NSViewComponent.h index 8c267a8fc3..95657285e5 100644 --- a/modules/juce_gui_extra/embedding/juce_NSViewComponent.h +++ b/modules/juce_gui_extra/embedding/juce_NSViewComponent.h @@ -71,8 +71,7 @@ public: //============================================================================== /** @internal */ - void paint (Graphics& g); - + void paint (Graphics&) override; /** @internal */ static ReferenceCountedObject* attachViewToComponent (Component&, void*); diff --git a/modules/juce_gui_extra/embedding/juce_UIViewComponent.h b/modules/juce_gui_extra/embedding/juce_UIViewComponent.h index 406432a1a5..85fd9fb74c 100644 --- a/modules/juce_gui_extra/embedding/juce_UIViewComponent.h +++ b/modules/juce_gui_extra/embedding/juce_UIViewComponent.h @@ -71,7 +71,7 @@ public: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; private: diff --git a/modules/juce_gui_extra/misc/juce_ColourSelector.cpp b/modules/juce_gui_extra/misc/juce_ColourSelector.cpp index cfdf1dffae..4e5fc7723a 100644 --- a/modules/juce_gui_extra/misc/juce_ColourSelector.cpp +++ b/modules/juce_gui_extra/misc/juce_ColourSelector.cpp @@ -54,7 +54,7 @@ public: setInterceptsMouseClicks (false, false); } - void paint (Graphics& g) + void paint (Graphics& g) override { g.setColour (Colour::greyLevel (0.1f)); g.drawEllipse (1.0f, 1.0f, getWidth() - 2.0f, getHeight() - 2.0f, 1.0f); @@ -77,7 +77,7 @@ public: setMouseCursor (MouseCursor::CrosshairCursor); } - void paint (Graphics& g) + void paint (Graphics& g) override { if (colours.isNull()) { @@ -104,12 +104,12 @@ public: 0, 0, colours.getWidth(), colours.getHeight()); } - void mouseDown (const MouseEvent& e) + void mouseDown (const MouseEvent& e) override { mouseDrag (e); } - void mouseDrag (const MouseEvent& e) + void mouseDrag (const MouseEvent& e) override { const float sat = (e.x - edge) / (float) (getWidth() - edge * 2); const float val = 1.0f - (e.y - edge) / (float) (getHeight() - edge * 2); @@ -164,7 +164,7 @@ public: setInterceptsMouseClicks (false, false); } - void paint (Graphics& g) + void paint (Graphics& g) override { const float cw = (float) getWidth(); const float ch = (float) getHeight(); @@ -199,7 +199,7 @@ public: addAndMakeVisible (&marker); } - void paint (Graphics& g) + void paint (Graphics& g) override { ColourGradient cg; cg.isRadial = false; @@ -213,17 +213,17 @@ public: g.fillRect (getLocalBounds().reduced (edge)); } - void resized() + void resized() override { marker.setBounds (0, roundToInt ((getHeight() - edge * 2) * h), getWidth(), edge * 2); } - void mouseDown (const MouseEvent& e) + void mouseDown (const MouseEvent& e) override { mouseDrag (e); } - void mouseDrag (const MouseEvent& e) + void mouseDrag (const MouseEvent& e) override { owner.setHue ((e.y - edge) / (float) (getHeight() - edge * 2)); } @@ -253,7 +253,7 @@ public: { } - void paint (Graphics& g) + void paint (Graphics& g) override { const Colour c (owner.getSwatchColour (index)); @@ -262,7 +262,7 @@ public: Colour (0xffffffff).overlaidWith (c)); } - void mouseDown (const MouseEvent&) + void mouseDown (const MouseEvent&) override { PopupMenu m; m.addItem (1, TRANS("Use this swatch as the current colour")); diff --git a/modules/juce_gui_extra/misc/juce_ColourSelector.h b/modules/juce_gui_extra/misc/juce_ColourSelector.h index 677912bb49..0677c31410 100644 --- a/modules/juce_gui_extra/misc/juce_ColourSelector.h +++ b/modules/juce_gui_extra/misc/juce_ColourSelector.h @@ -156,8 +156,8 @@ private: void updateHSV(); void update(); void sliderValueChanged (Slider*); - void paint (Graphics& g); - void resized(); + void paint (Graphics&) override; + void resized() override; JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ColourSelector) diff --git a/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.cpp b/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.cpp index f98c41a006..2c5ca0cd52 100644 --- a/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.cpp +++ b/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.cpp @@ -229,7 +229,7 @@ public: addChildComponent (b); } - void paint (Graphics& g) + void paint (Graphics& g) override { g.setFont (getHeight() * 0.7f); g.setColour (findColour (KeyMappingEditorComponent::textColourId)); @@ -239,7 +239,7 @@ public: Justification::centredLeft, true); } - void resized() + void resized() override { int x = getWidth() - 4; @@ -296,7 +296,7 @@ public: bool mightContainSubItems() { return true; } int getItemHeight() const { return 28; } - void paintItem (Graphics& g, int width, int height) + void paintItem (Graphics& g, int width, int height) override { g.setFont (Font (height * 0.6f, Font::bold)); g.setColour (owner.findColour (KeyMappingEditorComponent::textColourId)); @@ -306,7 +306,7 @@ public: Justification::centredLeft, true); } - void itemOpennessChanged (bool isNowOpen) + void itemOpennessChanged (bool isNowOpen) override { if (isNowOpen) { @@ -353,7 +353,7 @@ public: bool mightContainSubItems() { return true; } String getUniqueName() const { return "keys"; } - void changeListenerCallback (ChangeBroadcaster*) + void changeListenerCallback (ChangeBroadcaster*) override { const OpennessRestorer opennessRestorer (*this); clearSubItems(); @@ -380,7 +380,7 @@ public: owner->getMappings().resetToDefaultMappings(); } - void buttonClicked (Button*) + void buttonClicked (Button*) override { AlertWindow::showOkCancelBox (AlertWindow::QuestionIcon, TRANS("Reset to defaults"), diff --git a/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.h b/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.h index 6567313210..5b9ba39ef7 100644 --- a/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.h +++ b/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.h @@ -109,9 +109,9 @@ public: //============================================================================== /** @internal */ - void parentHierarchyChanged(); + void parentHierarchyChanged() override; /** @internal */ - void resized(); + void resized() override; private: //============================================================================== diff --git a/modules/juce_gui_extra/misc/juce_PreferencesPanel.h b/modules/juce_gui_extra/misc/juce_PreferencesPanel.h index 4b8a432d1d..4e19cb88d7 100644 --- a/modules/juce_gui_extra/misc/juce_PreferencesPanel.h +++ b/modules/juce_gui_extra/misc/juce_PreferencesPanel.h @@ -127,11 +127,11 @@ public: //============================================================================== /** @internal */ - void resized(); + void resized() override; /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** @internal */ - void buttonClicked (Button* button); + void buttonClicked (Button*) override; private: //============================================================================== diff --git a/modules/juce_gui_extra/misc/juce_SplashScreen.h b/modules/juce_gui_extra/misc/juce_SplashScreen.h index 87b5512213..6d2973e910 100644 --- a/modules/juce_gui_extra/misc/juce_SplashScreen.h +++ b/modules/juce_gui_extra/misc/juce_SplashScreen.h @@ -128,7 +128,7 @@ public: //============================================================================== /** @internal */ - void paint (Graphics&); + void paint (Graphics&) override; private: //============================================================================== @@ -136,7 +136,7 @@ private: Time earliestTimeToDelete; int originalClickCounter; - void timerCallback(); + void timerCallback() override; JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (SplashScreen) }; diff --git a/modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h b/modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h index f0c3ea73e8..1d3ee3fdd4 100644 --- a/modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h +++ b/modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h @@ -64,7 +64,7 @@ public: #if JUCE_LINUX /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; #endif private: diff --git a/modules/juce_gui_extra/misc/juce_WebBrowserComponent.h b/modules/juce_gui_extra/misc/juce_WebBrowserComponent.h index 419a82ff28..34f140c6a8 100644 --- a/modules/juce_gui_extra/misc/juce_WebBrowserComponent.h +++ b/modules/juce_gui_extra/misc/juce_WebBrowserComponent.h @@ -99,13 +99,13 @@ public: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; /** @internal */ - void resized(); + void resized() override; /** @internal */ - void parentHierarchyChanged(); + void parentHierarchyChanged() override; /** @internal */ - void visibilityChanged(); + void visibilityChanged() override; private: //============================================================================== diff --git a/modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h b/modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h index e395f90c66..5e0baedbc7 100644 --- a/modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h +++ b/modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h @@ -251,7 +251,7 @@ public: } } - void timerCallback() + void timerCallback() override { if (isShowing()) { diff --git a/modules/juce_opengl/opengl/juce_OpenGLContext.cpp b/modules/juce_opengl/opengl/juce_OpenGLContext.cpp index a045752dd6..f82af00a2f 100644 --- a/modules/juce_opengl/opengl/juce_OpenGLContext.cpp +++ b/modules/juce_opengl/opengl/juce_OpenGLContext.cpp @@ -69,7 +69,7 @@ public: } //============================================================================== - void paint (Graphics&) + void paint (Graphics&) override { if (ComponentPeer* const peer = component.getPeer()) peer->addMaskedRegion (peer->getComponent().getLocalArea (&component, component.getLocalBounds())); @@ -291,7 +291,7 @@ public: } //============================================================================== - void run() + void run() override { { // Allow the message thread to finish setting-up the context before using it.. diff --git a/modules/juce_video/native/juce_win32_CameraDevice.cpp b/modules/juce_video/native/juce_win32_CameraDevice.cpp index fd95080f31..3208efc5b7 100644 --- a/modules/juce_video/native/juce_win32_CameraDevice.cpp +++ b/modules/juce_video/native/juce_win32_CameraDevice.cpp @@ -449,7 +449,7 @@ public: owner = nullptr; } - void paint (Graphics& g) + void paint (Graphics& g) override { g.setColour (Colours::black); g.setImageResamplingQuality (Graphics::lowResamplingQuality); @@ -460,7 +460,7 @@ public: g.fillAll (Colours::black); } - void changeListenerCallback (ChangeBroadcaster*) + void changeListenerCallback (ChangeBroadcaster*) override { const int64 now = Time::currentTimeMillis(); diff --git a/modules/juce_video/native/juce_win32_DirectShowComponent.cpp b/modules/juce_video/native/juce_win32_DirectShowComponent.cpp index 93130a6c9c..095a060247 100644 --- a/modules/juce_video/native/juce_win32_DirectShowComponent.cpp +++ b/modules/juce_video/native/juce_win32_DirectShowComponent.cpp @@ -252,7 +252,7 @@ public: videoRenderer->setVideoWindow (hwnd); } - void handleAsyncUpdate() + void handleAsyncUpdate() override { if (hwnd != 0) { diff --git a/modules/juce_video/playback/juce_DirectShowComponent.h b/modules/juce_video/playback/juce_DirectShowComponent.h index 14677bb4d0..78849256dc 100644 --- a/modules/juce_video/playback/juce_DirectShowComponent.h +++ b/modules/juce_video/playback/juce_DirectShowComponent.h @@ -186,7 +186,7 @@ public: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; private: //============================================================================== diff --git a/modules/juce_video/playback/juce_QuickTimeMovieComponent.h b/modules/juce_video/playback/juce_QuickTimeMovieComponent.h index 7cf67476c6..da739b1725 100644 --- a/modules/juce_video/playback/juce_QuickTimeMovieComponent.h +++ b/modules/juce_video/playback/juce_QuickTimeMovieComponent.h @@ -196,7 +196,7 @@ public: //============================================================================== /** @internal */ - void paint (Graphics& g); + void paint (Graphics&) override; private: