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

changed sub view factory method signature

Browse source
This commit is contained in:
Marc Zinnschlag 2012-12-11 11:24:30 +01:00
parent 832fc56d34
commit 0ed378dfb2
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -191,7 +191,7 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id)
if (iter==mSubViewFactories.end()) if (iter==mSubViewFactories.end())
throw std::logic_error ("can't create subview for " + id.toString()); throw std::logic_error ("can't create subview for " + id.toString());
CSVWorld::SubView *view = iter->second->makeSubView (id, mDocument->getData(), mDocument->getUndoStack()); CSVWorld::SubView *view = iter->second->makeSubView (id, *mDocument);
addDockWidget (Qt::TopDockWidgetArea, view); addDockWidget (Qt::TopDockWidgetArea, view);
view->show(); view->show();
} }

18
apps/opencs/view/world/subview.hpp
View file

@ -1,6 +1,8 @@
#ifndef CSV_WORLD_SUBVIEW_H #ifndef CSV_WORLD_SUBVIEW_H
#define CSV_WORLD_SUBVIEW_H #define CSV_WORLD_SUBVIEW_H
#include "../../model/doc/document.hpp"
#include "../../model/world/universalid.hpp" #include "../../model/world/universalid.hpp"
#include <QDockWidget> #include <QDockWidget>
@ -35,21 +37,20 @@ namespace CSVWorld
struct SubViewFactoryBase struct SubViewFactoryBase
{ {
virtual SubView *makeSubView (const CSMWorld::UniversalId& id, CSMWorld::Data& data, QUndoStack& undoStack) virtual SubView *makeSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
= 0; = 0;
}; };
template<class SubViewT> template<class SubViewT>
struct SubViewFactory : public SubViewFactoryBase struct SubViewFactory : public SubViewFactoryBase
{ {
virtual SubView *makeSubView (const CSMWorld::UniversalId& id, CSMWorld::Data& data, QUndoStack& undoStack); virtual SubView *makeSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document);
}; };
template<class SubViewT> template<class SubViewT>
SubView *SubViewFactory<SubViewT>::makeSubView (const CSMWorld::UniversalId& id, CSMWorld::Data& data, SubView *SubViewFactory<SubViewT>::makeSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
QUndoStack& undoStack)
{ {
return new SubViewT (id, data, undoStack); return new SubViewT (id, document.getData(), document.getUndoStack());
} }
template<class SubViewT> template<class SubViewT>
@ -59,7 +60,7 @@ namespace CSVWorld
SubViewFactoryWithCreateFlag (bool createAndDelete); SubViewFactoryWithCreateFlag (bool createAndDelete);
virtual SubView *makeSubView (const CSMWorld::UniversalId& id, CSMWorld::Data& data, QUndoStack& undoStack); virtual SubView *makeSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document);
}; };
template<class SubViewT> template<class SubViewT>
@ -69,10 +70,9 @@ namespace CSVWorld
template<class SubViewT> template<class SubViewT>
SubView *SubViewFactoryWithCreateFlag<SubViewT>::makeSubView (const CSMWorld::UniversalId& id, SubView *SubViewFactoryWithCreateFlag<SubViewT>::makeSubView (const CSMWorld::UniversalId& id,
CSMWorld::Data& data, CSMDoc::Document& document)
QUndoStack& undoStack)
{ {
return new SubViewT (id, data, undoStack, mCreateAndDelete); return new SubViewT (id, document.getData(), document.getUndoStack(), mCreateAndDelete);
} }
} }