electron-rare/leocad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compiler warnings.

Browse Source
This commit is contained in:
Leonardo Zide
2019-05-27 16:22:49 -07:00
parent 7d43f54e6e
commit cf135bcbc5
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/lc_partselectionwidget.cpp
+13 -7
View File
@@ -175,7 +175,7 @@ void lcPartSelectionListModel::SetModelsCategory()
lcModel* Model = Models[ModelIdx];
if (!Model->IncludesModel(ActiveModel))
mParts.append(QPair<PieceInfo*, QPixmap>(Model->GetPieceInfo(), QPixmap()));
mParts.emplace_back(QPair<PieceInfo*, QPixmap>(Model->GetPieceInfo(), QPixmap()));
}
endResetModel();
@@ -196,7 +196,7 @@ void lcPartSelectionListModel::SetCurrentModelCategory()
ActiveModel->GetPartsList(gDefaultColor, true, PartsList);
for (const auto& PartIt : PartsList)
mParts.append(QPair<PieceInfo*, QPixmap>((PieceInfo*)PartIt.first, QPixmap()));
mParts.emplace_back(QPair<PieceInfo*, QPixmap>((PieceInfo*)PartIt.first, QPixmap()));
endResetModel();
@@ -246,7 +246,7 @@ int lcPartSelectionListModel::rowCount(const QModelIndex& Parent) const
{
Q_UNUSED(Parent);
return mParts.size();
return (int)mParts.size();
}
QVariant lcPartSelectionListModel::data(const QModelIndex& Index, int Role) const
@@ -304,7 +304,7 @@ void lcPartSelectionListModel::RequestPreview(int InfoIndex)
if (!mIconSize || !mParts[InfoIndex].second.isNull())
return;
if (mRequestedPreviews.indexOf(InfoIndex) != -1)
if (std::find(mRequestedPreviews.begin(), mRequestedPreviews.end(), InfoIndex) != mRequestedPreviews.end())
return;
PieceInfo* Info = mParts[InfoIndex].first;
@@ -313,7 +313,7 @@ void lcPartSelectionListModel::RequestPreview(int InfoIndex)
if (Info->mState == LC_PIECEINFO_LOADED)
DrawPreview(InfoIndex);
else
mRequestedPreviews.append(InfoIndex);
mRequestedPreviews.push_back(InfoIndex);
}
void lcPartSelectionListModel::PartLoaded(PieceInfo* Info)
@@ -322,8 +322,12 @@ void lcPartSelectionListModel::PartLoaded(PieceInfo* Info)
{
if (mParts[PartIdx].first == Info)
{
if (mRequestedPreviews.removeOne(PartIdx))
auto PreviewIt = std::find(mRequestedPreviews.begin(), mRequestedPreviews.end(), PartIdx);
if (PreviewIt != mRequestedPreviews.end())
{
mRequestedPreviews.erase(PreviewIt);
DrawPreview(PartIdx);
}
break;
}
}
@@ -385,7 +389,9 @@ void lcPartSelectionListModel::DrawPreview(int InfoIndex)
Context->ClearResources();
#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
emit dataChanged(index(InfoIndex, 0), index(InfoIndex, 0), QVector<int>() << Qt::DecorationRole);
QVector<int> Roles;
Roles.append(Qt::DecorationRole);
emit dataChanged(index(InfoIndex, 0), index(InfoIndex, 0), Roles);
#else
emit dataChanged(index(InfoIndex, 0), index(InfoIndex, 0));
#endif