From cc354d06da37dcf76bf3a1182ff99c5191bc07c7 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Fri, 7 Apr 2017 20:37:25 -0400 Subject: [PATCH] Modifications to build successfully with -Werror -Wall -Wpedantic. --- glabels/CMakeLists.txt | 3 +++ glabels/DataCache.cpp | 2 +- glabels/FrameCd.cpp | 7 ++++--- glabels/FrameEllipse.cpp | 4 ++-- glabels/FrameRect.cpp | 7 ++++--- glabels/FrameRound.cpp | 4 ++-- glabels/Merge/Text.cpp | 6 +++--- glabels/PageRenderer.cpp | 2 +- glabels/Preview.cpp | 2 +- glabels/SimplePreview.cpp | 2 +- glabels/XmlUtil.cpp | 14 +++++++++----- glabels/XmlUtil.h | 4 +++- translations/glabels_C.ts | 4 ++-- 13 files changed, 36 insertions(+), 25 deletions(-) diff --git a/glabels/CMakeLists.txt b/glabels/CMakeLists.txt index 7661d36..0ab387f 100644 --- a/glabels/CMakeLists.txt +++ b/glabels/CMakeLists.txt @@ -8,6 +8,9 @@ if (NOT WIN32) add_compile_options (-fPIC) endif () +# Uncomment to build with pedantic flags +#add_compile_options (-Werror -Wall -Wpedantic) + #======================================= # Auto-generate Version.h diff --git a/glabels/DataCache.cpp b/glabels/DataCache.cpp index 6f4c93f..2738756 100644 --- a/glabels/DataCache.cpp +++ b/glabels/DataCache.cpp @@ -43,7 +43,7 @@ namespace glabels { if ( const QImage* image = imageObject->image() ) { - addImage( filenameNode.data(), *imageObject->image() ); + addImage( filenameNode.data(), *image ); } else { diff --git a/glabels/FrameCd.cpp b/glabels/FrameCd.cpp index 15f7ffe..7978435 100644 --- a/glabels/FrameCd.cpp +++ b/glabels/FrameCd.cpp @@ -35,7 +35,7 @@ namespace glabels const Distance& h, const Distance& waste, const QString& id ) - : mR1(r1), mR2(r2), mW(w), mH(h), mWaste(waste), Frame(id) + : Frame(id), mR1(r1), mR2(r2), mW(w), mH(h), mWaste(waste) { Distance wReal = (mW == 0) ? 2*mR1 : mW; Distance hReal = (mH == 0) ? 2*mR1 : mH; @@ -92,8 +92,9 @@ namespace glabels FrameCd::FrameCd( const FrameCd& other ) - : mR1(other.mR1), mR2(other.mR2), mW(other.mW), mH(other.mH), mWaste(other.mWaste), - mPath(other.mPath), Frame(other) + : Frame(other), + mR1(other.mR1), mR2(other.mR2), mW(other.mW), mH(other.mH), mWaste(other.mWaste), + mPath(other.mPath) { // empty } diff --git a/glabels/FrameEllipse.cpp b/glabels/FrameEllipse.cpp index 966b8fb..16264ad 100644 --- a/glabels/FrameEllipse.cpp +++ b/glabels/FrameEllipse.cpp @@ -31,14 +31,14 @@ namespace glabels const Distance& h, const Distance& waste, const QString& id ) - : mW(w), mH(h), mWaste(waste), Frame(id) + : Frame(id), mW(w), mH(h), mWaste(waste) { mPath.addEllipse( 0, 0, mW.pt(), mH.pt() ); mClipPath.addEllipse( -mWaste.pt(), -mWaste.pt(), (mW+2*mWaste).pt(), (mH+2*mWaste).pt() ); } FrameEllipse::FrameEllipse( const FrameEllipse& other ) - : mW(other.mW), mH(other.mH), mWaste(other.mWaste), mPath(other.mPath), Frame(other) + : Frame(other), mW(other.mW), mH(other.mH), mWaste(other.mWaste), mPath(other.mPath) { // empty } diff --git a/glabels/FrameRect.cpp b/glabels/FrameRect.cpp index ddbd2b6..854803d 100644 --- a/glabels/FrameRect.cpp +++ b/glabels/FrameRect.cpp @@ -33,7 +33,7 @@ namespace glabels const Distance& xWaste, const Distance& yWaste, const QString& id ) - : mW(w), mH(h), mR(r), mXWaste(xWaste), mYWaste(yWaste), Frame(id) + : Frame(id), mW(w), mH(h), mR(r), mXWaste(xWaste), mYWaste(yWaste) { mPath.addRoundedRect( 0, 0, mW.pt(), mH.pt(), mR.pt(), mR.pt() ); @@ -44,8 +44,9 @@ namespace glabels FrameRect::FrameRect( const FrameRect &other ) - : mW(other.mW), mH(other.mH), mR(other.mR), mXWaste(other.mXWaste), - mYWaste(other.mYWaste), mPath(other.mPath), Frame(other) + : Frame(other), + mW(other.mW), mH(other.mH), mR(other.mR), mXWaste(other.mXWaste), + mYWaste(other.mYWaste), mPath(other.mPath) { // empty } diff --git a/glabels/FrameRound.cpp b/glabels/FrameRound.cpp index e5241ed..1db08fb 100644 --- a/glabels/FrameRound.cpp +++ b/glabels/FrameRound.cpp @@ -30,7 +30,7 @@ namespace glabels FrameRound::FrameRound( const Distance& r, const Distance& waste, const QString& id ) - : mR(r), mWaste(waste), Frame(id) + : Frame(id), mR(r), mWaste(waste) { mPath.addEllipse( 0, 0, 2*mR.pt(), 2*mR.pt() ); mClipPath.addEllipse( -mWaste.pt(), -mWaste.pt(), @@ -39,7 +39,7 @@ namespace glabels FrameRound::FrameRound( const FrameRound& other ) - : mR(other.mR), mWaste(other.mWaste), mPath(other.mPath), Frame(other) + : Frame(other), mR(other.mR), mWaste(other.mWaste), mPath(other.mPath) { // empty } diff --git a/glabels/Merge/Text.cpp b/glabels/Merge/Text.cpp index 2425a03..b1c223a 100644 --- a/glabels/Merge/Text.cpp +++ b/glabels/Merge/Text.cpp @@ -35,7 +35,7 @@ namespace glabels /// Constructor /// Text::Text( QChar delimiter, bool line1HasKeys ) - : mNFieldsMax(0), mDelimeter(delimiter), mLine1HasKeys(line1HasKeys) + : mDelimeter(delimiter), mLine1HasKeys(line1HasKeys), mNFieldsMax(0) { } @@ -45,8 +45,8 @@ namespace glabels /// Text::Text( const Text* merge ) : Merge( merge ), - mNFieldsMax(merge->mNFieldsMax), - mDelimeter(merge->mDelimeter), mLine1HasKeys(merge->mLine1HasKeys) + mDelimeter(merge->mDelimeter), mLine1HasKeys(merge->mLine1HasKeys), + mNFieldsMax(merge->mNFieldsMax) { } diff --git a/glabels/PageRenderer.cpp b/glabels/PageRenderer.cpp index 37038b7..ee1292f 100644 --- a/glabels/PageRenderer.cpp +++ b/glabels/PageRenderer.cpp @@ -47,7 +47,7 @@ namespace glabels PageRenderer::PageRenderer() : mModel(nullptr), mNCopies(0), mStartLabel(0), mPrintOutlines(false), mPrintCropMarks(false), mPrintReverse(false), - mIsMerge(false), mIPage(0), mNPages(0) + mIPage(0), mIsMerge(false), mNPages(0) { // empty } diff --git a/glabels/Preview.cpp b/glabels/Preview.cpp index d76f844..182dac4 100644 --- a/glabels/Preview.cpp +++ b/glabels/Preview.cpp @@ -54,7 +54,7 @@ namespace glabels /// Constructor /// Preview::Preview( QWidget *parent ) - : mModel(nullptr), mRenderer(nullptr), QGraphicsView(parent) + : QGraphicsView(parent), mModel(nullptr), mRenderer(nullptr) { mScene = new QGraphicsScene(); setScene( mScene ); diff --git a/glabels/SimplePreview.cpp b/glabels/SimplePreview.cpp index e4b91e6..8cb62fd 100644 --- a/glabels/SimplePreview.cpp +++ b/glabels/SimplePreview.cpp @@ -58,7 +58,7 @@ namespace glabels /// Constructor /// SimplePreview::SimplePreview( QWidget *parent ) - : mTmplate(nullptr), mRotateFlag(false), QGraphicsView(parent) + : QGraphicsView(parent), mTmplate(nullptr), mRotateFlag(false) { mScene = new QGraphicsScene(); setScene( mScene ); diff --git a/glabels/XmlUtil.cpp b/glabels/XmlUtil.cpp index a332b90..d14469f 100644 --- a/glabels/XmlUtil.cpp +++ b/glabels/XmlUtil.cpp @@ -31,7 +31,7 @@ namespace glabels // // Static data // - Units XmlUtil::mUnits; + XmlUtil* XmlUtil::mInstance = nullptr; XmlUtil::XmlUtil() @@ -42,7 +42,10 @@ namespace glabels void XmlUtil::init() { - static XmlUtil* xmlUtil = new XmlUtil(); + if ( mInstance == nullptr ) + { + mInstance = new XmlUtil(); + } } @@ -50,7 +53,7 @@ namespace glabels { init(); - return mUnits; + return mInstance->mUnits; } @@ -58,7 +61,7 @@ namespace glabels { init(); - mUnits = units; + mInstance->mUnits = units; } @@ -287,7 +290,8 @@ namespace glabels { init(); - node.setAttribute( name, QString::number(value.inUnits(mUnits)) + mUnits.toIdString() ); + Units units = mInstance->mUnits; + node.setAttribute( name, QString::number(value.inUnits(units)) + units.toIdString() ); } } // namespace glabels diff --git a/glabels/XmlUtil.h b/glabels/XmlUtil.h index ce472b2..e850b01 100644 --- a/glabels/XmlUtil.h +++ b/glabels/XmlUtil.h @@ -99,7 +99,9 @@ namespace glabels const Distance& value ); private: - static Units mUnits; + Units mUnits; + + static XmlUtil* mInstance; }; diff --git a/translations/glabels_C.ts b/translations/glabels_C.ts index a8393ef..0da4b0e 100644 --- a/translations/glabels_C.ts +++ b/translations/glabels_C.ts @@ -97,8 +97,8 @@ FrameCd - - + + diameter