comparison data/model/SparseModel.h @ 387:7aa1de571880

* juggle some files around in order to free audioio, base, and system libraries
  from dependency on QtGui

 #ifndef _SPARSE_MODEL_H_
 #define _SPARSE_MODEL_H_
 
 #include "Model.h"
 #include "base/Command.h"
-#include "base/CommandHistory.h"
 
 #include <iostream>
 
 #include <set>
 #include <QMutex>

 	 * Stack an arbitrary other command in the same sequence.
 	 */
 	virtual void addCommand(Command *command) { addCommand(command, true); }
 
 	/**
-	 * If any points have been added or deleted, add this command
-	 * to the command history.  Otherwise delete the command.
+	 * If any points have been added or deleted, return this
+	 * command (so the caller can add it to the command history).
+	 * Otherwise delete the command.
 	 */
-	virtual void finish();
+	virtual Command *finish();
 
     protected:
 	virtual void addCommand(Command *command, bool executeFirst);
 
 	SparseModel<PointType> *m_model;

 {
     addCommand(new DeletePointCommand(m_model, point), true);
 }
 
 template <typename PointType>
-void
+Command *
 SparseModel<PointType>::EditCommand::finish()
 {
     if (!m_commands.empty()) {
-	CommandHistory::getInstance()->addCommand(this, false);
+        return this;
     } else {
         delete this;
     }
 }