Pointer cleanup (#242)
- Made greater use of smart pointers, eliminating many instances of manual memory management - Do not use pointers at all for many non-polymorphic classes - Assorted other code cleanup
This commit is contained in:
+4
-3
@@ -43,13 +43,14 @@ namespace glabels
|
||||
TextNode filenameNode = imageObject->filenameNode();
|
||||
if ( !filenameNode.isField() )
|
||||
{
|
||||
if ( const QImage* image = imageObject->image() )
|
||||
auto& image = imageObject->image();
|
||||
if ( !image.isNull() )
|
||||
{
|
||||
addImage( filenameNode.data(), *image );
|
||||
addImage( filenameNode.data(), image );
|
||||
}
|
||||
else
|
||||
{
|
||||
QByteArray svg = imageObject->svg();
|
||||
auto& svg = imageObject->svg();
|
||||
if ( !svg.isEmpty() )
|
||||
{
|
||||
addSvg( filenameNode.data(), svg );
|
||||
|
||||
Reference in New Issue
Block a user