From 2b5ad625e4d7500689e847cef045147a481f4b27 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Sat, 3 Feb 2018 21:29:29 -0500 Subject: [PATCH] Initialize previously uninitialized members. --- glabels/ColorButton.cpp | 2 +- glabels/LabelEditor.cpp | 15 +++++++++++++-- glabels/LabelEditor.h | 6 +++--- glabels/MergeView.cpp | 2 +- glabels/PropertiesView.cpp | 2 +- model/Model.cpp | 22 ++-------------------- model/Model.h | 4 ---- model/ModelBarcodeObject.cpp | 1 + model/PageRenderer.cpp | 4 ++-- translations/glabels_C.ts | 12 ++++++------ 10 files changed, 30 insertions(+), 40 deletions(-) diff --git a/glabels/ColorButton.cpp b/glabels/ColorButton.cpp index f5fc841..1abb9a0 100644 --- a/glabels/ColorButton.cpp +++ b/glabels/ColorButton.cpp @@ -41,7 +41,7 @@ namespace glabels ColorButton::ColorButton( QWidget* parent ) - : QPushButton( parent ) + : QPushButton( parent ), mIsDefault(0), mDialog(nullptr) { // empty } diff --git a/glabels/LabelEditor.cpp b/glabels/LabelEditor.cpp index c75d7b1..574fe38 100644 --- a/glabels/LabelEditor.cpp +++ b/glabels/LabelEditor.cpp @@ -84,14 +84,25 @@ namespace glabels LabelEditor::LabelEditor( QScrollArea* scrollArea, QWidget* parent ) : QWidget(parent), mScrollArea(scrollArea) { - mState = IdleState; - mModel = nullptr; mUndoRedoModel = nullptr; + + mZoom = 1; + mZoomToFitFlag = false; + mScale = 1; mMarkupVisible = true; mGridVisible = true; mGridSpacing = 18; + mState = IdleState; + + mSelectRegionVisible = false; + mResizeObject = nullptr; + mResizeHandle = nullptr; + mResizeHonorAspect = false; + mCreateObjectType = Box; + mCreateObject = nullptr; + setMouseTracking( true ); setFocusPolicy(Qt::StrongFocus); diff --git a/glabels/LabelEditor.h b/glabels/LabelEditor.h index af30700..815517f 100644 --- a/glabels/LabelEditor.h +++ b/glabels/LabelEditor.h @@ -176,6 +176,9 @@ namespace glabels QScrollArea* mScrollArea; + model::Model* mModel; + UndoRedoModel* mUndoRedoModel; + double mZoom; bool mZoomToFitFlag; double mScale; @@ -188,9 +191,6 @@ namespace glabels double mGridSpacing; model::Distance mStepSize; - model::Model* mModel; - UndoRedoModel* mUndoRedoModel; - State mState; /* ArrowSelectRegion state */ diff --git a/glabels/MergeView.cpp b/glabels/MergeView.cpp index fc236b3..9ff3143 100644 --- a/glabels/MergeView.cpp +++ b/glabels/MergeView.cpp @@ -34,7 +34,7 @@ namespace glabels /// Constructor /// MergeView::MergeView( QWidget *parent ) - : QWidget(parent), mModel(nullptr), mBlock(false) + : QWidget(parent), mModel(nullptr), mUndoRedoModel(nullptr), mBlock(false), mOldFormatComboIndex(0) { setupUi( this ); diff --git a/glabels/PropertiesView.cpp b/glabels/PropertiesView.cpp index 6c4fb1d..a17d096 100644 --- a/glabels/PropertiesView.cpp +++ b/glabels/PropertiesView.cpp @@ -37,7 +37,7 @@ namespace glabels /// Constructor /// PropertiesView::PropertiesView( QWidget *parent ) - : QWidget(parent), mModel(nullptr) + : QWidget(parent), mModel(nullptr), mUndoRedoModel(nullptr) { setupUi( this ); diff --git a/model/Model.cpp b/model/Model.cpp index 43f305c..774ebab 100644 --- a/model/Model.cpp +++ b/model/Model.cpp @@ -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 /// diff --git a/model/Model.h b/model/Model.h index c16454c..e1d0cfa 100644 --- a/model/Model.h +++ b/model/Model.h @@ -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; diff --git a/model/ModelBarcodeObject.cpp b/model/ModelBarcodeObject.cpp index 32fe29b..8cbfcf9 100644 --- a/model/ModelBarcodeObject.cpp +++ b/model/ModelBarcodeObject.cpp @@ -111,6 +111,7 @@ namespace glabels mBcStyle = bcStyle; mBcTextFlag = bcTextFlag; mBcChecksumFlag = bcChecksumFlag; + mBcFormatDigits = mBcStyle.preferedN(); mBcData = bcData; mBcColorNode = bcColorNode; diff --git a/model/PageRenderer.cpp b/model/PageRenderer.cpp index 190bba4..3d7d237 100644 --- a/model/PageRenderer.cpp +++ b/model/PageRenderer.cpp @@ -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 ) { diff --git a/translations/glabels_C.ts b/translations/glabels_C.ts index f08b66b..959f257 100644 --- a/translations/glabels_C.ts +++ b/translations/glabels_C.ts @@ -878,16 +878,16 @@ glabels::LabelEditor - - - - - + + + + + Move - + Delete