mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-05 03:50:07 +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

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

@ -54,7 +54,7 @@ FillType::FillType (const Image& im, const AffineTransform& t) noexcept
FillType::FillType (const FillType& other)
: colour (other.colour),
gradient (other.gradient.createCopy()),
gradient (createCopyIfNotNull (other.gradient.get())),
image (other.image),
transform (other.transform)
{
@ -65,7 +65,7 @@ FillType& FillType::operator= (const FillType& other)
if (this != &other)
{
colour = other.colour;
gradient.reset (other.gradient.createCopy());
gradient.reset (createCopyIfNotNull (other.gradient.get()));
image = other.image;
transform = other.transform;
}

6
modules/juce_graphics/native/juce_RenderingHelpers.h
View file

@ -2661,10 +2661,10 @@ public:
void initialise (StateObjectType* state)
{
currentState = state;
currentState.reset (state);
}
inline StateObjectType* operator->() const noexcept { return currentState; }
inline StateObjectType* operator->() const noexcept { return currentState.get(); }
inline StateObjectType& operator*() const noexcept { return *currentState; }
void save()
@ -2693,7 +2693,7 @@ public:
void endTransparencyLayer()
{
const ScopedPointer<StateObjectType> finishedTransparencyLayer (currentState);
ScopedPointer<StateObjectType> finishedTransparencyLayer (currentState.release());
restore();
currentState->endTransparencyLayer (*finishedTransparencyLayer);
}