History

Naming coding standard fix

Atlante45 committed 9 years ago

Commit eb06c331 parent 73483ee4 files · +16 −16Browse files

Showing the changes to interface/src/scripting/AssetMappingsScriptingInterface.cpp (1 of 4 files). Show all

Unified · Split

interface/src/scripting/AssetMappingsScriptingInterface.cpp+6−6
@@ -239,7 +239,7 @@ void AssetMappingModel::refresh() { · 238 unmodified lines
239 239
240 connect(request, &GetAllMappingsRequest::finished, this, [this](GetAllMappingsRequest* request) mutable {240 connect(request, &GetAllMappingsRequest::finished, this, [this](GetAllMappingsRequest* request) mutable {
241 if (request->getError() == MappingRequest::NoError) {241 if (request->getError() == MappingRequest::NoError) {
242 int bakesPendingCount = 0;242 int numPendingBakes = 0;
243 auto mappings = request->getMappings();243 auto mappings = request->getMappings();
244 auto existingPaths = _pathToItemMap.keys();244 auto existingPaths = _pathToItemMap.keys();
245 for (auto& mapping : mappings) {245 for (auto& mapping : mappings) {
@@ -289,7 +289,7 @@ void AssetMappingModel::refresh() { · 43 unmodified lines
289 lastItem->setData(statusString, Qt::UserRole + 5);289 lastItem->setData(statusString, Qt::UserRole + 5);
290 lastItem->setData(mapping.second.bakingErrors, Qt::UserRole + 6);290 lastItem->setData(mapping.second.bakingErrors, Qt::UserRole + 6);
291 if (mapping.second.status == Pending) {291 if (mapping.second.status == Pending) {
292 ++bakesPendingCount;292 ++numPendingBakes;
293 }293 }
294 }294 }
295 295
@@ -339,9 +339,9 @@ void AssetMappingModel::refresh() { · 43 unmodified lines
339 }339 }
340 }340 }
341 341
342 if (bakesPendingCount != _bakesPendingCount) {342 if (numPendingBakes != _numPendingBakes) {
343 _bakesPendingCount = bakesPendingCount;343 _numPendingBakes = numPendingBakes;
344 emit bakesPendingCountChanged(_bakesPendingCount);344 emit numPendingBakesChanged(_numPendingBakes);
345 }345 }
346 } else {346 } else {
347 emit errorGettingMappings(request->getErrorString());347 emit errorGettingMappings(request->getErrorString());
@@ -373,4 +373,4 @@ void AssetMappingModel::setupRoles() { · 25 unmodified lines
373 roleNames[Qt::DisplayRole] = "name";373 roleNames[Qt::DisplayRole] = "name";
374 roleNames[Qt::UserRole + 5] = "baked";374 roleNames[Qt::UserRole + 5] = "baked";
375 setItemRoleNames(roleNames);375 setItemRoleNames(roleNames);
376}376}