mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-16 00:34:19 +00:00
Code Activity

More ScopedPointer/unique_ptr compatibility work

Browse source
This commit is contained in:
jules 2018-01-10 17:35:08 +00:00
parent 48a5fbd333
commit 1a60fa9765
80 changed files with 404 additions and 368 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/juce_gui_basics/components/juce_Component.cpp
View file

@ -830,7 +830,7 @@ private:
void Component::setCachedComponentImage (CachedComponentImage* newCachedImage)
{
if (cachedImage != newCachedImage)
if (cachedImage.get() != newCachedImage)
{
cachedImage.reset (newCachedImage);
repaint();
@ -2140,14 +2140,13 @@ void Component::copyAllExplicitColoursTo (Component& target) const
}
//==============================================================================
Component::Positioner::Positioner (Component& c) noexcept
: component (c)
Component::Positioner::Positioner (Component& c) noexcept : component (c)
{
}
Component::Positioner* Component::getPositioner() const noexcept
{
return positioner;
return positioner.get();
}
void Component::setPositioner (Positioner* newPositioner)
@ -2775,7 +2774,9 @@ void Component::moveKeyboardFocusToSibling (bool moveToNext)
if (parentComponent != nullptr)
{
if (ScopedPointer<KeyboardFocusTraverser> traverser = createFocusTraverser())
ScopedPointer<KeyboardFocusTraverser> traverser (createFocusTraverser());
if (traverser != nullptr)
{
auto* nextComp = moveToNext ? traverser->getNextComponent (this)
: traverser->getPreviousComponent (this);