Object lifecycle cleanup in glbarcode.

This commit is contained in:
Jim Evins
2018-02-11 17:28:55 -05:00
parent 9aff6c2e2f
commit a932ca74a2
6 changed files with 31 additions and 29 deletions
+5
View File
@@ -57,6 +57,11 @@ namespace glbarcode
*/ */
virtual ~Barcode(); virtual ~Barcode();
/*
* Non-copyable
*/
Barcode( const Barcode & ) = delete;
void operator=( const Barcode & ) = delete;
/** /**
* Set accessor for "showText" property. * Set accessor for "showText" property.
+6
View File
@@ -50,6 +50,12 @@ namespace glbarcode
*/ */
virtual ~DrawingPrimitive() = default; virtual ~DrawingPrimitive() = default;
/*
* Non-copyable
*/
DrawingPrimitive( const DrawingPrimitive & ) = delete;
void operator=( const DrawingPrimitive & ) = delete;
/** /**
* Get X coordinate of primitive's origin (points). * Get X coordinate of primitive's origin (points).
*/ */
+9
View File
@@ -104,6 +104,15 @@ namespace glbarcode
} }
/**
* Copy assignment "=" operator
*/
inline Matrix & operator=( const Matrix & src )
{
return Matrix( src );
}
/** /**
* Indirection "[]" operator * Indirection "[]" operator
*/ */
-16
View File
@@ -59,28 +59,12 @@ namespace glbarcode
} }
QtRenderer::QtRenderer( const QtRenderer& from )
{
d = new QtRenderer::PrivateData;
*d = *from.d;
}
QtRenderer::~QtRenderer() QtRenderer::~QtRenderer()
{ {
delete d; delete d;
} }
QtRenderer& QtRenderer::operator=( const QtRenderer& from )
{
*d = *from.d;
return *this;
}
QPainter* QtRenderer::painter( ) const QPainter* QtRenderer::painter( ) const
{ {
return d->painter; return d->painter;
-13
View File
@@ -48,24 +48,11 @@ namespace glbarcode
*/ */
QtRenderer( QPainter* painter ); QtRenderer( QPainter* painter );
/**
* Copy Constructor
*/
QtRenderer( const QtRenderer& from );
/** /**
* Destructor * Destructor
*/ */
~QtRenderer() override; ~QtRenderer() override;
/** Assignment operator.
*
* @param[in] from The value to assign to this object.
*
* @return A reference to this object.
*/
QtRenderer& operator=( const QtRenderer& from );
/** Get "painter" parameter /** Get "painter" parameter
* *
* @returns painter parameter * @returns painter parameter
+11
View File
@@ -40,12 +40,23 @@ namespace glbarcode
*/ */
class Renderer class Renderer
{ {
protected:
/**
* Default constructor.
*/
Renderer() = default;
public: public:
/** /**
* Destructor. * Destructor.
*/ */
virtual ~Renderer() = default; virtual ~Renderer() = default;
/*
* Non-copyable
*/
Renderer( const Renderer & ) = delete;
void operator=( const Renderer & ) = delete;
/** /**
* Render list of primitives. * Render list of primitives.