Skip to content
Extraits de code Groupes Projets
Valider f22cfa17 rédigé par Rodrigo Braz Monteiro's avatar Rodrigo Braz Monteiro
Parcourir les fichiers

More interface cleanup.

Originally committed to SVN as r2478.
parent c7f8ba6c
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -47,7 +47,7 @@ class wxOutputStream; ...@@ -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 { ...@@ -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 { ...@@ -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) ...@@ -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;
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter