From 5918d039ceb9e691645b09bd462317a0bbf49928 Mon Sep 17 00:00:00 2001 From: jules Date: Mon, 8 Jul 2013 19:05:14 +0100 Subject: [PATCH] Added some "override" annotations. --- .../Source/Application/jucer_Application.h | 2 +- .../documents/jucer_ButtonDocument.cpp | 2 +- .../Project/jucer_ProjectTreeViewBase.cpp | 2 +- .../Source/demos/AudioDemoPlaybackPage.cpp | 18 ++--- extras/JuceDemo/Source/demos/WidgetsDemo.cpp | 2 +- .../AU/juce_AU_Wrapper.mm | 8 +-- .../RTAS/juce_RTAS_Wrapper.cpp | 12 ++-- .../Standalone/juce_StandaloneFilterWindow.h | 6 +- .../VST/juce_VST_Wrapper.cpp | 2 +- .../format_types/juce_VSTPluginFormat.cpp | 14 ++-- .../scanning/juce_PluginListComponent.h | 16 ++--- .../gui/juce_AudioDeviceSelectorComponent.cpp | 18 ++--- .../gui/juce_AudioDeviceSelectorComponent.h | 4 +- .../gui/juce_MidiKeyboardComponent.cpp | 4 +- .../broadcasters/juce_ActionBroadcaster.cpp | 2 +- .../broadcasters/juce_AsyncUpdater.cpp | 2 +- .../juce_InterprocessConnection.cpp | 8 +-- modules/juce_events/messages/juce_Message.h | 2 +- .../messages/juce_MessageManager.cpp | 6 +- .../native/juce_android_Messaging.cpp | 2 +- .../contexts/juce_LowLevelGraphicsContext.h | 30 ++++---- .../juce_LowLevelGraphicsPostScriptRenderer.h | 56 +++++++-------- .../juce_LowLevelGraphicsSoftwareRenderer.h | 71 +++++++++--------- .../juce_graphics/fonts/juce_CustomTypeface.h | 14 ++-- .../native/juce_mac_CoreGraphicsContext.h | 72 +++++++++---------- .../buttons/juce_ArrowButton.h | 2 +- .../buttons/juce_ShapeButton.h | 3 +- .../juce_gui_basics/buttons/juce_TextButton.h | 4 +- .../buttons/juce_ToggleButton.h | 4 +- .../juce_ApplicationCommandTarget.cpp | 2 +- .../commands/juce_KeyPressMappingSet.h | 7 +- .../components/juce_Component.cpp | 4 +- .../juce_gui_basics/drawables/juce_Drawable.h | 2 +- .../filebrowser/juce_FileListComponent.h | 16 ++--- .../juce_gui_basics/layout/juce_ScrollBar.cpp | 4 +- .../layout/juce_TabbedButtonBar.h | 10 +-- .../juce_gui_basics/layout/juce_Viewport.h | 10 +-- .../lookandfeel/juce_LookAndFeel.cpp | 2 +- .../juce_gui_basics/menus/juce_PopupMenu.cpp | 4 +- .../mouse/juce_DragAndDropContainer.cpp | 2 +- .../native/juce_android_Windowing.cpp | 8 +-- .../native/juce_ios_UIViewComponentPeer.mm | 2 +- .../native/juce_mac_MainMenu.mm | 4 +- .../native/juce_mac_NSViewComponentPeer.mm | 2 +- .../properties/juce_TextPropertyComponent.cpp | 8 +-- .../juce_gui_basics/widgets/juce_Slider.cpp | 6 +- .../juce_gui_basics/widgets/juce_TextEditor.h | 6 +- .../widgets/juce_ToolbarItemComponent.h | 4 +- .../windows/juce_ComponentPeer.cpp | 2 +- .../windows/juce_DocumentWindow.cpp | 4 +- .../code_editor/juce_CodeEditorComponent.h | 4 +- .../misc/juce_ColourSelector.cpp | 2 +- .../misc/juce_KeyMappingEditorComponent.cpp | 8 +-- 53 files changed, 254 insertions(+), 257 deletions(-) diff --git a/extras/Introjucer/Source/Application/jucer_Application.h b/extras/Introjucer/Source/Application/jucer_Application.h index a33b8395bb..cf0a5ae979 100644 --- a/extras/Introjucer/Source/Application/jucer_Application.h +++ b/extras/Introjucer/Source/Application/jucer_Application.h @@ -97,7 +97,7 @@ public: { ModuleFolderChecker() {} - void messageCallback() + void messageCallback() override { if (IntrojucerApp* const app = dynamic_cast (JUCEApplication::getInstance())) app->makeSureUserHasSelectedModuleFolder(); diff --git a/extras/Introjucer/Source/ComponentEditor/documents/jucer_ButtonDocument.cpp b/extras/Introjucer/Source/ComponentEditor/documents/jucer_ButtonDocument.cpp index c1ddf4afdb..987cb08a1d 100644 --- a/extras/Introjucer/Source/ComponentEditor/documents/jucer_ButtonDocument.cpp +++ b/extras/Introjucer/Source/ComponentEditor/documents/jucer_ButtonDocument.cpp @@ -282,7 +282,7 @@ public: setClickingTogglesState (true); } - void paintButton (Graphics& g, bool isMouseOverButton, bool isButtonDown) + void paintButton (Graphics& g, bool isMouseOverButton, bool isButtonDown) override { if (document->paintStatesEnabled [background]) { diff --git a/extras/Introjucer/Source/Project/jucer_ProjectTreeViewBase.cpp b/extras/Introjucer/Source/Project/jucer_ProjectTreeViewBase.cpp index 80ce1a8a68..8991db42a8 100644 --- a/extras/Introjucer/Source/Project/jucer_ProjectTreeViewBase.cpp +++ b/extras/Introjucer/Source/Project/jucer_ProjectTreeViewBase.cpp @@ -114,7 +114,7 @@ void ProjectTreeViewBase::triggerAsyncRename (const Project::Item& itemToRename) RenameMessage (TreeView* const t, const Project::Item& i) : tree (t), itemToRename (i) {} - void messageCallback() + void messageCallback() override { if (tree != nullptr) if (ProjectTreeViewBase* root = dynamic_cast (tree->getRootItem())) diff --git a/extras/JuceDemo/Source/demos/AudioDemoPlaybackPage.cpp b/extras/JuceDemo/Source/demos/AudioDemoPlaybackPage.cpp index 434fb95e1c..3ee2b604f5 100644 --- a/extras/JuceDemo/Source/demos/AudioDemoPlaybackPage.cpp +++ b/extras/JuceDemo/Source/demos/AudioDemoPlaybackPage.cpp @@ -70,7 +70,7 @@ public: } } - void mouseWheelMove (const MouseEvent&, const MouseWheelDetails& wheel) + void mouseWheelMove (const MouseEvent&, const MouseWheelDetails& wheel) override { if (thumbnail.getTotalLength() > 0) { @@ -86,7 +86,7 @@ public: } } - void paint (Graphics& g) + void paint (Graphics& g) override { g.fillAll (Colours::white); g.setColour (Colours::lightblue); @@ -103,18 +103,18 @@ public: } } - void changeListenerCallback (ChangeBroadcaster*) + void changeListenerCallback (ChangeBroadcaster*) override { // this method is called by the thumbnail when it has changed, so we should repaint it.. repaint(); } - bool isInterestedInFileDrag (const StringArray& /*files*/) + bool isInterestedInFileDrag (const StringArray& /*files*/) override { return true; } - void filesDropped (const StringArray& files, int /*x*/, int /*y*/) + void filesDropped (const StringArray& files, int /*x*/, int /*y*/) override { AudioDemoPlaybackPage* demoPage = findParentComponentOfClass(); @@ -122,22 +122,22 @@ public: demoPage->showFile (File (files[0])); } - void mouseDown (const MouseEvent& e) + void mouseDown (const MouseEvent& e) override { mouseDrag (e); } - void mouseDrag (const MouseEvent& e) + void mouseDrag (const MouseEvent& e) override { transportSource.setPosition (jmax (0.0, xToTime ((float) e.x))); } - void mouseUp (const MouseEvent&) + void mouseUp (const MouseEvent&) override { transportSource.start(); } - void timerCallback() + void timerCallback() override { currentPositionMarker.setVisible (transportSource.isPlaying() || isMouseButtonDown()); diff --git a/extras/JuceDemo/Source/demos/WidgetsDemo.cpp b/extras/JuceDemo/Source/demos/WidgetsDemo.cpp index 423d10f7fb..07d4989103 100644 --- a/extras/JuceDemo/Source/demos/WidgetsDemo.cpp +++ b/extras/JuceDemo/Source/demos/WidgetsDemo.cpp @@ -232,7 +232,7 @@ public: changeWidthToFitText(); } - void clicked() + void clicked() override { ColourSelector* colourSelector = new ColourSelector(); colourSelector->setName ("background"); diff --git a/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm b/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm index 054cc1c0ca..32fde2d747 100644 --- a/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm +++ b/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm @@ -1354,15 +1354,15 @@ private: [pluginWindow orderFront: nil]; } - void resized() + void resized() override { if (Component* const child = getChildComponent (0)) child->setBounds (getLocalBounds()); } - void paint (Graphics&) {} + void paint (Graphics&) override {} - void childBoundsChanged (Component*) + void childBoundsChanged (Component*) override { if (! recursive) { @@ -1385,7 +1385,7 @@ private: } } - bool keyPressed (const KeyPress& kp) + bool keyPressed (const KeyPress& kp) override { if (! kp.getModifiers().isCommandDown()) { 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 39ee1dc2f9..619b3a57ad 100644 --- a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp @@ -363,9 +363,9 @@ public: #endif } - void paint (Graphics&) {} + void paint (Graphics&) override {} - void resized() + void resized() override { if (juce::Component* const ed = getEditor()) ed->setBounds (getLocalBounds()); @@ -374,7 +374,7 @@ public: } #if JUCE_WINDOWS - void globalFocusChanged (juce::Component*) + void globalFocusChanged (juce::Component*) override { #if ! JucePlugin_EditorRequiresKeyboardFocus if (hasKeyboardFocus (true)) @@ -383,7 +383,7 @@ public: } #endif - void childBoundsChanged (juce::Component* child) + void childBoundsChanged (juce::Component* child) override { setSize (child->getWidth(), child->getHeight()); child->setTopLeftPosition (0, 0); @@ -394,10 +394,10 @@ public: owner->updateSize(); } - void userTriedToCloseWindow() {} + void userTriedToCloseWindow() override {} #if JUCE_MAC && JucePlugin_EditorRequiresKeyboardFocus - bool keyPressed (const KeyPress& kp) + bool keyPressed (const KeyPress& kp) override { owner->updateSize(); forwardCurrentKeyEventToHostWindow(); diff --git a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h index cde253e53d..ffb2165c5d 100644 --- a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h +++ b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h @@ -241,13 +241,13 @@ public: //============================================================================== /** @internal */ - void closeButtonPressed() + void closeButtonPressed() override { JUCEApplication::quit(); } /** @internal */ - void buttonClicked (Button*) + void buttonClicked (Button*) override { if (filter != nullptr) { @@ -271,7 +271,7 @@ public: } /** @internal */ - void resized() + void resized() override { DocumentWindow::resized(); optionsButton.setBounds (8, 6, 60, getTitleBarHeight() - 8); 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 8f76de968f..c8fd8dfbe1 100644 --- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp @@ -1491,7 +1491,7 @@ private: public: MessageThreadCallback (bool& tr) : triggered (tr) {} - void messageCallback() + void messageCallback() override { triggered = true; } diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp index 99e47760f8..85db685786 100644 --- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp +++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp @@ -2401,7 +2401,7 @@ private: } } - void mouseEnter (const MouseEvent& e) + void mouseEnter (const MouseEvent& e) override { if (pluginWindow != 0) { @@ -2424,7 +2424,7 @@ private: } } - void mouseExit (const MouseEvent& e) + void mouseExit (const MouseEvent& e) override { if (pluginWindow != 0) { @@ -2448,7 +2448,7 @@ private: } } - void mouseMove (const MouseEvent& e) + void mouseMove (const MouseEvent& e) override { if (pluginWindow != 0) { @@ -2468,7 +2468,7 @@ private: } } - void mouseDrag (const MouseEvent& e) + void mouseDrag (const MouseEvent& e) override { if (pluginWindow != 0) { @@ -2489,7 +2489,7 @@ private: } } - void mouseUp (const MouseEvent& e) + void mouseUp (const MouseEvent& e) override { if (pluginWindow != 0) { @@ -2509,7 +2509,7 @@ private: } } - void mouseWheelMove (const MouseEvent& e, const MouseWheelDetails& wheel) + void mouseWheelMove (const MouseEvent& e, const MouseWheelDetails& wheel) override { if (pluginWindow != 0) { @@ -2621,7 +2621,7 @@ private: ScopedPointer innerWrapper; #endif - void resized() + void resized() override { if (innerWrapper != nullptr) innerWrapper->setSize (getWidth(), getHeight()); diff --git a/modules/juce_audio_processors/scanning/juce_PluginListComponent.h b/modules/juce_audio_processors/scanning/juce_PluginListComponent.h index 1d52c92360..0b57831d24 100644 --- a/modules/juce_audio_processors/scanning/juce_PluginListComponent.h +++ b/modules/juce_audio_processors/scanning/juce_PluginListComponent.h @@ -77,17 +77,17 @@ public: //============================================================================== /** @internal */ - void resized(); + void resized() override; /** @internal */ - bool isInterestedInFileDrag (const StringArray&); + bool isInterestedInFileDrag (const StringArray&) override; /** @internal */ - void filesDropped (const StringArray&, int, int); + void filesDropped (const StringArray&, int, int) override; /** @internal */ - int getNumRows(); + int getNumRows() override; /** @internal */ - void paintListBoxItem (int row, Graphics&, int width, int height, bool rowIsSelected); + void paintListBoxItem (int row, Graphics&, int width, int height, bool rowIsSelected) override; /** @internal */ - void deleteKeyPressed (int lastRowSelected); + void deleteKeyPressed (int lastRowSelected) override; private: //============================================================================== @@ -114,8 +114,8 @@ private: bool canShowSelectedFolder() const; void removeMissingPlugins(); - void buttonClicked (Button*); - void changeListenerCallback (ChangeBroadcaster*); + void buttonClicked (Button*) override; + void changeListenerCallback (ChangeBroadcaster*) override; JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PluginListComponent) }; diff --git a/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp b/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp index 38973fe466..26b330d8e1 100644 --- a/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp +++ b/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp @@ -223,7 +223,7 @@ public: setup.manager->removeChangeListener (this); } - void resized() + void resized() override { const int lx = proportionOfWidth (0.35f); const int w = proportionOfWidth (0.4f); @@ -305,7 +305,7 @@ public: } } - void comboBoxChanged (ComboBox* comboBoxThatHasChanged) + void comboBoxChanged (ComboBox* comboBoxThatHasChanged) override { if (comboBoxThatHasChanged == nullptr) return; @@ -381,7 +381,7 @@ public: return device->showControlPanel(); } - void buttonClicked (Button* button) + void buttonClicked (Button* button) override { if (button == showAdvancedSettingsButton) { @@ -475,7 +475,7 @@ public: setSize (getWidth(), getLowestY() + 4); } - void changeListenerCallback (ChangeBroadcaster*) + void changeListenerCallback (ChangeBroadcaster*) override { updateAllControls(); } @@ -714,12 +714,12 @@ public: repaint(); } - int getNumRows() + int getNumRows() override { return items.size(); } - void paintListBoxItem (int row, Graphics& g, int width, int height, bool rowIsSelected) + void paintListBoxItem (int row, Graphics& g, int width, int height, bool rowIsSelected) override { if (isPositiveAndBelow (row, items.size())) { @@ -760,7 +760,7 @@ public: } } - void listBoxItemClicked (int row, const MouseEvent& e) + void listBoxItemClicked (int row, const MouseEvent& e) override { selectRow (row); @@ -768,12 +768,12 @@ public: flipEnablement (row); } - void listBoxItemDoubleClicked (int row, const MouseEvent&) + void listBoxItemDoubleClicked (int row, const MouseEvent&) override { flipEnablement (row); } - void returnKeyPressed (int row) + void returnKeyPressed (int row) override { flipEnablement (row); } diff --git a/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h b/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h index b8c05a641e..51989d339b 100644 --- a/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h +++ b/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h @@ -97,8 +97,8 @@ private: ScopedPointer midiOutputSelector; ScopedPointer