mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Another batch of ScopedPointer cleanups

Browse source
This commit is contained in:
jules 2018-01-10 14:49:57 +00:00
parent 5b13063162
commit 48a5fbd333
74 changed files with 311 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/juce_graphics/colour/juce_FillType.cpp
View file

@ -65,7 +65,7 @@ FillType& FillType::operator= (const FillType& other)
if (this != &other)
{
colour = other.colour;
gradient = other.gradient.createCopy();
gradient.reset (other.gradient.createCopy());
image = other.image;
transform = other.transform;
}
@ -75,7 +75,7 @@ FillType& FillType::operator= (const FillType& other)
FillType::FillType (FillType&& other) noexcept
: colour (other.colour),
gradient (other.gradient.release()),
gradient (static_cast<ScopedPointer<ColourGradient>&&> (other.gradient)),
image (static_cast<Image&&> (other.image)),
transform (other.transform)
{
@ -86,7 +86,7 @@ FillType& FillType::operator= (FillType&& other) noexcept
jassert (this != &other); // hopefully the compiler should make this situation impossible!
colour = other.colour;
gradient = other.gradient.release();
gradient = static_cast<ScopedPointer<ColourGradient>&&> (other.gradient);
image = static_cast<Image&&> (other.image);
transform = other.transform;
return *this;
@ -112,7 +112,7 @@ bool FillType::operator!= (const FillType& other) const
void FillType::setColour (Colour newColour) noexcept
{
gradient.reset();
image = Image();
image = {};
colour = newColour;
}
@ -124,8 +124,8 @@ void FillType::setGradient (const ColourGradient& newGradient)
}
else
{
image = Image();
gradient = new ColourGradient (newGradient);
image = {};
gradient.reset (new ColourGradient (newGradient));
colour = Colours::black;
}
}