mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 00:36:46 +00:00
Code Issues Releases Wiki Activity

Small correction.

Browse source
This commit is contained in:
Marek Kochanowicz 2014-01-20 16:23:34 +01:00
parent d82f272e05
commit 92ee252eef
6 changed files with 5 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -657,27 +657,6 @@ int CSMWorld::Data::count (RecordBase::State state) const
count (state, mReferenceables); count (state, mReferenceables);
} }
bool CSMWorld::Data::recordDeleted(const std::string& id) const
{
return
getGlobals().getRecord(id).isDeleted() ||
getGmsts().getRecord(id).isDeleted() ||
getSkills().getRecord(id).isDeleted() ||
getClasses().getRecord(id).isDeleted() ||
getFactions().getRecord(id).isDeleted() ||
getRaces().getRecord(id).isDeleted() ||
getSounds().getRecord(id).isDeleted() ||
getScripts().getRecord(id).isDeleted() ||
getRegions().getRecord(id).isDeleted() ||
getBirthsigns().getRecord(id).isDeleted() ||
getSpells().getRecord(id).isDeleted() ||
getTopics().getRecord(id).isDeleted() ||
getJournals().getRecord(id).isDeleted() ||
getCells().getRecord(id).isDeleted() ||
getReferenceables().getRecord(id).isDeleted();
}
void CSMWorld::Data::setDescription (const std::string& description) void CSMWorld::Data::setDescription (const std::string& description)
{ {
mDescription = description; mDescription = description;

2
apps/opencs/model/world/data.hpp
View file

@ -190,8 +190,6 @@ namespace CSMWorld
std::string getAuthor() const; std::string getAuthor() const;
bool recordDeleted(const std::string& id) const;
signals: signals:
void idListChanged(); void idListChanged();

7
apps/opencs/view/world/genericcreator.cpp
View file

@ -125,13 +125,10 @@ void CSVWorld::GenericCreator::create()
{ {
if (mCloneMode) if (mCloneMode)
{ {
const std::string id = getId(); std::string id = getId();
if (mData.recordDeleted(id))
{
return;
}
std::auto_ptr<CSMWorld::CloneCommand> command (new CSMWorld::CloneCommand ( std::auto_ptr<CSMWorld::CloneCommand> command (new CSMWorld::CloneCommand (
dynamic_cast<CSMWorld::IdTable&> (*mData.getTableModel(mListId)), mClonedId, id, mClonedType, mArgumentType)); dynamic_cast<CSMWorld::IdTable&> (*mData.getTableModel(mListId)), mClonedId, id, mClonedType, mArgumentType));
mUndoStack.push(command.release()); mUndoStack.push(command.release());
emit done(); emit done();

1
apps/opencs/view/world/table.cpp
View file

@ -308,6 +308,7 @@ void CSVWorld::Table::cloneRecord()
if (!mEditLock) if (!mEditLock)
{ {
QModelIndexList selectedRows = selectionModel()->selectedRows(); QModelIndexList selectedRows = selectionModel()->selectedRows();
if (selectedRows.size()==1) if (selectedRows.size()==1)
{ {
emit cloneRequest (selectedRows.begin()->row(), mModel); emit cloneRequest (selectedRows.begin()->row(), mModel);

2
apps/opencs/view/world/table.hpp
View file

@ -74,7 +74,7 @@ namespace CSVWorld
/// \param modified Number of added and modified records /// \param modified Number of added and modified records
void createRequest(); void createRequest();
void cloneRequest(int row, const CSMWorld::IdTable* table); void cloneRequest(int row, const CSMWorld::IdTable*);
private slots: private slots:

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

@ -49,7 +49,7 @@ CSVWorld::TableSubView::TableSubView (const CSMWorld::UniversalId& id, CSMDoc::D
{ {
connect (mTable, SIGNAL (createRequest()), mBottom, SLOT (createRequest())); connect (mTable, SIGNAL (createRequest()), mBottom, SLOT (createRequest()));
connect (mTable, SIGNAL (cloneRequest(int, CSMWorld::IdTable*)), this, SLOT(cloneRequest(int, CSMWorld::IdTable*))); connect (mTable, SIGNAL (cloneRequest(int, const CSMWorld::IdTable*)), this, SLOT(cloneRequest(int, const CSMWorld::IdTable*)));
connect (this, SIGNAL(cloneRequest(const std::string&, const CSMWorld::UniversalId::Type, const CSMWorld::UniversalId::ArgumentType)), connect (this, SIGNAL(cloneRequest(const std::string&, const CSMWorld::UniversalId::Type, const CSMWorld::UniversalId::ArgumentType)),
mBottom, SLOT(cloneRequest(const std::string&, const CSMWorld::UniversalId::Type, const CSMWorld::UniversalId::ArgumentType))); mBottom, SLOT(cloneRequest(const std::string&, const CSMWorld::UniversalId::Type, const CSMWorld::UniversalId::ArgumentType)));
} }