Remove Object2.

6 files changed, 8 insertions, 21 deletions

diff --git a/include/cru/base/Base.h b/include/cru/base/Base.h
index 28983469..6dfe995a 100644
--- a/include/cru/base/Base.h
+++ b/include/cru/base/Base.h
@@ -67,21 +67,11 @@ namespace cru {
 class CRU_BASE_API Object {
  public:
   Object() = default;
-  CRU_DEFAULT_COPY(Object)
-  CRU_DEFAULT_MOVE(Object)
+  CRU_DELETE_COPY(Object)
+  CRU_DELETE_MOVE(Object)
   virtual ~Object() = default;
 };
 
-class CRU_BASE_API Object2 {
- public:
-  Object2() = default;
-  Object2(const Object2&) = delete;
-  Object2& operator=(const Object2&) = delete;
-  Object2(Object2&&) = delete;
-  Object2& operator=(Object2&&) = delete;
-  virtual ~Object2() = default;
-};
-
 struct CRU_BASE_API Interface {
   Interface() = default;
   CRU_DELETE_COPY(Interface)
diff --git a/include/cru/base/PropertyTree.h b/include/cru/base/PropertyTree.h
index 8eecc3b9..47055c2a 100644
--- a/include/cru/base/PropertyTree.h
+++ b/include/cru/base/PropertyTree.h
@@ -33,7 +33,7 @@ class CRU_BASE_API PropertySubTreeRef {
   std::string path_;
 };
 
-class CRU_BASE_API PropertyTree : public Object2 {
+class CRU_BASE_API PropertyTree : public Object {
  public:
   static std::string CombineKey(std::string_view left, std::string_view right);
 
diff --git a/include/cru/base/Timer.h b/include/cru/base/Timer.h
index 6e34d9cb..7b467f18 100644
--- a/include/cru/base/Timer.h
+++ b/include/cru/base/Timer.h
@@ -12,7 +12,7 @@
 
 namespace cru {
 template <typename D>
-class TimerRegistry : public Object2 {
+class TimerRegistry : public Object {
  private:
   struct TimerData {
     int id;
diff --git a/include/cru/base/io/Stream.h b/include/cru/base/io/Stream.h
index f082b490..54801f05 100644
--- a/include/cru/base/io/Stream.h
+++ b/include/cru/base/io/Stream.h
@@ -64,9 +64,6 @@ class CRU_BASE_API Stream : public Object {
  public:
   enum class SeekOrigin { Current, Begin, End };
 
-  CRU_DELETE_COPY(Stream)
-  CRU_DELETE_MOVE(Stream)
-
   ~Stream() override = default;
 
  public:
diff --git a/include/cru/base/log/Logger.h b/include/cru/base/log/Logger.h
index f44bad72..8f7c32e0 100644
--- a/include/cru/base/log/Logger.h
+++ b/include/cru/base/log/Logger.h
@@ -30,7 +30,7 @@ struct CRU_BASE_API ILogTarget : virtual Interface {
   virtual void Write(LogLevel level, std::string s) = 0;
 };
 
-class CRU_BASE_API Logger : public Object2 {
+class CRU_BASE_API Logger : public Object {
  public:
   static Logger* GetInstance();
 
@@ -76,7 +76,7 @@ class CRU_BASE_API Logger : public Object2 {
   std::vector<std::unique_ptr<ILogTarget>> target_list_;
 };
 
-class CRU_BASE_API LoggerCppStream : public Object2 {
+class CRU_BASE_API LoggerCppStream : public Object {
  public:
   explicit LoggerCppStream(Logger* logger, LogLevel level, std::string tag);
   ~LoggerCppStream() override = default;
diff --git a/include/cru/base/platform/unix/EventLoop.h b/include/cru/base/platform/unix/EventLoop.h
index 697c6f37..0bc68138 100644
--- a/include/cru/base/platform/unix/EventLoop.h
+++ b/include/cru/base/platform/unix/EventLoop.h
@@ -17,7 +17,7 @@
 #include <utility>
 
 namespace cru::platform::unix {
-class UnixTimerFile : public Object2 {
+class UnixTimerFile : public Object {
  public:
   template <class Rep, class Period>
   explicit UnixTimerFile(std::chrono::duration<Rep, Period> time) {
@@ -45,7 +45,7 @@ class UnixTimerFile : public Object2 {
   std::thread thread_;
 };
 
-class UnixEventLoop : public Object2 {
+class UnixEventLoop : public Object {
   CRU_DEFINE_CLASS_LOG_TAG("cru::platform::unix::UnixEventLoop")
  public:
   using PollEvents = decltype(std::declval<pollfd>().events);