Merge pull request #104 from daleglass/implicit_copy_constructor

Make default copy constructors explicit
This commit is contained in:
kasenvr 2020-02-08 14:45:44 -05:00 committed by GitHub
commit 48ae156db7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 1 deletions

View file

@ -31,6 +31,8 @@ public:
surfaceNormal = stylusPickResult.surfaceNormal;
}
StylusPickResult& operator=(const StylusPickResult &right) = default;
IntersectionType type { NONE };
bool intersects { false };
QUuid objectID;

View file

@ -162,6 +162,7 @@ protected:
const QString& typeVarIn, const QString& weightVarIn, float weightIn, const std::vector<float>& flexCoefficientsIn,
const QString& poleVectorEnabledVar, const QString& poleReferenceVectorVar, const QString& poleVectorVar);
IKTargetVar(const IKTargetVar& orig);
AnimInverseKinematics::IKTargetVar& operator=(const AnimInverseKinematics::IKTargetVar&) = default;
QString jointName;
QString positionVar;

View file

@ -121,6 +121,8 @@ public:
static void propertiesToBlob(QScriptEngine& scriptEngine, const QUuid& myAvatarID, const EntityItemProperties& properties, QByteArray& blob);
EntityItemProperties(EntityPropertyFlags desiredProperties = EntityPropertyFlags());
EntityItemProperties(const EntityItemProperties&) = default;
virtual ~EntityItemProperties() = default;
void merge(const EntityItemProperties& other);

View file

@ -112,6 +112,7 @@ public:
SimulationOwner();
SimulationOwner(const QUuid& id, uint8_t priority);
SimulationOwner(const SimulationOwner &) = default;
const QUuid& getID() const { return _id; }
const uint64_t& getExpiry() const { return _expiry; }

View file

@ -59,7 +59,7 @@ namespace image {
Image() : _dims(0,0) {}
Image(int width, int height, Format format);
Image(const QImage& data) : _packedData(data), _dims(data.width(), data.height()), _format((Format)data.format()) {}
Image(const Image &other) = default;
void operator=(const QImage& other) {
_packedData = other;
_floatData.clear();

View file

@ -19,6 +19,8 @@ public:
CubicHermiteSplineFunctor(const CubicHermiteSplineFunctor& orig) : _p0(orig._p0), _m0(orig._m0), _p1(orig._p1), _m1(orig._m1) {}
CubicHermiteSplineFunctor& operator=(const CubicHermiteSplineFunctor&) = default;
virtual ~CubicHermiteSplineFunctor() {}
// evalute the hermite curve at parameter t (0..1)
@ -85,6 +87,8 @@ public:
memcpy(_values, orig._values, sizeof(float) * (NUM_SUBDIVISIONS + 1));
}
CubicHermiteSplineFunctorWithArcLength& operator=(const CubicHermiteSplineFunctorWithArcLength&) = default;
// given the spline parameter (0..1) output the arcLength of the spline up to that point.
float arcLength(float t) const {
float index = t * NUM_SUBDIVISIONS;

View file

@ -48,6 +48,7 @@ public:
webMediaTypes(mediaType.webMediaTypes),
fileSignatures(mediaType.fileSignatures) {
}
MediaType& operator=(const MediaType&) = default;
static MediaType NONE;