Commit 43ece7f7 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Use "= delete" to get rid of copy constructor, not private section

parent 97aa5c2c
...@@ -125,6 +125,7 @@ public: ...@@ -125,6 +125,7 @@ public:
/// Destructor. /// Destructor.
virtual ~AbstractType (); virtual ~AbstractType ();
AbstractType(const AbstractType& rhs) = delete;
AbstractType& operator=(const AbstractType& rhs) = delete; AbstractType& operator=(const AbstractType& rhs) = delete;
/** /**
...@@ -291,9 +292,6 @@ protected: ...@@ -291,9 +292,6 @@ protected:
TYPE_DECLARE_DATA(AbstractType) TYPE_DECLARE_DATA(AbstractType)
friend class AbstractTypeDataRequest; friend class AbstractTypeDataRequest;
private:
AbstractType(const AbstractType& rhs);
}; };
/** /**
......
...@@ -152,6 +152,8 @@ public: ...@@ -152,6 +152,8 @@ public:
{ {
} }
MergeIdentifiedType(const MergeIdentifiedType& rhs) = delete;
IdentifiedTypeData* idData() override IdentifiedTypeData* idData() override
{ {
return static_cast<Data*>(this->d_func_dynamic()); return static_cast<Data*>(this->d_func_dynamic());
...@@ -172,9 +174,6 @@ public: ...@@ -172,9 +174,6 @@ public:
return IdentifiedType::equals(static_cast<const IdentifiedType*>(rhsId)); return IdentifiedType::equals(static_cast<const IdentifiedType*>(rhsId));
} }
private:
MergeIdentifiedType(const MergeIdentifiedType& rhs);
}; };
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment