Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/MRViewer/MRAncillaryLabels.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ struct MRVIEWER_CLASS AncillaryLabel
AncillaryLabel() = default;

/// since this uniquely owns an ancillary object, we provide only move operations, not copy
AncillaryLabel( AncillaryLabel && b ) noexcept : obj{ std::move( b.obj ) } {}
AncillaryLabel( AncillaryLabel && b ) noexcept = default;
AncillaryLabel & operator =( AncillaryLabel && b ) { reset(); obj = std::move( b.obj ); return *this; }

/// Make not-pickable ancillary object, link it to parent object, and set label text
Expand Down
3 changes: 1 addition & 2 deletions source/MRViewer/MRAncillaryLines.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ struct MRVIEWER_CLASS AncillaryLines
AncillaryLines() = default;

/// since this uniquely owns an ancillary object, we provide only move operations, not copy
AncillaryLines( AncillaryLines && b ) noexcept : obj{ std::move( b.obj ) } {}
AncillaryLines( AncillaryLines && b ) noexcept = default;
AncillaryLines & operator =( AncillaryLines && b ) { reset(); obj = std::move( b.obj ); return *this; }
AncillaryLines( AncillaryLines& b ) = default;

/// Make not-pickable ancillary object, link it to parent object, and set line geometry
explicit AncillaryLines( Object& parent, const Contours3f& contours = {} ) { make( parent, contours ); }
Expand Down
2 changes: 1 addition & 1 deletion source/MRViewer/MRAncillaryMesh.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ struct MRVIEWER_CLASS AncillaryMesh
AncillaryMesh() = default;

/// since this uniquely owns an ancillary object, we provide only move operations, not copy
AncillaryMesh( AncillaryMesh && b ) noexcept : obj{ std::move( b.obj ) } {}
AncillaryMesh( AncillaryMesh && b ) noexcept = default;
AncillaryMesh & operator =( AncillaryMesh && b ) { reset(); obj = std::move( b.obj ); return *this; }

/// Make not-pickable object, link it to parent object
Expand Down
2 changes: 1 addition & 1 deletion source/MRViewer/MRAncillaryPoints.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ struct MRVIEWER_CLASS AncillaryPoints
AncillaryPoints() = default;

/// since this uniquely owns an ancillary object, we provide only move operations, not copy
AncillaryPoints( AncillaryPoints && b ) noexcept : obj{ std::move( b.obj ) } {}
AncillaryPoints( AncillaryPoints && b ) noexcept = default;
AncillaryPoints & operator =( AncillaryPoints && b ) { reset(); obj = std::move( b.obj ); return *this; }

/// Make not-pickable object, link it to parent object
Expand Down
Loading