X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=src%2Fsortaction.h;h=a99f786988b88a9cb238fc77122fb6a14aa5d4f2;hb=c997c8f4931cde3ede1b51905c10c4d9c442e630;hp=66c337ca625cac468b113debc86c1cd224029a76;hpb=6ed5c4682ee599c7d03d8c67dcca3ac4033a63ec;p=germs.git

diff --git a/src/sortaction.h b/src/sortaction.h
index 66c337c..a99f786 100644
--- a/src/sortaction.h
+++ b/src/sortaction.h
@@ -21,56 +21,97 @@
 #ifndef __SORTACTION_H__
 #define __SORTACTION_H__
 
-#include <tr1/memory>
+#include "shared_ptr.h"
 #include <string>
 class GeneOrder;
+
+
 /**
- * Abstraction of a sort action, all child actions has to be immutable.
+ * Abstraction for a sort action implementation, this is the base that other
+ * actions inherits from.
+ */
+class SortActionImpl{
+	public:
+
+		virtual ~SortActionImpl(){};
+
+		/**
+		 * Applies the action on the GeneOrder and returning it.
+		 */
+		virtual GeneOrder& operator()(GeneOrder& go) const = 0;
+
+		/**
+		 * Compares sort actions.
+		 */
+		virtual bool operator==(const SortActionImpl& sa) const = 0;
+		
+		/**
+		 * Gives a string representation of the action, for output
+		 */
+		virtual std::string toString() const = 0;
+};
+
+/**
+ * Abstraction of a sort action, all SortActionImpls has to be immutable.
  *
  * \author Michael Andreen
  */
 class SortAction{
 	public:
-		typedef std::tr1::shared_ptr<SortAction> ActionPointer;
+		typedef shared_ptr<SortActionImpl> ActionPointer;
 
 		/**
 		 * Creates a new sort action, given a specified action.
 		 * SortAction promises to remove the given action.
 		 */
-		SortAction(SortAction* sa): _action(sa){
+		SortAction(SortActionImpl* sa): _action(sa){
 		}
 
 		SortAction(const SortAction& sa): _action(sa._action){
 		}
 
-		virtual const SortAction& operator=(const SortAction& sa){
+		const SortAction& operator=(const SortAction& sa){
 			if (this != &sa)
 				_action = sa._action;
 			return *this;
 		}
 		
-		virtual ~SortAction(){};
+		~SortAction(){};
 
 		/**
 		 * Applies the action on the GeneOrder and returning it.
 		 */
-		virtual GeneOrder& operator()(GeneOrder& go) const{
+		GeneOrder& operator()(GeneOrder& go) const{
 			return (*_action)(go);
 		}
 
 		/**
 		 * Compares sort actions.
 		 */
-		virtual bool operator==(const SortAction& sa) const{
-			return (*_action) == (sa._action.get() == 0 ? sa : *sa._action);
+		bool operator==(const SortAction& sa) const{
+			return (*_action) == (*sa._action);
+		}
+
+		/**
+		 * Compares sort actions.
+		 */
+		bool operator==(const SortActionImpl& sa) const{
+			return (*_action) == sa;
 		}
 		
 		/**
 		 * Gives a string representation of the action, for output
 		 */
-		virtual std::string toString() const{
+		std::string toString() const{
 			return _action->toString();
 		}
+
+		/**
+		 * Gives access to the implementation
+		 */
+		const SortActionImpl& impl() const{
+			return *_action;
+		}
 	private:
 		ActionPointer _action;