Initialize previously uninitialized members.

This commit is contained in:
Jim Evins
2018-02-03 21:29:29 -05:00
parent c7c97178ca
commit 2b5ad625e4
10 changed files with 30 additions and 40 deletions
+1 -1
View File
@@ -41,7 +41,7 @@ namespace glabels
ColorButton::ColorButton( QWidget* parent )
: QPushButton( parent )
: QPushButton( parent ), mIsDefault(0), mDialog(nullptr)
{
// empty
}
+13 -2
View File
@@ -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);
+3 -3
View File
@@ -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 */
+1 -1
View File
@@ -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 );
+1 -1
View File
@@ -37,7 +37,7 @@ namespace glabels
/// Constructor
///
PropertiesView::PropertiesView( QWidget *parent )
: QWidget(parent), mModel(nullptr)
: QWidget(parent), mModel(nullptr), mUndoRedoModel(nullptr)
{
setupUi( this );