diff --git a/examples/Demo/Source/Demos/GraphicsDemo.cpp b/examples/Demo/Source/Demos/GraphicsDemo.cpp index 8beeae1ed1..b9c935b800 100644 --- a/examples/Demo/Source/Demos/GraphicsDemo.cpp +++ b/examples/Demo/Source/Demos/GraphicsDemo.cpp @@ -478,7 +478,7 @@ public: if (svgFileStream != nullptr) { - svgDrawable = dynamic_cast (Drawable::createFromImageDataStream (*svgFileStream)); + svgDrawable = dynamic_cast (Drawable::createFromImageDataStream (*svgFileStream)); if (svgDrawable != nullptr) { diff --git a/examples/Demo/Source/Demos/MultithreadingDemo.cpp b/examples/Demo/Source/Demos/MultithreadingDemo.cpp index aec6d78950..f4427a3de2 100644 --- a/examples/Demo/Source/Demos/MultithreadingDemo.cpp +++ b/examples/Demo/Source/Demos/MultithreadingDemo.cpp @@ -287,7 +287,7 @@ private: int indexToRemove = Random::getSystemRandom().nextInt (balls.size()); if (isUsingPool) - pool.removeJob (dynamic_cast (balls [indexToRemove]), true, 4000); + pool.removeJob (dynamic_cast (balls [indexToRemove]), true, 4000); balls.remove (indexToRemove); } diff --git a/examples/Demo/Source/Demos/WidgetsDemo.cpp b/examples/Demo/Source/Demos/WidgetsDemo.cpp index 525cce66e3..422f3bf509 100644 --- a/examples/Demo/Source/Demos/WidgetsDemo.cpp +++ b/examples/Demo/Source/Demos/WidgetsDemo.cpp @@ -89,7 +89,7 @@ public: void changeListenerCallback (ChangeBroadcaster* source) override { - if (ColourSelector* cs = dynamic_cast (source)) + if (ColourSelector* cs = dynamic_cast (source)) setColour (TextButton::buttonColourId, cs->getCurrentColour()); } }; diff --git a/examples/audio plugin host/Source/FilterGraph.cpp b/examples/audio plugin host/Source/FilterGraph.cpp index 5f3c5e4a38..3ad3b6fc01 100644 --- a/examples/audio plugin host/Source/FilterGraph.cpp +++ b/examples/audio plugin host/Source/FilterGraph.cpp @@ -267,7 +267,7 @@ void FilterGraph::setLastDocumentOpened (const File& file) //============================================================================== static XmlElement* createNodeXml (AudioProcessorGraph::Node* const node) noexcept { - AudioPluginInstance* plugin = dynamic_cast (node->getProcessor()); + AudioPluginInstance* plugin = dynamic_cast (node->getProcessor()); if (plugin == nullptr) { diff --git a/examples/audio plugin host/Source/GraphEditorPanel.cpp b/examples/audio plugin host/Source/GraphEditorPanel.cpp index 6ecaaac4e7..072368c5c1 100644 --- a/examples/audio plugin host/Source/GraphEditorPanel.cpp +++ b/examples/audio plugin host/Source/GraphEditorPanel.cpp @@ -447,7 +447,7 @@ public: { for (int i = 0; i < getNumChildComponents(); ++i) { - if (PinComponent* const pc = dynamic_cast (getChildComponent(i))) + if (PinComponent* const pc = dynamic_cast (getChildComponent(i))) { const int total = pc->isInput ? numIns : numOuts; const int index = pc->index == FilterGraph::midiChannelNumber ? (total - 1) : pc->index; @@ -463,7 +463,7 @@ public: { for (int i = 0; i < getNumChildComponents(); ++i) { - if (PinComponent* const pc = dynamic_cast (getChildComponent(i))) + if (PinComponent* const pc = dynamic_cast (getChildComponent(i))) { if (pc->index == index && isInput == pc->isInput) { @@ -839,7 +839,7 @@ FilterComponent* GraphEditorPanel::getComponentForFilter (const uint32 filterID) { for (int i = getNumChildComponents(); --i >= 0;) { - if (FilterComponent* const fc = dynamic_cast (getChildComponent (i))) + if (FilterComponent* const fc = dynamic_cast (getChildComponent (i))) if (fc->filterID == filterID) return fc; } @@ -851,7 +851,7 @@ ConnectorComponent* GraphEditorPanel::getComponentForConnection (const AudioProc { for (int i = getNumChildComponents(); --i >= 0;) { - if (ConnectorComponent* const c = dynamic_cast (getChildComponent (i))) + if (ConnectorComponent* const c = dynamic_cast (getChildComponent (i))) if (c->sourceFilterID == conn.sourceNodeId && c->destFilterID == conn.destNodeId && c->sourceFilterChannel == conn.sourceChannelIndex @@ -866,10 +866,10 @@ PinComponent* GraphEditorPanel::findPinAt (const int x, const int y) const { for (int i = getNumChildComponents(); --i >= 0;) { - if (FilterComponent* fc = dynamic_cast (getChildComponent (i))) + if (FilterComponent* fc = dynamic_cast (getChildComponent (i))) { - if (PinComponent* pin = dynamic_cast (fc->getComponentAt (x - fc->getX(), - y - fc->getY()))) + if (PinComponent* pin = dynamic_cast (fc->getComponentAt (x - fc->getX(), + y - fc->getY()))) return pin; } } @@ -891,13 +891,13 @@ void GraphEditorPanel::updateComponents() { for (int i = getNumChildComponents(); --i >= 0;) { - if (FilterComponent* const fc = dynamic_cast (getChildComponent (i))) + if (FilterComponent* const fc = dynamic_cast (getChildComponent (i))) fc->update(); } for (int i = getNumChildComponents(); --i >= 0;) { - ConnectorComponent* const cc = dynamic_cast (getChildComponent (i)); + ConnectorComponent* const cc = dynamic_cast (getChildComponent (i)); if (cc != nullptr && cc != draggingConnector) { @@ -944,7 +944,7 @@ void GraphEditorPanel::beginConnectorDrag (const uint32 sourceFilterID, const in const uint32 destFilterID, const int destFilterChannel, const MouseEvent& e) { - draggingConnector = dynamic_cast (e.originalComponent); + draggingConnector = dynamic_cast (e.originalComponent); if (draggingConnector == nullptr) draggingConnector = new ConnectorComponent (graph); @@ -1063,7 +1063,7 @@ public: void timerCallback() { Component* const underMouse = Desktop::getInstance().getMainMouseSource().getComponentUnderMouse(); - TooltipClient* const ttc = dynamic_cast (underMouse); + TooltipClient* const ttc = dynamic_cast (underMouse); String newTip; diff --git a/examples/audio plugin host/Source/MainHostWindow.cpp b/examples/audio plugin host/Source/MainHostWindow.cpp index 73a00833e6..2ea7a84c50 100644 --- a/examples/audio plugin host/Source/MainHostWindow.cpp +++ b/examples/audio plugin host/Source/MainHostWindow.cpp @@ -545,7 +545,7 @@ void MainHostWindow::filesDropped (const StringArray& files, int x, int y) GraphDocumentComponent* MainHostWindow::getGraphEditor() const { - return dynamic_cast (getContentComponent()); + return dynamic_cast (getContentComponent()); } bool MainHostWindow::isDoublePrecisionProcessing() diff --git a/examples/audio plugin host/Source/MainHostWindow.h b/examples/audio plugin host/Source/MainHostWindow.h index 6c1d05e9ba..ccde2ad8b8 100644 --- a/examples/audio plugin host/Source/MainHostWindow.h +++ b/examples/audio plugin host/Source/MainHostWindow.h @@ -100,7 +100,7 @@ private: KnownPluginList::SortMethod pluginSortMethod; class PluginListWindow; - ScopedPointer pluginListWindow; + ScopedPointer pluginListWindow; void showAudioSettings(); diff --git a/extras/Introjucer/Source/Application/jucer_MainWindow.h b/extras/Introjucer/Source/Application/jucer_MainWindow.h index fe0e92a51f..d7aa244ad6 100644 --- a/extras/Introjucer/Source/Application/jucer_MainWindow.h +++ b/extras/Introjucer/Source/Application/jucer_MainWindow.h @@ -76,7 +76,7 @@ public: bool shouldDropFilesWhenDraggedExternally (const DragAndDropTarget::SourceDetails& sourceDetails, StringArray& files, bool& canMoveFiles) override; private: - ScopedPointer currentProject; + ScopedPointer currentProject; static const char* getProjectWindowPosName() { return "projectWindowPos"; } void createProjectContentCompIfNeeded(); diff --git a/extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.cpp b/extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.cpp index 044af42d74..2e5a700c1b 100644 --- a/extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.cpp +++ b/extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.cpp @@ -159,7 +159,7 @@ SourceCodeEditor::~SourceCodeEditor() getAppSettings().appearance.settings.removeListener (this); - if (SourceCodeDocument* doc = dynamic_cast (getDocument())) + if (SourceCodeDocument* doc = dynamic_cast (getDocument())) doc->updateLastState (*editor); } diff --git a/extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.h b/extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.h index 7c6c2d0f91..5528d58f9e 100644 --- a/extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.h +++ b/extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.h @@ -104,7 +104,7 @@ public: MemoryBlock mb; if (file.loadFileAsData (mb) - && seemsToBeText (static_cast (mb.getData()), (int) mb.getSize()) + && seemsToBeText (static_cast (mb.getData()), (int) mb.getSize()) && ! file.hasFileExtension ("svg")) return true; diff --git a/extras/Introjucer/Source/ComponentEditor/components/jucer_ButtonHandler.h b/extras/Introjucer/Source/ComponentEditor/components/jucer_ButtonHandler.h index 2dcca924f0..4d16767c0b 100644 --- a/extras/Introjucer/Source/ComponentEditor/components/jucer_ButtonHandler.h +++ b/extras/Introjucer/Source/ComponentEditor/components/jucer_ButtonHandler.h @@ -38,7 +38,7 @@ public: { ComponentTypeHandler::getEditableProperties (component, document, props); - Button* const b = dynamic_cast (component); + Button* const b = dynamic_cast (component); props.add (new ButtonTextProperty (b, document)); @@ -54,7 +54,7 @@ public: XmlElement* createXmlFor (Component* comp, const ComponentLayout* layout) { - Button* const b = dynamic_cast (comp); + Button* const b = dynamic_cast (comp); XmlElement* e = ComponentTypeHandler::createXmlFor (comp, layout); e->setAttribute ("buttonText", b->getButtonText()); @@ -67,7 +67,7 @@ public: bool restoreFromXml (const XmlElement& xml, Component* comp, const ComponentLayout* layout) { - Button* const b = dynamic_cast (comp); + Button* const b = dynamic_cast (comp); if (! ComponentTypeHandler::restoreFromXml (xml, comp, layout)) return false; @@ -89,7 +89,7 @@ public: { ComponentTypeHandler::fillInCreationCode (code, component, memberVariableName); - Button* const b = dynamic_cast (component); + Button* const b = dynamic_cast (component); if (b->getButtonText() != b->getName()) { diff --git a/extras/Introjucer/Source/ComponentEditor/components/jucer_ComboBoxHandler.h b/extras/Introjucer/Source/ComponentEditor/components/jucer_ComboBoxHandler.h index e88380141d..e328d9af55 100644 --- a/extras/Introjucer/Source/ComponentEditor/components/jucer_ComboBoxHandler.h +++ b/extras/Introjucer/Source/ComponentEditor/components/jucer_ComboBoxHandler.h @@ -36,7 +36,7 @@ public: XmlElement* createXmlFor (Component* comp, const ComponentLayout* layout) { - ComboBox* const c = dynamic_cast (comp); + ComboBox* const c = dynamic_cast (comp); jassert (c != nullptr); XmlElement* e = ComponentTypeHandler::createXmlFor (comp, layout); @@ -57,7 +57,7 @@ public: ComboBox defaultBox (String::empty); - ComboBox* const c = dynamic_cast (comp); + ComboBox* const c = dynamic_cast (comp); jassert (c != nullptr); c->setEditableText (xml.getBoolAttribute ("editable", defaultBox.isTextEditable())); @@ -75,7 +75,7 @@ public: { ComponentTypeHandler::getEditableProperties (component, document, props); - ComboBox* const c = dynamic_cast (component); + ComboBox* const c = dynamic_cast (component); jassert (c != nullptr); props.add (new ComboItemsProperty (c, document)); @@ -94,7 +94,7 @@ public: { ComponentTypeHandler::fillInCreationCode (code, component, memberVariableName); - ComboBox* const c = dynamic_cast (component); + ComboBox* const c = dynamic_cast (component); jassert (c != nullptr); String s; diff --git a/extras/Introjucer/Source/ComponentEditor/components/jucer_ComponentTypeHandler.cpp b/extras/Introjucer/Source/ComponentEditor/components/jucer_ComponentTypeHandler.cpp index bf94003a17..566b29d18a 100644 --- a/extras/Introjucer/Source/ComponentEditor/components/jucer_ComponentTypeHandler.cpp +++ b/extras/Introjucer/Source/ComponentEditor/components/jucer_ComponentTypeHandler.cpp @@ -100,10 +100,10 @@ JucerDocument* ComponentTypeHandler::findParentDocument (Component* component) while (p != nullptr) { - if (JucerDocumentEditor* const ed = dynamic_cast (p)) + if (JucerDocumentEditor* const ed = dynamic_cast (p)) return ed->getDocument(); - if (TestComponent* const t = dynamic_cast (p)) + if (TestComponent* const t = dynamic_cast (p)) return t->getDocument(); p = p->getParentComponent(); @@ -151,7 +151,7 @@ XmlElement* ComponentTypeHandler::createXmlFor (Component* comp, const Component pos.updateFromComponent (*comp, layout); pos.applyToXml (*e); - if (SettableTooltipClient* const ttc = dynamic_cast (comp)) + if (SettableTooltipClient* const ttc = dynamic_cast (comp)) if (ttc->getTooltip().isNotEmpty()) e->setAttribute ("tooltip", ttc->getTooltip()); @@ -191,7 +191,7 @@ bool ComponentTypeHandler::restoreFromXml (const XmlElement& xml, jassert (layout != 0); setComponentPosition (comp, rpr, layout); - if (SettableTooltipClient* const ttc = dynamic_cast (comp)) + if (SettableTooltipClient* const ttc = dynamic_cast (comp)) ttc->setTooltip (xml.getStringAttribute ("tooltip")); for (int i = 0; i < colours.size(); ++i) @@ -266,7 +266,7 @@ public: String getText() const override { - SettableTooltipClient* ttc = dynamic_cast (component); + SettableTooltipClient* ttc = dynamic_cast (component); return ttc->getTooltip(); } @@ -284,7 +284,7 @@ private: : ComponentUndoableAction (comp, l), newValue (newValue_) { - SettableTooltipClient* ttc = dynamic_cast (comp); + SettableTooltipClient* ttc = dynamic_cast (comp); jassert (ttc != nullptr); oldValue = ttc->getTooltip(); } @@ -293,7 +293,7 @@ private: { showCorrectTab(); - if (SettableTooltipClient* ttc = dynamic_cast (getComponent())) + if (SettableTooltipClient* ttc = dynamic_cast (getComponent())) { ttc->setTooltip (newValue); changed(); @@ -307,7 +307,7 @@ private: { showCorrectTab(); - if (SettableTooltipClient* ttc = dynamic_cast (getComponent())) + if (SettableTooltipClient* ttc = dynamic_cast (getComponent())) { ttc->setTooltip (oldValue); changed(); @@ -422,7 +422,7 @@ void ComponentTypeHandler::getEditableProperties (Component* component, props.add (new ComponentPositionProperty (component, document, "width", ComponentPositionProperty::componentWidth)); props.add (new ComponentPositionProperty (component, document, "height", ComponentPositionProperty::componentHeight)); - if (dynamic_cast (component) != nullptr) + if (dynamic_cast (component) != nullptr) props.add (new TooltipProperty (component, document)); props.add (new FocusOrderProperty (component, document)); @@ -551,7 +551,7 @@ void ComponentTypeHandler::fillInCreationCode (GeneratedCode& code, Component* c s << " (" << params << "));\n"; } - if (SettableTooltipClient* ttc = dynamic_cast (component)) + if (SettableTooltipClient* ttc = dynamic_cast (component)) { if (ttc->getTooltip().isNotEmpty()) { diff --git a/extras/Introjucer/Source/ComponentEditor/components/jucer_ComponentUndoableAction.h b/extras/Introjucer/Source/ComponentEditor/components/jucer_ComponentUndoableAction.h index 020ddcf926..45e5119115 100644 --- a/extras/Introjucer/Source/ComponentEditor/components/jucer_ComponentUndoableAction.h +++ b/extras/Introjucer/Source/ComponentEditor/components/jucer_ComponentUndoableAction.h @@ -44,7 +44,7 @@ public: ComponentType* getComponent() const { - ComponentType* const c = dynamic_cast (layout.getComponent (componentIndex)); + ComponentType* const c = dynamic_cast (layout.getComponent (componentIndex)); jassert (c != nullptr); return c; } @@ -67,7 +67,7 @@ protected: ed->showLayout(); if (layout.getSelectedSet().getNumSelected() == 0) - if (ComponentType* const c = dynamic_cast (layout.getComponent (componentIndex))) + if (ComponentType* const c = dynamic_cast (layout.getComponent (componentIndex))) layout.getSelectedSet().selectOnly (getComponent()); } diff --git a/extras/Introjucer/Source/ComponentEditor/components/jucer_GenericComponentHandler.h b/extras/Introjucer/Source/ComponentEditor/components/jucer_GenericComponentHandler.h index 88ede99129..d03ab2c27b 100644 --- a/extras/Introjucer/Source/ComponentEditor/components/jucer_GenericComponentHandler.h +++ b/extras/Introjucer/Source/ComponentEditor/components/jucer_GenericComponentHandler.h @@ -101,8 +101,8 @@ public: { ComponentTypeHandler::getEditableProperties (component, document, props); - props.add (new GenericCompClassProperty (dynamic_cast (component), document)); - props.add (new GenericCompParamsProperty (dynamic_cast (component), document)); + props.add (new GenericCompClassProperty (dynamic_cast (component), document)); + props.add (new GenericCompParamsProperty (dynamic_cast (component), document)); } String getClassName (Component* comp) const diff --git a/extras/Introjucer/Source/ComponentEditor/components/jucer_GroupComponentHandler.h b/extras/Introjucer/Source/ComponentEditor/components/jucer_GroupComponentHandler.h index b97cada7db..45bea8ee10 100644 --- a/extras/Introjucer/Source/ComponentEditor/components/jucer_GroupComponentHandler.h +++ b/extras/Introjucer/Source/ComponentEditor/components/jucer_GroupComponentHandler.h @@ -78,7 +78,7 @@ public: { ComponentTypeHandler::fillInCreationCode (code, component, memberVariableName); - GroupComponent* const g = dynamic_cast (component); + GroupComponent* const g = dynamic_cast (component); String s; diff --git a/extras/Introjucer/Source/ComponentEditor/components/jucer_ImageButtonHandler.h b/extras/Introjucer/Source/ComponentEditor/components/jucer_ImageButtonHandler.h index f217cb2010..a7d17d925c 100644 --- a/extras/Introjucer/Source/ComponentEditor/components/jucer_ImageButtonHandler.h +++ b/extras/Introjucer/Source/ComponentEditor/components/jucer_ImageButtonHandler.h @@ -97,7 +97,7 @@ public: return false; ImageButton* const ib = (ImageButton*) comp; - ComponentLayout& l = const_cast (*layout); + ComponentLayout& l = const_cast (*layout); setImageKeepProportions (l, ib, xml.getBoolAttribute ("keepProportions", true), false); @@ -120,7 +120,7 @@ public: { ButtonHandler::fillInCreationCode (code, component, memberVariableName); - ImageButton* const ib = dynamic_cast (component); + ImageButton* const ib = dynamic_cast (component); String s; diff --git a/extras/Introjucer/Source/ComponentEditor/components/jucer_JucerComponentHandler.h b/extras/Introjucer/Source/ComponentEditor/components/jucer_JucerComponentHandler.h index 532955a34b..17ff3f6d61 100644 --- a/extras/Introjucer/Source/ComponentEditor/components/jucer_JucerComponentHandler.h +++ b/extras/Introjucer/Source/ComponentEditor/components/jucer_JucerComponentHandler.h @@ -50,7 +50,7 @@ public: XmlElement* createXmlFor (Component* comp, const ComponentLayout* layout) { - TestComponent* const tc = dynamic_cast (comp); + TestComponent* const tc = dynamic_cast (comp); XmlElement* e = ComponentTypeHandler::createXmlFor (comp, layout); e->setAttribute ("sourceFile", tc->getFilename()); @@ -61,7 +61,7 @@ public: bool restoreFromXml (const XmlElement& xml, Component* comp, const ComponentLayout* layout) { - TestComponent* const tc = dynamic_cast (comp); + TestComponent* const tc = dynamic_cast (comp); if (! ComponentTypeHandler::restoreFromXml (xml, comp, layout)) return false; @@ -74,7 +74,7 @@ public: String getClassName (Component* comp) const { - TestComponent* const tc = dynamic_cast (comp); + TestComponent* const tc = dynamic_cast (comp); String jucerCompClassName; @@ -89,7 +89,7 @@ public: void getEditableProperties (Component* component, JucerDocument& document, Array& props) { - TestComponent* const tc = dynamic_cast (component); + TestComponent* const tc = dynamic_cast (component); ComponentTypeHandler::getEditableProperties (component, document, props); @@ -107,7 +107,7 @@ public: { ComponentTypeHandler::fillInCreationCode (code, component, memberVariableName); - TestComponent* const tc = dynamic_cast (component); + TestComponent* const tc = dynamic_cast (component); code.includeFilesH.add (tc->getFilename().replace (".cpp", ".h")); } diff --git a/extras/Introjucer/Source/ComponentEditor/components/jucer_LabelHandler.h b/extras/Introjucer/Source/ComponentEditor/components/jucer_LabelHandler.h index 7e70c5113a..c71fce659c 100644 --- a/extras/Introjucer/Source/ComponentEditor/components/jucer_LabelHandler.h +++ b/extras/Introjucer/Source/ComponentEditor/components/jucer_LabelHandler.h @@ -43,7 +43,7 @@ public: XmlElement* createXmlFor (Component* comp, const ComponentLayout* layout) { - Label* const l = dynamic_cast (comp); + Label* const l = dynamic_cast (comp); XmlElement* e = ComponentTypeHandler::createXmlFor (comp, layout); e->setAttribute ("labelText", l->getText()); @@ -63,7 +63,7 @@ public: bool restoreFromXml (const XmlElement& xml, Component* comp, const ComponentLayout* layout) { - Label* const l = dynamic_cast (comp); + Label* const l = dynamic_cast (comp); if (! ComponentTypeHandler::restoreFromXml (xml, comp, layout)) return false; @@ -99,7 +99,7 @@ public: String getCreationParameters (GeneratedCode& code, Component* component) { - Label* const l = dynamic_cast (component); + Label* const l = dynamic_cast (component); return quotedString (component->getName(), false) + ",\n" @@ -110,7 +110,7 @@ public: { ComponentTypeHandler::fillInCreationCode (code, component, memberVariableName); - Label* const l = dynamic_cast (component); + Label* const l = dynamic_cast (component); String s; @@ -161,7 +161,7 @@ public: { ComponentTypeHandler::getEditableProperties (component, document, props); - Label* const l = dynamic_cast (component); + Label* const l = dynamic_cast (component); props.add (new LabelTextProperty (l, document)); props.add (new LabelJustificationProperty (l, document)); diff --git a/extras/Introjucer/Source/ComponentEditor/components/jucer_SliderHandler.h b/extras/Introjucer/Source/ComponentEditor/components/jucer_SliderHandler.h index b925a0d630..f929f7409d 100644 --- a/extras/Introjucer/Source/ComponentEditor/components/jucer_SliderHandler.h +++ b/extras/Introjucer/Source/ComponentEditor/components/jucer_SliderHandler.h @@ -48,7 +48,7 @@ public: { XmlElement* e = ComponentTypeHandler::createXmlFor (comp, layout); - Slider* const s = dynamic_cast (comp); + Slider* const s = dynamic_cast (comp); e->setAttribute ("min", s->getMinimum()); e->setAttribute ("max", s->getMaximum()); e->setAttribute ("int", s->getInterval()); @@ -67,7 +67,7 @@ public: if (! ComponentTypeHandler::restoreFromXml (xml, comp, layout)) return false; - Slider* const s = dynamic_cast (comp); + Slider* const s = dynamic_cast (comp); s->setRange (xml.getDoubleAttribute ("min", 0.0), xml.getDoubleAttribute ("max", 10.0), @@ -94,7 +94,7 @@ public: { ComponentTypeHandler::fillInCreationCode (code, component, memberVariableName); - Slider* const s = dynamic_cast (component); + Slider* const s = dynamic_cast (component); String r; r << memberVariableName << "->setRange (" @@ -145,7 +145,7 @@ public: { ComponentTypeHandler::getEditableProperties (component, document, props); - Slider* s = dynamic_cast (component); + Slider* s = dynamic_cast (component); jassert (s != 0); props.add (new SliderRangeProperty (s, document, "minimum", 0)); @@ -226,7 +226,7 @@ private: Slider::ThreeValueVertical }; for (int i = 0; i < numElementsInArray (types); ++i) - if (types [i] == dynamic_cast (component)->getSliderStyle()) + if (types [i] == dynamic_cast (component)->getSliderStyle()) return i; return -1; @@ -502,7 +502,7 @@ private: String getText() const override { - Slider* s = dynamic_cast (component); + Slider* s = dynamic_cast (component); jassert (s != nullptr); switch (rangeParam) @@ -573,7 +573,7 @@ private: String getText() const override { - Slider* s = dynamic_cast (component); + Slider* s = dynamic_cast (component); jassert (s != 0); return String (s->getSkewFactor()); diff --git a/extras/Introjucer/Source/ComponentEditor/components/jucer_TextButtonHandler.h b/extras/Introjucer/Source/ComponentEditor/components/jucer_TextButtonHandler.h index 1023388d9c..185d0c776b 100644 --- a/extras/Introjucer/Source/ComponentEditor/components/jucer_TextButtonHandler.h +++ b/extras/Introjucer/Source/ComponentEditor/components/jucer_TextButtonHandler.h @@ -69,7 +69,7 @@ public: { ButtonHandler::fillInCreationCode (code, component, memberVariableName); - //TextButton* const tb = dynamic_cast (component); + //TextButton* const tb = dynamic_cast (component); //TextButton defaultButton (String::empty); String s; diff --git a/extras/Introjucer/Source/ComponentEditor/components/jucer_TextEditorHandler.h b/extras/Introjucer/Source/ComponentEditor/components/jucer_TextEditorHandler.h index 45ee52b722..ee92f94661 100644 --- a/extras/Introjucer/Source/ComponentEditor/components/jucer_TextEditorHandler.h +++ b/extras/Introjucer/Source/ComponentEditor/components/jucer_TextEditorHandler.h @@ -83,7 +83,7 @@ public: { ComponentTypeHandler::getEditableProperties (component, document, props); - TextEditor* const t = dynamic_cast (component); + TextEditor* const t = dynamic_cast (component); jassert (t != nullptr); props.add (new TextEditorInitialTextProperty (t, document)); @@ -105,7 +105,7 @@ public: { ComponentTypeHandler::fillInCreationCode (code, component, memberVariableName); - TextEditor* const te = dynamic_cast (component); + TextEditor* const te = dynamic_cast (component); jassert (te != 0); String s; diff --git a/extras/Introjucer/Source/ComponentEditor/components/jucer_ToggleButtonHandler.h b/extras/Introjucer/Source/ComponentEditor/components/jucer_ToggleButtonHandler.h index 3f607dd1fe..5203d36957 100644 --- a/extras/Introjucer/Source/ComponentEditor/components/jucer_ToggleButtonHandler.h +++ b/extras/Introjucer/Source/ComponentEditor/components/jucer_ToggleButtonHandler.h @@ -70,7 +70,7 @@ public: { ButtonHandler::fillInCreationCode (code, component, memberVariableName); - ToggleButton* const tb = dynamic_cast (component); + ToggleButton* const tb = dynamic_cast (component); String s; diff --git a/extras/Introjucer/Source/ComponentEditor/components/jucer_TreeViewHandler.h b/extras/Introjucer/Source/ComponentEditor/components/jucer_TreeViewHandler.h index f4b25c558f..d73e928523 100644 --- a/extras/Introjucer/Source/ComponentEditor/components/jucer_TreeViewHandler.h +++ b/extras/Introjucer/Source/ComponentEditor/components/jucer_TreeViewHandler.h @@ -39,7 +39,7 @@ public: XmlElement* createXmlFor (Component* comp, const ComponentLayout* layout) { - TreeView* const t = dynamic_cast (comp); + TreeView* const t = dynamic_cast (comp); XmlElement* const e = ComponentTypeHandler::createXmlFor (comp, layout); e->setAttribute ("rootVisible", t->isRootItemVisible()); @@ -54,7 +54,7 @@ public: return false; TreeView defaultTreeView; - TreeView* const t = dynamic_cast (comp); + TreeView* const t = dynamic_cast (comp); t->setRootItemVisible (xml.getBoolAttribute ("rootVisible", defaultTreeView.isRootItemVisible())); t->setDefaultOpenness (xml.getBoolAttribute ("openByDefault", defaultTreeView.areItemsOpenByDefault())); @@ -65,7 +65,7 @@ public: void getEditableProperties (Component* component, JucerDocument& document, Array& props) { ComponentTypeHandler::getEditableProperties (component, document, props); - TreeView* const t = dynamic_cast (component); + TreeView* const t = dynamic_cast (component); props.add (new TreeViewRootItemProperty (t, document)); props.add (new TreeViewRootOpennessProperty (t, document)); @@ -81,7 +81,7 @@ public: void fillInCreationCode (GeneratedCode& code, Component* component, const String& memberVariableName) { TreeView defaultTreeView; - TreeView* const t = dynamic_cast (component); + TreeView* const t = dynamic_cast (component); ComponentTypeHandler::fillInCreationCode (code, component, memberVariableName); diff --git a/extras/Introjucer/Source/ComponentEditor/components/jucer_ViewportHandler.h b/extras/Introjucer/Source/ComponentEditor/components/jucer_ViewportHandler.h index 8b470b2ff9..f66db1fa95 100644 --- a/extras/Introjucer/Source/ComponentEditor/components/jucer_ViewportHandler.h +++ b/extras/Introjucer/Source/ComponentEditor/components/jucer_ViewportHandler.h @@ -39,7 +39,7 @@ public: XmlElement* createXmlFor (Component* comp, const ComponentLayout* layout) { - Viewport* const v = dynamic_cast (comp); + Viewport* const v = dynamic_cast (comp); XmlElement* const e = ComponentTypeHandler::createXmlFor (comp, layout); e->setAttribute ("vscroll", v->isVerticalScrollBarShown()); @@ -60,7 +60,7 @@ public: return false; Viewport defaultViewport; - Viewport* const v = dynamic_cast (comp); + Viewport* const v = dynamic_cast (comp); v->setScrollBarsShown (xml.getBoolAttribute ("vscroll", defaultViewport.isVerticalScrollBarShown()), xml.getBoolAttribute ("hscroll", defaultViewport.isHorizontalScrollBarShown())); @@ -78,7 +78,7 @@ public: { ComponentTypeHandler::getEditableProperties (component, document, props); - Viewport* const v = dynamic_cast (component); + Viewport* const v = dynamic_cast (component); props.add (new ViewportScrollbarShownProperty (v, document, true)); props.add (new ViewportScrollbarShownProperty (v, document, false)); @@ -105,7 +105,7 @@ public: void fillInCreationCode (GeneratedCode& code, Component* component, const String& memberVariableName) { Viewport defaultViewport; - Viewport* const v = dynamic_cast (component); + Viewport* const v = dynamic_cast (component); ComponentTypeHandler::fillInCreationCode (code, component, memberVariableName); diff --git a/extras/Introjucer/Source/ComponentEditor/jucer_BinaryResources.cpp b/extras/Introjucer/Source/ComponentEditor/jucer_BinaryResources.cpp index f9cee033f7..84d19c1ab3 100644 --- a/extras/Introjucer/Source/ComponentEditor/jucer_BinaryResources.cpp +++ b/extras/Introjucer/Source/ComponentEditor/jucer_BinaryResources.cpp @@ -187,7 +187,7 @@ void BinaryResources::remove (const int i) const Drawable* BinaryResources::getDrawable (const String& name) const { - if (BinaryResources::BinaryResource* const res = const_cast (getResource (name))) + if (BinaryResources::BinaryResource* const res = const_cast (getResource (name))) { if (res->drawable == nullptr && res->data.getSize() > 0) res->drawable = Drawable::createFromImageData (res->data.getData(), diff --git a/extras/Introjucer/Source/ComponentEditor/jucer_ComponentLayout.cpp b/extras/Introjucer/Source/ComponentEditor/jucer_ComponentLayout.cpp index cae00a3839..95a3517841 100644 --- a/extras/Introjucer/Source/ComponentEditor/jucer_ComponentLayout.cpp +++ b/extras/Introjucer/Source/ComponentEditor/jucer_ComponentLayout.cpp @@ -418,7 +418,7 @@ Component* ComponentLayout::getComponentRelativePosTarget (Component* comp, int { jassert (comp != nullptr); - if (PaintElement* const pe = dynamic_cast (comp)) + if (PaintElement* const pe = dynamic_cast (comp)) { int64 compId; @@ -436,7 +436,7 @@ Component* ComponentLayout::getComponentRelativePosTarget (Component* comp, int void ComponentLayout::setComponentRelativeTarget (Component* comp, int whichDimension, Component* compToBeRelativeTo) { - PaintElement* const pe = dynamic_cast (comp); + PaintElement* const pe = dynamic_cast (comp); jassert (comp != nullptr); jassert (pe != nullptr || components.contains (comp)); @@ -453,7 +453,7 @@ void ComponentLayout::setComponentRelativeTarget (Component* comp, int whichDime if (pe != nullptr) { - oldBounds = pe->getCurrentBounds (dynamic_cast (pe->getParentComponent())->getComponentArea()); + oldBounds = pe->getCurrentBounds (dynamic_cast (pe->getParentComponent())->getComponentArea()); pos = pe->getPosition(); } else @@ -469,7 +469,7 @@ void ComponentLayout::setComponentRelativeTarget (Component* comp, int whichDime if (pe != nullptr) { pe->setPosition (pos, true); - pe->setCurrentBounds (oldBounds, dynamic_cast (pe->getParentComponent())->getComponentArea(), true); + pe->setCurrentBounds (oldBounds, dynamic_cast (pe->getParentComponent())->getComponentArea(), true); } else { diff --git a/extras/Introjucer/Source/ComponentEditor/jucer_JucerDocument.cpp b/extras/Introjucer/Source/ComponentEditor/jucer_JucerDocument.cpp index ba66e2b191..91b7444d45 100644 --- a/extras/Introjucer/Source/ComponentEditor/jucer_JucerDocument.cpp +++ b/extras/Introjucer/Source/ComponentEditor/jucer_JucerDocument.cpp @@ -555,7 +555,7 @@ bool JucerDocument::flushChangesToDocuments() OpenDocumentManager& odm = IntrojucerApp::getApp().openDocumentManager; - if (SourceCodeDocument* header = dynamic_cast (odm.openFile (nullptr, getHeaderFile()))) + if (SourceCodeDocument* header = dynamic_cast (odm.openFile (nullptr, getHeaderFile()))) { String existingHeader (header->getCodeDocument().getAllContent()); String existingCpp (cpp->getCodeDocument().getAllContent()); @@ -733,9 +733,9 @@ public: OpenDocumentManager& odm = IntrojucerApp::getApp().openDocumentManager; - if (SourceCodeDocument* cpp = dynamic_cast (odm.openFile (nullptr, cppFile))) + if (SourceCodeDocument* cpp = dynamic_cast (odm.openFile (nullptr, cppFile))) { - if (SourceCodeDocument* header = dynamic_cast (odm.openFile (nullptr, headerFile))) + if (SourceCodeDocument* header = dynamic_cast (odm.openFile (nullptr, headerFile))) { ScopedPointer jucerDoc (new ComponentDocument (cpp)); diff --git a/extras/Introjucer/Source/ComponentEditor/jucer_PaintRoutine.cpp b/extras/Introjucer/Source/ComponentEditor/jucer_PaintRoutine.cpp index ed133fa1de..ee090d072a 100644 --- a/extras/Introjucer/Source/ComponentEditor/jucer_PaintRoutine.cpp +++ b/extras/Introjucer/Source/ComponentEditor/jucer_PaintRoutine.cpp @@ -505,7 +505,7 @@ void PaintRoutine::dropImageAt (const File& f, int x, int y) PaintElement* newElement = addNewElement (ObjectTypes::createNewImageElement (this), -1, true); - if (PaintElementImage* pei = dynamic_cast (newElement)) + if (PaintElementImage* pei = dynamic_cast (newElement)) { String resourceName (getDocument()->getResources().findUniqueName (f.getFileName())); diff --git a/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_GradientPointComponent.h b/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_GradientPointComponent.h index 4f6813172e..45ef7fd00e 100644 --- a/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_GradientPointComponent.h +++ b/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_GradientPointComponent.h @@ -44,7 +44,7 @@ public: RelativePositionedRectangle getPosition() { - ColouredElement* e = dynamic_cast (owner); + ColouredElement* e = dynamic_cast (owner); if (isStroke) return isStart ? e->getStrokeType().fill.gradPos1 @@ -56,7 +56,7 @@ public: void setPosition (const RelativePositionedRectangle& newPos) { - ColouredElement* e = dynamic_cast (owner); + ColouredElement* e = dynamic_cast (owner); if (isStroke) { @@ -86,7 +86,7 @@ public: { PointComponent::updatePosition(); - ColouredElement* e = dynamic_cast (owner); + ColouredElement* e = dynamic_cast (owner); JucerFillType f (isStroke ? e->getStrokeType().fill : e->getFillType()); diff --git a/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_PaintElement.cpp b/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_PaintElement.cpp index 68c1e29b54..9e55b77c62 100644 --- a/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_PaintElement.cpp +++ b/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_PaintElement.cpp @@ -291,7 +291,7 @@ void PaintElement::mouseDrag (const MouseEvent& e) { if (! e.mods.isPopupMenu()) { - jassert (dynamic_cast (getParentComponent()) != nullptr); + jassert (dynamic_cast (getParentComponent()) != nullptr); const Rectangle area (((PaintRoutineEditor*) getParentComponent())->getComponentArea()); if (selected && ! dragging) @@ -392,7 +392,7 @@ void PaintElement::applyBoundsToComponent (Component*, const Rectangle& new { getDocument()->getUndoManager().undoCurrentTransactionOnly(); - jassert (dynamic_cast (getParentComponent()) != nullptr); + jassert (dynamic_cast (getParentComponent()) != nullptr); setCurrentBounds (newBounds.expanded (-borderThickness, -borderThickness), ((PaintRoutineEditor*) getParentComponent())->getComponentArea(), @@ -402,7 +402,7 @@ void PaintElement::applyBoundsToComponent (Component*, const Rectangle& new Rectangle PaintElement::getCurrentAbsoluteBounds() const { - jassert (dynamic_cast (getParentComponent()) != nullptr); + jassert (dynamic_cast (getParentComponent()) != nullptr); const Rectangle area (((PaintRoutineEditor*) getParentComponent())->getComponentArea()); return position.getRectangle (area, getDocument()->getComponentLayout()); @@ -410,7 +410,7 @@ Rectangle PaintElement::getCurrentAbsoluteBounds() const void PaintElement::getCurrentAbsoluteBoundsDouble (double& x, double& y, double& w, double& h) const { - jassert (dynamic_cast (getParentComponent()) != nullptr); + jassert (dynamic_cast (getParentComponent()) != nullptr); const Rectangle area (((PaintRoutineEditor*) getParentComponent())->getComponentArea()); position.getRectangleDouble (x, y, w, h, area, getDocument()->getComponentLayout()); diff --git a/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_PaintElementGroup.h b/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_PaintElementGroup.h index 6a433e118f..944e2e7959 100644 --- a/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_PaintElementGroup.h +++ b/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_PaintElementGroup.h @@ -97,7 +97,7 @@ public: return true; for (int i = subElements.size(); --i >= 0;) - if (PaintElementGroup* pg = dynamic_cast (subElements.getUnchecked(i))) + if (PaintElementGroup* pg = dynamic_cast (subElements.getUnchecked(i))) if (pg->containsElement (element)) return true; diff --git a/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_PaintElementImage.h b/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_PaintElementImage.h index 53c81d5bd7..ac7a9b98eb 100644 --- a/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_PaintElementImage.h +++ b/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_PaintElementImage.h @@ -98,7 +98,7 @@ public: if (opacity > 0) { - if (dynamic_cast (getDrawable()) != 0) + if (dynamic_cast (getDrawable()) != 0) { const String imageVariable ("cachedImage_" + resourceName.replace ("::", "_") + "_" + String (code.getUniqueSuffix())); @@ -288,7 +288,7 @@ public: { if (const Drawable* const image = getDrawable()) { - if (PaintRoutineEditor* ed = dynamic_cast (getParentComponent())) + if (PaintRoutineEditor* ed = dynamic_cast (getParentComponent())) { const Rectangle parentArea (ed->getComponentArea()); diff --git a/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_PaintElementUndoableAction.h b/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_PaintElementUndoableAction.h index e2de935a71..9edc4f0107 100644 --- a/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_PaintElementUndoableAction.h +++ b/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_PaintElementUndoableAction.h @@ -51,26 +51,26 @@ public: if (containerGroups.size() > 0) { PaintElementGroup* group = 0; - group = dynamic_cast (routine.getElement (containerGroups.getFirst())); + group = dynamic_cast (routine.getElement (containerGroups.getFirst())); if (group == 0) return 0; for (int i = 1; i < containerGroups.size(); ++i) { - group = dynamic_cast (group->getElement (containerGroups.getUnchecked(i))); + group = dynamic_cast (group->getElement (containerGroups.getUnchecked(i))); if (group == 0) return 0; } - ElementType* const e = dynamic_cast (group->getElement (elementIndex)); + ElementType* const e = dynamic_cast (group->getElement (elementIndex)); jassert (e != 0); return e; } else { - ElementType* const e = dynamic_cast (routine.getElement (elementIndex)); + ElementType* const e = dynamic_cast (routine.getElement (elementIndex)); jassert (e != 0); return e; } @@ -95,7 +95,7 @@ protected: docHolder->showGraphics (&routine); if (routine.getSelectedElements().getNumSelected() == 0) - if (ElementType* const e = dynamic_cast (routine.getElement (elementIndex))) + if (ElementType* const e = dynamic_cast (routine.getElement (elementIndex))) routine.getSelectedElements().selectOnly (e); } @@ -104,7 +104,7 @@ private: { for (int i = pr->getNumElements(); --i >= 0;) { - PaintElementGroup* const pg = dynamic_cast (pr->getElement (i)); + PaintElementGroup* const pg = dynamic_cast (pr->getElement (i)); if (pg != 0 && pg->containsElement (element)) { @@ -122,7 +122,7 @@ private: { for (int i = group->getNumElements(); --i >= 0;) { - PaintElementGroup* pg = dynamic_cast (group->getElement (i)); + PaintElementGroup* pg = dynamic_cast (group->getElement (i)); if (pg != 0 && pg->containsElement (element)) { diff --git a/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_PointComponent.h b/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_PointComponent.h index 92649effa4..7833460b93 100644 --- a/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_PointComponent.h +++ b/extras/Introjucer/Source/ComponentEditor/paintelements/jucer_PointComponent.h @@ -43,9 +43,9 @@ public: virtual RelativePositionedRectangle getPosition() = 0; virtual void setPosition (const RelativePositionedRectangle& newPos) = 0; - virtual void updatePosition() + void updatePosition() override { - if (dynamic_cast (getParentComponent()) != 0) + if (dynamic_cast (getParentComponent()) != nullptr) { const Rectangle area (((PaintRoutineEditor*) getParentComponent())->getComponentArea()); const Rectangle r (getPosition().getRectangle (area, owner->getDocument()->getComponentLayout())); @@ -55,7 +55,7 @@ public: } //============================================================================== - void paint (Graphics& g) + void paint (Graphics& g) override { g.setColour (Colours::white); g.drawEllipse (2.0f, 2.0f, getWidth() - 4.0f, getHeight() - 4.0f, 2.0f); @@ -65,14 +65,14 @@ public: } //============================================================================== - void mouseDown (const MouseEvent&) + void mouseDown (const MouseEvent&) override { const Rectangle area (((PaintRoutineEditor*) getParentComponent())->getComponentArea()); dragX = getX() + getWidth() / 2 - area.getX(); dragY = getY() + getHeight() / 2 - area.getY(); } - void mouseDrag (const MouseEvent& e) + void mouseDrag (const MouseEvent& e) override { const Rectangle area (((PaintRoutineEditor*) getParentComponent())->getComponentArea()); int x = dragX + e.getDistanceFromDragStartX(); @@ -99,7 +99,7 @@ public: } } - void mouseUp (const MouseEvent&) + void mouseUp (const MouseEvent&) override { } diff --git a/extras/Introjucer/Source/ComponentEditor/properties/jucer_ComponentColourProperty.h b/extras/Introjucer/Source/ComponentEditor/properties/jucer_ComponentColourProperty.h index 7beb81f166..5462579cdd 100644 --- a/extras/Introjucer/Source/ComponentEditor/properties/jucer_ComponentColourProperty.h +++ b/extras/Introjucer/Source/ComponentEditor/properties/jucer_ComponentColourProperty.h @@ -156,7 +156,7 @@ private: else getComponent()->removeColour (colourId); - if (TextEditor* const te = dynamic_cast (getComponent())) + if (TextEditor* const te = dynamic_cast (getComponent())) te->applyFontToAllText (te->getFont()); changed(); diff --git a/extras/Introjucer/Source/ComponentEditor/properties/jucer_PositionPropertyBase.h b/extras/Introjucer/Source/ComponentEditor/properties/jucer_PositionPropertyBase.h index 6ae60b6ef9..c02dad83ed 100644 --- a/extras/Introjucer/Source/ComponentEditor/properties/jucer_PositionPropertyBase.h +++ b/extras/Introjucer/Source/ComponentEditor/properties/jucer_PositionPropertyBase.h @@ -340,8 +340,8 @@ public: if (component->findParentComponentOfClass() != 0) parentArea.setSize (component->getParentWidth(), component->getParentHeight()); - else if (dynamic_cast (component->getParentComponent()) != 0) - parentArea = dynamic_cast (component->getParentComponent())->getComponentArea(); + else if (PaintRoutineEditor* pre = dynamic_cast (component->getParentComponent())) + parentArea = pre->getComponentArea(); else jassertfalse; diff --git a/extras/Introjucer/Source/ComponentEditor/ui/jucer_ComponentLayoutEditor.cpp b/extras/Introjucer/Source/ComponentEditor/ui/jucer_ComponentLayoutEditor.cpp index 03c11906de..f08fb3448d 100644 --- a/extras/Introjucer/Source/ComponentEditor/ui/jucer_ComponentLayoutEditor.cpp +++ b/extras/Introjucer/Source/ComponentEditor/ui/jucer_ComponentLayoutEditor.cpp @@ -188,7 +188,7 @@ Image ComponentLayoutEditor::createComponentLayerSnapshot() const void ComponentLayoutEditor::updateOverlayPositions() { for (int i = getNumChildComponents(); --i >= 0;) - if (ComponentOverlayComponent* const overlay = dynamic_cast (getChildComponent (i))) + if (ComponentOverlayComponent* const overlay = dynamic_cast (getChildComponent (i))) overlay->updateBoundsToMatchTarget(); } @@ -196,7 +196,7 @@ void ComponentLayoutEditor::refreshAllComponents() { for (int i = getNumChildComponents(); --i >= 0;) { - ScopedPointer overlay (dynamic_cast (getChildComponent (i))); + ScopedPointer overlay (dynamic_cast (getChildComponent (i))); if (overlay != nullptr && layout.containsComponent (overlay->target)) overlay.release(); @@ -399,7 +399,7 @@ ComponentOverlayComponent* ComponentLayoutEditor::getOverlayCompFor (Component* { for (int i = getNumChildComponents(); --i >= 0;) { - if (ComponentOverlayComponent* const overlay = dynamic_cast (getChildComponent (i))) + if (ComponentOverlayComponent* const overlay = dynamic_cast (getChildComponent (i))) if (overlay->target == compToFind) return overlay; } diff --git a/extras/Introjucer/Source/ComponentEditor/ui/jucer_EditingPanelBase.cpp b/extras/Introjucer/Source/ComponentEditor/ui/jucer_EditingPanelBase.cpp index 3de7c9a399..b54de95815 100644 --- a/extras/Introjucer/Source/ComponentEditor/ui/jucer_EditingPanelBase.cpp +++ b/extras/Introjucer/Source/ComponentEditor/ui/jucer_EditingPanelBase.cpp @@ -93,7 +93,7 @@ public: else { for (int i = getNumChildComponents(); --i >= 0;) - ScopedPointer deleter (dynamic_cast (getChildComponent (i))); + ScopedPointer deleter (dynamic_cast (getChildComponent (i))); } } } @@ -183,7 +183,7 @@ void EditingPanelBase::visibilityChanged() { resized(); - if (JucerDocumentEditor* const cdh = dynamic_cast (p->getParentComponent())) + if (JucerDocumentEditor* const cdh = dynamic_cast (p->getParentComponent())) cdh->setViewportToLastPos (viewport, *this); resized(); @@ -192,7 +192,7 @@ void EditingPanelBase::visibilityChanged() else { if (Component* p = getParentComponent()) - if (JucerDocumentEditor* const cdh = dynamic_cast (p->getParentComponent())) + if (JucerDocumentEditor* const cdh = dynamic_cast (p->getParentComponent())) cdh->storeLastViewportPos (viewport, *this); } diff --git a/extras/Introjucer/Source/ComponentEditor/ui/jucer_JucerDocumentEditor.cpp b/extras/Introjucer/Source/ComponentEditor/ui/jucer_JucerDocumentEditor.cpp index e5818b54cf..4dcfe9411d 100644 --- a/extras/Introjucer/Source/ComponentEditor/ui/jucer_JucerDocumentEditor.cpp +++ b/extras/Introjucer/Source/ComponentEditor/ui/jucer_JucerDocumentEditor.cpp @@ -360,14 +360,14 @@ void JucerDocumentEditor::refreshPropertiesPanel() const { for (int i = tabbedComponent.getNumTabs(); --i >= 0;) { - if (ComponentLayoutPanel* layoutPanel = dynamic_cast (tabbedComponent.getTabContentComponent (i))) + if (ComponentLayoutPanel* layoutPanel = dynamic_cast (tabbedComponent.getTabContentComponent (i))) { if (layoutPanel->isVisible()) layoutPanel->updatePropertiesList(); } else { - if (PaintRoutinePanel* pr = dynamic_cast (tabbedComponent.getTabContentComponent (i))) + if (PaintRoutinePanel* pr = dynamic_cast (tabbedComponent.getTabContentComponent (i))) if (pr->isVisible()) pr->updatePropertiesList(); } @@ -380,7 +380,7 @@ void JucerDocumentEditor::updateTabs() for (int i = tabbedComponent.getNumTabs(); --i >= 0;) { - if (dynamic_cast (tabbedComponent.getTabContentComponent (i)) != 0 + if (dynamic_cast (tabbedComponent.getTabContentComponent (i)) != 0 && ! paintRoutineNames.contains (tabbedComponent.getTabNames() [i])) { tabbedComponent.removeTab (i); @@ -394,7 +394,7 @@ void JucerDocumentEditor::updateTabs() int index, numPaintRoutinesSeen = 0; for (index = 1; index < tabbedComponent.getNumTabs(); ++index) { - if (dynamic_cast (tabbedComponent.getTabContentComponent (index)) != nullptr) + if (dynamic_cast (tabbedComponent.getTabContentComponent (index)) != nullptr) { if (++numPaintRoutinesSeen == i) { @@ -440,7 +440,7 @@ ApplicationCommandTarget* JucerDocumentEditor::getNextCommandTarget() ComponentLayout* JucerDocumentEditor::getCurrentLayout() const { - if (ComponentLayoutPanel* panel = dynamic_cast (tabbedComponent.getCurrentContentComponent())) + if (ComponentLayoutPanel* panel = dynamic_cast (tabbedComponent.getCurrentContentComponent())) return &(panel->layout); return nullptr; @@ -448,7 +448,7 @@ ComponentLayout* JucerDocumentEditor::getCurrentLayout() const PaintRoutine* JucerDocumentEditor::getCurrentPaintRoutine() const { - if (PaintRoutinePanel* panel = dynamic_cast (tabbedComponent.getCurrentContentComponent())) + if (PaintRoutinePanel* panel = dynamic_cast (tabbedComponent.getCurrentContentComponent())) return &(panel->getPaintRoutine()); return nullptr; @@ -460,7 +460,7 @@ void JucerDocumentEditor::showLayout() { for (int i = 0; i < tabbedComponent.getNumTabs(); ++i) { - if (dynamic_cast (tabbedComponent.getTabContentComponent (i)) != nullptr) + if (dynamic_cast (tabbedComponent.getTabContentComponent (i)) != nullptr) { tabbedComponent.setCurrentTabIndex (i); break; @@ -475,7 +475,7 @@ void JucerDocumentEditor::showGraphics (PaintRoutine* routine) { for (int i = 0; i < tabbedComponent.getNumTabs(); ++i) { - if (PaintRoutinePanel* pr = dynamic_cast (tabbedComponent.getTabContentComponent (i))) + if (PaintRoutinePanel* pr = dynamic_cast (tabbedComponent.getTabContentComponent (i))) { if (routine == &(pr->getPaintRoutine()) || routine == nullptr) { @@ -506,13 +506,13 @@ void JucerDocumentEditor::setZoom (double scale) { scale = jlimit (1.0 / 4.0, 32.0, scale); - if (EditingPanelBase* panel = dynamic_cast (tabbedComponent.getCurrentContentComponent())) + if (EditingPanelBase* panel = dynamic_cast (tabbedComponent.getCurrentContentComponent())) panel->setZoom (scale); } double JucerDocumentEditor::getZoom() const { - if (EditingPanelBase* panel = dynamic_cast (tabbedComponent.getCurrentContentComponent())) + if (EditingPanelBase* panel = dynamic_cast (tabbedComponent.getCurrentContentComponent())) return panel->getZoom(); return 1.0; @@ -528,7 +528,7 @@ static double snapToIntegerZoom (double zoom) void JucerDocumentEditor::addElement (const int index) { - if (PaintRoutinePanel* const panel = dynamic_cast (tabbedComponent.getCurrentContentComponent())) + if (PaintRoutinePanel* const panel = dynamic_cast (tabbedComponent.getCurrentContentComponent())) { PaintRoutine* const currentPaintRoutine = & (panel->getPaintRoutine()); const Rectangle area (panel->getComponentArea()); @@ -566,7 +566,7 @@ void JucerDocumentEditor::addComponent (const int index) { showLayout(); - if (ComponentLayoutPanel* const panel = dynamic_cast (tabbedComponent.getCurrentContentComponent())) + if (ComponentLayoutPanel* const panel = dynamic_cast (tabbedComponent.getCurrentContentComponent())) { const Rectangle area (panel->getComponentArea()); @@ -934,7 +934,7 @@ bool JucerDocumentEditor::perform (const InvocationInfo& info) case JucerCommandIDs::zoomNormal: setZoom (1.0); break; case JucerCommandIDs::spaceBarDrag: - if (EditingPanelBase* panel = dynamic_cast (tabbedComponent.getCurrentContentComponent())) + if (EditingPanelBase* panel = dynamic_cast (tabbedComponent.getCurrentContentComponent())) panel->dragKeyHeldDown (info.isKeyDown); break; @@ -958,7 +958,7 @@ bool JucerDocumentEditor::perform (const InvocationInfo& info) break; case JucerCommandIDs::bringBackLostItems: - if (EditingPanelBase* panel = dynamic_cast (tabbedComponent.getCurrentContentComponent())) + if (EditingPanelBase* panel = dynamic_cast (tabbedComponent.getCurrentContentComponent())) { int w = panel->getComponentArea().getWidth(); int h = panel->getComponentArea().getHeight(); diff --git a/extras/Introjucer/Source/ComponentEditor/ui/jucer_PaintRoutineEditor.cpp b/extras/Introjucer/Source/ComponentEditor/ui/jucer_PaintRoutineEditor.cpp index b3d1442407..c86b2978c5 100644 --- a/extras/Introjucer/Source/ComponentEditor/ui/jucer_PaintRoutineEditor.cpp +++ b/extras/Introjucer/Source/ComponentEditor/ui/jucer_PaintRoutineEditor.cpp @@ -56,7 +56,7 @@ PaintRoutineEditor::~PaintRoutineEditor() void PaintRoutineEditor::removeAllElementComps() { for (int i = getNumChildComponents(); --i >= 0;) - if (PaintElement* const e = dynamic_cast (getChildComponent (i))) + if (PaintElement* const e = dynamic_cast (getChildComponent (i))) removeChildComponent (e); } @@ -109,7 +109,7 @@ void PaintRoutineEditor::updateChildBounds() const Rectangle clip (getComponentArea()); for (int i = 0; i < getNumChildComponents(); ++i) - if (PaintElement* const e = dynamic_cast (getChildComponent (i))) + if (PaintElement* const e = dynamic_cast (getChildComponent (i))) e->updateBounds (clip); } @@ -153,7 +153,7 @@ void PaintRoutineEditor::visibilityChanged() void PaintRoutineEditor::refreshAllElements() { for (int i = getNumChildComponents(); --i >= 0;) - if (PaintElement* const e = dynamic_cast (getChildComponent (i))) + if (PaintElement* const e = dynamic_cast (getChildComponent (i))) if (! graphics.containsElement (e)) removeChildComponent (e); @@ -241,7 +241,7 @@ void PaintRoutineEditor::mouseUp (const MouseEvent& e) void PaintRoutineEditor::findLassoItemsInArea (Array & results, const Rectangle& lasso) { for (int i = 0; i < getNumChildComponents(); ++i) - if (PaintElement* const e = dynamic_cast (getChildComponent (i))) + if (PaintElement* const e = dynamic_cast (getChildComponent (i))) if (e->getBounds().expanded (-e->borderThickness).intersects (lasso)) results.add (e); } diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h index fbb44c0901..37b6e283ce 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h @@ -395,7 +395,7 @@ private: for (ConstConfigIterator config (*this); config.next();) { - const XcodeBuildConfiguration& xcodeConfig = dynamic_cast (*config); + const XcodeBuildConfiguration& xcodeConfig = dynamic_cast (*config); addProjectConfig (config->getName(), getProjectSettings (xcodeConfig)); addTargetConfig (config->getName(), getTargetSettings (xcodeConfig)); } diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h index 6c6a118104..2908419efe 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h @@ -278,7 +278,7 @@ private: void writeMainProjectFile() { - ScopedPointer xml (project.getProjectRoot().createXml()); + ScopedPointer xml (project.getProjectRoot().createXml()); jassert (xml != nullptr); if (xml != nullptr) diff --git a/extras/Introjucer/Source/Project/jucer_AudioPluginModule.h b/extras/Introjucer/Source/Project/jucer_AudioPluginModule.h index 922abecb40..d2e786bb29 100644 --- a/extras/Introjucer/Source/Project/jucer_AudioPluginModule.h +++ b/extras/Introjucer/Source/Project/jucer_AudioPluginModule.h @@ -59,7 +59,7 @@ namespace inline String getPluginRTASCategoryCode (Project& project) { - if (static_cast (getPluginIsSynth (project).getValue())) + if (static_cast (getPluginIsSynth (project).getValue())) return "ePlugInCategory_SWGenerators"; String s (getPluginRTASCategory (project).toString()); diff --git a/extras/Introjucer/Source/Project/jucer_GroupInformationComponent.h b/extras/Introjucer/Source/Project/jucer_GroupInformationComponent.h index b4896e1e5b..104ed2455a 100644 --- a/extras/Introjucer/Source/Project/jucer_GroupInformationComponent.h +++ b/extras/Introjucer/Source/Project/jucer_GroupInformationComponent.h @@ -83,7 +83,7 @@ public: Project::Item child (item.getChild (rowNumber)); if (existingComponentToUpdate == nullptr - || dynamic_cast (existing.get())->item != child) + || dynamic_cast (existing.get())->item != child) { existing = nullptr; existing = new FileOptionComponent (child); diff --git a/extras/Introjucer/Source/Project/jucer_Module.cpp b/extras/Introjucer/Source/Project/jucer_Module.cpp index d6f00fa053..e66c8db906 100644 --- a/extras/Introjucer/Source/Project/jucer_Module.cpp +++ b/extras/Introjucer/Source/Project/jucer_Module.cpp @@ -436,7 +436,7 @@ void LibraryModule::getConfigFlags (Project& project, OwnedArray config (new Project::ConfigFlag()); + ScopedPointer config (new Project::ConfigFlag()); config->sourceModuleID = getID(); config->symbol = line.fromFirstOccurrenceOf (":", false, false).trim(); diff --git a/extras/Introjucer/Source/Project/jucer_Project.cpp b/extras/Introjucer/Source/Project/jucer_Project.cpp index 36f4e05645..930240be1d 100644 --- a/extras/Introjucer/Source/Project/jucer_Project.cpp +++ b/extras/Introjucer/Source/Project/jucer_Project.cpp @@ -256,7 +256,7 @@ static void registerRecentFile (const File& file) //============================================================================== Result Project::loadDocument (const File& file) { - ScopedPointer xml (XmlDocument::parse (file)); + ScopedPointer xml (XmlDocument::parse (file)); if (xml == nullptr || ! xml->hasTagName (Ids::JUCERPROJECT.toString())) return Result::fail ("Not a valid Jucer project!"); diff --git a/extras/Introjucer/Source/Utility/jucer_FileHelpers.cpp b/extras/Introjucer/Source/Utility/jucer_FileHelpers.cpp index 411bfa97f5..ecbc9d7634 100644 --- a/extras/Introjucer/Source/Utility/jucer_FileHelpers.cpp +++ b/extras/Introjucer/Source/Utility/jucer_FileHelpers.cpp @@ -34,7 +34,7 @@ namespace FileHelpers int64 t = 0; for (size_t i = 0; i < numBytes; ++i) - t = t * 65599 + static_cast (data)[i]; + t = t * 65599 + static_cast (data)[i]; return t; } @@ -44,7 +44,7 @@ namespace FileHelpers int64 t = 0; const int bufferSize = 4096; - HeapBlock buffer; + HeapBlock buffer; buffer.malloc (bufferSize); for (;;) @@ -63,7 +63,7 @@ namespace FileHelpers int64 calculateFileHashCode (const File& file) { - ScopedPointer stream (file.createInputStream()); + ScopedPointer stream (file.createInputStream()); return stream != nullptr ? calculateStreamHashCode (*stream) : 0; } diff --git a/extras/Introjucer/Source/Utility/jucer_Icons.cpp b/extras/Introjucer/Source/Utility/jucer_Icons.cpp index 60a4263bc6..de128b8fec 100644 --- a/extras/Introjucer/Source/Utility/jucer_Icons.cpp +++ b/extras/Introjucer/Source/Utility/jucer_Icons.cpp @@ -964,7 +964,7 @@ const uint8 mainJuceLogo[] = { 110,109,104,98,101,67,226,177,185,67,98,216,179,8 path->setAttribute ("d", pathString); ScopedPointer d (Drawable::createFromSVG (svg)); - DrawablePath* dp = dynamic_cast (d->getChildComponent(0)); + DrawablePath* dp = dynamic_cast (d->getChildComponent(0)); jassert (dp != nullptr); Path p (dp->getPath()); diff --git a/extras/Introjucer/Source/Utility/jucer_JucerTreeViewBase.cpp b/extras/Introjucer/Source/Utility/jucer_JucerTreeViewBase.cpp index c4bf726b41..e9f11d9d4c 100644 --- a/extras/Introjucer/Source/Utility/jucer_JucerTreeViewBase.cpp +++ b/extras/Introjucer/Source/Utility/jucer_JucerTreeViewBase.cpp @@ -215,7 +215,7 @@ void JucerTreeViewBase::handlePopupMenuResult (int) ProjectContentComponent* JucerTreeViewBase::getProjectContentComponent() const { for (Component* c = getOwnerView(); c != nullptr; c = c->getParentComponent()) - if (ProjectContentComponent* pcc = dynamic_cast (c)) + if (ProjectContentComponent* pcc = dynamic_cast (c)) return pcc; return nullptr; diff --git a/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp b/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp index a6d9034dd5..c96318443e 100644 --- a/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp +++ b/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp @@ -325,7 +325,7 @@ String RolloverHelpComp::findTip (Component* c) { while (c != nullptr) { - if (TooltipClient* const tc = dynamic_cast (c)) + if (TooltipClient* const tc = dynamic_cast (c)) { const String tip (tc->getTooltip()); diff --git a/extras/Introjucer/Source/Utility/jucer_ValueSourceHelpers.h b/extras/Introjucer/Source/Utility/jucer_ValueSourceHelpers.h index f142e9fb54..218f51e3e8 100644 --- a/extras/Introjucer/Source/Utility/jucer_ValueSourceHelpers.h +++ b/extras/Introjucer/Source/Utility/jucer_ValueSourceHelpers.h @@ -42,10 +42,10 @@ public: void setValue (const var& newValue) override { - const Type newVal = static_cast (newValue); + const Type newVal = static_cast (newValue); - if (newVal != static_cast (getValue())) // this test is important, because if a property is missing, it won't - sourceValue = newVal; // create it (causing an unwanted undo action) when a control sets it to 0 + if (newVal != static_cast (getValue())) // this test is important, because if a property is missing, it won't + sourceValue = newVal; // create it (causing an unwanted undo action) when a control sets it to 0 } JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (NumericValueSource) diff --git a/modules/juce_audio_basics/buffers/juce_AudioDataConverters.h b/modules/juce_audio_basics/buffers/juce_AudioDataConverters.h index e11c6c1667..af9332ae38 100644 --- a/modules/juce_audio_basics/buffers/juce_AudioDataConverters.h +++ b/modules/juce_audio_basics/buffers/juce_AudioDataConverters.h @@ -99,7 +99,7 @@ public: class Int8 { public: - inline Int8 (void* d) noexcept : data (static_cast (d)) {} + inline Int8 (void* d) noexcept : data (static_cast (d)) {} inline void advance() noexcept { ++data; } inline void skip (int numSamples) noexcept { data += numSamples; } @@ -124,7 +124,7 @@ public: class UInt8 { public: - inline UInt8 (void* d) noexcept : data (static_cast (d)) {} + inline UInt8 (void* d) noexcept : data (static_cast (d)) {} inline void advance() noexcept { ++data; } inline void skip (int numSamples) noexcept { data += numSamples; } @@ -149,7 +149,7 @@ public: class Int16 { public: - inline Int16 (void* d) noexcept : data (static_cast (d)) {} + inline Int16 (void* d) noexcept : data (static_cast (d)) {} inline void advance() noexcept { ++data; } inline void skip (int numSamples) noexcept { data += numSamples; } @@ -174,7 +174,7 @@ public: class Int24 { public: - inline Int24 (void* d) noexcept : data (static_cast (d)) {} + inline Int24 (void* d) noexcept : data (static_cast (d)) {} inline void advance() noexcept { data += 3; } inline void skip (int numSamples) noexcept { data += 3 * numSamples; } @@ -199,7 +199,7 @@ public: class Int32 { public: - inline Int32 (void* d) noexcept : data (static_cast (d)) {} + inline Int32 (void* d) noexcept : data (static_cast (d)) {} inline void advance() noexcept { ++data; } inline void skip (int numSamples) noexcept { data += numSamples; } @@ -245,7 +245,7 @@ public: class Float32 { public: - inline Float32 (void* d) noexcept : data (static_cast (d)) {} + inline Float32 (void* d) noexcept : data (static_cast (d)) {} inline void advance() noexcept { ++data; } inline void skip (int numSamples) noexcept { data += numSamples; } @@ -318,7 +318,7 @@ public: { public: typedef const void VoidType; - static inline void* toVoidPtr (VoidType* v) noexcept { return const_cast (v); } + static inline void* toVoidPtr (VoidType* v) noexcept { return const_cast (v); } enum { isConst = 1 }; }; #endif diff --git a/modules/juce_audio_basics/midi/juce_MidiFile.cpp b/modules/juce_audio_basics/midi/juce_MidiFile.cpp index e24443b5ac..c9abe86365 100644 --- a/modules/juce_audio_basics/midi/juce_MidiFile.cpp +++ b/modules/juce_audio_basics/midi/juce_MidiFile.cpp @@ -254,12 +254,12 @@ bool MidiFile::readFrom (InputStream& sourceStream) if (sourceStream.readIntoMemoryBlock (data, maxSensibleMidiFileSize)) { size_t size = data.getSize(); - const uint8* d = static_cast (data.getData()); + const uint8* d = static_cast (data.getData()); short fileType, expectedTracks; if (size > 16 && MidiFileHelpers::parseMidiHeader (d, timeFormat, fileType, expectedTracks)) { - size -= (size_t) (d - static_cast (data.getData())); + size -= (size_t) (d - static_cast (data.getData())); int track = 0; diff --git a/modules/juce_audio_basics/midi/juce_MidiMessage.cpp b/modules/juce_audio_basics/midi/juce_MidiMessage.cpp index e8adb9a80d..4c2b5365f9 100644 --- a/modules/juce_audio_basics/midi/juce_MidiMessage.cpp +++ b/modules/juce_audio_basics/midi/juce_MidiMessage.cpp @@ -672,7 +672,7 @@ bool MidiMessage::isTextMetaEvent() const noexcept String MidiMessage::getTextFromTextMetaEvent() const { - const char* const textData = reinterpret_cast (getMetaEventData()); + const char* const textData = reinterpret_cast (getMetaEventData()); return String (CharPointer_UTF8 (textData), CharPointer_UTF8 (textData + getMetaEventLength())); } diff --git a/modules/juce_audio_devices/audio_cd/juce_AudioCDReader.h b/modules/juce_audio_devices/audio_cd/juce_AudioCDReader.h index bcf0f48087..bb9ac6ec88 100644 --- a/modules/juce_audio_devices/audio_cd/juce_AudioCDReader.h +++ b/modules/juce_audio_devices/audio_cd/juce_AudioCDReader.h @@ -151,7 +151,7 @@ private: File volumeDir; Array tracks; int currentReaderTrack; - ScopedPointer reader; + ScopedPointer reader; AudioCDReader (const File& volume); #elif JUCE_WINDOWS diff --git a/modules/juce_audio_devices/native/juce_MidiDataConcatenator.h b/modules/juce_audio_devices/native/juce_MidiDataConcatenator.h index 0cefb83b17..62eb5346b7 100644 --- a/modules/juce_audio_devices/native/juce_MidiDataConcatenator.h +++ b/modules/juce_audio_devices/native/juce_MidiDataConcatenator.h @@ -51,7 +51,7 @@ public: void pushMidiData (const void* inputData, int numBytes, double time, UserDataType* input, CallbackType& callback) { - const uint8* d = static_cast (inputData); + const uint8* d = static_cast (inputData); while (numBytes > 0) { diff --git a/modules/juce_audio_devices/native/juce_ios_Audio.cpp b/modules/juce_audio_devices/native/juce_ios_Audio.cpp index 16dba0c368..53a319def3 100644 --- a/modules/juce_audio_devices/native/juce_ios_Audio.cpp +++ b/modules/juce_audio_devices/native/juce_ios_Audio.cpp @@ -393,13 +393,13 @@ private: static void interruptionListenerCallback (void* client, UInt32 interruptionType) { - const Array & activeDevices = static_cast (client)->activeDevices; + const Array& activeDevices = static_cast (client)->activeDevices; for (int i = activeDevices.size(); --i >= 0;) activeDevices.getUnchecked(i)->interruptionListener (interruptionType); } - Array activeDevices; + Array activeDevices; }; static AudioSessionHolder& getSessionHolder() diff --git a/modules/juce_audio_devices/native/juce_linux_ALSA.cpp b/modules/juce_audio_devices/native/juce_linux_ALSA.cpp index 85fb8c5145..3fb5505a1a 100644 --- a/modules/juce_audio_devices/native/juce_linux_ALSA.cpp +++ b/modules/juce_audio_devices/native/juce_linux_ALSA.cpp @@ -993,7 +993,7 @@ public: { jassert (hasScanned); // need to call scanForDevices() before doing this - if (ALSAAudioIODevice* d = dynamic_cast (device)) + if (ALSAAudioIODevice* d = dynamic_cast (device)) return asInput ? inputIds.indexOf (d->inputId) : outputIds.indexOf (d->outputId); diff --git a/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp b/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp index ac9846f131..d9dd864625 100644 --- a/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp +++ b/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp @@ -388,7 +388,7 @@ private: if (callback != nullptr) { if ((numActiveInChans + numActiveOutChans) > 0) - callback->audioDeviceIOCallback (const_cast (inChans.getData()), numActiveInChans, + callback->audioDeviceIOCallback (const_cast (inChans.getData()), numActiveInChans, outChans, numActiveOutChans, numSamples); } else @@ -437,7 +437,7 @@ private: static void portConnectCallback (jack_port_id_t, jack_port_id_t, int, void* arg) { - if (JackAudioIODevice* device = static_cast (arg)) + if (JackAudioIODevice* device = static_cast (arg)) device->updateActivePorts(); } @@ -470,7 +470,7 @@ private: AudioIODeviceCallback* callback; CriticalSection callbackLock; - HeapBlock inChans, outChans; + HeapBlock inChans, outChans; int totalNumberOfInputChannels; int totalNumberOfOutputChannels; Array inputPorts, outputPorts; @@ -557,7 +557,7 @@ public: { jassert (hasScanned); // need to call scanForDevices() before doing this - if (JackAudioIODevice* d = dynamic_cast (device)) + if (JackAudioIODevice* d = dynamic_cast (device)) return asInput ? inputIds.indexOf (d->inputId) : outputIds.indexOf (d->outputId); diff --git a/modules/juce_audio_devices/native/juce_linux_Midi.cpp b/modules/juce_audio_devices/native/juce_linux_Midi.cpp index 7801a286e5..f042c8559a 100644 --- a/modules/juce_audio_devices/native/juce_linux_Midi.cpp +++ b/modules/juce_audio_devices/native/juce_linux_Midi.cpp @@ -136,7 +136,7 @@ private: HeapBlock pfd ((size_t) numPfds); snd_seq_poll_descriptors (seqHandle, pfd, (unsigned int) numPfds, POLLIN); - HeapBlock buffer (maxEventSize); + HeapBlock buffer (maxEventSize); while (! threadShouldExit()) { diff --git a/modules/juce_audio_devices/native/juce_win32_ASIO.cpp b/modules/juce_audio_devices/native/juce_win32_ASIO.cpp index 3f27cca449..d385b180de 100644 --- a/modules/juce_audio_devices/native/juce_win32_ASIO.cpp +++ b/modules/juce_audio_devices/native/juce_win32_ASIO.cpp @@ -785,7 +785,7 @@ private: HeapBlock inputFormat, outputFormat; WaitableEvent event1; - HeapBlock tempBuffer; + HeapBlock tempBuffer; int volatile bufferIndex, numActiveInputChans, numActiveOutputChans; bool deviceIsOpen, isStarted, buffersCreated; diff --git a/modules/juce_audio_devices/native/juce_win32_AudioCDBurner.cpp b/modules/juce_audio_devices/native/juce_win32_AudioCDBurner.cpp index 03a3c326bd..997484f2fc 100644 --- a/modules/juce_audio_devices/native/juce_win32_AudioCDBurner.cpp +++ b/modules/juce_audio_devices/native/juce_win32_AudioCDBurner.cpp @@ -367,7 +367,7 @@ bool AudioCDBurner::addAudioTrack (AudioSource* audioSource, int numSamples) hr = pimpl->redbook->CreateAudioTrack ((long) numSamples / (bytesPerBlock * 4)); - HeapBlock buffer (bytesPerBlock); + HeapBlock buffer (bytesPerBlock); AudioSampleBuffer sourceBuffer (2, samplesPerBlock); int samplesDone = 0; diff --git a/modules/juce_audio_devices/native/juce_win32_AudioCDReader.cpp b/modules/juce_audio_devices/native/juce_win32_AudioCDReader.cpp index fe9076a7af..ea99f80abf 100644 --- a/modules/juce_audio_devices/native/juce_win32_AudioCDReader.cpp +++ b/modules/juce_audio_devices/native/juce_win32_AudioCDReader.cpp @@ -1027,7 +1027,7 @@ AudioCDReader::AudioCDReader (void* handle_) AudioCDReader::~AudioCDReader() { using namespace CDReaderHelpers; - CDDeviceWrapper* const device = static_cast (handle); + CDDeviceWrapper* const device = static_cast (handle); delete device; } @@ -1035,7 +1035,7 @@ bool AudioCDReader::readSamples (int** destSamples, int numDestChannels, int sta int64 startSampleInFile, int numSamples) { using namespace CDReaderHelpers; - CDDeviceWrapper* const device = static_cast (handle); + CDDeviceWrapper* const device = static_cast (handle); bool ok = true; @@ -1131,7 +1131,7 @@ bool AudioCDReader::isCDStillPresent() const { using namespace CDReaderHelpers; TOC toc = { 0 }; - return static_cast (handle)->deviceHandle.readTOC (&toc); + return static_cast (handle)->deviceHandle.readTOC (&toc); } void AudioCDReader::refreshTrackLengths() @@ -1142,7 +1142,7 @@ void AudioCDReader::refreshTrackLengths() TOC toc = { 0 }; - if (static_cast (handle)->deviceHandle.readTOC (&toc)) + if (static_cast (handle)->deviceHandle.readTOC (&toc)) { int numTracks = 1 + toc.lastTrack - toc.firstTrack; @@ -1174,7 +1174,7 @@ int AudioCDReader::getLastIndex() const int AudioCDReader::getIndexAt (int samplePos) { using namespace CDReaderHelpers; - CDDeviceWrapper* const device = static_cast (handle); + CDDeviceWrapper* const device = static_cast (handle); const int frameNeeded = samplePos / samplesPerFrame; @@ -1255,7 +1255,7 @@ Array AudioCDReader::findIndexesInTrack (const int trackNumber) if (needToScan) { - CDDeviceWrapper* const device = static_cast (handle); + CDDeviceWrapper* const device = static_cast (handle); int pos = trackStart; int last = -1; @@ -1305,5 +1305,5 @@ Array AudioCDReader::findIndexesInTrack (const int trackNumber) void AudioCDReader::ejectDisk() { using namespace CDReaderHelpers; - static_cast (handle)->deviceHandle.openDrawer (true); + static_cast (handle)->deviceHandle.openDrawer (true); } diff --git a/modules/juce_audio_devices/native/juce_win32_DirectSound.cpp b/modules/juce_audio_devices/native/juce_win32_DirectSound.cpp index 1491ab290d..3d2d92cabc 100644 --- a/modules/juce_audio_devices/native/juce_win32_DirectSound.cpp +++ b/modules/juce_audio_devices/native/juce_win32_DirectSound.cpp @@ -1226,7 +1226,7 @@ public: { jassert (hasScanned); // need to call scanForDevices() before doing this - if (DSoundAudioIODevice* const d = dynamic_cast (device)) + if (DSoundAudioIODevice* const d = dynamic_cast (device)) return asInput ? d->inputDeviceIndex : d->outputDeviceIndex; diff --git a/modules/juce_audio_devices/native/juce_win32_Midi.cpp b/modules/juce_audio_devices/native/juce_win32_Midi.cpp index 042c98d01f..97e4b722fb 100644 --- a/modules/juce_audio_devices/native/juce_win32_Midi.cpp +++ b/modules/juce_audio_devices/native/juce_win32_Midi.cpp @@ -116,7 +116,7 @@ public: static void CALLBACK midiInCallback (HMIDIIN, UINT uMsg, DWORD_PTR dwInstance, DWORD_PTR midiMessage, DWORD_PTR timeStamp) { - MidiInCollector* const collector = reinterpret_cast (dwInstance); + MidiInCollector* const collector = reinterpret_cast (dwInstance); if (activeMidiCollectors.contains (collector)) { @@ -270,8 +270,8 @@ MidiInput* MidiInput::openDevice (const int index, MidiInputCallback* const call } } - ScopedPointer in (new MidiInput (name)); - ScopedPointer collector (new MidiInCollector (in, *callback)); + ScopedPointer in (new MidiInput (name)); + ScopedPointer collector (new MidiInCollector (in, *callback)); HMIDIIN h; MMRESULT err = midiInOpen (&h, deviceId, diff --git a/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp index 6a631ddb92..8a4057fd41 100644 --- a/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp +++ b/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp @@ -531,7 +531,7 @@ public: } else if (type == chunkName ("INST")) { - HeapBlock inst; + HeapBlock inst; inst.calloc (jmax ((size_t) length + 1, sizeof (InstChunk)), 1); input->read (inst, (int) length); inst->copyTo (metadataValues); @@ -972,7 +972,7 @@ bool AiffAudioFormat::canHandleFile (const File& f) AudioFormatReader* AiffAudioFormat::createReaderFor (InputStream* sourceStream, const bool deleteStreamIfOpeningFails) { - ScopedPointer w (new AiffAudioFormatReader (sourceStream)); + ScopedPointer w (new AiffAudioFormatReader (sourceStream)); if (w->sampleRate > 0 && w->numChannels > 0) return w.release(); diff --git a/modules/juce_audio_formats/codecs/juce_MP3AudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_MP3AudioFormat.cpp index 8f9f6d6545..b468010505 100644 --- a/modules/juce_audio_formats/codecs/juce_MP3AudioFormat.cpp +++ b/modules/juce_audio_formats/codecs/juce_MP3AudioFormat.cpp @@ -3020,7 +3020,7 @@ public: } const int numToCopy = jmin (decodedEnd - decodedStart, numSamples); - float* const* const dst = reinterpret_cast (destSamples); + float* const* const dst = reinterpret_cast (destSamples); memcpy (dst[0] + startOffsetInDestBuffer, decoded0 + decodedStart, sizeof (float) * (size_t) numToCopy); if (numDestChannels > 1 && dst[1] != nullptr) diff --git a/modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp index 6d1f92af25..b396c2d02b 100644 --- a/modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp +++ b/modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp @@ -428,7 +428,7 @@ private: const String s (metadata [name]); if (s.isNotEmpty()) - vorbis_comment_add_tag (&vc, vorbisName, const_cast (s.toRawUTF8())); + vorbis_comment_add_tag (&vc, vorbisName, const_cast (s.toRawUTF8())); } JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (OggWriter) @@ -483,8 +483,8 @@ AudioFormatWriter* OggVorbisAudioFormat::createWriterFor (OutputStream* out, const StringPairArray& metadataValues, int qualityOptionIndex) { - ScopedPointer w (new OggWriter (out, sampleRate, numChannels, - (unsigned int) bitsPerSample, qualityOptionIndex, metadataValues)); + ScopedPointer w (new OggWriter (out, sampleRate, numChannels, + (unsigned int) bitsPerSample, qualityOptionIndex, metadataValues)); return w->ok ? w.release() : nullptr; } diff --git a/modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp index b87c05d6fd..8c270e4e02 100644 --- a/modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp +++ b/modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp @@ -142,7 +142,7 @@ public: if (err != noErr) return; - HeapBlock qt_audio_channel_layout; + HeapBlock qt_audio_channel_layout; qt_audio_channel_layout.calloc (output_layout_size, 1); MovieAudioExtractionGetProperty (extractor, @@ -322,8 +322,8 @@ private: Thread::ThreadID lastThreadId; MovieAudioExtractionRef extractor; AudioStreamBasicDescription inputStreamDesc; - HeapBlock bufferList; - HeapBlock dataBuffer; + HeapBlock bufferList; + HeapBlock dataBuffer; Handle dataHandle; //============================================================================== diff --git a/modules/juce_audio_formats/format/juce_AudioFormatManager.cpp b/modules/juce_audio_formats/format/juce_AudioFormatManager.cpp index c51ebcb27f..13b94784bc 100644 --- a/modules/juce_audio_formats/format/juce_AudioFormatManager.cpp +++ b/modules/juce_audio_formats/format/juce_AudioFormatManager.cpp @@ -151,7 +151,7 @@ AudioFormatReader* AudioFormatManager::createReaderFor (InputStream* audioFileSt // use them to open a file! jassert (getNumKnownFormats() > 0); - ScopedPointer in (audioFileStream); + ScopedPointer in (audioFileStream); if (in != nullptr) { diff --git a/modules/juce_audio_formats/format/juce_AudioFormatWriter.cpp b/modules/juce_audio_formats/format/juce_AudioFormatWriter.cpp index 508207010b..67d7a709f4 100644 --- a/modules/juce_audio_formats/format/juce_AudioFormatWriter.cpp +++ b/modules/juce_audio_formats/format/juce_AudioFormatWriter.cpp @@ -95,7 +95,7 @@ bool AudioFormatWriter::writeFromAudioReader (AudioFormatReader& reader, } } - if (! write (const_cast (buffers), numToDo)) + if (! write (const_cast (buffers), numToDo)) return false; numSamplesToRead -= numToDo; diff --git a/modules/juce_audio_formats/sampler/juce_Sampler.cpp b/modules/juce_audio_formats/sampler/juce_Sampler.cpp index 7440c16f30..d75989ff83 100644 --- a/modules/juce_audio_formats/sampler/juce_Sampler.cpp +++ b/modules/juce_audio_formats/sampler/juce_Sampler.cpp @@ -93,7 +93,7 @@ void SamplerVoice::startNote (const int midiNoteNumber, SynthesiserSound* s, const int /*currentPitchWheelPosition*/) { - if (const SamplerSound* const sound = dynamic_cast (s)) + if (const SamplerSound* const sound = dynamic_cast (s)) { pitchRatio = pow (2.0, (midiNoteNumber - sound->midiRootNote) / 12.0) * sound->sourceSampleRate / getSampleRate(); @@ -152,7 +152,7 @@ void SamplerVoice::controllerMoved (const int /*controllerNumber*/, //============================================================================== void SamplerVoice::renderNextBlock (AudioSampleBuffer& outputBuffer, int startSample, int numSamples) { - if (const SamplerSound* const playingSound = static_cast (getCurrentlyPlayingSound().get())) + if (const SamplerSound* const playingSound = static_cast (getCurrentlyPlayingSound().get())) { const float* const inL = playingSound->data->getReadPointer (0); const float* const inR = playingSound->data->getNumChannels() > 1 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 75703d9211..e61dd61d3f 100644 --- a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp @@ -421,7 +421,7 @@ public: JuceCustomUIView* getView() const { - return dynamic_cast (fOurPlugInView); + return dynamic_cast (fOurPlugInView); } void GetViewRect (Rect* size) override @@ -478,11 +478,11 @@ public: if (MIDILogIn() == noErr) { #if JucePlugin_WantsMidiInput - if (CEffectType* const type = dynamic_cast (this->GetProcessType())) + if (CEffectType* const type = dynamic_cast (this->GetProcessType())) { char nodeName [64]; type->GetProcessTypeName (63, nodeName); - p2cstrcpy (nodeName, reinterpret_cast (nodeName)); + p2cstrcpy (nodeName, reinterpret_cast (nodeName)); midiBufferNode = new CEffectMIDIOtherBufferedNode (&mMIDIWorld, 8192, diff --git a/modules/juce_audio_processors/format/juce_AudioPluginFormatManager.cpp b/modules/juce_audio_processors/format/juce_AudioPluginFormatManager.cpp index e27f128ea0..f29e8adea8 100644 --- a/modules/juce_audio_processors/format/juce_AudioPluginFormatManager.cpp +++ b/modules/juce_audio_processors/format/juce_AudioPluginFormatManager.cpp @@ -33,19 +33,19 @@ void AudioPluginFormatManager::addDefaultFormats() for (int i = formats.size(); --i >= 0;) { #if JUCE_PLUGINHOST_VST - jassert (dynamic_cast (formats[i]) == nullptr); + jassert (dynamic_cast (formats[i]) == nullptr); #endif #if JUCE_PLUGINHOST_VST3 - jassert (dynamic_cast (formats[i]) == nullptr); + jassert (dynamic_cast (formats[i]) == nullptr); #endif #if JUCE_PLUGINHOST_AU && JUCE_MAC - jassert (dynamic_cast (formats[i]) == nullptr); + jassert (dynamic_cast (formats[i]) == nullptr); #endif #if JUCE_PLUGINHOST_LADSPA && JUCE_LINUX - jassert (dynamic_cast (formats[i]) == nullptr); + jassert (dynamic_cast (formats[i]) == nullptr); #endif } #endif diff --git a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm index 433cc8865a..d491130e79 100644 --- a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm +++ b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm @@ -909,7 +909,7 @@ private: CriticalSection lock; bool wantsMidiMessages, producesMidiMessages, wasPlaying, prepared; - HeapBlock outputBufferList; + HeapBlock outputBufferList; AudioTimeStamp timeStamp; AudioSampleBuffer* currentBuffer; AudioUnitElement numInputBusChannels, numOutputBusChannels, numInputBusses, numOutputBusses; @@ -1389,7 +1389,7 @@ private: && AudioUnitGetPropertyInfo (plugin.audioUnit, kAudioUnitProperty_CocoaUI, kAudioUnitScope_Global, 0, &dataSize, &isWritable) == noErr) { - HeapBlock info; + HeapBlock info; info.calloc (dataSize, 1); if (AudioUnitGetProperty (plugin.audioUnit, kAudioUnitProperty_CocoaUI, kAudioUnitScope_Global, diff --git a/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.cpp index aed4184a50..f9863345d8 100644 --- a/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.cpp +++ b/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.cpp @@ -451,7 +451,7 @@ public: void setStateInformation (const void* data, int sizeInBytes) { - const float* p = static_cast (data); + const float* p = static_cast (data); for (int i = 0; i < getNumParameters(); ++i) setParameter (i, p[i]); diff --git a/modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h b/modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h index bf7bc4b53e..11cbe4f7fd 100644 --- a/modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h +++ b/modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h @@ -160,7 +160,7 @@ public: } //============================================================================== - HeapBlock events; + HeapBlock events; private: int numEventsUsed, numEventsAllocated; diff --git a/modules/juce_browser_plugin_client/wrapper/juce_ActiveX_GlueCode.cpp b/modules/juce_browser_plugin_client/wrapper/juce_ActiveX_GlueCode.cpp index fc5d8871bb..6bb9ee9cb5 100644 --- a/modules/juce_browser_plugin_client/wrapper/juce_ActiveX_GlueCode.cpp +++ b/modules/juce_browser_plugin_client/wrapper/juce_ActiveX_GlueCode.cpp @@ -318,7 +318,7 @@ public: DISPID id = 0; if (source->GetIDsOfNames (IID_NULL, (LPOLESTR*) &name, 1, 0, &id) == S_OK) { - HeapBlock params; + HeapBlock params; params.calloc (args.numArguments + 1); for (int i = 0; i < args.numArguments; ++i) @@ -548,7 +548,7 @@ static String getExeVersion (const String& exeFileName, const String& fieldName) if (size > 0) { - HeapBlock exeInfo; + HeapBlock exeInfo; exeInfo.calloc (size); if (GetFileVersionInfo (exeFileName.toUTF16(), 0, size, exeInfo)) diff --git a/modules/juce_browser_plugin_client/wrapper/juce_NPAPI_GlueCode.cpp b/modules/juce_browser_plugin_client/wrapper/juce_NPAPI_GlueCode.cpp index 7635cad385..03ad491848 100644 --- a/modules/juce_browser_plugin_client/wrapper/juce_NPAPI_GlueCode.cpp +++ b/modules/juce_browser_plugin_client/wrapper/juce_NPAPI_GlueCode.cpp @@ -1154,9 +1154,7 @@ NPError NPP_SetValue (NPP npp, NPNVariable variable, void* value) //============================================================================== static NPP getInstance (const BrowserPluginComponent* bpc) { - BrowserPluginHolderComponent* holder = dynamic_cast (bpc->getParentComponent()); - - if (holder != nullptr) + if (BrowserPluginHolderComponent* holder = dynamic_cast (bpc->getParentComponent())) return holder->npp; return currentlyInitialisingNPP; diff --git a/modules/juce_core/containers/juce_Array.h b/modules/juce_core/containers/juce_Array.h index 3f14cb1dc4..8c48dabc6d 100644 --- a/modules/juce_core/containers/juce_Array.h +++ b/modules/juce_core/containers/juce_Array.h @@ -365,7 +365,7 @@ public: for (; e != end_; ++e) if (elementToLookFor == *e) - return static_cast (e - data.elements.getData()); + return static_cast (e - data.elements.getData()); return -1; } diff --git a/modules/juce_core/containers/juce_ArrayAllocationBase.h b/modules/juce_core/containers/juce_ArrayAllocationBase.h index 1a673c9889..837e6df9aa 100644 --- a/modules/juce_core/containers/juce_ArrayAllocationBase.h +++ b/modules/juce_core/containers/juce_ArrayAllocationBase.h @@ -60,14 +60,14 @@ public: #if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS ArrayAllocationBase (ArrayAllocationBase&& other) noexcept - : elements (static_cast &&> (other.elements)), + : elements (static_cast&&> (other.elements)), numAllocated (other.numAllocated) { } ArrayAllocationBase& operator= (ArrayAllocationBase&& other) noexcept { - elements = static_cast &&> (other.elements); + elements = static_cast&&> (other.elements); numAllocated = other.numAllocated; return *this; } @@ -127,7 +127,7 @@ public: } //============================================================================== - HeapBlock elements; + HeapBlock elements; int numAllocated; private: diff --git a/modules/juce_core/containers/juce_ListenerList.h b/modules/juce_core/containers/juce_ListenerList.h index 86ccfdcc5f..edc08771b7 100644 --- a/modules/juce_core/containers/juce_ListenerList.h +++ b/modules/juce_core/containers/juce_ListenerList.h @@ -149,7 +149,7 @@ public: /** Calls a member function on each listener in the list, with no parameters. */ void call (void (ListenerClass::*callbackFunction) ()) { - callChecked (static_cast (DummyBailOutChecker()), callbackFunction); + callChecked (static_cast (DummyBailOutChecker()), callbackFunction); } /** Calls a member function on each listener in the list, with no parameters and a bail-out-checker. diff --git a/modules/juce_core/containers/juce_NamedValueSet.cpp b/modules/juce_core/containers/juce_NamedValueSet.cpp index 68ba5f88ad..94ea828bed 100644 --- a/modules/juce_core/containers/juce_NamedValueSet.cpp +++ b/modules/juce_core/containers/juce_NamedValueSet.cpp @@ -79,7 +79,7 @@ NamedValueSet& NamedValueSet::operator= (const NamedValueSet& other) #if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS NamedValueSet::NamedValueSet (NamedValueSet&& other) noexcept - : values (static_cast &&> (other.values)) + : values (static_cast&&> (other.values)) { } diff --git a/modules/juce_core/containers/juce_OwnedArray.h b/modules/juce_core/containers/juce_OwnedArray.h index aa2f2fbaae..d066a21e77 100644 --- a/modules/juce_core/containers/juce_OwnedArray.h +++ b/modules/juce_core/containers/juce_OwnedArray.h @@ -74,7 +74,7 @@ public: #if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS OwnedArray (OwnedArray&& other) noexcept - : data (static_cast &&> (other.data)), + : data (static_cast&&> (other.data)), numUsed (other.numUsed) { other.numUsed = 0; @@ -85,7 +85,7 @@ public: const ScopedLockType lock (getLock()); deleteAllObjects(); - data = static_cast &&> (other.data); + data = static_cast&&> (other.data); numUsed = other.numUsed; other.numUsed = 0; return *this; @@ -239,7 +239,7 @@ public: for (; e != end_; ++e) if (objectToLookFor == *e) - return static_cast (e - data.elements.getData()); + return static_cast (e - data.elements.getData()); return -1; } diff --git a/modules/juce_core/containers/juce_ReferenceCountedArray.h b/modules/juce_core/containers/juce_ReferenceCountedArray.h index 12a8925ce2..db02fb1e6c 100644 --- a/modules/juce_core/containers/juce_ReferenceCountedArray.h +++ b/modules/juce_core/containers/juce_ReferenceCountedArray.h @@ -281,7 +281,7 @@ public: while (e != endPointer) { if (objectToLookFor == *e) - return static_cast (e - data.elements.getData()); + return static_cast (e - data.elements.getData()); ++e; } diff --git a/modules/juce_core/files/juce_File.cpp b/modules/juce_core/files/juce_File.cpp index a8c2c690fb..9737fa8aad 100644 --- a/modules/juce_core/files/juce_File.cpp +++ b/modules/juce_core/files/juce_File.cpp @@ -57,13 +57,13 @@ File& File::operator= (const File& other) #if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS File::File (File&& other) noexcept - : fullPath (static_cast (other.fullPath)) + : fullPath (static_cast (other.fullPath)) { } File& File::operator= (File&& other) noexcept { - fullPath = static_cast (other.fullPath); + fullPath = static_cast (other.fullPath); return *this; } #endif diff --git a/modules/juce_core/files/juce_FileOutputStream.h b/modules/juce_core/files/juce_FileOutputStream.h index 7d1520cf5e..83c8f12a7c 100644 --- a/modules/juce_core/files/juce_FileOutputStream.h +++ b/modules/juce_core/files/juce_FileOutputStream.h @@ -101,7 +101,7 @@ private: Result status; int64 currentPosition; size_t bufferSize, bytesInBuffer; - HeapBlock buffer; + HeapBlock buffer; void openHandle(); void closeHandle(); diff --git a/modules/juce_core/files/juce_TemporaryFile.h b/modules/juce_core/files/juce_TemporaryFile.h index 0aad9c90b0..64ea9903cc 100644 --- a/modules/juce_core/files/juce_TemporaryFile.h +++ b/modules/juce_core/files/juce_TemporaryFile.h @@ -48,7 +48,7 @@ TemporaryFile temp (myTargetFile); // create a stream to the temporary file, and write some data to it... - ScopedPointer out (temp.getFile().createOutputStream()); + ScopedPointer out (temp.getFile().createOutputStream()); if (out != nullptr) { diff --git a/modules/juce_core/maths/juce_BigInteger.cpp b/modules/juce_core/maths/juce_BigInteger.cpp index 84eabe3fda..f037101562 100644 --- a/modules/juce_core/maths/juce_BigInteger.cpp +++ b/modules/juce_core/maths/juce_BigInteger.cpp @@ -87,7 +87,7 @@ BigInteger::BigInteger (const BigInteger& other) #if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS BigInteger::BigInteger (BigInteger&& other) noexcept - : values (static_cast &&> (other.values)), + : values (static_cast&&> (other.values)), numValues (other.numValues), highestBit (other.highestBit), negative (other.negative) @@ -96,7 +96,7 @@ BigInteger::BigInteger (BigInteger&& other) noexcept BigInteger& BigInteger::operator= (BigInteger&& other) noexcept { - values = static_cast &&> (other.values); + values = static_cast&&> (other.values); numValues = other.numValues; highestBit = other.highestBit; negative = other.negative; diff --git a/modules/juce_core/maths/juce_Expression.cpp b/modules/juce_core/maths/juce_Expression.cpp index 71535b879e..fb9660a1da 100644 --- a/modules/juce_core/maths/juce_Expression.cpp +++ b/modules/juce_core/maths/juce_Expression.cpp @@ -397,7 +397,7 @@ struct Expression::Helpers JUCE_DECLARE_NON_COPYABLE (SymbolRenamingVisitor) }; - SymbolTerm* getSymbol() const { return static_cast (left.get()); } + SymbolTerm* getSymbol() const { return static_cast (left.get()); } JUCE_DECLARE_NON_COPYABLE (DotOperator) }; @@ -958,13 +958,13 @@ Expression& Expression::operator= (const Expression& other) #if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS Expression::Expression (Expression&& other) noexcept - : term (static_cast &&> (other.term)) + : term (static_cast&&> (other.term)) { } Expression& Expression::operator= (Expression&& other) noexcept { - term = static_cast &&> (other.term); + term = static_cast&&> (other.term); return *this; } #endif diff --git a/modules/juce_core/maths/juce_MathsFunctions.h b/modules/juce_core/maths/juce_MathsFunctions.h index 0124112e07..0f2ee6e4e6 100644 --- a/modules/juce_core/maths/juce_MathsFunctions.h +++ b/modules/juce_core/maths/juce_MathsFunctions.h @@ -245,7 +245,7 @@ template <> inline bool isPositiveAndBelow (const int valueToTest, const int upperLimit) noexcept { jassert (upperLimit >= 0); // makes no sense to call this if the upper limit is itself below zero.. - return static_cast (valueToTest) < static_cast (upperLimit); + return static_cast (valueToTest) < static_cast (upperLimit); } /** Returns true if a value is at least zero, and also less than or equal to a specified upper limit. @@ -264,7 +264,7 @@ template <> inline bool isPositiveAndNotGreaterThan (const int valueToTest, const int upperLimit) noexcept { jassert (upperLimit >= 0); // makes no sense to call this if the upper limit is itself below zero.. - return static_cast (valueToTest) <= static_cast (upperLimit); + return static_cast (valueToTest) <= static_cast (upperLimit); } //============================================================================== diff --git a/modules/juce_core/memory/juce_Atomic.h b/modules/juce_core/memory/juce_Atomic.h index d7a61d45a3..970d4d38ee 100644 --- a/modules/juce_core/memory/juce_Atomic.h +++ b/modules/juce_core/memory/juce_Atomic.h @@ -178,7 +178,7 @@ private: template inline PointerType* negateValue (PointerType* n) noexcept { - return reinterpret_cast (-reinterpret_cast (n)); + return reinterpret_cast (-reinterpret_cast (n)); } }; diff --git a/modules/juce_core/memory/juce_ReferenceCountedObject.h b/modules/juce_core/memory/juce_ReferenceCountedObject.h index 3dac3c46cd..fca745eba1 100644 --- a/modules/juce_core/memory/juce_ReferenceCountedObject.h +++ b/modules/juce_core/memory/juce_ReferenceCountedObject.h @@ -260,7 +260,7 @@ public: */ template ReferenceCountedObjectPtr (const ReferenceCountedObjectPtr& other) noexcept - : referencedObject (static_cast (other.get())) + : referencedObject (static_cast (other.get())) { incIfNotNull (referencedObject); } diff --git a/modules/juce_core/memory/juce_WeakReference.h b/modules/juce_core/memory/juce_WeakReference.h index ff23d994ca..ca3dd1fb27 100644 --- a/modules/juce_core/memory/juce_WeakReference.h +++ b/modules/juce_core/memory/juce_WeakReference.h @@ -98,8 +98,8 @@ public: WeakReference& operator= (ObjectType* const newObject) { holder = getRef (newObject); return *this; } #if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS - WeakReference (WeakReference&& other) noexcept : holder (static_cast (other.holder)) {} - WeakReference& operator= (WeakReference&& other) noexcept { holder = static_cast (other.holder); return *this; } + WeakReference (WeakReference&& other) noexcept : holder (static_cast (other.holder)) {} + WeakReference& operator= (WeakReference&& other) noexcept { holder = static_cast (other.holder); return *this; } #endif /** Returns the object that this pointer refers to, or null if the object no longer exists. */ diff --git a/modules/juce_core/misc/juce_Result.cpp b/modules/juce_core/misc/juce_Result.cpp index 0999531a9f..e2a1c13015 100644 --- a/modules/juce_core/misc/juce_Result.cpp +++ b/modules/juce_core/misc/juce_Result.cpp @@ -46,13 +46,13 @@ Result& Result::operator= (const Result& other) #if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS Result::Result (Result&& other) noexcept - : errorMessage (static_cast (other.errorMessage)) + : errorMessage (static_cast (other.errorMessage)) { } Result& Result::operator= (Result&& other) noexcept { - errorMessage = static_cast (other.errorMessage); + errorMessage = static_cast (other.errorMessage); return *this; } #endif diff --git a/modules/juce_core/native/juce_linux_Network.cpp b/modules/juce_core/native/juce_linux_Network.cpp index 30a05823b4..a05518c9a2 100644 --- a/modules/juce_core/native/juce_linux_Network.cpp +++ b/modules/juce_core/native/juce_linux_Network.cpp @@ -453,7 +453,7 @@ private: const int numToSend = jmin (1024, (int) (requestHeader.getSize() - totalHeaderSent)); - if (send (socketHandle, static_cast (requestHeader.getData()) + totalHeaderSent, (size_t) numToSend, 0) != numToSend) + if (send (socketHandle, static_cast (requestHeader.getData()) + totalHeaderSent, (size_t) numToSend, 0) != numToSend) return false; totalHeaderSent += (size_t) numToSend; diff --git a/modules/juce_core/native/juce_mac_SystemStats.mm b/modules/juce_core/native/juce_mac_SystemStats.mm index 18d8909c15..0767a76066 100644 --- a/modules/juce_core/native/juce_mac_SystemStats.mm +++ b/modules/juce_core/native/juce_mac_SystemStats.mm @@ -178,7 +178,7 @@ String SystemStats::getCpuVendor() SystemStatsHelpers::doCPUID (dummy, vendor[0], vendor[2], vendor[1], 0); - return String (reinterpret_cast (vendor), 12); + return String (reinterpret_cast (vendor), 12); #else return String(); #endif diff --git a/modules/juce_core/native/juce_osx_ObjCHelpers.h b/modules/juce_core/native/juce_osx_ObjCHelpers.h index cc7c56a9db..b0222635cb 100644 --- a/modules/juce_core/native/juce_osx_ObjCHelpers.h +++ b/modules/juce_core/native/juce_osx_ObjCHelpers.h @@ -60,10 +60,10 @@ namespace template static NSRect makeNSRect (const RectangleType& r) noexcept { - return NSMakeRect (static_cast (r.getX()), - static_cast (r.getY()), - static_cast (r.getWidth()), - static_cast (r.getHeight())); + return NSMakeRect (static_cast (r.getX()), + static_cast (r.getY()), + static_cast (r.getWidth()), + static_cast (r.getHeight())); } // These hacks are a workaround for newer Xcode builds which by default prevent calls to these objc functions.. @@ -162,7 +162,7 @@ struct ObjCClass { void* v = nullptr; object_getInstanceVariable (self, name, &v); - return static_cast (v); + return static_cast (v); } Class cls; diff --git a/modules/juce_core/native/juce_posix_NamedPipe.cpp b/modules/juce_core/native/juce_posix_NamedPipe.cpp index 45a9f8a581..9fb3fe5889 100644 --- a/modules/juce_core/native/juce_posix_NamedPipe.cpp +++ b/modules/juce_core/native/juce_posix_NamedPipe.cpp @@ -191,7 +191,7 @@ void NamedPipe::close() char buffer[1] = { 0 }; ssize_t done = ::write (pimpl->pipeIn, buffer, 1); - (void) done; + ignoreUnused (done); ScopedWriteLock sl (lock); pimpl = nullptr; @@ -224,11 +224,11 @@ bool NamedPipe::openInternal (const String& pipeName, const bool createPipe, boo int NamedPipe::read (void* destBuffer, int maxBytesToRead, int timeOutMilliseconds) { ScopedReadLock sl (lock); - return pimpl != nullptr ? pimpl->read (static_cast (destBuffer), maxBytesToRead, timeOutMilliseconds) : -1; + return pimpl != nullptr ? pimpl->read (static_cast (destBuffer), maxBytesToRead, timeOutMilliseconds) : -1; } int NamedPipe::write (const void* sourceBuffer, int numBytesToWrite, int timeOutMilliseconds) { ScopedReadLock sl (lock); - return pimpl != nullptr ? pimpl->write (static_cast (sourceBuffer), numBytesToWrite, timeOutMilliseconds) : -1; + return pimpl != nullptr ? pimpl->write (static_cast (sourceBuffer), numBytesToWrite, timeOutMilliseconds) : -1; } diff --git a/modules/juce_core/native/juce_win32_ComSmartPtr.h b/modules/juce_core/native/juce_win32_ComSmartPtr.h index 10d5d204ce..380e9d8439 100644 --- a/modules/juce_core/native/juce_win32_ComSmartPtr.h +++ b/modules/juce_core/native/juce_win32_ComSmartPtr.h @@ -145,7 +145,7 @@ protected: template JUCE_COMRESULT castToType (void** result) { - this->AddRef(); *result = dynamic_cast (this); return S_OK; + this->AddRef(); *result = dynamic_cast (this); return S_OK; } }; diff --git a/modules/juce_core/native/juce_win32_Files.cpp b/modules/juce_core/native/juce_win32_Files.cpp index 2853a2c2cd..b4808a5d3a 100644 --- a/modules/juce_core/native/juce_win32_Files.cpp +++ b/modules/juce_core/native/juce_win32_Files.cpp @@ -65,7 +65,7 @@ namespace WindowsFileHelpers path.copyToUTF16 (pathCopy, numBytes); if (PathStripToRoot (pathCopy)) - path = static_cast (pathCopy); + path = static_cast (pathCopy); return path; } diff --git a/modules/juce_core/native/juce_win32_Network.cpp b/modules/juce_core/native/juce_win32_Network.cpp index 437a6e50aa..dc80f77338 100644 --- a/modules/juce_core/native/juce_win32_Network.cpp +++ b/modules/juce_core/native/juce_win32_Network.cpp @@ -505,7 +505,7 @@ bool JUCE_CALLTYPE Process::openEmailWithAttachments (const String& targetEmailA message.nRecipCount = 1; message.lpRecips = &recip; - HeapBlock files; + HeapBlock files; files.calloc ((size_t) filesToAttach.size()); message.nFileCount = (ULONG) filesToAttach.size(); diff --git a/modules/juce_core/native/juce_win32_Registry.cpp b/modules/juce_core/native/juce_win32_Registry.cpp index 164f2e24c0..8615f4325b 100644 --- a/modules/juce_core/native/juce_win32_Registry.cpp +++ b/modules/juce_core/native/juce_win32_Registry.cpp @@ -70,7 +70,7 @@ struct RegistryKeyWrapper return key.key != 0 && RegSetValueEx (key.key, key.wideCharValueName, 0, type, - reinterpret_cast (data), + reinterpret_cast (data), (DWORD) dataSize) == ERROR_SUCCESS; } @@ -107,7 +107,7 @@ struct RegistryKeyWrapper MemoryBlock buffer; switch (getBinaryValue (regValuePath, buffer, wow64Flags)) { - case REG_SZ: return static_cast (buffer.getData()); + case REG_SZ: return static_cast (buffer.getData()); case REG_DWORD: return String ((int) *reinterpret_cast (buffer.getData())); default: break; } diff --git a/modules/juce_core/streams/juce_BufferedInputStream.cpp b/modules/juce_core/streams/juce_BufferedInputStream.cpp index ea91f64a56..addc441bba 100644 --- a/modules/juce_core/streams/juce_BufferedInputStream.cpp +++ b/modules/juce_core/streams/juce_BufferedInputStream.cpp @@ -158,7 +158,7 @@ int BufferedInputStream::read (void* destBuffer, int maxBytesToRead) maxBytesToRead -= bytesAvailable; bytesRead += bytesAvailable; position += bytesAvailable; - destBuffer = static_cast (destBuffer) + bytesAvailable; + destBuffer = static_cast (destBuffer) + bytesAvailable; } const int64 oldLastReadPos = lastReadPos; diff --git a/modules/juce_core/streams/juce_BufferedInputStream.h b/modules/juce_core/streams/juce_BufferedInputStream.h index e0e74a29ba..c7eccb92c1 100644 --- a/modules/juce_core/streams/juce_BufferedInputStream.h +++ b/modules/juce_core/streams/juce_BufferedInputStream.h @@ -83,7 +83,7 @@ private: OptionalScopedPointer source; int bufferSize; int64 position, lastReadPos, bufferStart, bufferOverlap; - HeapBlock buffer; + HeapBlock buffer; void ensureBuffered(); JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (BufferedInputStream) diff --git a/modules/juce_core/text/juce_CharPointer_ASCII.h b/modules/juce_core/text/juce_CharPointer_ASCII.h index e85af4ba6a..a58028aae5 100644 --- a/modules/juce_core/text/juce_CharPointer_ASCII.h +++ b/modules/juce_core/text/juce_CharPointer_ASCII.h @@ -45,7 +45,7 @@ public: typedef char CharType; inline explicit CharPointer_ASCII (const CharType* const rawPointer) noexcept - : data (const_cast (rawPointer)) + : data (const_cast (rawPointer)) { } @@ -62,7 +62,7 @@ public: inline CharPointer_ASCII operator= (const CharType* text) noexcept { - data = const_cast (text); + data = const_cast (text); return *this; } diff --git a/modules/juce_core/text/juce_CharPointer_UTF16.h b/modules/juce_core/text/juce_CharPointer_UTF16.h index 7a245e1367..8ebbd2bc59 100644 --- a/modules/juce_core/text/juce_CharPointer_UTF16.h +++ b/modules/juce_core/text/juce_CharPointer_UTF16.h @@ -46,7 +46,7 @@ public: #endif inline explicit CharPointer_UTF16 (const CharType* const rawPointer) noexcept - : data (const_cast (rawPointer)) + : data (const_cast (rawPointer)) { } @@ -63,7 +63,7 @@ public: inline CharPointer_UTF16 operator= (const CharType* text) noexcept { - data = const_cast (text); + data = const_cast (text); return *this; } @@ -471,7 +471,7 @@ public: /** Atomically swaps this pointer for a new value, returning the previous value. */ CharPointer_UTF16 atomicSwap (const CharPointer_UTF16 newValue) { - return CharPointer_UTF16 (reinterpret_cast &> (data).exchange (newValue.data)); + return CharPointer_UTF16 (reinterpret_cast&> (data).exchange (newValue.data)); } /** These values are the byte-order-mark (BOM) values for a UTF-16 stream. */ diff --git a/modules/juce_core/text/juce_CharPointer_UTF32.h b/modules/juce_core/text/juce_CharPointer_UTF32.h index 9e96d70570..1ce92c32cf 100644 --- a/modules/juce_core/text/juce_CharPointer_UTF32.h +++ b/modules/juce_core/text/juce_CharPointer_UTF32.h @@ -42,7 +42,7 @@ public: typedef juce_wchar CharType; inline explicit CharPointer_UTF32 (const CharType* const rawPointer) noexcept - : data (const_cast (rawPointer)) + : data (const_cast (rawPointer)) { } @@ -59,7 +59,7 @@ public: inline CharPointer_UTF32 operator= (const CharType* text) noexcept { - data = const_cast (text); + data = const_cast (text); return *this; } @@ -367,7 +367,7 @@ public: /** Atomically swaps this pointer for a new value, returning the previous value. */ CharPointer_UTF32 atomicSwap (const CharPointer_UTF32 newValue) { - return CharPointer_UTF32 (reinterpret_cast &> (data).exchange (newValue.data)); + return CharPointer_UTF32 (reinterpret_cast&> (data).exchange (newValue.data)); } private: diff --git a/modules/juce_core/text/juce_CharPointer_UTF8.h b/modules/juce_core/text/juce_CharPointer_UTF8.h index 107d9c4a90..ba4ac186e9 100644 --- a/modules/juce_core/text/juce_CharPointer_UTF8.h +++ b/modules/juce_core/text/juce_CharPointer_UTF8.h @@ -41,7 +41,7 @@ public: typedef char CharType; inline explicit CharPointer_UTF8 (const CharType* const rawPointer) noexcept - : data (const_cast (rawPointer)) + : data (const_cast (rawPointer)) { } @@ -58,7 +58,7 @@ public: inline CharPointer_UTF8 operator= (const CharType* text) noexcept { - data = const_cast (text); + data = const_cast (text); return *this; } @@ -542,7 +542,7 @@ public: /** Atomically swaps this pointer for a new value, returning the previous value. */ CharPointer_UTF8 atomicSwap (const CharPointer_UTF8 newValue) { - return CharPointer_UTF8 (reinterpret_cast &> (data).exchange (newValue.data)); + return CharPointer_UTF8 (reinterpret_cast&> (data).exchange (newValue.data)); } /** These values are the byte-order mark (BOM) values for a UTF-8 stream. */ diff --git a/modules/juce_core/text/juce_String.cpp b/modules/juce_core/text/juce_String.cpp index 7527ca0a5f..063b38916b 100644 --- a/modules/juce_core/text/juce_String.cpp +++ b/modules/juce_core/text/juce_String.cpp @@ -1948,7 +1948,7 @@ String String::toHexString (const void* const d, const int size, const int group String s (PreallocationBytes (sizeof (CharPointerType::CharType) * (size_t) numChars)); - const unsigned char* data = static_cast (d); + const unsigned char* data = static_cast (d); CharPointerType dest (s.text); for (int i = 0; i < size; ++i) diff --git a/modules/juce_core/text/juce_StringArray.cpp b/modules/juce_core/text/juce_StringArray.cpp index 7ccdcb8631..dc331d8dd9 100644 --- a/modules/juce_core/text/juce_StringArray.cpp +++ b/modules/juce_core/text/juce_StringArray.cpp @@ -37,7 +37,7 @@ StringArray::StringArray (const StringArray& other) #if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS StringArray::StringArray (StringArray&& other) noexcept - : strings (static_cast &&> (other.strings)) + : strings (static_cast&&> (other.strings)) { } #endif @@ -81,7 +81,7 @@ StringArray& StringArray::operator= (const StringArray& other) #if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS StringArray& StringArray::operator= (StringArray&& other) noexcept { - strings = static_cast &&> (other.strings); + strings = static_cast&&> (other.strings); return *this; } #endif diff --git a/modules/juce_core/threads/juce_Thread.cpp b/modules/juce_core/threads/juce_Thread.cpp index dce488dbc0..d5b7110b97 100644 --- a/modules/juce_core/threads/juce_Thread.cpp +++ b/modules/juce_core/threads/juce_Thread.cpp @@ -57,7 +57,7 @@ struct CurrentThreadHolder : public ReferenceCountedObject { CurrentThreadHolder() noexcept {} - typedef ReferenceCountedObjectPtr Ptr; + typedef ReferenceCountedObjectPtr Ptr; ThreadLocalValue value; JUCE_DECLARE_NON_COPYABLE (CurrentThreadHolder) @@ -110,7 +110,7 @@ void Thread::threadEntryPoint() // used to wrap the incoming call from the platform-specific code void JUCE_API juce_threadEntryPoint (void* userData) { - static_cast (userData)->threadEntryPoint(); + static_cast (userData)->threadEntryPoint(); } //============================================================================== diff --git a/modules/juce_core/threads/juce_ThreadPool.cpp b/modules/juce_core/threads/juce_ThreadPool.cpp index 4051610191..b50c9de455 100644 --- a/modules/juce_core/threads/juce_ThreadPool.cpp +++ b/modules/juce_core/threads/juce_ThreadPool.cpp @@ -157,13 +157,13 @@ ThreadPoolJob* ThreadPool::getJob (const int index) const bool ThreadPool::contains (const ThreadPoolJob* const job) const { const ScopedLock sl (lock); - return jobs.contains (const_cast (job)); + return jobs.contains (const_cast (job)); } bool ThreadPool::isJobRunning (const ThreadPoolJob* const job) const { const ScopedLock sl (lock); - return jobs.contains (const_cast (job)) && job->isActive; + return jobs.contains (const_cast (job)) && job->isActive; } bool ThreadPool::waitForJobToFinish (const ThreadPoolJob* const job, const int timeOutMs) const diff --git a/modules/juce_core/xml/juce_XmlDocument.cpp b/modules/juce_core/xml/juce_XmlDocument.cpp index de77013b38..b9f5e0d3dc 100644 --- a/modules/juce_core/xml/juce_XmlDocument.cpp +++ b/modules/juce_core/xml/juce_XmlDocument.cpp @@ -759,10 +759,10 @@ String XmlDocument::expandEntity (const String& ent) const juce_wchar char1 = ent[1]; if (char1 == 'x' || char1 == 'X') - return String::charToString (static_cast (ent.substring (2).getHexValue32())); + return String::charToString (static_cast (ent.substring (2).getHexValue32())); if (char1 >= '0' && char1 <= '9') - return String::charToString (static_cast (ent.substring (1).getIntValue())); + return String::charToString (static_cast (ent.substring (1).getIntValue())); setLastError ("illegal escape sequence", false); return String::charToString ('&'); diff --git a/modules/juce_core/xml/juce_XmlElement.h b/modules/juce_core/xml/juce_XmlElement.h index c253dbe15c..7586f69215 100644 --- a/modules/juce_core/xml/juce_XmlElement.h +++ b/modules/juce_core/xml/juce_XmlElement.h @@ -642,7 +642,7 @@ public: if (num > 1) { - HeapBlock elems ((size_t) num); + HeapBlock elems ((size_t) num); getChildElementsAsArray (elems); sortArray (comparator, (XmlElement**) elems, 0, num - 1, retainOrderOfEquivalentItems); reorderChildElements (elems, num); diff --git a/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp b/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp index ec90603ac6..7ee8a9175d 100644 --- a/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp +++ b/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp @@ -85,7 +85,7 @@ private: if (streamIsValid) { - stream.next_in = const_cast (data); + stream.next_in = const_cast (data); stream.next_out = buffer; stream.avail_in = (z_uInt) dataSize; stream.avail_out = (z_uInt) sizeof (buffer); @@ -144,7 +144,7 @@ bool GZIPCompressorOutputStream::write (const void* destBuffer, size_t howMany) { jassert (destBuffer != nullptr && (ssize_t) howMany >= 0); - return helper->write (static_cast (destBuffer), howMany, *destStream); + return helper->write (static_cast (destBuffer), howMany, *destStream); } int64 GZIPCompressorOutputStream::getPosition() diff --git a/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp b/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp index 88d49a334f..422f17c6e8 100644 --- a/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp +++ b/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp @@ -226,7 +226,7 @@ int GZIPDecompressorInputStream::read (void* destBuffer, int howMany) if (howMany > 0 && ! isEof) { int numRead = 0; - uint8* d = static_cast (destBuffer); + uint8* d = static_cast (destBuffer); while (! helper->error) { diff --git a/modules/juce_core/zip/juce_GZIPDecompressorInputStream.h b/modules/juce_core/zip/juce_GZIPDecompressorInputStream.h index cdd9fd270c..8c2b9bf0a3 100644 --- a/modules/juce_core/zip/juce_GZIPDecompressorInputStream.h +++ b/modules/juce_core/zip/juce_GZIPDecompressorInputStream.h @@ -92,7 +92,7 @@ private: bool isEof; int activeBufferSize; int64 originalSourcePos, currentPos; - HeapBlock buffer; + HeapBlock buffer; class GZIPDecompressHelper; friend struct ContainerDeletePolicy; diff --git a/modules/juce_cryptography/encryption/juce_BlowFish.cpp b/modules/juce_cryptography/encryption/juce_BlowFish.cpp index 4179670a88..5a5d0a292b 100644 --- a/modules/juce_cryptography/encryption/juce_BlowFish.cpp +++ b/modules/juce_cryptography/encryption/juce_BlowFish.cpp @@ -181,7 +181,7 @@ BlowFish::BlowFish (const void* const keyData, const int keyBytes) for (int k = 0; k < 4; ++k) { - d = (d << 8) | static_cast (keyData)[j]; + d = (d << 8) | static_cast (keyData)[j]; if (++j >= keyBytes) j = 0; diff --git a/modules/juce_cryptography/encryption/juce_BlowFish.h b/modules/juce_cryptography/encryption/juce_BlowFish.h index 879e761ae0..7394e0e5ed 100644 --- a/modules/juce_cryptography/encryption/juce_BlowFish.h +++ b/modules/juce_cryptography/encryption/juce_BlowFish.h @@ -61,7 +61,7 @@ public: private: //============================================================================== uint32 p[18]; - HeapBlock s[4]; + HeapBlock s[4]; uint32 F (uint32) const noexcept; diff --git a/modules/juce_cryptography/hashing/juce_MD5.cpp b/modules/juce_cryptography/hashing/juce_MD5.cpp index d4d15639e7..0a1c1ff009 100644 --- a/modules/juce_cryptography/hashing/juce_MD5.cpp +++ b/modules/juce_cryptography/hashing/juce_MD5.cpp @@ -56,12 +56,12 @@ public: transform (buffer); for (i = spaceLeft; i + 64 <= dataSize; i += 64) - transform (static_cast (data) + i); + transform (static_cast (data) + i); bufferPos = 0; } - memcpy (buffer + bufferPos, static_cast (data) + i, dataSize - i); + memcpy (buffer + bufferPos, static_cast (data) + i, dataSize - i); } void transform (const void* bufferToTransform) noexcept diff --git a/modules/juce_data_structures/app_properties/juce_ApplicationProperties.h b/modules/juce_data_structures/app_properties/juce_ApplicationProperties.h index a047de8399..fa201313d8 100644 --- a/modules/juce_data_structures/app_properties/juce_ApplicationProperties.h +++ b/modules/juce_data_structures/app_properties/juce_ApplicationProperties.h @@ -120,7 +120,7 @@ public: private: //============================================================================== PropertiesFile::Options options; - ScopedPointer userProps, commonProps; + ScopedPointer userProps, commonProps; int commonSettingsAreReadOnly; void openFiles(); diff --git a/modules/juce_events/interprocess/juce_InterprocessConnection.h b/modules/juce_events/interprocess/juce_InterprocessConnection.h index 280ad54a90..23e9fe3d64 100644 --- a/modules/juce_events/interprocess/juce_InterprocessConnection.h +++ b/modules/juce_events/interprocess/juce_InterprocessConnection.h @@ -181,8 +181,8 @@ private: WeakReference::Master masterReference; friend class WeakReference; CriticalSection pipeAndSocketLock; - ScopedPointer socket; - ScopedPointer pipe; + ScopedPointer socket; + ScopedPointer pipe; bool callbackConnectionState; const bool useMessageThread; const uint32 magicMessageHeader; diff --git a/modules/juce_events/interprocess/juce_InterprocessConnectionServer.h b/modules/juce_events/interprocess/juce_InterprocessConnectionServer.h index 2bf0a22210..32350837bc 100644 --- a/modules/juce_events/interprocess/juce_InterprocessConnectionServer.h +++ b/modules/juce_events/interprocess/juce_InterprocessConnectionServer.h @@ -82,7 +82,7 @@ protected: private: //============================================================================== - ScopedPointer socket; + ScopedPointer socket; void run() override; diff --git a/modules/juce_events/messages/juce_MessageListener.cpp b/modules/juce_events/messages/juce_MessageListener.cpp index 6bcd25e51c..ed75dd4992 100644 --- a/modules/juce_events/messages/juce_MessageListener.cpp +++ b/modules/juce_events/messages/juce_MessageListener.cpp @@ -44,6 +44,6 @@ MessageListener::~MessageListener() void MessageListener::postMessage (Message* const message) const { - message->recipient = const_cast (this); + message->recipient = const_cast (this); message->post(); } diff --git a/modules/juce_events/messages/juce_MessageManager.h b/modules/juce_events/messages/juce_MessageManager.h index 23b8a6234b..0a27162bea 100644 --- a/modules/juce_events/messages/juce_MessageManager.h +++ b/modules/juce_events/messages/juce_MessageManager.h @@ -202,7 +202,7 @@ private: friend class QuitMessage; friend class MessageManagerLock; - ScopedPointer broadcaster; + ScopedPointer broadcaster; bool quitMessagePosted, quitMessageReceived; Thread::ThreadID messageThreadId; Thread::ThreadID volatile threadWithLock; diff --git a/modules/juce_events/native/juce_osx_MessageQueue.h b/modules/juce_events/native/juce_osx_MessageQueue.h index 7c92d5e0d5..7042f03a14 100644 --- a/modules/juce_events/native/juce_osx_MessageQueue.h +++ b/modules/juce_events/native/juce_osx_MessageQueue.h @@ -96,7 +96,7 @@ private: static void runLoopSourceCallback (void* info) { - static_cast (info)->runLoopCallback(); + static_cast (info)->runLoopCallback(); } }; diff --git a/modules/juce_graphics/colour/juce_ColourGradient.cpp b/modules/juce_graphics/colour/juce_ColourGradient.cpp index 87ccb56921..59b87f3f3f 100644 --- a/modules/juce_graphics/colour/juce_ColourGradient.cpp +++ b/modules/juce_graphics/colour/juce_ColourGradient.cpp @@ -178,7 +178,7 @@ void ColourGradient::createLookupTable (PixelARGB* const lookupTable, const int lookupTable [index++] = pix1; } -int ColourGradient::createLookupTable (const AffineTransform& transform, HeapBlock & lookupTable) const +int ColourGradient::createLookupTable (const AffineTransform& transform, HeapBlock& lookupTable) const { JUCE_COLOURGRADIENT_CHECK_COORDS_INITIALISED // Trying to use this object without setting its coordinates? jassert (colours.size() >= 2); diff --git a/modules/juce_graphics/colour/juce_ColourGradient.h b/modules/juce_graphics/colour/juce_ColourGradient.h index 9349d82b30..542985b9c0 100644 --- a/modules/juce_graphics/colour/juce_ColourGradient.h +++ b/modules/juce_graphics/colour/juce_ColourGradient.h @@ -126,7 +126,7 @@ public: colours that it added. When calling this, the ColourGradient must have at least 2 colour stops specified. */ - int createLookupTable (const AffineTransform& transform, HeapBlock & resultLookupTable) const; + int createLookupTable (const AffineTransform& transform, HeapBlock& resultLookupTable) const; /** Creates a set of interpolated premultiplied ARGB values. This will fill an array of a user-specified size with the gradient, interpolating to fit. diff --git a/modules/juce_graphics/colour/juce_FillType.cpp b/modules/juce_graphics/colour/juce_FillType.cpp index c477f71d94..34d6da9c6d 100644 --- a/modules/juce_graphics/colour/juce_FillType.cpp +++ b/modules/juce_graphics/colour/juce_FillType.cpp @@ -67,7 +67,7 @@ FillType& FillType::operator= (const FillType& other) FillType::FillType (FillType&& other) noexcept : colour (other.colour), gradient (other.gradient.release()), - image (static_cast (other.image)), + image (static_cast (other.image)), transform (other.transform) { } @@ -78,7 +78,7 @@ FillType& FillType::operator= (FillType&& other) noexcept colour = other.colour; gradient = other.gradient.release(); - image = static_cast (other.image); + image = static_cast (other.image); transform = other.transform; return *this; } diff --git a/modules/juce_graphics/colour/juce_FillType.h b/modules/juce_graphics/colour/juce_FillType.h index 3cf037d142..28effc0f4c 100644 --- a/modules/juce_graphics/colour/juce_FillType.h +++ b/modules/juce_graphics/colour/juce_FillType.h @@ -126,7 +126,7 @@ public: If a gradient is active, the overall opacity with which it should be applied is indicated by the alpha channel of the colour variable. */ - ScopedPointer gradient; + ScopedPointer gradient; /** The image that should be used for tiling. If an image fill is active, the overall opacity with which it should be applied diff --git a/modules/juce_graphics/fonts/juce_AttributedString.cpp b/modules/juce_graphics/fonts/juce_AttributedString.cpp index a5c5849bac..e1d9cbec29 100644 --- a/modules/juce_graphics/fonts/juce_AttributedString.cpp +++ b/modules/juce_graphics/fonts/juce_AttributedString.cpp @@ -94,23 +94,23 @@ AttributedString& AttributedString::operator= (const AttributedString& other) #if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS AttributedString::AttributedString (AttributedString&& other) noexcept - : text (static_cast (other.text)), + : text (static_cast (other.text)), lineSpacing (other.lineSpacing), justification (other.justification), wordWrap (other.wordWrap), readingDirection (other.readingDirection), - attributes (static_cast &&> (other.attributes)) + attributes (static_cast&&> (other.attributes)) { } AttributedString& AttributedString::operator= (AttributedString&& other) noexcept { - text = static_cast (other.text); + text = static_cast (other.text); lineSpacing = other.lineSpacing; justification = other.justification; wordWrap = other.wordWrap; readingDirection = other.readingDirection; - attributes = static_cast &&> (other.attributes); + attributes = static_cast&&> (other.attributes); return *this; } #endif diff --git a/modules/juce_graphics/fonts/juce_Typeface.h b/modules/juce_graphics/fonts/juce_Typeface.h index 0646305541..e39fa6761a 100644 --- a/modules/juce_graphics/fonts/juce_Typeface.h +++ b/modules/juce_graphics/fonts/juce_Typeface.h @@ -46,7 +46,7 @@ class JUCE_API Typeface : public ReferenceCountedObject public: //============================================================================== /** A handy typedef for a pointer to a typeface. */ - typedef ReferenceCountedObjectPtr Ptr; + typedef ReferenceCountedObjectPtr Ptr; //============================================================================== /** Returns the font family of the typeface. diff --git a/modules/juce_graphics/geometry/juce_Path.cpp b/modules/juce_graphics/geometry/juce_Path.cpp index 48c78aaf5d..0c67dd103c 100644 --- a/modules/juce_graphics/geometry/juce_Path.cpp +++ b/modules/juce_graphics/geometry/juce_Path.cpp @@ -156,7 +156,7 @@ Path& Path::operator= (const Path& other) #if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS Path::Path (Path&& other) noexcept - : data (static_cast &&> (other.data)), + : data (static_cast&&> (other.data)), numElements (other.numElements), bounds (other.bounds), useNonZeroWinding (other.useNonZeroWinding) @@ -165,7 +165,7 @@ Path::Path (Path&& other) noexcept Path& Path::operator= (Path&& other) noexcept { - data = static_cast &&> (other.data); + data = static_cast&&> (other.data); numElements = other.numElements; bounds = other.bounds; useNonZeroWinding = other.useNonZeroWinding; diff --git a/modules/juce_graphics/geometry/juce_Path.h b/modules/juce_graphics/geometry/juce_Path.h index 50d2e0f0cd..3b28248f82 100644 --- a/modules/juce_graphics/geometry/juce_Path.h +++ b/modules/juce_graphics/geometry/juce_Path.h @@ -315,8 +315,8 @@ public: template void addRectangle (const Rectangle& rectangle) { - addRectangle (static_cast (rectangle.getX()), static_cast (rectangle.getY()), - static_cast (rectangle.getWidth()), static_cast (rectangle.getHeight())); + addRectangle (static_cast (rectangle.getX()), static_cast (rectangle.getY()), + static_cast (rectangle.getWidth()), static_cast (rectangle.getHeight())); } /** Adds a rectangle with rounded corners to the path. @@ -350,8 +350,8 @@ public: template void addRoundedRectangle (const Rectangle& rectangle, float cornerSizeX, float cornerSizeY) { - addRoundedRectangle (static_cast (rectangle.getX()), static_cast (rectangle.getY()), - static_cast (rectangle.getWidth()), static_cast (rectangle.getHeight()), + addRoundedRectangle (static_cast (rectangle.getX()), static_cast (rectangle.getY()), + static_cast (rectangle.getWidth()), static_cast (rectangle.getHeight()), cornerSizeX, cornerSizeY); } diff --git a/modules/juce_graphics/geometry/juce_PathIterator.h b/modules/juce_graphics/geometry/juce_PathIterator.h index 0c1e5a163c..899988ae0e 100644 --- a/modules/juce_graphics/geometry/juce_PathIterator.h +++ b/modules/juce_graphics/geometry/juce_PathIterator.h @@ -102,7 +102,7 @@ private: float subPathCloseX, subPathCloseY; const bool isIdentityTransform; - HeapBlock stackBase; + HeapBlock stackBase; float* stackPos; size_t index, stackSize; diff --git a/modules/juce_graphics/geometry/juce_Rectangle.h b/modules/juce_graphics/geometry/juce_Rectangle.h index ac9df0eb3f..952953ace9 100644 --- a/modules/juce_graphics/geometry/juce_Rectangle.h +++ b/modules/juce_graphics/geometry/juce_Rectangle.h @@ -578,8 +578,8 @@ public: */ Point getRelativePoint (double relativeX, double relativeY) const noexcept { - return Point (pos.x + static_cast (w * relativeX), - pos.y + static_cast (h * relativeY)); + return Point (pos.x + static_cast (w * relativeX), + pos.y + static_cast (h * relativeY)); } /** Returns true if any part of another rectangle overlaps this one. */ diff --git a/modules/juce_graphics/image_formats/juce_GIFLoader.cpp b/modules/juce_graphics/image_formats/juce_GIFLoader.cpp index ff5cd8ff27..e0c5b70ab1 100644 --- a/modules/juce_graphics/image_formats/juce_GIFLoader.cpp +++ b/modules/juce_graphics/image_formats/juce_GIFLoader.cpp @@ -432,7 +432,7 @@ Image GIFImageFormat::decodeImage (InputStream& in) #if (JUCE_MAC || JUCE_IOS) && USE_COREGRAPHICS_RENDERING && JUCE_USE_COREIMAGE_LOADER return juce_loadWithCoreImage (in); #else - const ScopedPointer loader (new GIFLoader (in)); + const ScopedPointer loader (new GIFLoader (in)); return loader->image; #endif } diff --git a/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp b/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp index a5a09a590a..ca01ff0581 100644 --- a/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp +++ b/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp @@ -186,7 +186,7 @@ namespace JPEGHelpers static void jpegWriteTerminate (j_compress_ptr cinfo) { - JuceJpegDest* const dest = static_cast (cinfo->dest); + JuceJpegDest* const dest = static_cast (cinfo->dest); const size_t numToWrite = jpegBufferSize - dest->free_in_buffer; dest->output->write (dest->buffer, numToWrite); @@ -194,11 +194,11 @@ namespace JPEGHelpers static boolean jpegWriteFlush (j_compress_ptr cinfo) { - JuceJpegDest* const dest = static_cast (cinfo->dest); + JuceJpegDest* const dest = static_cast (cinfo->dest); const int numToWrite = jpegBufferSize; - dest->next_output_byte = reinterpret_cast (dest->buffer); + dest->next_output_byte = reinterpret_cast (dest->buffer); dest->free_in_buffer = jpegBufferSize; return (boolean) dest->output->write (dest->buffer, (size_t) numToWrite); @@ -271,7 +271,7 @@ Image JPEGImageFormat::decodeImage (InputStream& in) jpegDecompStruct.src->resync_to_restart = jpeg_resync_to_restart; jpegDecompStruct.src->term_source = dummyCallback1; - jpegDecompStruct.src->next_input_byte = static_cast (mb.getData()); + jpegDecompStruct.src->next_input_byte = static_cast (mb.getData()); jpegDecompStruct.src->bytes_in_buffer = mb.getDataSize(); jpeg_read_header (&jpegDecompStruct, TRUE); @@ -363,7 +363,7 @@ bool JPEGImageFormat::writeImageToStream (const Image& image, OutputStream& out) jpegCompStruct.dest = &dest; dest.output = &out; - HeapBlock tempBuffer (jpegBufferSize); + HeapBlock tempBuffer (jpegBufferSize); dest.buffer = tempBuffer; dest.next_output_byte = (JOCTET*) dest.buffer; dest.free_in_buffer = jpegBufferSize; diff --git a/modules/juce_graphics/images/juce_Image.cpp b/modules/juce_graphics/images/juce_Image.cpp index 42998526d0..d801b48ce1 100644 --- a/modules/juce_graphics/images/juce_Image.cpp +++ b/modules/juce_graphics/images/juce_Image.cpp @@ -238,13 +238,13 @@ Image& Image::operator= (const Image& other) #if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS Image::Image (Image&& other) noexcept - : image (static_cast (other.image)) + : image (static_cast (other.image)) { } Image& Image::operator= (Image&& other) noexcept { - image = static_cast (other.image); + image = static_cast (other.image); return *this; } #endif diff --git a/modules/juce_graphics/images/juce_ImageConvolutionKernel.h b/modules/juce_graphics/images/juce_ImageConvolutionKernel.h index 67d55d61cf..43afc9e00f 100644 --- a/modules/juce_graphics/images/juce_ImageConvolutionKernel.h +++ b/modules/juce_graphics/images/juce_ImageConvolutionKernel.h @@ -101,7 +101,7 @@ public: private: //============================================================================== - HeapBlock values; + HeapBlock values; const int size; JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ImageConvolutionKernel) diff --git a/modules/juce_graphics/native/juce_freetype_Fonts.cpp b/modules/juce_graphics/native/juce_freetype_Fonts.cpp index cc87924cdd..04a05ddab4 100644 --- a/modules/juce_graphics/native/juce_freetype_Fonts.cpp +++ b/modules/juce_graphics/native/juce_freetype_Fonts.cpp @@ -41,7 +41,7 @@ struct FTLibWrapper : public ReferenceCountedObject FT_Library library; - typedef ReferenceCountedObjectPtr Ptr; + typedef ReferenceCountedObjectPtr Ptr; JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FTLibWrapper) }; diff --git a/modules/juce_graphics/native/juce_win32_Fonts.cpp b/modules/juce_graphics/native/juce_win32_Fonts.cpp index db57fd1980..9d84483df5 100644 --- a/modules/juce_graphics/native/juce_win32_Fonts.cpp +++ b/modules/juce_graphics/native/juce_win32_Fonts.cpp @@ -363,7 +363,7 @@ public: results[numChars] = -1; float x = 0; - if (GetGlyphIndices (dc, utf16, (int) numChars, reinterpret_cast (results.getData()), + if (GetGlyphIndices (dc, utf16, (int) numChars, reinterpret_cast (results.getData()), GGI_MARK_NONEXISTING_GLYPHS) != GDI_ERROR) { for (size_t i = 0; i < numChars; ++i) @@ -381,7 +381,7 @@ public: results[numChars] = -1; float x = 0; - if (GetGlyphIndices (dc, utf16, (int) numChars, reinterpret_cast (results.getData()), + if (GetGlyphIndices (dc, utf16, (int) numChars, reinterpret_cast (results.getData()), GGI_MARK_NONEXISTING_GLYPHS) != GDI_ERROR) { resultGlyphs.ensureStorageAllocated ((int) numChars); diff --git a/modules/juce_graphics/placement/juce_RectanglePlacement.h b/modules/juce_graphics/placement/juce_RectanglePlacement.h index fd5b24e758..ec99bee93f 100644 --- a/modules/juce_graphics/placement/juce_RectanglePlacement.h +++ b/modules/juce_graphics/placement/juce_RectanglePlacement.h @@ -151,10 +151,10 @@ public: const Rectangle& destination) const noexcept { double x = source.getX(), y = source.getY(), w = source.getWidth(), h = source.getHeight(); - applyTo (x, y, w, h, static_cast (destination.getX()), static_cast (destination.getY()), - static_cast (destination.getWidth()), static_cast (destination.getHeight())); - return Rectangle (static_cast (x), static_cast (y), - static_cast (w), static_cast (h)); + applyTo (x, y, w, h, static_cast (destination.getX()), static_cast (destination.getY()), + static_cast (destination.getWidth()), static_cast (destination.getHeight())); + return Rectangle (static_cast (x), static_cast (y), + static_cast (w), static_cast (h)); } /** Returns the transform that should be applied to these source coordinates to fit them diff --git a/modules/juce_gui_basics/application/juce_Application.cpp b/modules/juce_gui_basics/application/juce_Application.cpp index 47c4ee2a50..449f6c0206 100644 --- a/modules/juce_gui_basics/application/juce_Application.cpp +++ b/modules/juce_gui_basics/application/juce_Application.cpp @@ -28,7 +28,7 @@ JUCEApplication::~JUCEApplication() {} //============================================================================== JUCEApplication* JUCE_CALLTYPE JUCEApplication::getInstance() noexcept { - return dynamic_cast (JUCEApplicationBase::getInstance()); + return dynamic_cast (JUCEApplicationBase::getInstance()); } bool JUCEApplication::moreThanOneInstanceAllowed() { return true; } diff --git a/modules/juce_gui_basics/buttons/juce_Button.cpp b/modules/juce_gui_basics/buttons/juce_Button.cpp index 3debe03d2f..89181a3487 100644 --- a/modules/juce_gui_basics/buttons/juce_Button.cpp +++ b/modules/juce_gui_basics/buttons/juce_Button.cpp @@ -244,7 +244,7 @@ void Button::turnOffOtherButtonsInGroup (const NotificationType notification) if (c != this) { - if (Button* const b = dynamic_cast (c)) + if (Button* const b = dynamic_cast (c)) { if (b->getRadioGroupId() == radioGroupId) { diff --git a/modules/juce_gui_basics/commands/juce_ApplicationCommandTarget.cpp b/modules/juce_gui_basics/commands/juce_ApplicationCommandTarget.cpp index 734def2e66..092f6d2d82 100644 --- a/modules/juce_gui_basics/commands/juce_ApplicationCommandTarget.cpp +++ b/modules/juce_gui_basics/commands/juce_ApplicationCommandTarget.cpp @@ -78,7 +78,7 @@ bool ApplicationCommandTarget::tryToInvoke (const InvocationInfo& info, const bo ApplicationCommandTarget* ApplicationCommandTarget::findFirstTargetParentComponent() { - if (Component* const c = dynamic_cast (this)) + if (Component* const c = dynamic_cast (this)) return c->findParentComponentOfClass(); return nullptr; diff --git a/modules/juce_gui_basics/components/juce_ModalComponentManager.h b/modules/juce_gui_basics/components/juce_ModalComponentManager.h index df8b7b2de3..b0817518a2 100644 --- a/modules/juce_gui_basics/components/juce_ModalComponentManager.h +++ b/modules/juce_gui_basics/components/juce_ModalComponentManager.h @@ -328,7 +328,7 @@ private: void modalStateFinished (int returnValue) { - function (returnValue, static_cast (comp.get())); + function (returnValue, static_cast (comp.get())); } private: @@ -349,7 +349,7 @@ private: void modalStateFinished (int returnValue) { - function (returnValue, static_cast (comp.get()), param1); + function (returnValue, static_cast (comp.get()), param1); } private: diff --git a/modules/juce_gui_basics/drawables/juce_Drawable.cpp b/modules/juce_gui_basics/drawables/juce_Drawable.cpp index f9b0944d78..91d322e000 100644 --- a/modules/juce_gui_basics/drawables/juce_Drawable.cpp +++ b/modules/juce_gui_basics/drawables/juce_Drawable.cpp @@ -42,7 +42,7 @@ Drawable::~Drawable() //============================================================================== void Drawable::draw (Graphics& g, float opacity, const AffineTransform& transform) const { - const_cast (this)->nonConstDraw (g, opacity, transform); + const_cast (this)->nonConstDraw (g, opacity, transform); } void Drawable::nonConstDraw (Graphics& g, float opacity, const AffineTransform& transform) @@ -83,7 +83,7 @@ void Drawable::drawWithin (Graphics& g, const Rectangle& destArea, //============================================================================== DrawableComposite* Drawable::getParent() const { - return dynamic_cast (getParentComponent()); + return dynamic_cast (getParentComponent()); } void Drawable::transformContextToCorrectOrigin (Graphics& g) @@ -150,11 +150,11 @@ Drawable* Drawable::createFromImageData (const void* data, const size_t numBytes const String asString (String::createStringFromData (data, (int) numBytes)); XmlDocument doc (asString); - ScopedPointer outer (doc.getDocumentElement (true)); + ScopedPointer outer (doc.getDocumentElement (true)); if (outer != nullptr && outer->hasTagName ("svg")) { - ScopedPointer svg (doc.getDocumentElement()); + ScopedPointer svg (doc.getDocumentElement()); if (svg != nullptr) result = Drawable::createFromSVG (*svg); @@ -202,7 +202,7 @@ public: void updateComponentFromState (Component* component, const ValueTree& state) { - DrawableClass* const d = dynamic_cast (component); + DrawableClass* const d = dynamic_cast (component); jassert (d != nullptr); d->refreshFromValueTree (state, *this->getBuilder()); } @@ -224,7 +224,7 @@ Drawable* Drawable::createFromValueTree (const ValueTree& tree, ComponentBuilder registerDrawableTypeHandlers (builder); ScopedPointer comp (builder.createComponent()); - Drawable* const d = dynamic_cast (static_cast (comp)); + Drawable* const d = dynamic_cast (static_cast (comp)); if (d != nullptr) comp.release(); diff --git a/modules/juce_gui_basics/drawables/juce_DrawableComposite.cpp b/modules/juce_gui_basics/drawables/juce_DrawableComposite.cpp index fa21d92331..b99c90876b 100644 --- a/modules/juce_gui_basics/drawables/juce_DrawableComposite.cpp +++ b/modules/juce_gui_basics/drawables/juce_DrawableComposite.cpp @@ -40,7 +40,7 @@ DrawableComposite::DrawableComposite (const DrawableComposite& other) updateBoundsReentrant (false) { for (int i = 0; i < other.getNumChildComponents(); ++i) - if (const Drawable* const d = dynamic_cast (other.getChildComponent(i))) + if (const Drawable* const d = dynamic_cast (other.getChildComponent(i))) addAndMakeVisible (d->createCopy()); } @@ -60,7 +60,7 @@ Rectangle DrawableComposite::getDrawableBounds() const Rectangle r; for (int i = getNumChildComponents(); --i >= 0;) - if (const Drawable* const d = dynamic_cast (getChildComponent(i))) + if (const Drawable* const d = dynamic_cast (getChildComponent(i))) r = r.getUnion (d->isTransformed() ? d->getDrawableBounds().transformedBy (d->getTransform()) : d->getDrawableBounds()); @@ -314,7 +314,7 @@ ValueTree DrawableComposite::createValueTree (ComponentBuilder::ImageProvider* i for (int i = 0; i < getNumChildComponents(); ++i) { - const Drawable* const d = dynamic_cast (getChildComponent(i)); + const Drawable* const d = dynamic_cast (getChildComponent(i)); jassert (d != nullptr); // You can't save a mix of Drawables and normal components! childList.addChild (d->createValueTree (imageProvider), -1, nullptr); diff --git a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.cpp index 287119357e..552a676bfa 100644 --- a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.cpp @@ -48,7 +48,7 @@ void DirectoryContentsDisplayComponent::removeListener (FileBrowserListener* con void DirectoryContentsDisplayComponent::sendSelectionChangeMessage() { - Component::BailOutChecker checker (dynamic_cast (this)); + Component::BailOutChecker checker (dynamic_cast (this)); listeners.callChecked (checker, &FileBrowserListener::selectionChanged); } @@ -56,7 +56,7 @@ void DirectoryContentsDisplayComponent::sendMouseClickMessage (const File& file, { if (fileList.getDirectory().exists()) { - Component::BailOutChecker checker (dynamic_cast (this)); + Component::BailOutChecker checker (dynamic_cast (this)); listeners.callChecked (checker, &FileBrowserListener::fileClicked, file, e); } } @@ -65,7 +65,7 @@ void DirectoryContentsDisplayComponent::sendDoubleClickMessage (const File& file { if (fileList.getDirectory().exists()) { - Component::BailOutChecker checker (dynamic_cast (this)); + Component::BailOutChecker checker (dynamic_cast (this)); listeners.callChecked (checker, &FileBrowserListener::fileDoubleClicked, file); } } diff --git a/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp index 51f20f3aee..178a10b3d5 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp @@ -133,7 +133,7 @@ public: for (int maxRetries = 500; --maxRetries > 0;) { for (int i = 0; i < getNumSubItems(); ++i) - if (FileListTreeItem* f = dynamic_cast (getSubItem (i))) + if (FileListTreeItem* f = dynamic_cast (getSubItem (i))) if (f->selectFile (target)) return true; @@ -282,7 +282,7 @@ void FileTreeComponent::refresh() //============================================================================== File FileTreeComponent::getSelectedFile (const int index) const { - if (const FileListTreeItem* const item = dynamic_cast (getSelectedItem (index))) + if (const FileListTreeItem* const item = dynamic_cast (getSelectedItem (index))) return item->file; return File::nonexistent; @@ -305,7 +305,7 @@ void FileTreeComponent::setDragAndDropDescription (const String& description) void FileTreeComponent::setSelectedFile (const File& target) { - if (FileListTreeItem* t = dynamic_cast (getRootItem())) + if (FileListTreeItem* t = dynamic_cast (getRootItem())) if (! t->selectFile (target)) clearSelectedItems(); } diff --git a/modules/juce_gui_basics/layout/juce_ComponentBuilder.cpp b/modules/juce_gui_basics/layout/juce_ComponentBuilder.cpp index 4c5c5653a7..da2e247b15 100644 --- a/modules/juce_gui_basics/layout/juce_ComponentBuilder.cpp +++ b/modules/juce_gui_basics/layout/juce_ComponentBuilder.cpp @@ -109,7 +109,7 @@ ComponentBuilder::~ComponentBuilder() #if JUCE_DEBUG // Don't delete the managed component!! The builder owns that component, and will delete // it automatically when it gets deleted. - jassert (componentRef.get() == static_cast (component)); + jassert (componentRef.get() == static_cast (component)); #endif } diff --git a/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp b/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp index 60ba1572f6..69c40bb9fa 100644 --- a/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp +++ b/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp @@ -137,7 +137,7 @@ void MultiDocumentPanel::addWindow (Component* component) dw->setName (component->getName()); const var bkg (component->getProperties() ["mdiDocumentBkg_"]); - dw->setBackgroundColour (bkg.isVoid() ? backgroundColour : Colour ((uint32) static_cast (bkg))); + dw->setBackgroundColour (bkg.isVoid() ? backgroundColour : Colour ((uint32) static_cast (bkg))); int x = 4; @@ -161,7 +161,7 @@ bool MultiDocumentPanel::addDocument (Component* const component, { // If you try passing a full DocumentWindow or ResizableWindow in here, you'll end up // with a frame-within-a-frame! Just pass in the bare content component. - jassert (dynamic_cast (component) == nullptr); + jassert (dynamic_cast (component) == nullptr); if (component == nullptr || (maximumNumDocuments > 0 && components.size() >= maximumNumDocuments)) return false; @@ -239,7 +239,7 @@ bool MultiDocumentPanel::closeDocument (Component* component, { for (int i = getNumChildComponents(); --i >= 0;) { - if (MultiDocumentPanelWindow* const dw = dynamic_cast (getChildComponent (i))) + if (MultiDocumentPanelWindow* const dw = dynamic_cast (getChildComponent (i))) { if (dw->getContentComponent() == component) { @@ -258,7 +258,7 @@ bool MultiDocumentPanel::closeDocument (Component* component, { for (int i = getNumChildComponents(); --i >= 0;) { - ScopedPointer dw (dynamic_cast (getChildComponent (i))); + ScopedPointer dw (dynamic_cast (getChildComponent (i))); if (dw != nullptr) dw->clearContentComponent(); @@ -325,7 +325,7 @@ Component* MultiDocumentPanel::getActiveDocument() const noexcept if (mode == FloatingWindows) { for (int i = getNumChildComponents(); --i >= 0;) - if (MultiDocumentPanelWindow* const dw = dynamic_cast (getChildComponent (i))) + if (MultiDocumentPanelWindow* const dw = dynamic_cast (getChildComponent (i))) if (dw->isActiveWindow()) return dw->getContentComponent(); } @@ -397,7 +397,7 @@ void MultiDocumentPanel::setLayoutMode (const LayoutMode newLayoutMode) { for (int i = getNumChildComponents(); --i >= 0;) { - ScopedPointer dw (dynamic_cast (getChildComponent (i))); + ScopedPointer dw (dynamic_cast (getChildComponent (i))); if (dw != nullptr) { @@ -417,7 +417,7 @@ void MultiDocumentPanel::setLayoutMode (const LayoutMode newLayoutMode) Component* const c = tempComps.getUnchecked(i); addDocument (c, - Colour ((uint32) static_cast (c->getProperties().getWithDefault ("mdiDocumentBkg_", (int) Colours::white.getARGB()))), + Colour ((uint32) static_cast (c->getProperties().getWithDefault ("mdiDocumentBkg_", (int) Colours::white.getARGB()))), MultiDocHelpers::shouldDeleteComp (c)); } } @@ -455,7 +455,7 @@ Component* MultiDocumentPanel::getContainerComp (Component* c) const if (mode == FloatingWindows) { for (int i = 0; i < getNumChildComponents(); ++i) - if (MultiDocumentPanelWindow* const dw = dynamic_cast (getChildComponent (i))) + if (MultiDocumentPanelWindow* const dw = dynamic_cast (getChildComponent (i))) if (dw->getContentComponent() == c) return dw; } @@ -468,7 +468,7 @@ void MultiDocumentPanel::componentNameChanged (Component&) if (mode == FloatingWindows) { for (int i = 0; i < getNumChildComponents(); ++i) - if (MultiDocumentPanelWindow* const dw = dynamic_cast (getChildComponent (i))) + if (MultiDocumentPanelWindow* const dw = dynamic_cast (getChildComponent (i))) dw->setName (dw->getContentComponent()->getName()); } else if (tabComponent != nullptr) @@ -487,7 +487,7 @@ void MultiDocumentPanel::updateOrder() components.clear(); for (int i = 0; i < getNumChildComponents(); ++i) - if (MultiDocumentPanelWindow* const dw = dynamic_cast (getChildComponent (i))) + if (MultiDocumentPanelWindow* const dw = dynamic_cast (getChildComponent (i))) components.add (dw->getContentComponent()); } else diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp index 13c821f29d..af92bd8101 100644 --- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp +++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp @@ -1605,7 +1605,7 @@ void LookAndFeel_V2::layoutFilenameComponent (FilenameComponent& filenameComp, { browseButton->setSize (80, filenameComp.getHeight()); - if (TextButton* const tb = dynamic_cast (browseButton)) + if (TextButton* const tb = dynamic_cast (browseButton)) tb->changeWidthToFitText(); browseButton->setTopRightPosition (filenameComp.getWidth(), 0); @@ -2575,7 +2575,7 @@ void LookAndFeel_V2::layoutFileBrowserComponent (FileBrowserComponent& browserCo y += controlsHeight + 4; - if (Component* const listAsComp = dynamic_cast (fileListComponent)) + if (Component* const listAsComp = dynamic_cast (fileListComponent)) { listAsComp->setBounds (x, y, w, browserComp.getHeight() - y - bottomSectionHeight); y = listAsComp->getBottom() + 4; diff --git a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp index 4595b7f13a..3848e4e170 100644 --- a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp +++ b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp @@ -107,8 +107,8 @@ public: const Colour textColour; const bool isActive, isSeparator, isTicked, usesColour; ScopedPointer iconDrawable; - ReferenceCountedObjectPtr customComp; - ScopedPointer subMenu; + ReferenceCountedObjectPtr customComp; + ScopedPointer subMenu; ApplicationCommandManager* const commandManager; private: diff --git a/modules/juce_gui_basics/native/juce_linux_Clipboard.cpp b/modules/juce_gui_basics/native/juce_linux_Clipboard.cpp index a6291877ed..0427e9458d 100644 --- a/modules/juce_gui_basics/native/juce_linux_Clipboard.cpp +++ b/modules/juce_gui_basics/native/juce_linux_Clipboard.cpp @@ -142,7 +142,7 @@ namespace ClipboardHelpers reply.property = None; // == "fail" reply.time = evt.time; - HeapBlock data; + HeapBlock data; int propertyFormat = 0; size_t numDataItems = 0; diff --git a/modules/juce_gui_basics/native/juce_mac_MainMenu.mm b/modules/juce_gui_basics/native/juce_mac_MainMenu.mm index 6f667e413f..8ca3b614f7 100644 --- a/modules/juce_gui_basics/native/juce_mac_MainMenu.mm +++ b/modules/juce_gui_basics/native/juce_mac_MainMenu.mm @@ -491,7 +491,7 @@ private: { if (juce::Component* focused = juce::Component::getCurrentlyFocusedComponent()) { - if (juce::NSViewComponentPeer* peer = dynamic_cast (focused->getPeer())) + if (juce::NSViewComponentPeer* peer = dynamic_cast (focused->getPeer())) { if ([e type] == NSKeyDown) peer->redirectKeyDown (e); diff --git a/modules/juce_gui_basics/native/juce_mac_Windowing.mm b/modules/juce_gui_basics/native/juce_mac_Windowing.mm index 103f4b1499..cb9a4a0f91 100644 --- a/modules/juce_gui_basics/native/juce_mac_Windowing.mm +++ b/modules/juce_gui_basics/native/juce_mac_Windowing.mm @@ -330,7 +330,7 @@ public: static void displayReconfigurationCallBack (CGDirectDisplayID, CGDisplayChangeSummaryFlags, void*) { - const_cast (Desktop::getInstance().getDisplays()).refresh(); + const_cast (Desktop::getInstance().getDisplays()).refresh(); } juce_DeclareSingleton_SingleThreaded_Minimal (DisplaySettingsChangeCallback) diff --git a/modules/juce_gui_basics/native/juce_win32_DragAndDrop.cpp b/modules/juce_gui_basics/native/juce_win32_DragAndDrop.cpp index 253364ebe2..0e25ac386a 100644 --- a/modules/juce_gui_basics/native/juce_win32_DragAndDrop.cpp +++ b/modules/juce_gui_basics/native/juce_win32_DragAndDrop.cpp @@ -282,7 +282,7 @@ bool DragAndDropContainer::performExternalDragDropOfText (const String& text) const size_t numBytes = CharPointer_UTF16::getBytesRequiredFor (text.getCharPointer()); medium.hGlobal = GlobalAlloc (GMEM_MOVEABLE | GMEM_ZEROINIT, numBytes + 2); - WCHAR* const data = static_cast (GlobalLock (medium.hGlobal)); + WCHAR* const data = static_cast (GlobalLock (medium.hGlobal)); text.copyToUTF16 (data, numBytes); format.cfFormat = CF_UNICODETEXT; diff --git a/modules/juce_gui_basics/positioning/juce_RelativeCoordinate.cpp b/modules/juce_gui_basics/positioning/juce_RelativeCoordinate.cpp index 62d3d3d989..a545acd7ac 100644 --- a/modules/juce_gui_basics/positioning/juce_RelativeCoordinate.cpp +++ b/modules/juce_gui_basics/positioning/juce_RelativeCoordinate.cpp @@ -69,13 +69,13 @@ RelativeCoordinate& RelativeCoordinate::operator= (const RelativeCoordinate& oth #if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS RelativeCoordinate::RelativeCoordinate (RelativeCoordinate&& other) noexcept - : term (static_cast (other.term)) + : term (static_cast (other.term)) { } RelativeCoordinate& RelativeCoordinate::operator= (RelativeCoordinate&& other) noexcept { - term = static_cast (other.term); + term = static_cast (other.term); return *this; } #endif diff --git a/modules/juce_gui_basics/positioning/juce_RelativeRectangle.cpp b/modules/juce_gui_basics/positioning/juce_RelativeRectangle.cpp index 7cd71236c8..009bb83f46 100644 --- a/modules/juce_gui_basics/positioning/juce_RelativeRectangle.cpp +++ b/modules/juce_gui_basics/positioning/juce_RelativeRectangle.cpp @@ -244,7 +244,7 @@ void RelativeRectangle::applyToComponent (Component& component) const { if (isDynamic()) { - RelativeRectangleComponentPositioner* current = dynamic_cast (component.getPositioner()); + RelativeRectangleComponentPositioner* current = dynamic_cast (component.getPositioner()); if (current == nullptr || ! current->isUsingRectangle (*this)) { diff --git a/modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp b/modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp index 914591862d..b886de928a 100644 --- a/modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp +++ b/modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp @@ -45,7 +45,7 @@ public: void setValue (const var& newValue) { - const var remappedVal (mappings [static_cast (newValue) - 1]); + const var remappedVal (mappings [static_cast (newValue) - 1]); if (! remappedVal.equalsWithSameType (sourceValue)) sourceValue = remappedVal; diff --git a/modules/juce_gui_basics/widgets/juce_Label.cpp b/modules/juce_gui_basics/widgets/juce_Label.cpp index d9f5cab0ab..2727c378a5 100644 --- a/modules/juce_gui_basics/widgets/juce_Label.cpp +++ b/modules/juce_gui_basics/widgets/juce_Label.cpp @@ -391,7 +391,7 @@ public: static Component* getComp (Component* current) { - return dynamic_cast (current) != nullptr + return dynamic_cast (current) != nullptr ? current->getParentComponent() : current; } }; diff --git a/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.cpp b/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.cpp index aa014a40de..96482c776d 100644 --- a/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.cpp +++ b/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.cpp @@ -445,7 +445,7 @@ String TableHeaderComponent::toString() const void TableHeaderComponent::restoreFromString (const String& storedVersion) { - ScopedPointer storedXml (XmlDocument::parse (storedVersion)); + ScopedPointer storedXml (XmlDocument::parse (storedVersion)); int index = 0; if (storedXml != nullptr && storedXml->hasTagName ("TABLELAYOUT")) diff --git a/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.cpp b/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.cpp index 7011af5e71..5e5ce3f2e1 100644 --- a/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.cpp +++ b/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.cpp @@ -109,7 +109,7 @@ private: ToolbarItemComponent* getToolbarItemComponent() const noexcept { - return dynamic_cast (getParentComponent()); + return dynamic_cast (getParentComponent()); } JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ItemDragAndDropOverlayComponent) @@ -141,7 +141,7 @@ ToolbarItemComponent::~ToolbarItemComponent() Toolbar* ToolbarItemComponent::getToolbar() const { - return dynamic_cast (getParentComponent()); + return dynamic_cast (getParentComponent()); } bool ToolbarItemComponent::isToolbarVertical() const diff --git a/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.h b/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.h index 8b6881fc63..0594e5787d 100644 --- a/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.h +++ b/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.h @@ -193,7 +193,7 @@ private: const int itemId; ToolbarEditingMode mode; Toolbar::ToolbarItemStyle toolbarStyle; - ScopedPointer overlayComp; + ScopedPointer overlayComp; int dragOffsetX, dragOffsetY; bool isActive, isBeingDragged, isBeingUsedAsAButton; Rectangle contentArea; diff --git a/modules/juce_gui_basics/widgets/juce_TreeView.cpp b/modules/juce_gui_basics/widgets/juce_TreeView.cpp index e78eb34f35..973808274f 100644 --- a/modules/juce_gui_basics/widgets/juce_TreeView.cpp +++ b/modules/juce_gui_basics/widgets/juce_TreeView.cpp @@ -416,7 +416,7 @@ public: ContentComponent* getContentComp() const noexcept { - return static_cast (getViewedComponent()); + return static_cast (getViewedComponent()); } bool keyPressed (const KeyPress& key) override @@ -490,7 +490,7 @@ void TreeView::setRootItem (TreeViewItem* const newRootItem) void TreeView::deleteRootItem() { - const ScopedPointer deleter (rootItem); + const ScopedPointer deleter (rootItem); setRootItem (nullptr); } diff --git a/modules/juce_gui_basics/widgets/juce_TreeView.h b/modules/juce_gui_basics/widgets/juce_TreeView.h index 74de758402..1ab9c0c754 100644 --- a/modules/juce_gui_basics/widgets/juce_TreeView.h +++ b/modules/juce_gui_basics/widgets/juce_TreeView.h @@ -573,7 +573,7 @@ public: private: TreeViewItem& treeViewItem; - ScopedPointer oldOpenness; + ScopedPointer oldOpenness; JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (OpennessRestorer) }; diff --git a/modules/juce_gui_basics/windows/juce_DialogWindow.h b/modules/juce_gui_basics/windows/juce_DialogWindow.h index ed3d341f0f..85da72c975 100644 --- a/modules/juce_gui_basics/windows/juce_DialogWindow.h +++ b/modules/juce_gui_basics/windows/juce_DialogWindow.h @@ -93,7 +93,7 @@ public: you'd like the dialog to automatically delete the component when the dialog has terminated. */ - OptionalScopedPointer content; + OptionalScopedPointer content; /** If this is not a nullptr, it indicates a component that you'd like to position this dialog box in front of. See the DocumentWindow::centreAroundComponent() method for diff --git a/modules/juce_gui_basics/windows/juce_DocumentWindow.h b/modules/juce_gui_basics/windows/juce_DocumentWindow.h index 439fa15fdc..90972c2c3a 100644 --- a/modules/juce_gui_basics/windows/juce_DocumentWindow.h +++ b/modules/juce_gui_basics/windows/juce_DocumentWindow.h @@ -277,9 +277,9 @@ private: //============================================================================== int titleBarHeight, menuBarHeight, requiredButtons; bool positionTitleBarButtonsOnLeft, drawTitleTextCentred; - ScopedPointer