diff --git a/src/lib/code39barcode.h b/src/lib/code39barcode.h --- a/src/lib/code39barcode.h +++ b/src/lib/code39barcode.h @@ -27,9 +27,6 @@ * @param size */ QImage paintImage(const QSizeF& size ) override; - private: - class Private; - Private *d; }; } // namespace diff --git a/src/lib/code39barcode.cpp b/src/lib/code39barcode.cpp --- a/src/lib/code39barcode.cpp +++ b/src/lib/code39barcode.cpp @@ -9,22 +9,19 @@ #include using namespace Prison; -/** -@cond PRIVATE -*/ -class Code39Barcode::Private { - public: - static QList barSequence(const char* str) { - Q_ASSERT(strlen(str)==9); // this is a internal helper tool, only called with fixed strings in here, all 9 chars long - QList ret; - for(int i = 0 ; i < 9 ; i++) { + +static QList barSequence(const char* str) { + Q_ASSERT(strlen(str)==9); // this is a internal helper tool, only called with fixed strings in here, all 9 chars long + QList ret; + for(int i = 0 ; i < 9 ; i++) { ret.append(str[i] == '1'); Q_ASSERT(str[i] == '0' || str[i] == '1'); - } - return ret; } - static QList sequenceForChar(ushort c) { - switch(QChar::toUpper(c)) { + return ret; +} + +static QList sequenceForChar(ushort c) { + switch(QChar::toUpper(c)) { case '0': return barSequence("000110100"); case '1': return barSequence("100100001"); case '2': return barSequence("001100001"); @@ -69,33 +66,25 @@ case '+': return barSequence("010001010"); case '%': return barSequence("000101010"); default: return QList(); // unknown character - } } -}; -/** -@endcond -*/ - -Code39Barcode::Code39Barcode() : AbstractBarcode(), d(nullptr){ } -Code39Barcode::~Code39Barcode() { - delete d; -} +Code39Barcode::Code39Barcode() = default; +Code39Barcode::~Code39Barcode() = default; QImage Code39Barcode::paintImage(const QSizeF& size) { if(size.height() == 0.0) return QImage(); QList barcode; // convert text into sequences of wide/narrow bars { // the guard sequence that goes on each end - const QList endSequence = Private::barSequence("010010100"); + const QList endSequence = barSequence("010010100"); barcode += endSequence; barcode += false; // translate the string const QString str = data(); for(int i = 0 ; i < str.size(); i++) { - QList b = Private::sequenceForChar(str.at(i).unicode()); + QList b = sequenceForChar(str.at(i).unicode()); if(!b.empty()) { barcode += b; barcode += false; // add a narrow space between each character diff --git a/src/lib/code93barcode.h b/src/lib/code93barcode.h --- a/src/lib/code93barcode.h +++ b/src/lib/code93barcode.h @@ -26,9 +26,6 @@ * @param size The requested size of the barcode, approximate. if the barcode generator can't generate it, it can return a null QImage */ QImage paintImage(const QSizeF& size) override; - private: - class Private; - Private *d; }; } // namespace diff --git a/src/lib/code93barcode.cpp b/src/lib/code93barcode.cpp --- a/src/lib/code93barcode.cpp +++ b/src/lib/code93barcode.cpp @@ -9,23 +9,20 @@ #include using namespace Prison; -/** -@cond PRIVATE -*/ -class Code93Barcode::Private { - public: - static QList barSequence(const char* str) { - Q_ASSERT(strlen(str)==9); // this is a internal helper tool, only called with fixed strings in here, all 9 chars long - QList ret; - for(int i = 0 ; i < 9 ; i++) { + +static QList barSequence(const char* str) { + Q_ASSERT(strlen(str)==9); // this is a internal helper tool, only called with fixed strings in here, all 9 chars long + QList ret; + for(int i = 0 ; i < 9 ; i++) { ret.append(str[i] == '1'); Q_ASSERT(str[i] == '0' || str[i] == '1'); - } - return ret; } - // returns a list of 9 bar colors, where `true' means foreground and `false' means background color - static QList sequenceForID(int id) { - switch(id) { + return ret; +} + +// returns a list of 9 bar colors, where `true' means foreground and `false' means background color +static QList sequenceForID(int id) { + switch(id) { case 0: return barSequence("100010100"); // 0-9 case 1: return barSequence("101001000"); case 2: return barSequence("101000100"); @@ -74,16 +71,17 @@ case 45: return barSequence("111010110"); // (/) case 46: return barSequence("100110010"); // (+) case 47: return barSequence("101011110"); // stop sequence - default: - // unknown ID... shouldn't happen - qWarning("Code93Barcode::sequenceForID called with unknown ID"); - return QList(); - } + default: + // unknown ID... shouldn't happen + qWarning("Code93Barcode::sequenceForID called with unknown ID"); + return QList(); } - // returns the list of IDs that represent a character - static QList codesForChar(uint c) { - QList ret; - switch(c) { +} + +// returns the list of IDs that represent a character +static QList codesForChar(uint c) { + QList ret; + switch(c) { case 0: ret += 44; ret += 30; break; case 1: ret += 43; ret += 10; break; case 2: ret += 43; ret += 11; break; @@ -212,30 +210,23 @@ case 125: ret += 44; ret += 27; break; case 126: ret += 44; ret += 28; break; case 127: ret += 44; ret += 29; break; - } - return ret; // return an empty list for a non-ascii character code } - // calculate a checksum - static int checksum(const QList &codes, int wrap) { - int check = 0; - for(int i = 0 ; i < codes.size() ; i++) { + return ret; // return an empty list for a non-ascii character code +} + +// calculate a checksum +static int checksum(const QList &codes, int wrap) { + int check = 0; + for(int i = 0 ; i < codes.size() ; i++) { // weight goes from 1 to wrap, right-to-left, then repeats const int weight = (codes.size() - i - 1) % wrap + 1; check += codes.at(i) * weight; - } - return check % 47; } -}; -/** -@endcond -*/ - -Code93Barcode::Code93Barcode() : AbstractBarcode(), d(nullptr){ + return check % 47; } -Code93Barcode::~Code93Barcode() { - delete d; -} +Code93Barcode::Code93Barcode() = default; +Code93Barcode::~Code93Barcode() = default; QImage Code93Barcode::paintImage(const QSizeF& size) { if(size.height() == 0.0) { @@ -248,20 +239,20 @@ QList codes; const QString str = data(); for(int i = 0 ; i < str.size() ; i++) { - codes += Private::codesForChar(str.at(i).unicode()); + codes += codesForChar(str.at(i).unicode()); } // calculate checksums - codes.append(Private::checksum(codes, 20)); // "C" checksum - codes.append(Private::checksum(codes, 15)); // "K" checksum: includes previous checksum + codes.append(checksum(codes, 20)); // "C" checksum + codes.append(checksum(codes, 15)); // "K" checksum: includes previous checksum // now generate the barcode // the guard sequence that goes on each end - const QList endSequence = Private::sequenceForID(47); + const QList endSequence = sequenceForID(47); barcode += endSequence; // translate codes into bars for(int i = 0 ; i < codes.size() ; i++) { - barcode += Private::sequenceForID(codes.at(i)); + barcode += sequenceForID(codes.at(i)); } // ending guard barcode += endSequence; diff --git a/src/lib/datamatrixbarcode.h b/src/lib/datamatrixbarcode.h --- a/src/lib/datamatrixbarcode.h +++ b/src/lib/datamatrixbarcode.h @@ -28,9 +28,6 @@ * @return QImage containing a DataMatrix, trying to approximate the requested sizes */ QImage paintImage(const QSizeF& size) override; - private: - class Private; - Private *d; }; } diff --git a/src/lib/datamatrixbarcode.cpp b/src/lib/datamatrixbarcode.cpp --- a/src/lib/datamatrixbarcode.cpp +++ b/src/lib/datamatrixbarcode.cpp @@ -9,24 +9,8 @@ #include using namespace Prison; -/** - * @cond PRIVATE - */ -class DataMatrixBarcode::Private { - public: -}; -/** - * @endcond - */ - -DataMatrixBarcode::DataMatrixBarcode() : d(nullptr) { - -} - -DataMatrixBarcode::~DataMatrixBarcode() { - delete d; -} - +DataMatrixBarcode::DataMatrixBarcode() = default; +DataMatrixBarcode::~DataMatrixBarcode() = default; QImage DataMatrixBarcode::paintImage(const QSizeF& size) { const int width = qRound(qMin(size.width(),size.height())); diff --git a/src/lib/qrcodebarcode.h b/src/lib/qrcodebarcode.h --- a/src/lib/qrcodebarcode.h +++ b/src/lib/qrcodebarcode.h @@ -14,7 +14,7 @@ * QRCode Barcode generator ; uses libqrencode to do the actual encoding * of the barcode. */ -class PRISON_EXPORT QRCodeBarcode : public Prison::AbstractBarcode { +class QRCodeBarcode : public Prison::AbstractBarcode { public: /** * creates a QRCode generator @@ -27,9 +27,6 @@ * @param size The requested size of the barcode, approximate. if the barcode generator can't get the data to fit in there, it might be a null QImage */ QImage paintImage(const QSizeF& size) override; - private: - class Private; - Private *d; }; } // namespace diff --git a/src/lib/qrcodebarcode.cpp b/src/lib/qrcodebarcode.cpp --- a/src/lib/qrcodebarcode.cpp +++ b/src/lib/qrcodebarcode.cpp @@ -9,25 +9,9 @@ #include using namespace Prison; -/** -@cond PRIVATE -*/ -class QRCodeBarcode::Private { - public: -}; -/** -@endcond -*/ - -QRCodeBarcode::QRCodeBarcode() : AbstractBarcode(), d(nullptr){ - -} - -QRCodeBarcode::~QRCodeBarcode() { - delete d; -} - +QRCodeBarcode::QRCodeBarcode() = default; +QRCodeBarcode::~QRCodeBarcode() = default; QImage QRCodeBarcode::paintImage(const QSizeF& size) { const int width = qRound(qMin(size.width(),size.height()));