Skip to content

Commit

Permalink
Fixed warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
leozide committed Mar 12, 2019
1 parent ec200db commit f99e6d7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion common/project.cpp
Expand Up @@ -1525,7 +1525,7 @@ QImage Project::CreatePartsListImage(lcModel* Model, lcStep Step)
}
}

auto ImageCompare = [this](const lcPartsListImage& Image1, const lcPartsListImage& Image2)
auto ImageCompare = [](const lcPartsListImage& Image1, const lcPartsListImage& Image2)
{
if (Image1.ColorIndex != Image2.ColorIndex)
return Image1.ColorIndex < Image2.ColorIndex;
Expand Down
6 changes: 3 additions & 3 deletions common/view.cpp
Expand Up @@ -581,7 +581,7 @@ lcMatrix44 View::GetPieceInsertPosition(bool IgnoreSelected, PieceInfo* Info) co
return WorldMatrix;
}

std::array<lcVector3, 2> ClickPoints = { lcVector3((float)mInputState.x, (float)mInputState.y, 0.0f), lcVector3((float)mInputState.x, (float)mInputState.y, 1.0f) };
std::array<lcVector3, 2> ClickPoints = {{ lcVector3((float)mInputState.x, (float)mInputState.y, 0.0f), lcVector3((float)mInputState.x, (float)mInputState.y, 1.0f) }};
UnprojectPoints(ClickPoints.data(), 2);

if (ActiveModel != mModel)
Expand Down Expand Up @@ -681,14 +681,14 @@ lcArray<lcObject*> View::FindObjectsInBox(float x1, float y1, float x2, float y2
}

std::array<lcVector3, 6> Corners =
{
{{
lcVector3(Left, Top, 0),
lcVector3(Left, Bottom, 0),
lcVector3(Right, Bottom, 0),
lcVector3(Right, Top, 0),
lcVector3(Left, Top, 1),
lcVector3(Right, Bottom, 1)
};
}};

UnprojectPoints(Corners.data(), Corners.size());

Expand Down
2 changes: 1 addition & 1 deletion qt/lc_qpreferencesdialog.cpp
Expand Up @@ -711,7 +711,7 @@ void lcQPreferencesDialog::UpdateMouseTree()

void lcQPreferencesDialog::UpdateMouseTreeItem(int ItemIndex)
{
auto GetShortcutText = [this](Qt::MouseButton Button, Qt::KeyboardModifiers Modifiers)
auto GetShortcutText = [](Qt::MouseButton Button, Qt::KeyboardModifiers Modifiers)
{
QString Shortcut = QKeySequence(Modifiers).toString(QKeySequence::NativeText);

Expand Down

0 comments on commit f99e6d7

Please sign in to comment.