teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

In ModifyCommand replace proxy model with the source model (Fixes #2498)

Browse source
This commit is contained in:
Marc Zinnschlag 2015-04-23 14:24:43 +02:00
parent 82bc666e00
commit 6fcf4ea9e3
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,28 +1,37 @@
#include "commands.hpp"
#include <components/misc/stringops.hpp>
#include <QAbstractItemModel>
#include <QAbstractProxyModel>
#include "idtable.hpp"
#include "idtree.hpp"
#include <components/misc/stringops.hpp>
#include "nestedtablewrapper.hpp"
CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelIndex& index,
const QVariant& new_, QUndoCommand* parent)
: QUndoCommand (parent), mModel (model), mIndex (index), mNew (new_)
: QUndoCommand (parent), mModel (&model), mIndex (index), mNew (new_)
{
setText ("Modify " + mModel.headerData (mIndex.column(), Qt::Horizontal, Qt::DisplayRole).toString());
if (QAbstractProxyModel *proxy = dynamic_cast<QAbstractProxyModel *> (&model))
{
// Replace proxy with actual model
mIndex = proxy->mapToSource (index);
mModel = proxy->sourceModel();
}
setText ("Modify " + mModel->headerData (mIndex.column(), Qt::Horizontal, Qt::DisplayRole).toString());
}
void CSMWorld::ModifyCommand::redo()
{
mOld = mModel.data (mIndex, Qt::EditRole);
mModel.setData (mIndex, mNew);
mOld = mModel->data (mIndex, Qt::EditRole);
mModel->setData (mIndex, mNew);
}
void CSMWorld::ModifyCommand::undo()
{
mModel.setData (mIndex, mOld);
mModel->setData (mIndex, mOld);
}

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

@ -26,7 +26,7 @@ namespace CSMWorld
class ModifyCommand : public QUndoCommand
{
QAbstractItemModel& mModel;
QAbstractItemModel *mModel;
QModelIndex mIndex;
QVariant mNew;
QVariant mOld;