Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-01-17 18:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed compiler warnings.

Browse source
This commit is contained in:
leo 2015-03-18 02:25:22 +00:00
parent be59eb624f
commit efacceee29
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/lc_model.cpp
View file

@ -1946,7 +1946,7 @@ void lcModel::ShowSelectedPiecesLater()
UpdateSelection();
}
void lcModel::SetPieceSteps(const QList<QPair<lcPiece*, int>>& PieceSteps)
void lcModel::SetPieceSteps(const QList<QPair<lcPiece*, lcStep>>& PieceSteps)
{
if (PieceSteps.size() != mPieces.GetSize())
return;
@ -1955,7 +1955,7 @@ void lcModel::SetPieceSteps(const QList<QPair<lcPiece*, int>>& PieceSteps)
for (int PieceIdx = 0; PieceIdx < PieceSteps.size(); PieceIdx++)
{
const QPair<lcPiece*, int>& PieceStep = PieceSteps[PieceIdx];
const QPair<lcPiece*, lcStep>& PieceStep = PieceSteps[PieceIdx];
lcPiece* Piece = mPieces[PieceIdx];
if (Piece != PieceStep.first || Piece->GetStepShow() != PieceStep.second)

2
common/lc_model.h
View file

@ -198,7 +198,7 @@ public:
void DeleteSelectedObjects();
void ShowSelectedPiecesEarlier();
void ShowSelectedPiecesLater();
void SetPieceSteps(const QList<QPair<lcPiece*, int>>& PieceSteps);
void SetPieceSteps(const QList<QPair<lcPiece*, lcStep>>& PieceSteps);
lcGroup* AddGroup(const char* Prefix, lcGroup* Parent);
lcGroup* GetGroup(const char* Name, bool CreateIfMissing);

6
common/lc_timelinewidget.cpp
View file

@ -109,7 +109,7 @@ void lcTimelineWidget::Update(bool Clear)
const lcArray<lcPiece*>& 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<QPair<lcPiece*, int>> PieceSteps;
QList<QPair<lcPiece*, lcStep>> 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<uintptr_t>();
PieceSteps.append(QPair<lcPiece*, int>(Piece, TopLevelItemIdx + 1));
PieceSteps.append(QPair<lcPiece*, lcStep>(Piece, TopLevelItemIdx + 1));
}
}