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

More std::unique_ptr modernisation - changed functions that used to return raw Drawable* pointers to use it

Browse source
This commit is contained in:
jules 2019-05-16 15:37:40 +01:00
parent a2017062f5
commit a97c4a9139
28 changed files with 118 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

27
modules/juce_gui_basics/drawables/juce_Drawable.cpp
View file

@ -110,11 +110,11 @@ DrawableComposite* Drawable::getParent() const
return dynamic_cast<DrawableComposite*> (getParentComponent());
}
void Drawable::setClipPath (Drawable* clipPath)
void Drawable::setClipPath (std::unique_ptr<Drawable> clipPath)
{
if (drawableClipPath.get() != clipPath)
if (drawableClipPath != clipPath)
{
drawableClipPath.reset (clipPath);
drawableClipPath = std::move (clipPath);
repaint();
}
}
@ -166,9 +166,9 @@ void Drawable::setTransformToFit (const Rectangle<float>& area, RectanglePlaceme
}
//==============================================================================
Drawable* Drawable::createFromImageData (const void* data, const size_t numBytes)
std::unique_ptr<Drawable> Drawable::createFromImageData (const void* data, const size_t numBytes)
{
Drawable* result = nullptr;
std::unique_ptr<Drawable> result;
auto image = ImageFileFormat::loadFrom (data, numBytes);
@ -176,7 +176,7 @@ Drawable* Drawable::createFromImageData (const void* data, const size_t numBytes
{
auto* di = new DrawableImage();
di->setImage (image);
result = di;
result.reset (di);
}
else
{
@ -186,18 +186,14 @@ Drawable* Drawable::createFromImageData (const void* data, const size_t numBytes
std::unique_ptr<XmlElement> outer (doc.getDocumentElement (true));
if (outer != nullptr && outer->hasTagName ("svg"))
{
std::unique_ptr<XmlElement> svg (doc.getDocumentElement());
if (svg != nullptr)
if (auto svg = doc.getDocumentElement())
result = Drawable::createFromSVG (*svg);
}
}
return result;
}
Drawable* Drawable::createFromImageDataStream (InputStream& dataSource)
std::unique_ptr<Drawable> Drawable::createFromImageDataStream (InputStream& dataSource)
{
MemoryOutputStream mo;
mo << dataSource;
@ -205,11 +201,14 @@ Drawable* Drawable::createFromImageDataStream (InputStream& dataSource)
return createFromImageData (mo.getData(), mo.getDataSize());
}
Drawable* Drawable::createFromImageFile (const File& file)
std::unique_ptr<Drawable> Drawable::createFromImageFile (const File& file)
{
FileInputStream fin (file);
return fin.openedOk() ? createFromImageDataStream (fin) : nullptr;
if (fin.openedOk())
return createFromImageDataStream (fin);
return {};
}
} // namespace juce