diff --git a/common/lc_model.cpp b/common/lc_model.cpp index 9388ab5d..9f40a78d 100644 --- a/common/lc_model.cpp +++ b/common/lc_model.cpp @@ -1946,7 +1946,7 @@ void lcModel::ShowSelectedPiecesLater() UpdateSelection(); } -void lcModel::SetPieceSteps(const QList>& PieceSteps) +void lcModel::SetPieceSteps(const QList>& PieceSteps) { if (PieceSteps.size() != mPieces.GetSize()) return; @@ -1955,7 +1955,7 @@ void lcModel::SetPieceSteps(const QList>& PieceSteps) for (int PieceIdx = 0; PieceIdx < PieceSteps.size(); PieceIdx++) { - const QPair& PieceStep = PieceSteps[PieceIdx]; + const QPair& PieceStep = PieceSteps[PieceIdx]; lcPiece* Piece = mPieces[PieceIdx]; if (Piece != PieceStep.first || Piece->GetStepShow() != PieceStep.second) diff --git a/common/lc_model.h b/common/lc_model.h index edf5d47d..6c73c108 100644 --- a/common/lc_model.h +++ b/common/lc_model.h @@ -198,7 +198,7 @@ public: void DeleteSelectedObjects(); void ShowSelectedPiecesEarlier(); void ShowSelectedPiecesLater(); - void SetPieceSteps(const QList>& PieceSteps); + void SetPieceSteps(const QList>& PieceSteps); lcGroup* AddGroup(const char* Prefix, lcGroup* Parent); lcGroup* GetGroup(const char* Name, bool CreateIfMissing); diff --git a/common/lc_timelinewidget.cpp b/common/lc_timelinewidget.cpp index e64b2f41..75d50f7e 100644 --- a/common/lc_timelinewidget.cpp +++ b/common/lc_timelinewidget.cpp @@ -109,7 +109,7 @@ void lcTimelineWidget::Update(bool Clear) const lcArray& Pieces = Model->GetPieces(); QTreeWidgetItem* StepItem = NULL; int PieceItemIndex = 0; - int Step = 0; + lcStep Step = 0; for (int PieceIdx = 0; PieceIdx != Pieces.GetSize(); PieceIdx++) { @@ -277,7 +277,7 @@ void lcTimelineWidget::dropEvent(QDropEvent* Event) { QTreeWidget::dropEvent(Event); - QList> PieceSteps; + QList> PieceSteps; for (int TopLevelItemIdx = 0; TopLevelItemIdx < topLevelItemCount(); TopLevelItemIdx++) { @@ -288,7 +288,7 @@ void lcTimelineWidget::dropEvent(QDropEvent* Event) QTreeWidgetItem* PieceItem = StepItem->child(PieceItemIdx); lcPiece* Piece = (lcPiece*)PieceItem->data(0, Qt::UserRole).value(); - PieceSteps.append(QPair(Piece, TopLevelItemIdx + 1)); + PieceSteps.append(QPair(Piece, TopLevelItemIdx + 1)); } }