Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Modernization cleanup.

Browse Source
This commit is contained in:
Jim Evins
2017-04-10 22:43:34 -04:00
parent b17cea7ace
commit 4d194f72e9
34 changed files with 110 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glbarcode/Barcode.cpp
+7 -7
View File
@@ -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<DrawingPrimitive*>::iterator primitive;
glbarcode/Barcode.h
+7 -7
View File
@@ -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();
/**
glbarcode/Barcode1dBase.h
+2 -2
View File
@@ -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:
glbarcode/Barcode2dBase.h
+2 -2
View File
@@ -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:
glbarcode/BarcodeCepnet.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ namespace glbarcode
/*
* Static CEPNET barcode creation method
*/
Barcode* BarcodeCepnet::create( void )
Barcode* BarcodeCepnet::create( )
{
return new BarcodeCepnet();
}
glbarcode/BarcodeCepnet.h
+2 -2
View File
@@ -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;
};
glbarcode/BarcodeCode39.cpp
+1 -1
View File
@@ -103,7 +103,7 @@ namespace glbarcode
/*
* Static Code39 barcode creation method
*/
Barcode* BarcodeCode39::create( void )
Barcode* BarcodeCode39::create( )
{
return new BarcodeCode39();
}
glbarcode/BarcodeCode39.h
+5 -5
View File
@@ -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;
};
}
glbarcode/BarcodeCode39Ext.cpp
+1 -1
View File
@@ -67,7 +67,7 @@ namespace glbarcode
/*
* Static Extended Code39 barcode creation method
*/
Barcode* BarcodeCode39Ext::create( void )
Barcode* BarcodeCode39Ext::create( )
{
return new BarcodeCode39Ext();
}
glbarcode/BarcodeCode39Ext.h
+4 -4
View File
@@ -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;
};
glbarcode/BarcodeDataMatrix.cpp
+3 -3
View File
@@ -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;
}
glbarcode/BarcodeDataMatrix.h
+3 -3
View File
@@ -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<bool>& encodedData );
Matrix<bool>& encodedData ) override;
};
glbarcode/BarcodeEan13.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ namespace glbarcode
/*
* Static EAN-13 barcode creation method
*/
Barcode* BarcodeEan13::create( void )
Barcode* BarcodeEan13::create( )
{
return new BarcodeEan13();
}
glbarcode/BarcodeEan13.h
+4 -4
View File
@@ -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;
};
glbarcode/BarcodeOnecode.cpp
+4 -3
View File
@@ -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 );
glbarcode/BarcodeOnecode.h
+4 -4
View File
@@ -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:
glbarcode/BarcodePostnet.cpp
+4 -4
View File
@@ -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 );
glbarcode/BarcodePostnet.h
+4 -4
View File
@@ -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;
};
glbarcode/BarcodePostnet11.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ namespace glbarcode
/*
* Static Postnet-11 barcode creation method
*/
Barcode* BarcodePostnet11::create( void )
Barcode* BarcodePostnet11::create( )
{
return new BarcodePostnet11();
}
glbarcode/BarcodePostnet11.h
+2 -2
View File
@@ -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;
};
glbarcode/BarcodePostnet5.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ namespace glbarcode
/*
* Static Postnet-5 barcode creation method
*/
Barcode* BarcodePostnet5::create( void )
Barcode* BarcodePostnet5::create( )
{
return new BarcodePostnet5();
}
glbarcode/BarcodePostnet5.h
+2 -2
View File
@@ -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;
};
glbarcode/BarcodePostnet9.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ namespace glbarcode
/*
* Static Postnet-9 barcode creation method
*/
Barcode* BarcodePostnet9::create( void )
Barcode* BarcodePostnet9::create( )
{
return new BarcodePostnet9();
}
glbarcode/BarcodePostnet9.h
+2 -2
View File
@@ -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;
};
glbarcode/BarcodeQrcode.h
+3 -3
View File
@@ -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<bool>& encodedData );
Matrix<bool>& encodedData ) override;
};
glbarcode/BarcodeUpcA.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ namespace glbarcode
/*
* Static UPC-A barcode creation method
*/
Barcode* BarcodeUpcA::create( void )
Barcode* BarcodeUpcA::create( )
{
return new BarcodeUpcA();
}
glbarcode/BarcodeUpcA.h
+4 -4
View File
@@ -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;
};
glbarcode/BarcodeUpcBase.h
+4 -4
View File
@@ -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:
glbarcode/Factory.cpp
+5 -5
View File
@@ -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;
}
glbarcode/Factory.h
+3 -3
View File
@@ -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:
glbarcode/Matrix.h
+9 -9
View File
@@ -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<T>& 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;
}
glbarcode/QtRenderer.cpp
+4 -4
View File
@@ -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) );
}
}
glbarcode/QtRenderer.h
+8 -8
View File
@@ -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
glbarcode/Renderer.h
+1 -1
View File
@@ -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;
/**