Избягване на експлицитното преобразуване на Cloneable* към Task*

чрез шаблонизиране на Cloneable, шаблонният параметър указва базовия клас, указател към който ще връща clone()
triffon · Jun 5, 2019 · 3368b78 · 3368b78
1 parent b5f3e01
commit 3368b78
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/common/cloneable.h b/common/cloneable.h
@@ -1,9 +1,10 @@
 #ifndef __CLONEABLE_H
 #define __CLONEABLE_H
 
+template <typename T>
 class Cloneable {
 public:
-  virtual Cloneable* clone() const = 0;
+  virtual T* clone() const = 0;
 };
 
 #endif
diff --git a/tasks/quick_task.h b/tasks/quick_task.h
@@ -16,7 +16,7 @@ class QuickTask : public Task {
 
   void print(std::ostream& os = std::cout) const;
 
-  Cloneable* clone() const { return new QuickTask(*this); }
+  Task* clone() const { return new QuickTask(*this); }
 };
 
 #endif
diff --git a/tasks/repeated_task.cpp b/tasks/repeated_task.cpp
@@ -2,7 +2,7 @@
 
 RepeatedTask::RepeatedTask(char const* n, Task const& t, unsigned r) :
   SimpleTask(n, r), current(nullptr) {
-  prototype = (Task*)t.clone();
+  prototype = t.clone();
   reset();
 }
 
@@ -24,8 +24,8 @@ RepeatedTask::~RepeatedTask() {
 }
 
 void RepeatedTask::copy(RepeatedTask const& rt) {
-  prototype = (Task*)rt.prototype->clone();
-  current = (Task*)rt.current->clone();
+  prototype = rt.prototype->clone();
+  current = rt.current->clone();
 }
 
 void RepeatedTask::destroy() {

diff --git a/tasks/repeated_task.h b/tasks/repeated_task.h
@@ -30,7 +30,7 @@ class RepeatedTask : public SimpleTask {
 
   void print(std::ostream& os = std::cout) const;
 
-  Cloneable* clone() const { return new RepeatedTask(*this); }
+  Task* clone() const { return new RepeatedTask(*this); }
 
   unsigned getRepetitions() const { return SimpleTask::getExecutionTime(); }
 

diff --git a/tasks/simple_task.h b/tasks/simple_task.h
@@ -17,7 +17,7 @@ class SimpleTask : public Task {
 
   void print(std::ostream& os = std::cout) const;
 
-  Cloneable* clone() const { return new SimpleTask(*this); }
+  Task* clone() const { return new SimpleTask(*this); }
 };
 
 #endif
diff --git a/tasks/task.h b/tasks/task.h
@@ -5,7 +5,7 @@
 #include "../common/named.h"
 #include "../common/cloneable.h"
 
-class Task : public Printable, public Named, public Cloneable {
+class Task : public Printable, public Named, public Cloneable<Task> {
 
 public: