diff --git a/glbarcode/Barcode.cpp b/glbarcode/Barcode.cpp index ce52469..039cf2f 100644 --- a/glbarcode/Barcode.cpp +++ b/glbarcode/Barcode.cpp @@ -76,7 +76,7 @@ namespace glbarcode } - bool Barcode::showText( void ) const + bool Barcode::showText( ) const { return d->mShowTextFlag; } @@ -89,7 +89,7 @@ namespace glbarcode } - bool Barcode::checksum( void ) const + bool Barcode::checksum( ) const { return d->mChecksumFlag; } @@ -101,7 +101,7 @@ namespace glbarcode } - bool Barcode::isEmpty( void ) const + bool Barcode::isEmpty( ) const { return d->mIsEmpty; } @@ -113,7 +113,7 @@ namespace glbarcode } - bool Barcode::isDataValid( void ) const + bool Barcode::isDataValid( ) const { return d->mIsDataValid; } @@ -125,13 +125,13 @@ namespace glbarcode } - double Barcode::width( void ) const + double Barcode::width( ) const { return d->mW; } - double Barcode::height( void ) const + double Barcode::height( ) const { return d->mH; } @@ -149,7 +149,7 @@ namespace glbarcode } - void Barcode::clear( void ) + void Barcode::clear( ) { std::list::iterator primitive; diff --git a/glbarcode/Barcode.h b/glbarcode/Barcode.h index 8cae869..6f0e63f 100644 --- a/glbarcode/Barcode.h +++ b/glbarcode/Barcode.h @@ -83,7 +83,7 @@ namespace glbarcode * * @sa setShowText() */ - bool showText( void ) const; + bool showText() const; /** @@ -105,7 +105,7 @@ namespace glbarcode * * @sa setChecksum() */ - bool checksum( void ) const; + bool checksum() const; /** @@ -138,7 +138,7 @@ namespace glbarcode * * @sa setIsEmpty() */ - bool isEmpty( void ) const; + bool isEmpty() const; /** @@ -149,7 +149,7 @@ namespace glbarcode * * @sa setIsDataValid() */ - bool isDataValid( void ) const; + bool isDataValid() const; /** @@ -159,7 +159,7 @@ namespace glbarcode * * @sa setWidth() */ - double width( void ) const; + double width() const; /** @@ -169,14 +169,14 @@ namespace glbarcode * * @sa setHeight() */ - double height( void ) const; + double height() const; protected: /** * Clear drawing primitives. */ - void clear( void ); + void clear(); /** diff --git a/glbarcode/Barcode1dBase.h b/glbarcode/Barcode1dBase.h index cc28c0e..b914607 100644 --- a/glbarcode/Barcode1dBase.h +++ b/glbarcode/Barcode1dBase.h @@ -54,7 +54,7 @@ namespace glbarcode /** * Destructor. */ - virtual ~Barcode1dBase(); + ~Barcode1dBase() override; /** @@ -73,7 +73,7 @@ namespace glbarcode */ Barcode& build( const std::string& data, double w = 0, - double h = 0 ); + double h = 0 ) override; protected: diff --git a/glbarcode/Barcode2dBase.h b/glbarcode/Barcode2dBase.h index feac1ec..4eb0531 100644 --- a/glbarcode/Barcode2dBase.h +++ b/glbarcode/Barcode2dBase.h @@ -56,7 +56,7 @@ namespace glbarcode /** * Destructor. */ - virtual ~Barcode2dBase(); + ~Barcode2dBase() override; /** @@ -75,7 +75,7 @@ namespace glbarcode */ Barcode& build( const std::string& data, double w = 0, - double h = 0 ); + double h = 0 ) override; protected: diff --git a/glbarcode/BarcodeCepnet.cpp b/glbarcode/BarcodeCepnet.cpp index 964ce17..6a16796 100644 --- a/glbarcode/BarcodeCepnet.cpp +++ b/glbarcode/BarcodeCepnet.cpp @@ -27,7 +27,7 @@ namespace glbarcode /* * Static CEPNET barcode creation method */ - Barcode* BarcodeCepnet::create( void ) + Barcode* BarcodeCepnet::create( ) { return new BarcodeCepnet(); } diff --git a/glbarcode/BarcodeCepnet.h b/glbarcode/BarcodeCepnet.h index d5044c7..211be3c 100644 --- a/glbarcode/BarcodeCepnet.h +++ b/glbarcode/BarcodeCepnet.h @@ -52,11 +52,11 @@ namespace glbarcode * * Used by glbarcode::BarcodeFactory */ - static Barcode* create( void ); + static Barcode* create(); private: - bool validateDigits( int nDigits ); + bool validateDigits( int nDigits ) override; }; diff --git a/glbarcode/BarcodeCode39.cpp b/glbarcode/BarcodeCode39.cpp index e1f2e2e..39ab554 100644 --- a/glbarcode/BarcodeCode39.cpp +++ b/glbarcode/BarcodeCode39.cpp @@ -103,7 +103,7 @@ namespace glbarcode /* * Static Code39 barcode creation method */ - Barcode* BarcodeCode39::create( void ) + Barcode* BarcodeCode39::create( ) { return new BarcodeCode39(); } diff --git a/glbarcode/BarcodeCode39.h b/glbarcode/BarcodeCode39.h index fd62526..72ec721 100644 --- a/glbarcode/BarcodeCode39.h +++ b/glbarcode/BarcodeCode39.h @@ -77,21 +77,21 @@ namespace glbarcode * * Used by glbarcode::BarcodeFactory */ - static Barcode* create( void ); + static Barcode* create(); private: - bool validate( const std::string& rawData ); + bool validate( const std::string& rawData ) override; - std::string encode( const std::string& cookedData ); + std::string encode( const std::string& cookedData ) override; - std::string prepareText( const std::string& rawData ); + std::string prepareText( const std::string& rawData ) override; void vectorize( const std::string& codedData, const std::string& displayText, const std::string& cookedData, double& w, - double& h ); + double& h ) override; }; } diff --git a/glbarcode/BarcodeCode39Ext.cpp b/glbarcode/BarcodeCode39Ext.cpp index e21c8a3..a22d7ae 100644 --- a/glbarcode/BarcodeCode39Ext.cpp +++ b/glbarcode/BarcodeCode39Ext.cpp @@ -67,7 +67,7 @@ namespace glbarcode /* * Static Extended Code39 barcode creation method */ - Barcode* BarcodeCode39Ext::create( void ) + Barcode* BarcodeCode39Ext::create( ) { return new BarcodeCode39Ext(); } diff --git a/glbarcode/BarcodeCode39Ext.h b/glbarcode/BarcodeCode39Ext.h index 5ec0732..1a83e4d 100644 --- a/glbarcode/BarcodeCode39Ext.h +++ b/glbarcode/BarcodeCode39Ext.h @@ -114,15 +114,15 @@ namespace glbarcode * * Used by glbarcode::BarcodeFactory */ - static Barcode* create( void ); + static Barcode* create(); private: - bool validate( const std::string& rawData ); + bool validate( const std::string& rawData ) override; - std::string preprocess( const std::string& rawData ); + std::string preprocess( const std::string& rawData ) override; - std::string prepareText( const std::string& rawData ); + std::string prepareText( const std::string& rawData ) override; }; diff --git a/glbarcode/BarcodeDataMatrix.cpp b/glbarcode/BarcodeDataMatrix.cpp index 056fe03..78e4952 100644 --- a/glbarcode/BarcodeDataMatrix.cpp +++ b/glbarcode/BarcodeDataMatrix.cpp @@ -303,7 +303,7 @@ namespace if ( nRawCw > 1558 ) { - return NULL; + return nullptr; } int iParam = 0; @@ -569,7 +569,7 @@ namespace glbarcode /* * Static DataMatrix barcode creation method */ - Barcode* BarcodeDataMatrix::create( void ) + Barcode* BarcodeDataMatrix::create( ) { return new BarcodeDataMatrix(); } @@ -600,7 +600,7 @@ namespace glbarcode * Determine parameters for "best size" */ const DMParameterEntry * p = ecc200BestSizeParams( nRawCw ); - if ( p == NULL ) + if ( p == nullptr ) { return false; } diff --git a/glbarcode/BarcodeDataMatrix.h b/glbarcode/BarcodeDataMatrix.h index f19a03d..1000107 100644 --- a/glbarcode/BarcodeDataMatrix.h +++ b/glbarcode/BarcodeDataMatrix.h @@ -44,14 +44,14 @@ namespace glbarcode * * Used by glbarcode::BarcodeFactory */ - static Barcode* create( void ); + static Barcode* create(); private: - bool validate( const std::string& rawData ); + bool validate( const std::string& rawData ) override; bool encode( const std::string& cookedData, - Matrix& encodedData ); + Matrix& encodedData ) override; }; diff --git a/glbarcode/BarcodeEan13.cpp b/glbarcode/BarcodeEan13.cpp index 6f2b0fd..a67eca4 100644 --- a/glbarcode/BarcodeEan13.cpp +++ b/glbarcode/BarcodeEan13.cpp @@ -30,7 +30,7 @@ namespace glbarcode /* * Static EAN-13 barcode creation method */ - Barcode* BarcodeEan13::create( void ) + Barcode* BarcodeEan13::create( ) { return new BarcodeEan13(); } diff --git a/glbarcode/BarcodeEan13.h b/glbarcode/BarcodeEan13.h index 9c075cb..3d718ec 100644 --- a/glbarcode/BarcodeEan13.h +++ b/glbarcode/BarcodeEan13.h @@ -44,7 +44,7 @@ namespace glbarcode * * Used by glbarcode::BarcodeFactory */ - static Barcode* create( void ); + static Barcode* create(); /** @@ -54,9 +54,9 @@ namespace glbarcode private: - bool validateDigits( int nDigits ); + bool validateDigits( int nDigits ) override; - std::string preprocess( const std::string& rawData ); + std::string preprocess( const std::string& rawData ) override; void vectorizeText( const std::string& displayText, double size1, @@ -66,7 +66,7 @@ namespace glbarcode double y1, double x2Left, double x2Right, - double y2 ); + double y2 ) override; }; diff --git a/glbarcode/BarcodeOnecode.cpp b/glbarcode/BarcodeOnecode.cpp index 243da38..ebb4cdf 100644 --- a/glbarcode/BarcodeOnecode.cpp +++ b/glbarcode/BarcodeOnecode.cpp @@ -294,7 +294,7 @@ namespace class Int104 { public: - Int104( void ) + Int104( ) { for ( int i = 0; i < 13; i++ ) { @@ -352,7 +352,7 @@ namespace glbarcode /* * Static Onecode barcode creation method */ - Barcode* BarcodeOnecode::create( void ) + Barcode* BarcodeOnecode::create( ) { return new BarcodeOnecode(); } @@ -515,7 +515,7 @@ namespace glbarcode for ( unsigned int i = 0; i < codedData.size(); i++ ) { double y = ONECODE_VERT_MARGIN; - double length; + double length = 0; switch ( codedData[i] ) { @@ -539,6 +539,7 @@ namespace glbarcode // Not reached break; } + double width = ONECODE_BAR_WIDTH; addLine( x, y, width, length ); diff --git a/glbarcode/BarcodeOnecode.h b/glbarcode/BarcodeOnecode.h index 359a187..bf8ba83 100644 --- a/glbarcode/BarcodeOnecode.h +++ b/glbarcode/BarcodeOnecode.h @@ -46,19 +46,19 @@ namespace glbarcode * * Used by glbarcode::BarcodeFactory */ - static Barcode* create( void ); + static Barcode* create(); private: - bool validate( const std::string& rawData ); + bool validate( const std::string& rawData ) override; - std::string encode( const std::string& cookedData ); + std::string encode( const std::string& cookedData ) override; void vectorize( const std::string& codedData, const std::string& displayText, const std::string& cookedData, double& w, - double& h ); + double& h ) override; private: diff --git a/glbarcode/BarcodePostnet.cpp b/glbarcode/BarcodePostnet.cpp index 6f04eb7..f70457a 100644 --- a/glbarcode/BarcodePostnet.cpp +++ b/glbarcode/BarcodePostnet.cpp @@ -69,7 +69,7 @@ namespace glbarcode /* * Static Postnet barcode creation method */ - Barcode* BarcodePostnet::create( void ) + Barcode* BarcodePostnet::create( ) { return new BarcodePostnet(); } @@ -153,10 +153,9 @@ namespace glbarcode double x = POSTNET_HORIZ_MARGIN; for ( unsigned int i=0; i < codedData.size(); i++ ) { - double length, width; - double y = POSTNET_VERT_MARGIN; + double length = 0; switch ( codedData[i] ) { case '0': @@ -170,7 +169,8 @@ namespace glbarcode // Not reached break; } - width = POSTNET_BAR_WIDTH; + + double width = POSTNET_BAR_WIDTH; addLine( x, y, width, length ); diff --git a/glbarcode/BarcodePostnet.h b/glbarcode/BarcodePostnet.h index b21f8d8..489b268 100644 --- a/glbarcode/BarcodePostnet.h +++ b/glbarcode/BarcodePostnet.h @@ -69,7 +69,7 @@ namespace glbarcode * * Used by glbarcode::BarcodeFactory */ - static Barcode* create( void ); + static Barcode* create(); protected: @@ -80,15 +80,15 @@ namespace glbarcode private: - bool validate( const std::string& rawData ); + bool validate( const std::string& rawData ) override; - std::string encode( const std::string& cookedData ); + std::string encode( const std::string& cookedData ) override; void vectorize( const std::string& codedData, const std::string& displayText, const std::string& cookedData, double& w, - double& h ); + double& h ) override; }; diff --git a/glbarcode/BarcodePostnet11.cpp b/glbarcode/BarcodePostnet11.cpp index 7329323..cdd9733 100644 --- a/glbarcode/BarcodePostnet11.cpp +++ b/glbarcode/BarcodePostnet11.cpp @@ -27,7 +27,7 @@ namespace glbarcode /* * Static Postnet-11 barcode creation method */ - Barcode* BarcodePostnet11::create( void ) + Barcode* BarcodePostnet11::create( ) { return new BarcodePostnet11(); } diff --git a/glbarcode/BarcodePostnet11.h b/glbarcode/BarcodePostnet11.h index 2400731..9f52a1c 100644 --- a/glbarcode/BarcodePostnet11.h +++ b/glbarcode/BarcodePostnet11.h @@ -52,11 +52,11 @@ namespace glbarcode * * Used by glbarcode::BarcodeFactory */ - static Barcode* create( void ); + static Barcode* create(); private: - bool validateDigits( int nDigits ); + bool validateDigits( int nDigits ) override; }; diff --git a/glbarcode/BarcodePostnet5.cpp b/glbarcode/BarcodePostnet5.cpp index d48df18..ead1c72 100644 --- a/glbarcode/BarcodePostnet5.cpp +++ b/glbarcode/BarcodePostnet5.cpp @@ -27,7 +27,7 @@ namespace glbarcode /* * Static Postnet-5 barcode creation method */ - Barcode* BarcodePostnet5::create( void ) + Barcode* BarcodePostnet5::create( ) { return new BarcodePostnet5(); } diff --git a/glbarcode/BarcodePostnet5.h b/glbarcode/BarcodePostnet5.h index fab419a..d3d21ae 100644 --- a/glbarcode/BarcodePostnet5.h +++ b/glbarcode/BarcodePostnet5.h @@ -52,11 +52,11 @@ namespace glbarcode * * Used by glbarcode::BarcodeFactory */ - static Barcode* create( void ); + static Barcode* create(); private: - bool validateDigits( int nDigits ); + bool validateDigits( int nDigits ) override; }; diff --git a/glbarcode/BarcodePostnet9.cpp b/glbarcode/BarcodePostnet9.cpp index 87d9fc2..6da9b08 100644 --- a/glbarcode/BarcodePostnet9.cpp +++ b/glbarcode/BarcodePostnet9.cpp @@ -27,7 +27,7 @@ namespace glbarcode /* * Static Postnet-9 barcode creation method */ - Barcode* BarcodePostnet9::create( void ) + Barcode* BarcodePostnet9::create( ) { return new BarcodePostnet9(); } diff --git a/glbarcode/BarcodePostnet9.h b/glbarcode/BarcodePostnet9.h index cea2479..2ac7e9f 100644 --- a/glbarcode/BarcodePostnet9.h +++ b/glbarcode/BarcodePostnet9.h @@ -52,11 +52,11 @@ namespace glbarcode * * Used by glbarcode::BarcodeFactory */ - static Barcode* create( void ); + static Barcode* create(); private: - bool validateDigits( int nDigits ); + bool validateDigits( int nDigits ) override; }; diff --git a/glbarcode/BarcodeQrcode.h b/glbarcode/BarcodeQrcode.h index 07367b8..83a2abf 100644 --- a/glbarcode/BarcodeQrcode.h +++ b/glbarcode/BarcodeQrcode.h @@ -43,14 +43,14 @@ namespace glbarcode * * Used by glbarcode::BarcodeFactory */ - static Barcode* create( void ); + static Barcode* create(); private: - bool validate( const std::string& rawData ); + bool validate( const std::string& rawData ) override; bool encode( const std::string& cookedData, - Matrix& encodedData ); + Matrix& encodedData ) override; }; diff --git a/glbarcode/BarcodeUpcA.cpp b/glbarcode/BarcodeUpcA.cpp index e99d79c..821b3ee 100644 --- a/glbarcode/BarcodeUpcA.cpp +++ b/glbarcode/BarcodeUpcA.cpp @@ -30,7 +30,7 @@ namespace glbarcode /* * Static UPC-A barcode creation method */ - Barcode* BarcodeUpcA::create( void ) + Barcode* BarcodeUpcA::create( ) { return new BarcodeUpcA(); } diff --git a/glbarcode/BarcodeUpcA.h b/glbarcode/BarcodeUpcA.h index c3579bd..e59d057 100644 --- a/glbarcode/BarcodeUpcA.h +++ b/glbarcode/BarcodeUpcA.h @@ -44,7 +44,7 @@ namespace glbarcode * * Used by glbarcode::BarcodeFactory */ - static Barcode* create( void ); + static Barcode* create(); /** @@ -54,9 +54,9 @@ namespace glbarcode private: - bool validateDigits( int nDigits ); + bool validateDigits( int nDigits ) override; - std::string preprocess( const std::string& rawData ); + std::string preprocess( const std::string& rawData ) override; void vectorizeText( const std::string& displayText, double size1, @@ -66,7 +66,7 @@ namespace glbarcode double y1, double x2Left, double x2Right, - double y2 ); + double y2 ) override; }; diff --git a/glbarcode/BarcodeUpcBase.h b/glbarcode/BarcodeUpcBase.h index 8ea0bdc..6493e04 100644 --- a/glbarcode/BarcodeUpcBase.h +++ b/glbarcode/BarcodeUpcBase.h @@ -49,17 +49,17 @@ namespace glbarcode double y2 ) = 0; private: - bool validate( const std::string& rawData ); + bool validate( const std::string& rawData ) override; - std::string encode( const std::string& cookedData ); + std::string encode( const std::string& cookedData ) override; - std::string prepareText( const std::string& rawData ); + std::string prepareText( const std::string& rawData ) override; void vectorize( const std::string& codedData, const std::string& displayText, const std::string& cookedData, double& w, - double& h ); + double& h ) override; protected: diff --git a/glbarcode/Factory.cpp b/glbarcode/Factory.cpp index 0830330..27b9011 100644 --- a/glbarcode/Factory.cpp +++ b/glbarcode/Factory.cpp @@ -63,11 +63,11 @@ namespace glbarcode } - void Factory::init( void ) + void Factory::init( ) { - static Factory* singletonInstance = NULL; + static Factory* singletonInstance = nullptr; - if ( singletonInstance == NULL ) + if ( singletonInstance == nullptr ) { singletonInstance = new Factory(); } @@ -92,7 +92,7 @@ namespace glbarcode } - TypeIdList Factory::getSupportedTypes( void ) + TypeIdList Factory::getSupportedTypes( ) { init(); @@ -111,7 +111,7 @@ namespace glbarcode return i->second(); } - return NULL; + return nullptr; } diff --git a/glbarcode/Factory.h b/glbarcode/Factory.h index dd59db4..97697ad 100644 --- a/glbarcode/Factory.h +++ b/glbarcode/Factory.h @@ -48,7 +48,7 @@ namespace glbarcode /** * Barcode creation function signature. */ - typedef Barcode* (*BarcodeCreateFct)( void ); + typedef Barcode* (*BarcodeCreateFct)(); private: @@ -66,7 +66,7 @@ namespace glbarcode * is optional for an application to call init(), because glbarcode++ will automatically * initialize the factory on demand. */ - static void init( void ); + static void init(); /** @@ -97,7 +97,7 @@ namespace glbarcode /** * Get list of supported types. */ - static TypeIdList getSupportedTypes( void ); + static TypeIdList getSupportedTypes(); private: diff --git a/glbarcode/Matrix.h b/glbarcode/Matrix.h index e7784c5..cf8ced6 100644 --- a/glbarcode/Matrix.h +++ b/glbarcode/Matrix.h @@ -37,7 +37,7 @@ namespace glbarcode /** * Default constructor. */ - Matrix() : mNx(0), mNy(0), mData(NULL) { } + Matrix() : mNx(0), mNy(0), mData(nullptr) { } /** @@ -45,7 +45,7 @@ namespace glbarcode */ Matrix( int nx, int ny ) : mNx(nx), mNy(ny), - mData((nx > 0 && ny > 0) ? new T[nx * ny] : NULL) { } + mData((nx > 0 && ny > 0) ? new T[nx * ny] : nullptr) { } /** @@ -53,7 +53,7 @@ namespace glbarcode */ Matrix( const Matrix& src ) : mNx(src.mNx), mNy(src.mNy), - mData((src.mNx > 0 && src.mNy > 0) ? new T[src.mNx * src.mNy] : NULL) + mData((src.mNx > 0 && src.mNy > 0) ? new T[src.mNx * src.mNy] : nullptr) { for ( int iy = 0; iy < mNy; iy++ ) { @@ -74,7 +74,7 @@ namespace glbarcode int nx, int ny ) : mNx(nx), mNy(ny), - mData((nx > 0 && ny > 0) ? new T[nx * ny] : NULL) + mData((nx > 0 && ny > 0) ? new T[nx * ny] : nullptr) { for ( int iy = 0; iy < mNy; iy++ ) { @@ -97,7 +97,7 @@ namespace glbarcode */ ~Matrix() { - if ( mData != NULL ) + if ( mData != nullptr ) { delete[] mData; } @@ -127,13 +127,13 @@ namespace glbarcode */ inline void resize( int nx, int ny ) { - if ( mData != NULL ) + if ( mData != nullptr ) { delete[] mData; } mNx = nx; mNy = ny; - mData = (nx > 0 && ny > 0) ? new T[nx * ny] : NULL; + mData = (nx > 0 && ny > 0) ? new T[nx * ny] : nullptr; } @@ -142,7 +142,7 @@ namespace glbarcode * * @returns Value of "nx" parameter */ - inline int nx( void ) const + inline int nx() const { return mNx; } @@ -153,7 +153,7 @@ namespace glbarcode * * @returns Value of "ny" parameter */ - inline int ny( void ) const + inline int ny() const { return mNy; } diff --git a/glbarcode/QtRenderer.cpp b/glbarcode/QtRenderer.cpp index 924057b..051d8ad 100644 --- a/glbarcode/QtRenderer.cpp +++ b/glbarcode/QtRenderer.cpp @@ -73,7 +73,7 @@ namespace glbarcode } - QPainter* QtRenderer::painter( void ) const + QPainter* QtRenderer::painter( ) const { return d->painter; } @@ -97,7 +97,7 @@ namespace glbarcode } - void QtRenderer::drawEnd( void ) + void QtRenderer::drawEnd( ) { if ( d->painter ) { @@ -110,10 +110,10 @@ namespace glbarcode { if ( d->painter ) { - double x = x + w/2; // Offset line origin by 1/2 line width. + double x1 = x + w/2; // Offset line origin by 1/2 line width. d->painter->setPen( QPen( d->color, w ) ); - d->painter->drawLine( QPointF(x, y), QPointF(x, y+h) ); + d->painter->drawLine( QPointF(x1, y), QPointF(x1, y+h) ); } } diff --git a/glbarcode/QtRenderer.h b/glbarcode/QtRenderer.h index 624f4d9..4872ccb 100644 --- a/glbarcode/QtRenderer.h +++ b/glbarcode/QtRenderer.h @@ -56,7 +56,7 @@ namespace glbarcode /** * Destructor */ - virtual ~QtRenderer(); + ~QtRenderer() override; /** Assignment operator. * @@ -85,13 +85,13 @@ namespace glbarcode /* * Virtual methods implemented by QtRenderer. */ - void drawBegin( double w, double h ); - void drawEnd(); - void drawLine( double x, double y, double w, double h ); - void drawBox( double x, double y, double w, double h ); - void drawText( double x, double y, double size, const std::string& text ); - void drawRing( double x, double y, double r, double w ); - void drawHexagon( double x, double y, double h ); + void drawBegin( double w, double h ) override; + void drawEnd() override; + void drawLine( double x, double y, double w, double h ) override; + void drawBox( double x, double y, double w, double h ) override; + void drawText( double x, double y, double size, const std::string& text ) override; + void drawRing( double x, double y, double r, double w ) override; + void drawHexagon( double x, double y, double h ) override; /** * Private data diff --git a/glbarcode/Renderer.h b/glbarcode/Renderer.h index c75aa97..36326be 100644 --- a/glbarcode/Renderer.h +++ b/glbarcode/Renderer.h @@ -82,7 +82,7 @@ namespace glbarcode * Required virtual method to perform rendering cleanup, such as closing devices * and/or drawing contexts. */ - virtual void drawEnd( void ) = 0; + virtual void drawEnd() = 0; /**