mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-06 07:45:36 +00:00
Code Issues Releases Wiki Activity

Merge branch 'move_editor' into 'master'

Browse source 
Move local variables in the editor

See merge request OpenMW/openmw!3771
This commit is contained in:
Evil Eye 2024-01-17 17:21:05 +00:00
commit 0f6133b040
9 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/opencs/model/world/data.cpp
View file

@ -1107,7 +1107,7 @@ void CSMWorld::Data::loadFallbackEntries()
newMarker.mModel = model;
newMarker.mRecordFlags = 0;
auto record = std::make_unique<CSMWorld::Record<ESM::Static>>();
record->mBase = newMarker;
record->mBase = std::move(newMarker);
record->mState = CSMWorld::RecordBase::State_BaseOnly;
mReferenceables.appendRecord(std::move(record), CSMWorld::UniversalId::Type_Static);
}
@ -1123,7 +1123,7 @@ void CSMWorld::Data::loadFallbackEntries()
newMarker.mModel = model;
newMarker.mRecordFlags = 0;
auto record = std::make_unique<CSMWorld::Record<ESM::Door>>();
record->mBase = newMarker;
record->mBase = std::move(newMarker);
record->mState = CSMWorld::RecordBase::State_BaseOnly;
mReferenceables.appendRecord(std::move(record), CSMWorld::UniversalId::Type_Door);
}

2
apps/opencs/model/world/idcompletionmanager.cpp
View file

@ -117,7 +117,7 @@ void CSMWorld::IdCompletionManager::generateCompleters(CSMWorld::Data& data)
completer->setPopup(popup); // The completer takes ownership of the popup
completer->setMaxVisibleItems(10);
mCompleters[current->first] = completer;
mCompleters[current->first] = std::move(completer);
}
}
}

2
apps/opencs/view/doc/adjusterwidget.cpp
View file

@ -91,7 +91,7 @@ void CSVDoc::AdjusterWidget::setName(const QString& name, bool addon)
{
// path already points to the local data directory
message = "Will be saved as: " + Files::pathToQString(path);
mResultPath = path;
mResultPath = std::move(path);
}
// in all other cases, ensure the path points to data-local and do an existing file check
else

2
apps/opencs/view/doc/viewmanager.cpp
View file

@ -410,7 +410,7 @@ bool CSVDoc::ViewManager::removeDocument(CSVDoc::View* view)
remainingViews.push_back(*iter);
}
mDocumentManager.removeDocument(document);
mViews = remainingViews;
mViews = std::move(remainingViews);
}
return true;
}

2
apps/opencs/view/render/pagedworldspacewidget.cpp
View file

@ -514,7 +514,7 @@ void CSVRender::PagedWorldspaceWidget::moveCellSelection(int x, int y)
addCellToScene(*iter);
}
mSelection = newSelection;
mSelection = std::move(newSelection);
}
void CSVRender::PagedWorldspaceWidget::addCellToSceneFromCamera(int offsetX, int offsetY)

4
apps/opencs/view/render/terraintexturemode.cpp
View file

@ -541,7 +541,7 @@ void CSVRender::TerrainTextureMode::editTerrainTextureGrid(const WorldspaceHitRe
= landTable.data(landTable.getModelIndex(cellId, textureColumn))
.value<CSMWorld::LandTexturesColumn::DataType>();
newTerrainOtherCell[yInOtherCell * landTextureSize + xInOtherCell] = brushInt;
pushEditToCommand(newTerrainOtherCell, document, landTable, cellId);
pushEditToCommand(newTerrainOtherCell, document, landTable, std::move(cellId));
}
}
}
@ -702,7 +702,7 @@ void CSVRender::TerrainTextureMode::createTexture(const std::string& textureFile
QModelIndex index(ltexTable.getModelIndex(newId, ltexTable.findColumnIndex(CSMWorld::Columns::ColumnId_Texture)));
undoStack.push(new CSMWorld::ModifyCommand(ltexTable, index, textureFileNameVariant));
undoStack.endMacro();
mBrushTexture = newId;
mBrushTexture = std::move(newId);
}
bool CSVRender::TerrainTextureMode::allowLandTextureEditing(const std::string& cellId)

2
apps/opencs/view/widget/scenetooltexturebrush.cpp
View file

@ -213,7 +213,7 @@ void CSVWidget::TextureBrushWindow::setBrushTexture(std::string brushTexture)
mSelectedBrush->setText(QString::fromStdString(mBrushTextureLabel));
}
mBrushTexture = newBrushTextureId;
mBrushTexture = std::move(newBrushTextureId);
emit passTextureId(mBrushTexture);
emit passBrushShape(mBrushShape); // updates the icon tooltip

2
apps/opencs/view/world/extendedcommandconfigurator.cpp
View file

@ -146,7 +146,7 @@ void CSVWorld::ExtendedCommandConfigurator::setupCheckBoxes(const std::vector<CS
CSMWorld::UniversalId type = types[counter];
current->first->setText(QString::fromUtf8(type.getTypeName().c_str()));
current->first->setChecked(true);
current->second = type;
current->second = std::move(type);
++counter;
}
else

2
apps/opencs/view/world/tablesubview.cpp
View file

@ -169,7 +169,7 @@ void CSVWorld::TableSubView::createFilterRequest(std::vector<CSMWorld::Universal
{
CSVFilter::FilterData filterData;
filterData.searchData = it->getId();
filterData.columns = col;
filterData.columns = std::move(col);
sourceFilter.emplace_back(filterData);
}