Big-Ugly Style Update (#278)
* Bulk replaced tabs with spaces * Bulk removed trailing whitespace from lines * Replaced c-style comments with c++-style comments in file banners * Replace nested namespace definitions with single concise definitions (C++17), this keeps the indentation more manageable * Cleanup ordering and spacing of include directives * Bulk renaming of header file extensions from '.h' to '.hpp'. * Update CODING-STYLE.md * Update target_compile_features from cxx_std_11 to cxx_std_20. * Refresh .clang-format file. Still needs a lot of tweaking.
This commit is contained in:
Jaye Evins
GitHub
+93
-92
@@ -1,125 +1,126 @@
|
||||
/* Factory.cpp
|
||||
*
|
||||
* Copyright (C) 2013-2014 Jaye Evins <evins@snaught.com>
|
||||
*
|
||||
* This file is part of glbarcode++.
|
||||
*
|
||||
* glbarcode++ is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* glbarcode++ is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with glbarcode++. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
// Factory.cpp
|
||||
//
|
||||
// Copyright (C) 2013-2014 Jaye Evins <evins@snaught.com>
|
||||
//
|
||||
// This file is part of glbarcode++.
|
||||
//
|
||||
// glbarcode++ is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Lesser General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// glbarcode++ is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public License
|
||||
// along with glbarcode++. If not, see <http://www.gnu.org/licenses/>.
|
||||
//
|
||||
|
||||
#include "Factory.h"
|
||||
|
||||
#include "BarcodeCode39.h"
|
||||
#include "BarcodeCode39Ext.h"
|
||||
#include "BarcodeUpcA.h"
|
||||
#include "BarcodeEan13.h"
|
||||
#include "BarcodePostnet.h"
|
||||
#include "BarcodePostnet5.h"
|
||||
#include "BarcodePostnet9.h"
|
||||
#include "BarcodePostnet11.h"
|
||||
#include "BarcodeCepnet.h"
|
||||
#include "BarcodeOnecode.h"
|
||||
#include "BarcodeDataMatrix.h"
|
||||
#include "BarcodeQrcode.h"
|
||||
#include "Factory.hpp"
|
||||
|
||||
#include "BarcodeCepnet.hpp"
|
||||
#include "BarcodeCode39.hpp"
|
||||
#include "BarcodeCode39Ext.hpp"
|
||||
#include "BarcodeDataMatrix.hpp"
|
||||
#include "BarcodeEan13.hpp"
|
||||
#include "BarcodeOnecode.hpp"
|
||||
#include "BarcodePostnet.hpp"
|
||||
#include "BarcodePostnet5.hpp"
|
||||
#include "BarcodePostnet9.hpp"
|
||||
#include "BarcodePostnet11.hpp"
|
||||
#include "BarcodeQrcode.hpp"
|
||||
#include "BarcodeUpcA.hpp"
|
||||
|
||||
|
||||
namespace glbarcode
|
||||
{
|
||||
|
||||
Factory::BarcodeTypeMap Factory::mBarcodeTypeMap;
|
||||
TypeIdList Factory::mSupportedTypes;
|
||||
Factory::BarcodeTypeMap Factory::mBarcodeTypeMap;
|
||||
TypeIdList Factory::mSupportedTypes;
|
||||
|
||||
|
||||
Factory::Factory()
|
||||
{
|
||||
/*
|
||||
* Register built-in types.
|
||||
*/
|
||||
internalRegisterType( "code39", &BarcodeCode39::create );
|
||||
internalRegisterType( "code39ext", &BarcodeCode39Ext::create );
|
||||
internalRegisterType( "upc-a", &BarcodeUpcA::create );
|
||||
internalRegisterType( "ean-13", &BarcodeEan13::create );
|
||||
internalRegisterType( "postnet", &BarcodePostnet::create );
|
||||
internalRegisterType( "postnet-5", &BarcodePostnet5::create );
|
||||
internalRegisterType( "postnet-9", &BarcodePostnet9::create );
|
||||
internalRegisterType( "postnet-11", &BarcodePostnet11::create );
|
||||
internalRegisterType( "cepnet", &BarcodeCepnet::create );
|
||||
internalRegisterType( "onecode", &BarcodeOnecode::create );
|
||||
internalRegisterType( "datamatrix", &BarcodeDataMatrix::create );
|
||||
Factory::Factory()
|
||||
{
|
||||
/*
|
||||
* Register built-in types.
|
||||
*/
|
||||
internalRegisterType( "code39", &BarcodeCode39::create );
|
||||
internalRegisterType( "code39ext", &BarcodeCode39Ext::create );
|
||||
internalRegisterType( "upc-a", &BarcodeUpcA::create );
|
||||
internalRegisterType( "ean-13", &BarcodeEan13::create );
|
||||
internalRegisterType( "postnet", &BarcodePostnet::create );
|
||||
internalRegisterType( "postnet-5", &BarcodePostnet5::create );
|
||||
internalRegisterType( "postnet-9", &BarcodePostnet9::create );
|
||||
internalRegisterType( "postnet-11", &BarcodePostnet11::create );
|
||||
internalRegisterType( "cepnet", &BarcodeCepnet::create );
|
||||
internalRegisterType( "onecode", &BarcodeOnecode::create );
|
||||
internalRegisterType( "datamatrix", &BarcodeDataMatrix::create );
|
||||
#if HAVE_QRENCODE
|
||||
internalRegisterType( "qrcode", &BarcodeQrcode::create );
|
||||
internalRegisterType( "qrcode", &BarcodeQrcode::create );
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void Factory::init( )
|
||||
{
|
||||
static Factory* singletonInstance = nullptr;
|
||||
|
||||
if ( singletonInstance == nullptr )
|
||||
{
|
||||
singletonInstance = new Factory();
|
||||
}
|
||||
}
|
||||
void Factory::init( )
|
||||
{
|
||||
static Factory* singletonInstance = nullptr;
|
||||
|
||||
if ( singletonInstance == nullptr )
|
||||
{
|
||||
singletonInstance = new Factory();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void Factory::registerType( const std::string& typeId, Factory::BarcodeCreateFct fct )
|
||||
{
|
||||
init();
|
||||
void Factory::registerType( const std::string& typeId, Factory::BarcodeCreateFct fct )
|
||||
{
|
||||
init();
|
||||
|
||||
internalRegisterType( typeId, fct );
|
||||
}
|
||||
internalRegisterType( typeId, fct );
|
||||
}
|
||||
|
||||
|
||||
bool Factory::isTypeSupported( const std::string& typeId )
|
||||
{
|
||||
init();
|
||||
bool Factory::isTypeSupported( const std::string& typeId )
|
||||
{
|
||||
init();
|
||||
|
||||
auto i = mBarcodeTypeMap.find( typeId );
|
||||
auto i = mBarcodeTypeMap.find( typeId );
|
||||
|
||||
return ( i != mBarcodeTypeMap.end() );
|
||||
}
|
||||
return ( i != mBarcodeTypeMap.end() );
|
||||
}
|
||||
|
||||
|
||||
TypeIdList Factory::getSupportedTypes( )
|
||||
{
|
||||
init();
|
||||
TypeIdList Factory::getSupportedTypes( )
|
||||
{
|
||||
init();
|
||||
|
||||
return mSupportedTypes;
|
||||
}
|
||||
return mSupportedTypes;
|
||||
}
|
||||
|
||||
|
||||
Barcode* Factory::createBarcode( const std::string& typeId )
|
||||
{
|
||||
init();
|
||||
Barcode* Factory::createBarcode( const std::string& typeId )
|
||||
{
|
||||
init();
|
||||
|
||||
auto i = mBarcodeTypeMap.find( typeId );
|
||||
auto i = mBarcodeTypeMap.find( typeId );
|
||||
|
||||
if( i != mBarcodeTypeMap.end() )
|
||||
{
|
||||
return i->second();
|
||||
}
|
||||
if( i != mBarcodeTypeMap.end() )
|
||||
{
|
||||
return i->second();
|
||||
}
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
||||
void Factory::internalRegisterType( const std::string& typeId, Factory::BarcodeCreateFct fct )
|
||||
{
|
||||
mBarcodeTypeMap[ typeId ] = fct;
|
||||
mSupportedTypes.push_back( typeId );
|
||||
}
|
||||
void Factory::internalRegisterType( const std::string& typeId, Factory::BarcodeCreateFct fct )
|
||||
{
|
||||
mBarcodeTypeMap[ typeId ] = fct;
|
||||
mSupportedTypes.push_back( typeId );
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user