Initialize previously uninitialized members.
This commit is contained in:
+2
-20
@@ -54,7 +54,8 @@ namespace glabels
|
||||
///
|
||||
/// Default constructor.
|
||||
///
|
||||
Model::Model() : mUntitledInstance(0), mModified(true), mTmplate(nullptr), mRotate(false)
|
||||
Model::Model()
|
||||
: mUntitledInstance(0), mModified(true), mTmplate(nullptr), mFrame(nullptr), mRotate(false)
|
||||
{
|
||||
mMerge = new merge::None();
|
||||
}
|
||||
@@ -88,7 +89,6 @@ namespace glabels
|
||||
mUntitledInstance = savedModel->mUntitledInstance;
|
||||
mModified = savedModel->mModified;
|
||||
mFileName = savedModel->mFileName;
|
||||
mCompressionLevel = savedModel->mCompressionLevel;
|
||||
mTmplate = savedModel->mTmplate;
|
||||
mFrame = savedModel->mFrame;
|
||||
mRotate = savedModel->mRotate;
|
||||
@@ -150,24 +150,6 @@ namespace glabels
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// Get compression level
|
||||
///
|
||||
int Model::compressionLevel() const
|
||||
{
|
||||
return mCompressionLevel;
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// Set compression level
|
||||
///
|
||||
void Model::setCompressionLevel( int compressionLevel )
|
||||
{
|
||||
mCompressionLevel = compressionLevel;
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// Get template
|
||||
///
|
||||
|
||||
@@ -93,9 +93,6 @@ namespace glabels
|
||||
const QString& fileName() const;
|
||||
void setFileName( const QString &fileName );
|
||||
|
||||
int compressionLevel() const;
|
||||
void setCompressionLevel( int compressionLevel );
|
||||
|
||||
const Template* tmplate() const;
|
||||
const Frame* frame() const;
|
||||
void setTmplate( const Template* tmplate );
|
||||
@@ -225,7 +222,6 @@ namespace glabels
|
||||
int mUntitledInstance;
|
||||
bool mModified;
|
||||
QString mFileName;
|
||||
int mCompressionLevel;
|
||||
const Template* mTmplate;
|
||||
const Frame* mFrame;
|
||||
bool mRotate;
|
||||
|
||||
@@ -111,6 +111,7 @@ namespace glabels
|
||||
mBcStyle = bcStyle;
|
||||
mBcTextFlag = bcTextFlag;
|
||||
mBcChecksumFlag = bcChecksumFlag;
|
||||
mBcFormatDigits = mBcStyle.preferedN();
|
||||
mBcData = bcData;
|
||||
mBcColorNode = bcColorNode;
|
||||
|
||||
|
||||
@@ -47,9 +47,9 @@ namespace glabels
|
||||
|
||||
|
||||
PageRenderer::PageRenderer( const Model* model )
|
||||
: mModel(nullptr), mNCopies(0), mStartLabel(0),
|
||||
: mModel(nullptr), mMerge(nullptr), mNCopies(0), mStartLabel(0), mLastLabel(0),
|
||||
mPrintOutlines(false), mPrintCropMarks(false), mPrintReverse(false),
|
||||
mIPage(0), mIsMerge(false), mNPages(0)
|
||||
mIPage(0), mIsMerge(false), mNPages(0), mNLabelsPerPage(0)
|
||||
{
|
||||
if ( model )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user