diff --git a/modules/juce_data_structures/values/juce_ValueTree.cpp b/modules/juce_data_structures/values/juce_ValueTree.cpp index ee13400512..7bfa9191f6 100644 --- a/modules/juce_data_structures/values/juce_ValueTree.cpp +++ b/modules/juce_data_structures/values/juce_ValueTree.cpp @@ -492,7 +492,7 @@ public: { if (! (isAddingNewProperty || isDeletingProperty)) { - if (SetPropertyAction* const next = dynamic_cast (nextAction)) + if (SetPropertyAction* const next = dynamic_cast (nextAction)) if (next->target == target && next->name == name && ! (next->isAddingNewProperty || next->isDeletingProperty)) return new SetPropertyAction (target, name, next->newValue, oldValue, false, false); @@ -592,7 +592,7 @@ public: UndoableAction* createCoalescedAction (UndoableAction* nextAction) { - if (MoveChildAction* next = dynamic_cast (nextAction)) + if (MoveChildAction* next = dynamic_cast (nextAction)) if (next->parent == parent && next->startIndex == endIndex) return new MoveChildAction (parent, startIndex, next->endIndex); @@ -711,7 +711,7 @@ Identifier ValueTree::getType() const ValueTree ValueTree::getParent() const { return ValueTree (object != nullptr ? object->parent - : static_cast (nullptr)); + : static_cast (nullptr)); } ValueTree ValueTree::getSibling (const int delta) const @@ -846,7 +846,7 @@ int ValueTree::getNumChildren() const ValueTree ValueTree::getChild (int index) const { return ValueTree (object != nullptr ? object->children.getObjectPointer (index) - : static_cast (nullptr)); + : static_cast (nullptr)); } ValueTree ValueTree::getChildWithName (const Identifier type) const diff --git a/modules/juce_gui_basics/windows/juce_ComponentPeer.cpp b/modules/juce_gui_basics/windows/juce_ComponentPeer.cpp index ad95469732..a4171f16a0 100644 --- a/modules/juce_gui_basics/windows/juce_ComponentPeer.cpp +++ b/modules/juce_gui_basics/windows/juce_ComponentPeer.cpp @@ -71,7 +71,7 @@ ComponentPeer* ComponentPeer::getPeerFor (const Component* const component) noex bool ComponentPeer::isValidPeer (const ComponentPeer* const peer) noexcept { - return Desktop::getInstance().peers.contains (const_cast (peer)); + return Desktop::getInstance().peers.contains (const_cast (peer)); } void ComponentPeer::updateBounds() @@ -276,7 +276,7 @@ TextInputTarget* ComponentPeer::findCurrentTextInputTarget() Component* const c = Component::getCurrentlyFocusedComponent(); if (component.isParentOf (c)) - if (TextInputTarget* const ti = dynamic_cast (c)) + if (TextInputTarget* const ti = dynamic_cast (c)) if (ti->isTextInputActive()) return ti; @@ -377,7 +377,7 @@ void ComponentPeer::handleFocusLoss() Component* ComponentPeer::getLastFocusedSubcomponent() const noexcept { return (component.isParentOf (lastFocusedComponent) && lastFocusedComponent->isShowing()) - ? static_cast (lastFocusedComponent) + ? static_cast (lastFocusedComponent) : &component; } @@ -428,14 +428,14 @@ namespace DragHelpers static bool isSuitableTarget (const ComponentPeer::DragInfo& info, Component* target) { - return isFileDrag (info) ? dynamic_cast (target) != nullptr - : dynamic_cast (target) != nullptr; + return isFileDrag (info) ? dynamic_cast (target) != nullptr + : dynamic_cast (target) != nullptr; } static bool isInterested (const ComponentPeer::DragInfo& info, Component* target) { - return isFileDrag (info) ? dynamic_cast (target)->isInterestedInFileDrag (info.files) - : dynamic_cast (target)->isInterestedInTextDrag (info.text); + return isFileDrag (info) ? dynamic_cast (target)->isInterestedInFileDrag (info.files) + : dynamic_cast (target)->isInterestedInTextDrag (info.text); } static Component* findDragAndDropTarget (Component* c, const ComponentPeer::DragInfo& info, Component* const lastOne) @@ -459,9 +459,9 @@ namespace DragHelpers if (Component* const c = target.get()) { if (isFileDrag (info)) - dynamic_cast (c)->filesDropped (info.files, info.position.x, info.position.y); + dynamic_cast (c)->filesDropped (info.files, info.position.x, info.position.y); else - dynamic_cast (c)->textDropped (info.text, info.position.x, info.position.y); + dynamic_cast (c)->textDropped (info.text, info.position.x, info.position.y); } } @@ -492,9 +492,9 @@ bool ComponentPeer::handleDragMove (const ComponentPeer::DragInfo& info) if (lastTarget != nullptr) { if (DragHelpers::isFileDrag (info)) - dynamic_cast (lastTarget)->fileDragExit (info.files); + dynamic_cast (lastTarget)->fileDragExit (info.files); else - dynamic_cast (lastTarget)->textDragExit (info.text); + dynamic_cast (lastTarget)->textDragExit (info.text); } dragAndDropTargetComponent = nullptr; @@ -505,9 +505,9 @@ bool ComponentPeer::handleDragMove (const ComponentPeer::DragInfo& info) const Point pos (newTarget->getLocalPoint (&component, info.position)); if (DragHelpers::isFileDrag (info)) - dynamic_cast (newTarget)->fileDragEnter (info.files, pos.x, pos.y); + dynamic_cast (newTarget)->fileDragEnter (info.files, pos.x, pos.y); else - dynamic_cast (newTarget)->textDragEnter (info.text, pos.x, pos.y); + dynamic_cast (newTarget)->textDragEnter (info.text, pos.x, pos.y); } } } @@ -522,9 +522,9 @@ bool ComponentPeer::handleDragMove (const ComponentPeer::DragInfo& info) const Point pos (newTarget->getLocalPoint (&component, info.position)); if (DragHelpers::isFileDrag (info)) - dynamic_cast (newTarget)->fileDragMove (info.files, pos.x, pos.y); + dynamic_cast (newTarget)->fileDragMove (info.files, pos.x, pos.y); else - dynamic_cast (newTarget)->textDragMove (info.text, pos.x, pos.y); + dynamic_cast (newTarget)->textDragMove (info.text, pos.x, pos.y); return true; }