forked from mia/Aegisub
More interface cleanup.
Originally committed to SVN as r2478.
This commit is contained in:
parent
c7f8ba6ca8
commit
f22cfa177e
|
@ -47,7 +47,7 @@ class wxOutputStream;
|
||||||
|
|
||||||
namespace Athenasub {
|
namespace Athenasub {
|
||||||
|
|
||||||
// Prototypes
|
// Forward references
|
||||||
class Range;
|
class Range;
|
||||||
class Reader;
|
class Reader;
|
||||||
class Writer;
|
class Writer;
|
||||||
|
@ -64,8 +64,6 @@ namespace Athenasub {
|
||||||
class INotification;
|
class INotification;
|
||||||
class ISection;
|
class ISection;
|
||||||
class IDeltaCoder;
|
class IDeltaCoder;
|
||||||
class CController;
|
|
||||||
class CAction;
|
|
||||||
class IAction;
|
class IAction;
|
||||||
|
|
||||||
|
|
||||||
|
@ -326,12 +324,6 @@ namespace Athenasub {
|
||||||
|
|
||||||
// Action list
|
// Action list
|
||||||
class IActionList {
|
class IActionList {
|
||||||
friend class CModel;
|
|
||||||
|
|
||||||
protected:
|
|
||||||
virtual std::list<Action> GetActions() = 0;
|
|
||||||
virtual void AddActionStart(Action action) = 0;
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
virtual ~IActionList() {}
|
virtual ~IActionList() {}
|
||||||
|
|
||||||
|
|
|
@ -75,11 +75,11 @@ void CModel::ProcessActionList(CActionList &_actionList,int type)
|
||||||
{
|
{
|
||||||
// Copy the list
|
// Copy the list
|
||||||
//shared_ptr<CActionList> actions = shared_ptr<CActionList>(new CActionList(_actionList));
|
//shared_ptr<CActionList> actions = shared_ptr<CActionList>(new CActionList(_actionList));
|
||||||
ActionList actions = ActionList(new CActionList(_actionList));
|
shared_ptr<CActionList> actions = shared_ptr<CActionList>(new CActionList(_actionList));
|
||||||
bool canUndo = actions->CanUndo();
|
bool canUndo = actions->CanUndo();
|
||||||
|
|
||||||
// Setup undo
|
// Setup undo
|
||||||
ActionList undo = ActionList(new CActionList(actions->GetModel(),actions->GetName(),actions->GetOwner(),canUndo));
|
shared_ptr<CActionList> undo = shared_ptr<CActionList>(new CActionList(actions->GetModel(),actions->GetName(),actions->GetOwner(),canUndo));
|
||||||
ActionStack *stack;
|
ActionStack *stack;
|
||||||
if (type == 1) stack = &redoStack;
|
if (type == 1) stack = &redoStack;
|
||||||
else stack = &undoStack;
|
else stack = &undoStack;
|
||||||
|
|
Loading…
Reference in a new issue