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

Modifications to build successfully with -Werror -Wall -Wpedantic.

Browse Source
This commit is contained in:
Jim Evins
2017-04-07 20:37:25 -04:00
parent 8184027c05
commit cc354d06da
13 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/FrameCd.cpp
+4 -3
View File
@@ -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
}