diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-04-15 00:07:21 +0000 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-06-12 18:59:52 +0000 |
| commit | e4afb390e9d056f4e7758eda7d432612fbcb167c (patch) | |
| tree | 631727cecded1c3eb5cf966ea95d30cfd5799f2b /src | |
| parent | Migrated object-test and sp-gradient-test to gtest (diff) | |
| download | inkscape-e4afb390e9d056f4e7758eda7d432612fbcb167c.tar.gz inkscape-e4afb390e9d056f4e7758eda7d432612fbcb167c.zip | |
Run clang-tidy’s modernize-use-equals-delete pass.
Adds a delete specifier on constructors, destructors or assignment
methods that should never be called, ensuring they actually never will.
Diffstat (limited to 'src')
142 files changed, 307 insertions, 307 deletions
diff --git a/src/attribute-rel-css.h b/src/attribute-rel-css.h index 5f3aaf253..dfce37f85 100644 --- a/src/attribute-rel-css.h +++ b/src/attribute-rel-css.h @@ -30,8 +30,8 @@ public: private: SPAttributeRelCSS(); - SPAttributeRelCSS(const SPAttributeRelCSS&); - SPAttributeRelCSS& operator= (const SPAttributeRelCSS&); + SPAttributeRelCSS(const SPAttributeRelCSS&) = delete; + SPAttributeRelCSS& operator= (const SPAttributeRelCSS&) = delete; private: /* diff --git a/src/attribute-rel-svg.h b/src/attribute-rel-svg.h index c0a9cd215..1ec2b50e3 100644 --- a/src/attribute-rel-svg.h +++ b/src/attribute-rel-svg.h @@ -27,8 +27,8 @@ public: private: SPAttributeRelSVG(); - SPAttributeRelSVG(const SPAttributeRelSVG&); - SPAttributeRelSVG& operator= (const SPAttributeRelSVG&); + SPAttributeRelSVG(const SPAttributeRelSVG&) = delete; + SPAttributeRelSVG& operator= (const SPAttributeRelSVG&) = delete; private: static SPAttributeRelSVG *instance; diff --git a/src/debug/event-tracker.h b/src/debug/event-tracker.h index fe2069a29..8a2e6242a 100644 --- a/src/debug/event-tracker.h +++ b/src/debug/event-tracker.h @@ -136,8 +136,8 @@ protected: EventTrackerBase(bool active) : _active(active) {} private: - EventTrackerBase(EventTrackerBase const &); // no copy - void operator=(EventTrackerBase const &); // no assign + EventTrackerBase(EventTrackerBase const &) = delete; // no copy + void operator=(EventTrackerBase const &) = delete; // no assign bool _active; }; diff --git a/src/debug/gdk-event-latency-tracker.h b/src/debug/gdk-event-latency-tracker.h index 0fdb18790..75a861a40 100644 --- a/src/debug/gdk-event-latency-tracker.h +++ b/src/debug/gdk-event-latency-tracker.h @@ -29,8 +29,8 @@ public: static GdkEventLatencyTracker &default_tracker(); private: - GdkEventLatencyTracker(GdkEventLatencyTracker const &); // no copy - void operator=(GdkEventLatencyTracker const &); // no assign + GdkEventLatencyTracker(GdkEventLatencyTracker const &) = delete; // no copy + void operator=(GdkEventLatencyTracker const &) = delete; // no assign double start_seconds; double max_latency; diff --git a/src/device-manager.cpp b/src/device-manager.cpp index 6c8d4514c..185d417fb 100644 --- a/src/device-manager.cpp +++ b/src/device-manager.cpp @@ -188,8 +188,8 @@ public: virtual Glib::RefPtr<Gdk::Device> getDevice() {return device;} private: - InputDeviceImpl(InputDeviceImpl const &); // no copy - void operator=(InputDeviceImpl const &); // no assign + InputDeviceImpl(InputDeviceImpl const &) = delete; // no copy + void operator=(InputDeviceImpl const &) = delete; // no assign static Glib::ustring createId(Glib::ustring const &id, Gdk::InputSource source, std::set<Glib::ustring> &knownIDs); diff --git a/src/device-manager.h b/src/device-manager.h index d608a5717..8583ae5d0 100644 --- a/src/device-manager.h +++ b/src/device-manager.h @@ -34,8 +34,8 @@ protected: virtual ~InputDevice(); private: - InputDevice(InputDevice const &); // no copy - void operator=(InputDevice const &); // no assign + InputDevice(InputDevice const &) = delete; // no copy + void operator=(InputDevice const &) = delete; // no assign }; class DeviceManager : public Glib::Object { @@ -65,8 +65,8 @@ protected: virtual ~DeviceManager(); private: - DeviceManager(DeviceManager const &); // no copy - void operator=(DeviceManager const &); // no assign + DeviceManager(DeviceManager const &) = delete; // no copy + void operator=(DeviceManager const &) = delete; // no assign }; diff --git a/src/display/canvas-axonomgrid.h b/src/display/canvas-axonomgrid.h index 5e06ae564..4231520e7 100644 --- a/src/display/canvas-axonomgrid.h +++ b/src/display/canvas-axonomgrid.h @@ -52,8 +52,8 @@ protected: virtual Gtk::Widget * newSpecificWidget(); private: - CanvasAxonomGrid(const CanvasAxonomGrid&); - CanvasAxonomGrid& operator=(const CanvasAxonomGrid&); + CanvasAxonomGrid(const CanvasAxonomGrid&) = delete; + CanvasAxonomGrid& operator=(const CanvasAxonomGrid&) = delete; void updateWidgets(); diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h index c15cde656..a02b5d5fd 100644 --- a/src/display/canvas-grid.h +++ b/src/display/canvas-grid.h @@ -135,8 +135,8 @@ protected: Inkscape::UI::Widget::AlignmentSelector *_as_alignment; private: - CanvasGrid(const CanvasGrid&); - CanvasGrid& operator=(const CanvasGrid&); + CanvasGrid(const CanvasGrid&) = delete; + CanvasGrid& operator=(const CanvasGrid&) = delete; }; @@ -163,8 +163,8 @@ protected: virtual Gtk::Widget * newSpecificWidget(); private: - CanvasXYGrid(const CanvasXYGrid&); - CanvasXYGrid& operator=(const CanvasXYGrid&); + CanvasXYGrid(const CanvasXYGrid&) = delete; + CanvasXYGrid& operator=(const CanvasXYGrid&) = delete; void updateWidgets(); diff --git a/src/display/canvas-temporary-item-list.h b/src/display/canvas-temporary-item-list.h index 471bb99b9..c3e936b19 100644 --- a/src/display/canvas-temporary-item-list.h +++ b/src/display/canvas-temporary-item-list.h @@ -39,8 +39,8 @@ protected: void _item_timeout (TemporaryItem * tempitem); private: - TemporaryItemList(const TemporaryItemList&); - TemporaryItemList& operator=(const TemporaryItemList&); + TemporaryItemList(const TemporaryItemList&) = delete; + TemporaryItemList& operator=(const TemporaryItemList&) = delete; }; } //namespace Display diff --git a/src/display/canvas-temporary-item.h b/src/display/canvas-temporary-item.h index d7d3951f1..92b16b1ab 100644 --- a/src/display/canvas-temporary-item.h +++ b/src/display/canvas-temporary-item.h @@ -38,8 +38,8 @@ protected: static int _timeout(void* data); ///< callback for when lifetime expired private: - TemporaryItem(const TemporaryItem&); - TemporaryItem& operator=(const TemporaryItem&); + TemporaryItem(const TemporaryItem&) = delete; + TemporaryItem& operator=(const TemporaryItem&) = delete; }; } //namespace Display diff --git a/src/display/curve.h b/src/display/curve.h index 87b9984a8..b79d41ebe 100644 --- a/src/display/curve.h +++ b/src/display/curve.h @@ -88,8 +88,8 @@ protected: private: // Don't implement these: - SPCurve(const SPCurve&); - SPCurve& operator=(const SPCurve&); + SPCurve(const SPCurve&) = delete; + SPCurve& operator=(const SPCurve&) = delete; }; #endif // !SEEN_DISPLAY_CURVE_H diff --git a/src/display/snap-indicator.h b/src/display/snap-indicator.h index 30040d99c..d4a144002 100644 --- a/src/display/snap-indicator.h +++ b/src/display/snap-indicator.h @@ -49,8 +49,8 @@ protected: SPDesktop *_desktop; private: - SnapIndicator(const SnapIndicator&); - SnapIndicator& operator=(const SnapIndicator&); + SnapIndicator(const SnapIndicator&) = delete; + SnapIndicator& operator=(const SnapIndicator&) = delete; }; } //namespace Display diff --git a/src/document-subset.h b/src/document-subset.h index 2799ff173..b0a17eff5 100644 --- a/src/document-subset.h +++ b/src/document-subset.h @@ -46,8 +46,8 @@ protected: void _clear(); private: - DocumentSubset(DocumentSubset const &); // no copy - void operator=(DocumentSubset const &); // no assign + DocumentSubset(DocumentSubset const &) = delete; // no copy + void operator=(DocumentSubset const &) = delete; // no assign void _remove(SPObject *obj, bool subtree); diff --git a/src/document.h b/src/document.h index 65f0cf628..1f3de042b 100644 --- a/src/document.h +++ b/src/document.h @@ -226,8 +226,8 @@ public: void setModifiedSinceSave(bool const modified = true); private: - SPDocument(SPDocument const &); // no copy - void operator=(SPDocument const &); // no assign + SPDocument(SPDocument const &) = delete; // no copy + void operator=(SPDocument const &) = delete; // no assign Persp3D *current_persp3d; /**< Currently 'active' perspective (to which, e.g., newly created boxes are attached) */ Persp3DImpl *current_persp3d_impl; diff --git a/src/event-log.h b/src/event-log.h index c4c78d1dd..3cbcb6d3a 100644 --- a/src/event-log.h +++ b/src/event-log.h @@ -141,8 +141,8 @@ private: void checkForVirginity(); //< marks the document as untouched if undo/redo reaches a previously saved state // noncopyable, nonassignable - EventLog(EventLog const &other); - EventLog& operator=(EventLog const &other); + EventLog(EventLog const &other) = delete; + EventLog& operator=(EventLog const &other) = delete; }; } // namespace Inkscape diff --git a/src/gc-anchored.h b/src/gc-anchored.h index 33305df5c..772621eb2 100644 --- a/src/gc-anchored.h +++ b/src/gc-anchored.h @@ -73,8 +73,8 @@ private: Anchor *_new_anchor() const; void _free_anchor(Anchor *anchor) const; - Anchored(Anchored const &); // no copy - void operator=(Anchored const &); // no assign + Anchored(Anchored const &) = delete; // no copy + void operator=(Anchored const &) = delete; // no assign }; /** diff --git a/src/knot.h b/src/knot.h index 6db0db358..0d9e95d89 100644 --- a/src/knot.h +++ b/src/knot.h @@ -152,8 +152,8 @@ public: Geom::Point position() const; private: - SPKnot(SPKnot const&); - SPKnot& operator=(SPKnot const&); + SPKnot(SPKnot const&) = delete; + SPKnot& operator=(SPKnot const&) = delete; /** * Set knot control state (dragging/mouseover/normal). diff --git a/src/knotholder.h b/src/knotholder.h index f03eea3ea..b82ba61f9 100644 --- a/src/knotholder.h +++ b/src/knotholder.h @@ -89,7 +89,7 @@ protected: Geom::Affine _edit_transform; private: - KnotHolder(); // declared but not defined + KnotHolder() = delete; // declared but not defined }; /** diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h index cd8f9d743..cb3ee0afc 100644 --- a/src/live_effects/effect.h +++ b/src/live_effects/effect.h @@ -189,8 +189,8 @@ private: bool is_ready; bool defaultsopen; - Effect(const Effect&); - Effect& operator=(const Effect&); + Effect(const Effect&) = delete; + Effect& operator=(const Effect&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-attach-path.h b/src/live_effects/lpe-attach-path.h index 1d6c590d1..6b3a863d2 100644 --- a/src/live_effects/lpe-attach-path.h +++ b/src/live_effects/lpe-attach-path.h @@ -29,8 +29,8 @@ public: virtual void resetDefaults(SPItem const * item); private: - LPEAttachPath(const LPEAttachPath&); - LPEAttachPath& operator=(const LPEAttachPath&); + LPEAttachPath(const LPEAttachPath&) = delete; + LPEAttachPath& operator=(const LPEAttachPath&) = delete; Geom::Point curve_start_previous_origin; Geom::Point curve_end_previous_origin; diff --git a/src/live_effects/lpe-bool.h b/src/live_effects/lpe-bool.h index ce46f14d1..b7c522eb3 100644 --- a/src/live_effects/lpe-bool.h +++ b/src/live_effects/lpe-bool.h @@ -46,8 +46,8 @@ public: } private: - LPEBool(const LPEBool &); - LPEBool &operator=(const LPEBool &); + LPEBool(const LPEBool &) = delete; + LPEBool &operator=(const LPEBool &) = delete; OriginalPathParam operand_path; EnumParam<bool_op_ex> bool_operation; diff --git a/src/live_effects/lpe-bounding-box.h b/src/live_effects/lpe-bounding-box.h index d028a20ac..fe90ff0ec 100644 --- a/src/live_effects/lpe-bounding-box.h +++ b/src/live_effects/lpe-bounding-box.h @@ -27,8 +27,8 @@ private: BoolParam visual_bounds; private: - LPEBoundingBox(const LPEBoundingBox&); - LPEBoundingBox& operator=(const LPEBoundingBox&); + LPEBoundingBox(const LPEBoundingBox&) = delete; + LPEBoundingBox& operator=(const LPEBoundingBox&) = delete; }; }; //namespace LivePathEffect diff --git a/src/live_effects/lpe-bspline.h b/src/live_effects/lpe-bspline.h index 90cf82c19..44d0e4c26 100644 --- a/src/live_effects/lpe-bspline.h +++ b/src/live_effects/lpe-bspline.h @@ -43,8 +43,8 @@ private: BoolParam only_selected; ScalarParam weight; - LPEBSpline(const LPEBSpline &); - LPEBSpline &operator=(const LPEBSpline &); + LPEBSpline(const LPEBSpline &) = delete; + LPEBSpline &operator=(const LPEBSpline &) = delete; }; void sp_bspline_do_effect(SPCurve *curve, double helper_size); diff --git a/src/live_effects/lpe-circle_3pts.h b/src/live_effects/lpe-circle_3pts.h index 07c2eddb0..8ef11008b 100644 --- a/src/live_effects/lpe-circle_3pts.h +++ b/src/live_effects/lpe-circle_3pts.h @@ -30,8 +30,8 @@ public: virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); private: - LPECircle3Pts(const LPECircle3Pts&); - LPECircle3Pts& operator=(const LPECircle3Pts&); + LPECircle3Pts(const LPECircle3Pts&) = delete; + LPECircle3Pts& operator=(const LPECircle3Pts&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-circle_with_radius.h b/src/live_effects/lpe-circle_with_radius.h index f5bf0c414..97b5c8859 100644 --- a/src/live_effects/lpe-circle_with_radius.h +++ b/src/live_effects/lpe-circle_with_radius.h @@ -33,8 +33,8 @@ private: //ScalarParam radius; // there are all kinds of parameters. Check the /live_effects/parameter directory which types exist! - LPECircleWithRadius(const LPECircleWithRadius&); - LPECircleWithRadius& operator=(const LPECircleWithRadius&); + LPECircleWithRadius(const LPECircleWithRadius&) = delete; + LPECircleWithRadius& operator=(const LPECircleWithRadius&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-clone-original.h b/src/live_effects/lpe-clone-original.h index 9bf09879b..172cd0e0e 100644 --- a/src/live_effects/lpe-clone-original.h +++ b/src/live_effects/lpe-clone-original.h @@ -49,8 +49,8 @@ private: bool listening; bool is_updating; sigc::connection modified_connection; - LPECloneOriginal(const LPECloneOriginal&); - LPECloneOriginal& operator=(const LPECloneOriginal&); + LPECloneOriginal(const LPECloneOriginal&) = delete; + LPECloneOriginal& operator=(const LPECloneOriginal&) = delete; }; }; //namespace LivePathEffect diff --git a/src/live_effects/lpe-constructgrid.h b/src/live_effects/lpe-constructgrid.h index 49c986742..be6a638ba 100644 --- a/src/live_effects/lpe-constructgrid.h +++ b/src/live_effects/lpe-constructgrid.h @@ -31,8 +31,8 @@ private: ScalarParam nr_x; ScalarParam nr_y; - LPEConstructGrid(const LPEConstructGrid&); - LPEConstructGrid& operator=(const LPEConstructGrid&); + LPEConstructGrid(const LPEConstructGrid&) = delete; + LPEConstructGrid& operator=(const LPEConstructGrid&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index 84c1e402e..63db722cb 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -78,8 +78,8 @@ private: double previous_num_copies; bool reset; SPObject * container; - LPECopyRotate(const LPECopyRotate&); - LPECopyRotate& operator=(const LPECopyRotate&); + LPECopyRotate(const LPECopyRotate&) = delete; + LPECopyRotate& operator=(const LPECopyRotate&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-curvestitch.h b/src/live_effects/lpe-curvestitch.h index 0a48046e0..1c5a39cf5 100644 --- a/src/live_effects/lpe-curvestitch.h +++ b/src/live_effects/lpe-curvestitch.h @@ -45,8 +45,8 @@ private: BoolParam scale_y_rel; bool transformed; - LPECurveStitch(const LPECurveStitch&); - LPECurveStitch& operator=(const LPECurveStitch&); + LPECurveStitch(const LPECurveStitch&) = delete; + LPECurveStitch& operator=(const LPECurveStitch&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-dynastroke.h b/src/live_effects/lpe-dynastroke.h index 816cb60a6..ee2642fd3 100644 --- a/src/live_effects/lpe-dynastroke.h +++ b/src/live_effects/lpe-dynastroke.h @@ -57,8 +57,8 @@ private: BoolParam round_ends; PathParam capping; - LPEDynastroke(const LPEDynastroke&); - LPEDynastroke& operator=(const LPEDynastroke&); + LPEDynastroke(const LPEDynastroke&) = delete; + LPEDynastroke& operator=(const LPEDynastroke&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-ellipse_5pts.h b/src/live_effects/lpe-ellipse_5pts.h index 691a693dc..467a0d522 100644 --- a/src/live_effects/lpe-ellipse_5pts.h +++ b/src/live_effects/lpe-ellipse_5pts.h @@ -29,8 +29,8 @@ public: virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); private: - LPEEllipse5Pts(const LPEEllipse5Pts&); - LPEEllipse5Pts& operator=(const LPEEllipse5Pts&); + LPEEllipse5Pts(const LPEEllipse5Pts&) = delete; + LPEEllipse5Pts& operator=(const LPEEllipse5Pts&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-embrodery-stitch.h b/src/live_effects/lpe-embrodery-stitch.h index 67803f37b..32404e87f 100644 --- a/src/live_effects/lpe-embrodery-stitch.h +++ b/src/live_effects/lpe-embrodery-stitch.h @@ -62,8 +62,8 @@ private: ScalarParam show_stitch_gap; ScalarParam jump_if_longer; - LPEEmbroderyStitch(const LPEEmbroderyStitch &); - LPEEmbroderyStitch &operator=(const LPEEmbroderyStitch &); + LPEEmbroderyStitch(const LPEEmbroderyStitch &) = delete; + LPEEmbroderyStitch &operator=(const LPEEmbroderyStitch &) = delete; double GetPatternInitialStep(int pattern, int line); Geom::Point GetStartPointInterpolAfterRev(std::vector<OrderingInfo> const &info, unsigned i); diff --git a/src/live_effects/lpe-extrude.h b/src/live_effects/lpe-extrude.h index 491fe4959..32549a66a 100644 --- a/src/live_effects/lpe-extrude.h +++ b/src/live_effects/lpe-extrude.h @@ -31,8 +31,8 @@ public: private: VectorParam extrude_vector; - LPEExtrude(const LPEExtrude&); - LPEExtrude& operator=(const LPEExtrude&); + LPEExtrude(const LPEExtrude&) = delete; + LPEExtrude& operator=(const LPEExtrude&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-fill-between-many.h b/src/live_effects/lpe-fill-between-many.h index b03ec6bc3..796638d51 100644 --- a/src/live_effects/lpe-fill-between-many.h +++ b/src/live_effects/lpe-fill-between-many.h @@ -41,8 +41,8 @@ private: HiddenParam applied; Filllpemethod previous_method; private: - LPEFillBetweenMany(const LPEFillBetweenMany&); - LPEFillBetweenMany& operator=(const LPEFillBetweenMany&); + LPEFillBetweenMany(const LPEFillBetweenMany&) = delete; + LPEFillBetweenMany& operator=(const LPEFillBetweenMany&) = delete; }; }; //namespace LivePathEffect diff --git a/src/live_effects/lpe-fill-between-strokes.h b/src/live_effects/lpe-fill-between-strokes.h index d4bf75d01..da3842797 100644 --- a/src/live_effects/lpe-fill-between-strokes.h +++ b/src/live_effects/lpe-fill-between-strokes.h @@ -31,8 +31,8 @@ private: BoolParam close; private: - LPEFillBetweenStrokes(const LPEFillBetweenStrokes&); - LPEFillBetweenStrokes& operator=(const LPEFillBetweenStrokes&); + LPEFillBetweenStrokes(const LPEFillBetweenStrokes&) = delete; + LPEFillBetweenStrokes& operator=(const LPEFillBetweenStrokes&) = delete; }; }; //namespace LivePathEffect diff --git a/src/live_effects/lpe-gears.h b/src/live_effects/lpe-gears.h index 57b49d2b5..945cae8cc 100644 --- a/src/live_effects/lpe-gears.h +++ b/src/live_effects/lpe-gears.h @@ -29,8 +29,8 @@ private: ScalarParam phi; ScalarParam min_radius; - LPEGears(const LPEGears&); - LPEGears& operator=(const LPEGears&); + LPEGears(const LPEGears&) = delete; + LPEGears& operator=(const LPEGears&) = delete; }; }; //namespace LivePathEffect diff --git a/src/live_effects/lpe-interpolate.h b/src/live_effects/lpe-interpolate.h index ef8043e46..629b6906f 100644 --- a/src/live_effects/lpe-interpolate.h +++ b/src/live_effects/lpe-interpolate.h @@ -35,8 +35,8 @@ private: ScalarParam number_of_steps; BoolParam equidistant_spacing; - LPEInterpolate(const LPEInterpolate&); - LPEInterpolate& operator=(const LPEInterpolate&); + LPEInterpolate(const LPEInterpolate&) = delete; + LPEInterpolate& operator=(const LPEInterpolate&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-interpolate_points.h b/src/live_effects/lpe-interpolate_points.h index eb706a320..395fbc9fb 100644 --- a/src/live_effects/lpe-interpolate_points.h +++ b/src/live_effects/lpe-interpolate_points.h @@ -30,8 +30,8 @@ public: private: EnumParam<unsigned> interpolator_type; - LPEInterpolatePoints(const LPEInterpolatePoints&); - LPEInterpolatePoints& operator=(const LPEInterpolatePoints&); + LPEInterpolatePoints(const LPEInterpolatePoints&) = delete; + LPEInterpolatePoints& operator=(const LPEInterpolatePoints&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-jointype.h b/src/live_effects/lpe-jointype.h index ef7abdcc7..24f667d29 100644 --- a/src/live_effects/lpe-jointype.h +++ b/src/live_effects/lpe-jointype.h @@ -27,8 +27,8 @@ public: virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in);
private:
- LPEJoinType(const LPEJoinType&);
- LPEJoinType& operator=(const LPEJoinType&);
+ LPEJoinType(const LPEJoinType&) = delete;
+ LPEJoinType& operator=(const LPEJoinType&) = delete;
ScalarParam line_width;
EnumParam<unsigned> linecap_type;
diff --git a/src/live_effects/lpe-knot.h b/src/live_effects/lpe-knot.h index c268b051a..4f8ba95f6 100644 --- a/src/live_effects/lpe-knot.h +++ b/src/live_effects/lpe-knot.h @@ -88,8 +88,8 @@ private: unsigned selectedCrossing;//the selected crossing Geom::Point switcher;//where to put the "switcher" helper - LPEKnot(const LPEKnot&); - LPEKnot& operator=(const LPEKnot&); + LPEKnot(const LPEKnot&) = delete; + LPEKnot& operator=(const LPEKnot&) = delete; }; diff --git a/src/live_effects/lpe-lattice.h b/src/live_effects/lpe-lattice.h index 8720af138..52e1a0b9f 100644 --- a/src/live_effects/lpe-lattice.h +++ b/src/live_effects/lpe-lattice.h @@ -58,8 +58,8 @@ private: PointParam grid_point13; PointParam grid_point14; PointParam grid_point15; - LPELattice(const LPELattice&); - LPELattice& operator=(const LPELattice&); + LPELattice(const LPELattice&) = delete; + LPELattice& operator=(const LPELattice&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-lattice2.h b/src/live_effects/lpe-lattice2.h index 899c9e009..17bb67f23 100644 --- a/src/live_effects/lpe-lattice2.h +++ b/src/live_effects/lpe-lattice2.h @@ -94,8 +94,8 @@ private: bool expanded; Gtk::Expander * expander; - LPELattice2(const LPELattice2&); - LPELattice2& operator=(const LPELattice2&); + LPELattice2(const LPELattice2&) = delete; + LPELattice2& operator=(const LPELattice2&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-line_segment.h b/src/live_effects/lpe-line_segment.h index def828fe2..c5c0e7476 100644 --- a/src/live_effects/lpe-line_segment.h +++ b/src/live_effects/lpe-line_segment.h @@ -43,8 +43,8 @@ private: Geom::Point A, B; // intersections of the line segment with the limiting bounding box Geom::Point bboxA, bboxB; // upper left and lower right corner of limiting bounding box - LPELineSegment(const LPELineSegment&); - LPELineSegment& operator=(const LPELineSegment&); + LPELineSegment(const LPELineSegment&) = delete; + LPELineSegment& operator=(const LPELineSegment&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-measure-segments.h b/src/live_effects/lpe-measure-segments.h index 4f9df35c8..e4cde08a0 100644 --- a/src/live_effects/lpe-measure-segments.h +++ b/src/live_effects/lpe-measure-segments.h @@ -95,8 +95,8 @@ private: double arrow_gap; guint pagenumber; gchar const* locale_base; - LPEMeasureSegments(const LPEMeasureSegments &); - LPEMeasureSegments &operator=(const LPEMeasureSegments &); + LPEMeasureSegments(const LPEMeasureSegments &) = delete; + LPEMeasureSegments &operator=(const LPEMeasureSegments &) = delete; }; diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h index aa02b1352..1b5e936dd 100644 --- a/src/live_effects/lpe-mirror_symmetry.h +++ b/src/live_effects/lpe-mirror_symmetry.h @@ -74,8 +74,8 @@ private: bool reset; bool center_vert; bool center_horiz; - LPEMirrorSymmetry(const LPEMirrorSymmetry&); - LPEMirrorSymmetry& operator=(const LPEMirrorSymmetry&); + LPEMirrorSymmetry(const LPEMirrorSymmetry&) = delete; + LPEMirrorSymmetry& operator=(const LPEMirrorSymmetry&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-parallel.h b/src/live_effects/lpe-parallel.h index ff19d690e..56ee1b9ea 100644 --- a/src/live_effects/lpe-parallel.h +++ b/src/live_effects/lpe-parallel.h @@ -54,8 +54,8 @@ private: Geom::Point N; Geom::Point dir; - LPEParallel(const LPEParallel&); - LPEParallel& operator=(const LPEParallel&); + LPEParallel(const LPEParallel&) = delete; + LPEParallel& operator=(const LPEParallel&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-path_length.h b/src/live_effects/lpe-path_length.h index 14d093c09..6530e9fa1 100644 --- a/src/live_effects/lpe-path_length.h +++ b/src/live_effects/lpe-path_length.h @@ -30,8 +30,8 @@ public: virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in); private: - LPEPathLength(const LPEPathLength&); - LPEPathLength& operator=(const LPEPathLength&); + LPEPathLength(const LPEPathLength&) = delete; + LPEPathLength& operator=(const LPEPathLength&) = delete; ScalarParam scale; TextParamInternal info_text; UnitParam unit; diff --git a/src/live_effects/lpe-perp_bisector.h b/src/live_effects/lpe-perp_bisector.h index 3a2278de3..219cd6156 100644 --- a/src/live_effects/lpe-perp_bisector.h +++ b/src/live_effects/lpe-perp_bisector.h @@ -60,8 +60,8 @@ private: Geom::Point D; // right end of bisector Geom::Point perp_dir; - LPEPerpBisector(const LPEPerpBisector&); - LPEPerpBisector& operator=(const LPEPerpBisector&); + LPEPerpBisector(const LPEPerpBisector&) = delete; + LPEPerpBisector& operator=(const LPEPerpBisector&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-perspective-envelope.h b/src/live_effects/lpe-perspective-envelope.h index 727b7839d..5bf130ca7 100644 --- a/src/live_effects/lpe-perspective-envelope.h +++ b/src/live_effects/lpe-perspective-envelope.h @@ -67,8 +67,8 @@ private: PointParam down_left_point; PointParam down_right_point; std::vector<Geom::Point> handles; - LPEPerspectiveEnvelope(const LPEPerspectiveEnvelope&); - LPEPerspectiveEnvelope& operator=(const LPEPerspectiveEnvelope&); + LPEPerspectiveEnvelope(const LPEPerspectiveEnvelope&) = delete; + LPEPerspectiveEnvelope& operator=(const LPEPerspectiveEnvelope&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-perspective_path.h b/src/live_effects/lpe-perspective_path.h index 87ee453ff..d55d7fe8c 100644 --- a/src/live_effects/lpe-perspective_path.h +++ b/src/live_effects/lpe-perspective_path.h @@ -54,8 +54,8 @@ private: // there are all kinds of parameters. Check the /live_effects/parameter directory which types exist! Geom::Point orig; - LPEPerspectivePath(const LPEPerspectivePath&); - LPEPerspectivePath& operator=(const LPEPerspectivePath&); + LPEPerspectivePath(const LPEPerspectivePath&) = delete; + LPEPerspectivePath& operator=(const LPEPerspectivePath&) = delete; std::vector<Geom::Point> handles; double tmat[3][4]; diff --git a/src/live_effects/lpe-powerstroke-interpolators.h b/src/live_effects/lpe-powerstroke-interpolators.h index e3ab37e27..c0a60fa81 100644 --- a/src/live_effects/lpe-powerstroke-interpolators.h +++ b/src/live_effects/lpe-powerstroke-interpolators.h @@ -42,8 +42,8 @@ public: virtual Geom::Path interpolateToPath(std::vector<Point> const &points) const = 0; private: - Interpolator(const Interpolator&); - Interpolator& operator=(const Interpolator&); + Interpolator(const Interpolator&) = delete; + Interpolator& operator=(const Interpolator&) = delete; }; class Linear : public Interpolator { @@ -61,8 +61,8 @@ public: }; private: - Linear(const Linear&); - Linear& operator=(const Linear&); + Linear(const Linear&) = delete; + Linear& operator=(const Linear&) = delete; }; // this class is terrible @@ -100,8 +100,8 @@ public: }; private: - CubicBezierFit(const CubicBezierFit&); - CubicBezierFit& operator=(const CubicBezierFit&); + CubicBezierFit(const CubicBezierFit&) = delete; + CubicBezierFit& operator=(const CubicBezierFit&) = delete; }; /// @todo invent name for this class @@ -131,8 +131,8 @@ public: double _beta; private: - CubicBezierJohan(const CubicBezierJohan&); - CubicBezierJohan& operator=(const CubicBezierJohan&); + CubicBezierJohan(const CubicBezierJohan&) = delete; + CubicBezierJohan& operator=(const CubicBezierJohan&) = delete; }; /// @todo invent name for this class @@ -169,8 +169,8 @@ public: double _beta; private: - CubicBezierSmooth(const CubicBezierSmooth&); - CubicBezierSmooth& operator=(const CubicBezierSmooth&); + CubicBezierSmooth(const CubicBezierSmooth&) = delete; + CubicBezierSmooth& operator=(const CubicBezierSmooth&) = delete; }; class SpiroInterpolator : public Interpolator { @@ -202,8 +202,8 @@ public: }; private: - SpiroInterpolator(const SpiroInterpolator&); - SpiroInterpolator& operator=(const SpiroInterpolator&); + SpiroInterpolator(const SpiroInterpolator&) = delete; + SpiroInterpolator& operator=(const SpiroInterpolator&) = delete; }; // Quick mockup for testing the behavior for powerstroke controlpoint interpolation @@ -282,8 +282,8 @@ private: return CubicBezier(b0, b1, b2, b3); } - CentripetalCatmullRomInterpolator(const CentripetalCatmullRomInterpolator&); - CentripetalCatmullRomInterpolator& operator=(const CentripetalCatmullRomInterpolator&); + CentripetalCatmullRomInterpolator(const CentripetalCatmullRomInterpolator&) = delete; + CentripetalCatmullRomInterpolator& operator=(const CentripetalCatmullRomInterpolator&) = delete; }; diff --git a/src/live_effects/lpe-powerstroke.h b/src/live_effects/lpe-powerstroke.h index 19696ac57..685a40614 100644 --- a/src/live_effects/lpe-powerstroke.h +++ b/src/live_effects/lpe-powerstroke.h @@ -45,8 +45,8 @@ private: EnumParam<unsigned> linejoin_type; ScalarParam miter_limit; EnumParam<unsigned> end_linecap_type; - LPEPowerStroke(const LPEPowerStroke&); - LPEPowerStroke& operator=(const LPEPowerStroke&); + LPEPowerStroke(const LPEPowerStroke&) = delete; + LPEPowerStroke& operator=(const LPEPowerStroke&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-pts2ellipse.h b/src/live_effects/lpe-pts2ellipse.h index 1e04159d6..d7a6d2d40 100644 --- a/src/live_effects/lpe-pts2ellipse.h +++ b/src/live_effects/lpe-pts2ellipse.h @@ -38,8 +38,8 @@ public: virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); private: - LPEPts2Ellipse(const LPEPts2Ellipse&); - LPEPts2Ellipse& operator=(const LPEPts2Ellipse&); + LPEPts2Ellipse(const LPEPts2Ellipse&) = delete; + LPEPts2Ellipse& operator=(const LPEPts2Ellipse&) = delete; int genIsometricEllipse (std::vector<Geom::Point> const & points_in, diff --git a/src/live_effects/lpe-recursiveskeleton.h b/src/live_effects/lpe-recursiveskeleton.h index 099b030d4..42040e668 100644 --- a/src/live_effects/lpe-recursiveskeleton.h +++ b/src/live_effects/lpe-recursiveskeleton.h @@ -29,8 +29,8 @@ public: private: ScalarParam iterations; - LPERecursiveSkeleton(const LPERecursiveSkeleton&); - LPERecursiveSkeleton& operator=(const LPERecursiveSkeleton&); + LPERecursiveSkeleton(const LPERecursiveSkeleton&) = delete; + LPERecursiveSkeleton& operator=(const LPERecursiveSkeleton&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-rough-hatches.h b/src/live_effects/lpe-rough-hatches.h index f8454e1ea..ab1bf098c 100644 --- a/src/live_effects/lpe-rough-hatches.h +++ b/src/live_effects/lpe-rough-hatches.h @@ -66,8 +66,8 @@ private: VectorParam direction; VectorParam bender; - LPERoughHatches(const LPERoughHatches&); - LPERoughHatches& operator=(const LPERoughHatches&); + LPERoughHatches(const LPERoughHatches&) = delete; + LPERoughHatches& operator=(const LPERoughHatches&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-roughen.h b/src/live_effects/lpe-roughen.h index bab06022f..aebc0e313 100644 --- a/src/live_effects/lpe-roughen.h +++ b/src/live_effects/lpe-roughen.h @@ -64,8 +64,8 @@ private: BoolParam fixed_displacement; BoolParam spray_tool_friendly; long seed; - LPERoughen(const LPERoughen &); - LPERoughen &operator=(const LPERoughen &); + LPERoughen(const LPERoughen &) = delete; + LPERoughen &operator=(const LPERoughen &) = delete; }; diff --git a/src/live_effects/lpe-ruler.h b/src/live_effects/lpe-ruler.h index 8c5c83ceb..64c6bf40e 100644 --- a/src/live_effects/lpe-ruler.h +++ b/src/live_effects/lpe-ruler.h @@ -62,8 +62,8 @@ private: static Geom::Point n_major, n_minor; // used for internal computations - LPERuler(const LPERuler&); - LPERuler& operator=(const LPERuler&); + LPERuler(const LPERuler&) = delete; + LPERuler& operator=(const LPERuler&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-show_handles.h b/src/live_effects/lpe-show_handles.h index 583be9e61..7efa799f3 100644 --- a/src/live_effects/lpe-show_handles.h +++ b/src/live_effects/lpe-show_handles.h @@ -51,8 +51,8 @@ private: Geom::PathVector outline_path; - LPEShowHandles(const LPEShowHandles &); - LPEShowHandles &operator=(const LPEShowHandles &); + LPEShowHandles(const LPEShowHandles &) = delete; + LPEShowHandles &operator=(const LPEShowHandles &) = delete; }; diff --git a/src/live_effects/lpe-simplify.h b/src/live_effects/lpe-simplify.h index 6c407f572..c206e45e8 100644 --- a/src/live_effects/lpe-simplify.h +++ b/src/live_effects/lpe-simplify.h @@ -48,8 +48,8 @@ private: Geom::PathVector hp; Geom::OptRect bbox; - LPESimplify(const LPESimplify &); - LPESimplify &operator=(const LPESimplify &); + LPESimplify(const LPESimplify &) = delete; + LPESimplify &operator=(const LPESimplify &) = delete; }; diff --git a/src/live_effects/lpe-skeleton.h b/src/live_effects/lpe-skeleton.h index e633ba5ab..51d96777f 100644 --- a/src/live_effects/lpe-skeleton.h +++ b/src/live_effects/lpe-skeleton.h @@ -48,8 +48,8 @@ private: ScalarParam number; // there are all kinds of parameters. Check the /live_effects/parameter directory which types exist! - LPESkeleton(const LPESkeleton&); - LPESkeleton& operator=(const LPESkeleton&); + LPESkeleton(const LPESkeleton&) = delete; + LPESkeleton& operator=(const LPESkeleton&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-sketch.h b/src/live_effects/lpe-sketch.h index 3bef0cf5e..5d178269e 100644 --- a/src/live_effects/lpe-sketch.h +++ b/src/live_effects/lpe-sketch.h @@ -57,8 +57,8 @@ private: ScalarParam max_curvature; #endif #endif - LPESketch(const LPESketch&); - LPESketch& operator=(const LPESketch&); + LPESketch(const LPESketch&) = delete; + LPESketch& operator=(const LPESketch&) = delete; Geom::Piecewise<Geom::D2<Geom::SBasis> > computePerturbation (double s0, double s1); diff --git a/src/live_effects/lpe-spiro.h b/src/live_effects/lpe-spiro.h index c8aba53d9..14a026da4 100644 --- a/src/live_effects/lpe-spiro.h +++ b/src/live_effects/lpe-spiro.h @@ -23,8 +23,8 @@ public: virtual void doEffect(SPCurve * curve); private: - LPESpiro(const LPESpiro&); - LPESpiro& operator=(const LPESpiro&); + LPESpiro(const LPESpiro&) = delete; + LPESpiro& operator=(const LPESpiro&) = delete; }; void sp_spiro_do_effect(SPCurve *curve); diff --git a/src/live_effects/lpe-tangent_to_curve.h b/src/live_effects/lpe-tangent_to_curve.h index a6a3c17ca..5761a3cd7 100644 --- a/src/live_effects/lpe-tangent_to_curve.h +++ b/src/live_effects/lpe-tangent_to_curve.h @@ -56,8 +56,8 @@ private: Geom::Point C; // left end of tangent Geom::Point D; // right end of tangent - LPETangentToCurve(const LPETangentToCurve&); - LPETangentToCurve& operator=(const LPETangentToCurve&); + LPETangentToCurve(const LPETangentToCurve&) = delete; + LPETangentToCurve& operator=(const LPETangentToCurve&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-taperstroke.h b/src/live_effects/lpe-taperstroke.h index e3ecbb56c..9e3de772c 100644 --- a/src/live_effects/lpe-taperstroke.h +++ b/src/live_effects/lpe-taperstroke.h @@ -51,8 +51,8 @@ private: Geom::Point start_attach_point; Geom::Point end_attach_point; - LPETaperStroke(const LPETaperStroke&); - LPETaperStroke& operator=(const LPETaperStroke&); + LPETaperStroke(const LPETaperStroke&) = delete; + LPETaperStroke& operator=(const LPETaperStroke&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-test-doEffect-stack.h b/src/live_effects/lpe-test-doEffect-stack.h index 208a345c6..525774075 100644 --- a/src/live_effects/lpe-test-doEffect-stack.h +++ b/src/live_effects/lpe-test-doEffect-stack.h @@ -35,8 +35,8 @@ private: PointParam point; PathParam path; - LPEdoEffectStackTest(const LPEdoEffectStackTest&); - LPEdoEffectStackTest& operator=(const LPEdoEffectStackTest&); + LPEdoEffectStackTest(const LPEdoEffectStackTest&) = delete; + LPEdoEffectStackTest& operator=(const LPEdoEffectStackTest&) = delete; }; }; //namespace LivePathEffect diff --git a/src/live_effects/lpe-text_label.h b/src/live_effects/lpe-text_label.h index 58db5ece9..aef50a79a 100644 --- a/src/live_effects/lpe-text_label.h +++ b/src/live_effects/lpe-text_label.h @@ -30,8 +30,8 @@ public: private: TextParam label; - LPETextLabel(const LPETextLabel&); - LPETextLabel& operator=(const LPETextLabel&); + LPETextLabel(const LPETextLabel&) = delete; + LPETextLabel& operator=(const LPETextLabel&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-transform_2pts.h b/src/live_effects/lpe-transform_2pts.h index 0f88e6b00..632cae51d 100644 --- a/src/live_effects/lpe-transform_2pts.h +++ b/src/live_effects/lpe-transform_2pts.h @@ -70,8 +70,8 @@ private: Geom::Angle previous_angle; Geom::Point previous_start; double previous_lenght; - LPETransform2Pts(const LPETransform2Pts&); - LPETransform2Pts& operator=(const LPETransform2Pts&); + LPETransform2Pts(const LPETransform2Pts&) = delete; + LPETransform2Pts& operator=(const LPETransform2Pts&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/lpe-vonkoch.h b/src/live_effects/lpe-vonkoch.h index c0cb7ce42..e762030d7 100644 --- a/src/live_effects/lpe-vonkoch.h +++ b/src/live_effects/lpe-vonkoch.h @@ -71,8 +71,8 @@ private: // PointParam refB; ScalarParam maxComplexity; - LPEVonKoch(const LPEVonKoch&); - LPEVonKoch& operator=(const LPEVonKoch&); + LPEVonKoch(const LPEVonKoch&) = delete; + LPEVonKoch& operator=(const LPEVonKoch&) = delete; }; }; //namespace LivePathEffect diff --git a/src/live_effects/parameter/bool.h b/src/live_effects/parameter/bool.h index 1aa0e3c4a..2437c97c7 100644 --- a/src/live_effects/parameter/bool.h +++ b/src/live_effects/parameter/bool.h @@ -42,8 +42,8 @@ public: inline operator bool() const { return value; }; private: - BoolParam(const BoolParam&); - BoolParam& operator=(const BoolParam&); + BoolParam(const BoolParam&) = delete; + BoolParam& operator=(const BoolParam&) = delete; bool value; bool defvalue; diff --git a/src/live_effects/parameter/colorpicker.h b/src/live_effects/parameter/colorpicker.h index 84ae2f6d5..34b11284f 100644 --- a/src/live_effects/parameter/colorpicker.h +++ b/src/live_effects/parameter/colorpicker.h @@ -37,8 +37,8 @@ public: const guint32 get_value() const { return value; }; private: - ColorPickerParam(const ColorPickerParam&); - ColorPickerParam& operator=(const ColorPickerParam&); + ColorPickerParam(const ColorPickerParam&) = delete; + ColorPickerParam& operator=(const ColorPickerParam&) = delete; guint32 value; guint32 defvalue; }; diff --git a/src/live_effects/parameter/enum.h b/src/live_effects/parameter/enum.h index 82eaa6d43..eef176591 100644 --- a/src/live_effects/parameter/enum.h +++ b/src/live_effects/parameter/enum.h @@ -96,8 +96,8 @@ public: } private: - EnumParam(const EnumParam&); - EnumParam& operator=(const EnumParam&); + EnumParam(const EnumParam&) = delete; + EnumParam& operator=(const EnumParam&) = delete; E value; E defvalue; diff --git a/src/live_effects/parameter/fontbutton.h b/src/live_effects/parameter/fontbutton.h index e2d0e1bb2..f028492a7 100644 --- a/src/live_effects/parameter/fontbutton.h +++ b/src/live_effects/parameter/fontbutton.h @@ -37,8 +37,8 @@ public: const Glib::ustring get_value() const { return defvalue; }; private: - FontButtonParam(const FontButtonParam&); - FontButtonParam& operator=(const FontButtonParam&); + FontButtonParam(const FontButtonParam&) = delete; + FontButtonParam& operator=(const FontButtonParam&) = delete; Glib::ustring value; Glib::ustring defvalue; diff --git a/src/live_effects/parameter/hidden.h b/src/live_effects/parameter/hidden.h index b41c6c93c..e6df8ceea 100644 --- a/src/live_effects/parameter/hidden.h +++ b/src/live_effects/parameter/hidden.h @@ -46,8 +46,8 @@ public: const Glib::ustring get_value() const { return value; }; private: - HiddenParam(const HiddenParam&); - HiddenParam& operator=(const HiddenParam&); + HiddenParam(const HiddenParam&) = delete; + HiddenParam& operator=(const HiddenParam&) = delete; Glib::ustring value; Glib::ustring defvalue; }; diff --git a/src/live_effects/parameter/item-reference.h b/src/live_effects/parameter/item-reference.h index 597e7ba51..603453ec5 100644 --- a/src/live_effects/parameter/item-reference.h +++ b/src/live_effects/parameter/item-reference.h @@ -32,8 +32,8 @@ protected: virtual bool _acceptObject(SPObject * const obj) const; private: - ItemReference(const ItemReference&); - ItemReference& operator=(const ItemReference&); + ItemReference(const ItemReference&) = delete; + ItemReference& operator=(const ItemReference&) = delete; }; } // namespace LivePathEffect diff --git a/src/live_effects/parameter/item.h b/src/live_effects/parameter/item.h index d32098db5..7ccfc6a9f 100644 --- a/src/live_effects/parameter/item.h +++ b/src/live_effects/parameter/item.h @@ -68,8 +68,8 @@ protected: gchar * defvalue; private: - ItemParam(const ItemParam&); - ItemParam& operator=(const ItemParam&); + ItemParam(const ItemParam&) = delete; + ItemParam& operator=(const ItemParam&) = delete; }; diff --git a/src/live_effects/parameter/message.h b/src/live_effects/parameter/message.h index fd850a767..255f4b016 100644 --- a/src/live_effects/parameter/message.h +++ b/src/live_effects/parameter/message.h @@ -39,8 +39,8 @@ public: private: Gtk::Label * _label; int _min_height; - MessageParam(const MessageParam&); - MessageParam& operator=(const MessageParam&); + MessageParam(const MessageParam&) = delete; + MessageParam& operator=(const MessageParam&) = delete; const gchar * message; const gchar * defmessage; }; diff --git a/src/live_effects/parameter/originalitem.h b/src/live_effects/parameter/originalitem.h index 168728f86..23720c74a 100644 --- a/src/live_effects/parameter/originalitem.h +++ b/src/live_effects/parameter/originalitem.h @@ -35,8 +35,8 @@ protected: void on_select_original_button_click(); private: - OriginalItemParam(const OriginalItemParam&); - OriginalItemParam& operator=(const OriginalItemParam&); + OriginalItemParam(const OriginalItemParam&) = delete; + OriginalItemParam& operator=(const OriginalItemParam&) = delete; }; diff --git a/src/live_effects/parameter/originalpath.h b/src/live_effects/parameter/originalpath.h index ec80d1026..6e9888d42 100644 --- a/src/live_effects/parameter/originalpath.h +++ b/src/live_effects/parameter/originalpath.h @@ -42,8 +42,8 @@ protected: private: bool _from_original_d; - OriginalPathParam(const OriginalPathParam&); - OriginalPathParam& operator=(const OriginalPathParam&); + OriginalPathParam(const OriginalPathParam&) = delete; + OriginalPathParam& operator=(const OriginalPathParam&) = delete; }; diff --git a/src/live_effects/parameter/originalpatharray.h b/src/live_effects/parameter/originalpatharray.h index 8c972fd96..36d5b78a6 100644 --- a/src/live_effects/parameter/originalpatharray.h +++ b/src/live_effects/parameter/originalpatharray.h @@ -111,8 +111,8 @@ private: bool _from_original_d; bool _allow_only_bspline_spiro; void update(); - OriginalPathArrayParam(const OriginalPathArrayParam&); - OriginalPathArrayParam& operator=(const OriginalPathArrayParam&); + OriginalPathArrayParam(const OriginalPathArrayParam&) = delete; + OriginalPathArrayParam& operator=(const OriginalPathArrayParam&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/parameter/parameter.h b/src/live_effects/parameter/parameter.h index aa4212f15..33d91d4df 100644 --- a/src/live_effects/parameter/parameter.h +++ b/src/live_effects/parameter/parameter.h @@ -93,8 +93,8 @@ protected: void param_write_to_repr(const char * svgd); private: - Parameter(const Parameter&); - Parameter& operator=(const Parameter&); + Parameter(const Parameter&) = delete; + Parameter& operator=(const Parameter&) = delete; }; @@ -143,8 +143,8 @@ protected: private: bool on_button_release(GdkEventButton* button_event); - ScalarParam(const ScalarParam&); - ScalarParam& operator=(const ScalarParam&); + ScalarParam(const ScalarParam&) = delete; + ScalarParam& operator=(const ScalarParam&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/parameter/path-reference.h b/src/live_effects/parameter/path-reference.h index c32d063f6..ccd94dd1d 100644 --- a/src/live_effects/parameter/path-reference.h +++ b/src/live_effects/parameter/path-reference.h @@ -32,8 +32,8 @@ protected: virtual bool _acceptObject(SPObject * const obj) const; private: - PathReference(const PathReference&); - PathReference& operator=(const PathReference&); + PathReference(const PathReference&) = delete; + PathReference& operator=(const PathReference&) = delete; }; } // namespace LivePathEffect diff --git a/src/live_effects/parameter/path.h b/src/live_effects/parameter/path.h index 635056772..998874980 100644 --- a/src/live_effects/parameter/path.h +++ b/src/live_effects/parameter/path.h @@ -98,8 +98,8 @@ private: bool _copy_button; bool _paste_button; bool _link_button; - PathParam(const PathParam&); - PathParam& operator=(const PathParam&); + PathParam(const PathParam&) = delete; + PathParam& operator=(const PathParam&) = delete; }; diff --git a/src/live_effects/parameter/point.h b/src/live_effects/parameter/point.h index ea0110100..9d4164c9b 100644 --- a/src/live_effects/parameter/point.h +++ b/src/live_effects/parameter/point.h @@ -56,8 +56,8 @@ public: virtual void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item); friend class PointParamKnotHolderEntity; private: - PointParam(const PointParam&); - PointParam& operator=(const PointParam&); + PointParam(const PointParam&) = delete; + PointParam& operator=(const PointParam&) = delete; bool on_button_release(GdkEventButton* button_event); Geom::Point defvalue; bool liveupdate; diff --git a/src/live_effects/parameter/powerstrokepointarray.h b/src/live_effects/parameter/powerstrokepointarray.h index a1d4db3ca..d028d706d 100644 --- a/src/live_effects/parameter/powerstrokepointarray.h +++ b/src/live_effects/parameter/powerstrokepointarray.h @@ -53,8 +53,8 @@ public: friend class PowerStrokePointArrayParamKnotHolderEntity; private: - PowerStrokePointArrayParam(const PowerStrokePointArrayParam&); - PowerStrokePointArrayParam& operator=(const PowerStrokePointArrayParam&); + PowerStrokePointArrayParam(const PowerStrokePointArrayParam&) = delete; + PowerStrokePointArrayParam& operator=(const PowerStrokePointArrayParam&) = delete; SPKnotShapeType knot_shape; SPKnotModeType knot_mode; diff --git a/src/live_effects/parameter/random.h b/src/live_effects/parameter/random.h index a2c3712a1..9f0114ad2 100644 --- a/src/live_effects/parameter/random.h +++ b/src/live_effects/parameter/random.h @@ -61,8 +61,8 @@ private: long setup_seed(long); gdouble rand(); - RandomParam(const RandomParam&); - RandomParam& operator=(const RandomParam&); + RandomParam(const RandomParam&) = delete; + RandomParam& operator=(const RandomParam&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/parameter/satellitesarray.h b/src/live_effects/parameter/satellitesarray.h index 3039eb432..e7d61af22 100644 --- a/src/live_effects/parameter/satellitesarray.h +++ b/src/live_effects/parameter/satellitesarray.h @@ -65,8 +65,8 @@ protected: KnotHolder *_knoth; private: - SatellitesArrayParam(const SatellitesArrayParam &); - SatellitesArrayParam &operator=(const SatellitesArrayParam &); + SatellitesArrayParam(const SatellitesArrayParam &) = delete; + SatellitesArrayParam &operator=(const SatellitesArrayParam &) = delete; SPKnotShapeType _knot_shape; SPKnotModeType _knot_mode; diff --git a/src/live_effects/parameter/text.h b/src/live_effects/parameter/text.h index a9de26a52..51651edcf 100644 --- a/src/live_effects/parameter/text.h +++ b/src/live_effects/parameter/text.h @@ -53,8 +53,8 @@ public: const Glib::ustring get_value() const { return value; }; private: - TextParam(const TextParam&); - TextParam& operator=(const TextParam&); + TextParam(const TextParam&) = delete; + TextParam& operator=(const TextParam&) = delete; double anchor_x; double anchor_y; bool _hide_canvas_text; diff --git a/src/live_effects/parameter/togglebutton.h b/src/live_effects/parameter/togglebutton.h index c5f8a3c28..6d42c5155 100644 --- a/src/live_effects/parameter/togglebutton.h +++ b/src/live_effects/parameter/togglebutton.h @@ -55,8 +55,8 @@ public: virtual void param_update_default(const gchar * default_value); private: - ToggleButtonParam(const ToggleButtonParam&); - ToggleButtonParam& operator=(const ToggleButtonParam&); + ToggleButtonParam(const ToggleButtonParam&) = delete; + ToggleButtonParam& operator=(const ToggleButtonParam&) = delete; void refresh_button(); bool value; diff --git a/src/live_effects/parameter/transformedpoint.h b/src/live_effects/parameter/transformedpoint.h index 8b92d81ba..b2d3203ac 100644 --- a/src/live_effects/parameter/transformedpoint.h +++ b/src/live_effects/parameter/transformedpoint.h @@ -59,8 +59,8 @@ public: virtual void addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item); private: - TransformedPointParam(const TransformedPointParam&); - TransformedPointParam& operator=(const TransformedPointParam&); + TransformedPointParam(const TransformedPointParam&) = delete; + TransformedPointParam& operator=(const TransformedPointParam&) = delete; Geom::Point defvalue; diff --git a/src/live_effects/parameter/unit.h b/src/live_effects/parameter/unit.h index 86e1a24b3..8e3e3cb69 100644 --- a/src/live_effects/parameter/unit.h +++ b/src/live_effects/parameter/unit.h @@ -44,8 +44,8 @@ private: Inkscape::Util::Unit const *unit; Inkscape::Util::Unit const *defunit; - UnitParam(const UnitParam&); - UnitParam& operator=(const UnitParam&); + UnitParam(const UnitParam&) = delete; + UnitParam& operator=(const UnitParam&) = delete; }; } //namespace LivePathEffect diff --git a/src/live_effects/parameter/vector.h b/src/live_effects/parameter/vector.h index 8c842e805..412d4f0bb 100644 --- a/src/live_effects/parameter/vector.h +++ b/src/live_effects/parameter/vector.h @@ -58,8 +58,8 @@ public: virtual void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item); private: - VectorParam(const VectorParam&); - VectorParam& operator=(const VectorParam&); + VectorParam(const VectorParam&) = delete; + VectorParam& operator=(const VectorParam&) = delete; Geom::Point defvalue; diff --git a/src/live_effects/spiro-converters.h b/src/live_effects/spiro-converters.h index 6182a5dcd..b6b1c8da8 100644 --- a/src/live_effects/spiro-converters.h +++ b/src/live_effects/spiro-converters.h @@ -35,8 +35,8 @@ public: private: SPCurve &_curve; - ConverterSPCurve(const ConverterSPCurve&); - ConverterSPCurve& operator=(const ConverterSPCurve&); + ConverterSPCurve(const ConverterSPCurve&) = delete; + ConverterSPCurve& operator=(const ConverterSPCurve&) = delete; }; @@ -55,8 +55,8 @@ public: private: Geom::Path &_path; - ConverterPath(const ConverterPath&); - ConverterPath& operator=(const ConverterPath&); + ConverterPath(const ConverterPath&) = delete; + ConverterPath& operator=(const ConverterPath&) = delete; }; diff --git a/src/message-stack.h b/src/message-stack.h index ed0315cf5..a8cbf08df 100644 --- a/src/message-stack.h +++ b/src/message-stack.h @@ -164,8 +164,8 @@ private: guint timeout_id; }; - MessageStack(MessageStack const &); // no copy - void operator=(MessageStack const &); // no assign + MessageStack(MessageStack const &) = delete; // no copy + void operator=(MessageStack const &) = delete; // no assign /// pushes a message onto the stack with an optional timeout MessageId _push(MessageType type, unsigned int lifetime, char const *message); diff --git a/src/object/sp-conn-end.h b/src/object/sp-conn-end.h index 2b89a159d..46f9e36fa 100644 --- a/src/object/sp-conn-end.h +++ b/src/object/sp-conn-end.h @@ -33,8 +33,8 @@ public: private: - SPConnEnd(SPConnEnd const &); // no copy - SPConnEnd &operator=(SPConnEnd const &); // no assign + SPConnEnd(SPConnEnd const &) = delete; // no copy + SPConnEnd &operator=(SPConnEnd const &) = delete; // no assign }; void sp_conn_end_href_changed(SPObject *old_ref, SPObject *ref, diff --git a/src/object/uri-references.h b/src/object/uri-references.h index 4c57709a0..a820ba4fb 100644 --- a/src/object/uri-references.h +++ b/src/object/uri-references.h @@ -138,7 +138,7 @@ private: void _setObject(SPObject *object); void _release(SPObject *object); - void operator=(URIReference const& ref); + void operator=(URIReference const& ref) = delete; /* Private and definition-less to prevent accidental use. */ }; diff --git a/src/preferences.h b/src/preferences.h index 2a9818c63..88fdd864c 100644 --- a/src/preferences.h +++ b/src/preferences.h @@ -541,8 +541,8 @@ private: XML::Node *_findObserverNode(Glib::ustring const &pref_path, Glib::ustring &node_key, Glib::ustring &attr_key, bool create); // disable copying - Preferences(Preferences const &); - Preferences operator=(Preferences const &); + Preferences(Preferences const &) = delete; + Preferences operator=(Preferences const &) = delete; std::string _prefs_filename; ///< Full filename (with directory) of the prefs file Glib::ustring _lastErrPrimary; ///< Last primary error message, if any. diff --git a/src/profile-manager.h b/src/profile-manager.h index 54cd4a1da..dee21f018 100644 --- a/src/profile-manager.h +++ b/src/profile-manager.h @@ -30,8 +30,8 @@ public: ColorProfile* find(char const* name); private: - ProfileManager(ProfileManager const &); // no copy - void operator=(ProfileManager const &); // no assign + ProfileManager(ProfileManager const &) = delete; // no copy + void operator=(ProfileManager const &) = delete; // no assign void _resourcesChanged(); diff --git a/src/resource-manager.h b/src/resource-manager.h index 8f01c23a0..9452c5d69 100644 --- a/src/resource-manager.h +++ b/src/resource-manager.h @@ -27,8 +27,8 @@ protected: virtual ~ResourceManager(); private: - ResourceManager(ResourceManager const &); // no copy - void operator=(ResourceManager const &); // no assign + ResourceManager(ResourceManager const &) = delete; // no copy + void operator=(ResourceManager const &) = delete; // no assign }; diff --git a/src/selection.h b/src/selection.h index 989adf6b0..dc43dcf4f 100644 --- a/src/selection.h +++ b/src/selection.h @@ -207,9 +207,9 @@ protected: private: /** no copy. */ - Selection(Selection const &); + Selection(Selection const &) = delete; /** no assign. */ - void operator=(Selection const &); + void operator=(Selection const &) = delete; /** Issues modification notification signals. */ static int _emit_modified(Selection *selection); diff --git a/src/ui/clipboard.h b/src/ui/clipboard.h index e32b5aed2..a05c6c005 100644 --- a/src/ui/clipboard.h +++ b/src/ui/clipboard.h @@ -59,8 +59,8 @@ protected: ClipboardManager(); // singleton virtual ~ClipboardManager(); private: - ClipboardManager(const ClipboardManager &); ///< no copy - ClipboardManager &operator=(const ClipboardManager &); ///< no assign + ClipboardManager(const ClipboardManager &) = delete; ///< no copy + ClipboardManager &operator=(const ClipboardManager &) = delete; ///< no assign static ClipboardManager *_instance; }; diff --git a/src/ui/dialog/align-and-distribute.h b/src/ui/dialog/align-and-distribute.h index ce45fcccd..34d0230bf 100644 --- a/src/ui/dialog/align-and-distribute.h +++ b/src/ui/dialog/align-and-distribute.h @@ -118,8 +118,8 @@ protected: sigc::connection _toolChangeConn; sigc::connection _selChangeConn; private: - AlignAndDistribute(AlignAndDistribute const &d); - AlignAndDistribute& operator=(AlignAndDistribute const &d); + AlignAndDistribute(AlignAndDistribute const &d) = delete; + AlignAndDistribute& operator=(AlignAndDistribute const &d) = delete; }; diff --git a/src/ui/dialog/behavior.h b/src/ui/dialog/behavior.h index 5d5519a03..fbe47c635 100644 --- a/src/ui/dialog/behavior.h +++ b/src/ui/dialog/behavior.h @@ -78,9 +78,9 @@ protected: Dialog& _dialog; //< reference to the owner private: - Behavior(); // no constructor without params - Behavior(const Behavior &); // no copy - Behavior &operator=(const Behavior &); // no assign + Behavior() = delete; // no constructor without params + Behavior(const Behavior &) = delete; // no copy + Behavior &operator=(const Behavior &) = delete; // no assign }; } // namespace Behavior diff --git a/src/ui/dialog/calligraphic-profile-rename.h b/src/ui/dialog/calligraphic-profile-rename.h index b7a97a1e7..c70e8ae98 100644 --- a/src/ui/dialog/calligraphic-profile-rename.h +++ b/src/ui/dialog/calligraphic-profile-rename.h @@ -68,8 +68,8 @@ private: static CalligraphicProfileRename instance_; return instance_; } - CalligraphicProfileRename(CalligraphicProfileRename const &); // no copy - CalligraphicProfileRename &operator=(CalligraphicProfileRename const &); // no assign + CalligraphicProfileRename(CalligraphicProfileRename const &) = delete; // no copy + CalligraphicProfileRename &operator=(CalligraphicProfileRename const &) = delete; // no assign }; } // namespace Dialog diff --git a/src/ui/dialog/clonetiler.h b/src/ui/dialog/clonetiler.h index f42ef8fbe..4fd8f95cf 100644 --- a/src/ui/dialog/clonetiler.h +++ b/src/ui/dialog/clonetiler.h @@ -143,8 +143,8 @@ protected: private: - CloneTiler(CloneTiler const &d); - CloneTiler& operator=(CloneTiler const &d); + CloneTiler(CloneTiler const &d) = delete; + CloneTiler& operator=(CloneTiler const &d) = delete; Gtk::CheckButton *_b; Gtk::CheckButton *_cb_keep_bbox; diff --git a/src/ui/dialog/dialog.h b/src/ui/dialog/dialog.h index 9c7efd47b..2bde4459b 100644 --- a/src/ui/dialog/dialog.h +++ b/src/ui/dialog/dialog.h @@ -147,10 +147,10 @@ protected: private: Behavior::Behavior* _behavior; - Dialog(); // no constructor without params + Dialog() = delete; // no constructor without params - Dialog(Dialog const &d); // no copy - Dialog& operator=(Dialog const &d); // no assign + Dialog(Dialog const &d) = delete; // no copy + Dialog& operator=(Dialog const &d) = delete; // no assign friend class Behavior::FloatingBehavior; friend class Behavior::DockBehavior; diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp index 380c8a9c4..ab5fe06fd 100644 --- a/src/ui/dialog/export.cpp +++ b/src/ui/dialog/export.cpp @@ -97,8 +97,8 @@ public: } private: - MessageCleaner(MessageCleaner const &other); - MessageCleaner &operator=(MessageCleaner const &other); + MessageCleaner(MessageCleaner const &other) = delete; + MessageCleaner &operator=(MessageCleaner const &other) = delete; SPDesktop *_desktop; Inkscape::MessageId _messageId; diff --git a/src/ui/dialog/extensions.h b/src/ui/dialog/extensions.h index 73876bccc..b5b025fae 100644 --- a/src/ui/dialog/extensions.h +++ b/src/ui/dialog/extensions.h @@ -38,8 +38,8 @@ public: void set_full(bool full); private: - ExtensionsPanel(ExtensionsPanel const &); // no copy - ExtensionsPanel &operator=(ExtensionsPanel const &); // no assign + ExtensionsPanel(ExtensionsPanel const &) = delete; // no copy + ExtensionsPanel &operator=(ExtensionsPanel const &) = delete; // no assign static void listCB(Inkscape::Extension::Extension *in_plug, gpointer in_data); diff --git a/src/ui/dialog/fill-and-stroke.h b/src/ui/dialog/fill-and-stroke.h index 67e9d60ed..ad59443ad 100644 --- a/src/ui/dialog/fill-and-stroke.h +++ b/src/ui/dialog/fill-and-stroke.h @@ -67,8 +67,8 @@ protected: void _onSwitchPage(Gtk::Widget *page, guint pagenum); private: - FillAndStroke(FillAndStroke const &d); - FillAndStroke& operator=(FillAndStroke const &d); + FillAndStroke(FillAndStroke const &d) = delete; + FillAndStroke& operator=(FillAndStroke const &d) = delete; void setTargetDesktop(SPDesktop *desktop); diff --git a/src/ui/dialog/find.h b/src/ui/dialog/find.h index 94d635037..2b4869def 100644 --- a/src/ui/dialog/find.h +++ b/src/ui/dialog/find.h @@ -199,8 +199,8 @@ protected: void onSelectionChange(void); private: - Find(Find const &d); - Find& operator=(Find const &d); + Find(Find const &d) = delete; + Find& operator=(Find const &d) = delete; /* * Find and replace combo box widgets diff --git a/src/ui/dialog/font-substitution.h b/src/ui/dialog/font-substitution.h index 0818d778c..3d42c01f2 100644 --- a/src/ui/dialog/font-substitution.h +++ b/src/ui/dialog/font-substitution.h @@ -35,8 +35,8 @@ protected: std::vector<SPItem*> getFontReplacedItems(SPDocument* doc, Glib::ustring *out); private: - FontSubstitution(FontSubstitution const &d); - FontSubstitution& operator=(FontSubstitution const &d); + FontSubstitution(FontSubstitution const &d) = delete; + FontSubstitution& operator=(FontSubstitution const &d) = delete; }; } // namespace Dialog diff --git a/src/ui/dialog/glyphs.h b/src/ui/dialog/glyphs.h index 818d38811..d9eb30c7c 100644 --- a/src/ui/dialog/glyphs.h +++ b/src/ui/dialog/glyphs.h @@ -47,8 +47,8 @@ public: protected: private: - GlyphsPanel(GlyphsPanel const &); // no copy - GlyphsPanel &operator=(GlyphsPanel const &); // no assign + GlyphsPanel(GlyphsPanel const &) = delete; // no copy + GlyphsPanel &operator=(GlyphsPanel const &) = delete; // no assign static GlyphColumns *getColumns(); diff --git a/src/ui/dialog/grid-arrange-tab.h b/src/ui/dialog/grid-arrange-tab.h index 93bc38218..cba2af1b4 100644 --- a/src/ui/dialog/grid-arrange-tab.h +++ b/src/ui/dialog/grid-arrange-tab.h @@ -65,8 +65,8 @@ public: private: - GridArrangeTab(GridArrangeTab const &d); // no copy - void operator=(GridArrangeTab const &d); // no assign + GridArrangeTab(GridArrangeTab const &d) = delete; // no copy + void operator=(GridArrangeTab const &d) = delete; // no assign ArrangeDialog *Parent; diff --git a/src/ui/dialog/guides.h b/src/ui/dialog/guides.h index 25d32015c..fd3fbd74f 100644 --- a/src/ui/dialog/guides.h +++ b/src/ui/dialog/guides.h @@ -60,8 +60,8 @@ protected: void _modeChanged(); private: - GuidelinePropertiesDialog(GuidelinePropertiesDialog const &); // no copy - GuidelinePropertiesDialog &operator=(GuidelinePropertiesDialog const &); // no assign + GuidelinePropertiesDialog(GuidelinePropertiesDialog const &) = delete; // no copy + GuidelinePropertiesDialog &operator=(GuidelinePropertiesDialog const &) = delete; // no assign SPDesktop *_desktop; SPGuide *_guide; diff --git a/src/ui/dialog/icon-preview.h b/src/ui/dialog/icon-preview.h index caec7e3b5..2ad7e68b4 100644 --- a/src/ui/dialog/icon-preview.h +++ b/src/ui/dialog/icon-preview.h @@ -53,8 +53,8 @@ public: void modeToggled(); private: - IconPreviewPanel(IconPreviewPanel const &); // no copy - IconPreviewPanel &operator=(IconPreviewPanel const &); // no assign + IconPreviewPanel(IconPreviewPanel const &) = delete; // no copy + IconPreviewPanel &operator=(IconPreviewPanel const &) = delete; // no assign DesktopTracker deskTrack; diff --git a/src/ui/dialog/layer-properties.h b/src/ui/dialog/layer-properties.h index f62f22782..756f7a509 100644 --- a/src/ui/dialog/layer-properties.h +++ b/src/ui/dialog/layer-properties.h @@ -157,8 +157,8 @@ protected: void _handleButtonEvent(GdkEventButton* event); private: - LayerPropertiesDialog(LayerPropertiesDialog const &); // no copy - LayerPropertiesDialog &operator=(LayerPropertiesDialog const &); // no assign + LayerPropertiesDialog(LayerPropertiesDialog const &) = delete; // no copy + LayerPropertiesDialog &operator=(LayerPropertiesDialog const &) = delete; // no assign }; } // namespace diff --git a/src/ui/dialog/layers.h b/src/ui/dialog/layers.h index 3a580caf9..c2058ad48 100644 --- a/src/ui/dialog/layers.h +++ b/src/ui/dialog/layers.h @@ -53,8 +53,8 @@ private: class ModelColumns; class InternalUIBounce; - LayersPanel(LayersPanel const &); // no copy - LayersPanel &operator=(LayersPanel const &); // no assign + LayersPanel(LayersPanel const &) = delete; // no copy + LayersPanel &operator=(LayersPanel const &) = delete; // no assign void _styleButton( Gtk::Button& btn, SPDesktop *desktop, unsigned int code, char const* iconName, char const* fallback ); void _fireAction( unsigned int code ); diff --git a/src/ui/dialog/livepatheffect-add.h b/src/ui/dialog/livepatheffect-add.h index c686e8365..90457c917 100644 --- a/src/ui/dialog/livepatheffect-add.h +++ b/src/ui/dialog/livepatheffect-add.h @@ -106,8 +106,8 @@ private: static LivePathEffectAdd instance_; return instance_; } - LivePathEffectAdd(LivePathEffectAdd const &); // no copy - LivePathEffectAdd &operator=(LivePathEffectAdd const &); // no assign + LivePathEffectAdd(LivePathEffectAdd const &) = delete; // no copy + LivePathEffectAdd &operator=(LivePathEffectAdd const &) = delete; // no assign }; } // namespace Dialog diff --git a/src/ui/dialog/memory.h b/src/ui/dialog/memory.h index 792391b89..5ba93977d 100644 --- a/src/ui/dialog/memory.h +++ b/src/ui/dialog/memory.h @@ -28,8 +28,8 @@ protected: void _apply(); private: - Memory(Memory const &d); // no copy - void operator=(Memory const &d); // no assign + Memory(Memory const &d) = delete; // no copy + void operator=(Memory const &d) = delete; // no assign struct Private; Private &_private; diff --git a/src/ui/dialog/messages.h b/src/ui/dialog/messages.h index 6ed246ece..ca2d5dc4e 100644 --- a/src/ui/dialog/messages.h +++ b/src/ui/dialog/messages.h @@ -79,8 +79,8 @@ protected: guint handlerGtkmm; private: - Messages(Messages const &d); - Messages operator=(Messages const &d); + Messages(Messages const &d) = delete; + Messages operator=(Messages const &d) = delete; }; diff --git a/src/ui/dialog/panel-dialog.h b/src/ui/dialog/panel-dialog.h index 60885d81d..97bb25154 100644 --- a/src/ui/dialog/panel-dialog.h +++ b/src/ui/dialog/panel-dialog.h @@ -87,9 +87,9 @@ public: private: inline void _presentDialog(); - PanelDialog(); - PanelDialog(PanelDialog<Behavior> const &d); // no copy - PanelDialog<Behavior>& operator=(PanelDialog<Behavior> const &d); // no assign + PanelDialog() = delete; + PanelDialog(PanelDialog<Behavior> const &d) = delete; // no copy + PanelDialog<Behavior>& operator=(PanelDialog<Behavior> const &d) = delete; // no assign }; @@ -108,10 +108,10 @@ public: inline virtual void present(); private: - PanelDialog(); - PanelDialog(PanelDialog<Behavior::FloatingBehavior> const &d); // no copy + PanelDialog() = delete; + PanelDialog(PanelDialog<Behavior::FloatingBehavior> const &d) = delete; // no copy PanelDialog<Behavior::FloatingBehavior>& - operator=(PanelDialog<Behavior::FloatingBehavior> const &d); // no assign + operator=(PanelDialog<Behavior::FloatingBehavior> const &d) = delete; // no assign }; diff --git a/src/ui/dialog/polar-arrange-tab.h b/src/ui/dialog/polar-arrange-tab.h index 1a4e04eda..6381f42bc 100644 --- a/src/ui/dialog/polar-arrange-tab.h +++ b/src/ui/dialog/polar-arrange-tab.h @@ -51,8 +51,8 @@ public: void on_arrange_radio_changed(); private: - PolarArrangeTab(PolarArrangeTab const &d); // no copy - void operator=(PolarArrangeTab const &d); // no assign + PolarArrangeTab(PolarArrangeTab const &d) = delete; // no copy + void operator=(PolarArrangeTab const &d) = delete; // no assign ArrangeDialog *parent; diff --git a/src/ui/dialog/prototype.h b/src/ui/dialog/prototype.h index 95c3856f8..3494d8594 100644 --- a/src/ui/dialog/prototype.h +++ b/src/ui/dialog/prototype.h @@ -43,8 +43,8 @@ private: // No default constructor, noncopyable, nonassignable Prototype(); - Prototype(Prototype const &d); - Prototype operator=(Prototype const &d); + Prototype(Prototype const &d) = delete; + Prototype operator=(Prototype const &d) = delete; // Signals and handlers sigc::connection connectionDocumentReplaced; diff --git a/src/ui/dialog/styledialog.h b/src/ui/dialog/styledialog.h index 03932e3cc..39e3edfd7 100644 --- a/src/ui/dialog/styledialog.h +++ b/src/ui/dialog/styledialog.h @@ -52,8 +52,8 @@ public: private: // No default constructor, noncopyable, nonassignable StyleDialog(); - StyleDialog(StyleDialog const &d); - StyleDialog operator=(StyleDialog const &d); + StyleDialog(StyleDialog const &d) = delete; + StyleDialog operator=(StyleDialog const &d) = delete; // Monitor <style> element for changes. class NodeObserver; diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp index e57dde639..7225f12e0 100644 --- a/src/ui/dialog/swatches.cpp +++ b/src/ui/dialog/swatches.cpp @@ -1063,8 +1063,8 @@ public: sigc::connection defsModified; private: - DocTrack(DocTrack const &); // no copy - DocTrack &operator=(DocTrack const &); // no assign + DocTrack(DocTrack const &) = delete; // no copy + DocTrack &operator=(DocTrack const &) = delete; // no assign }; Glib::Timer *DocTrack::timer = 0; diff --git a/src/ui/dialog/swatches.h b/src/ui/dialog/swatches.h index cf3f99e8d..b3b694a6a 100644 --- a/src/ui/dialog/swatches.h +++ b/src/ui/dialog/swatches.h @@ -60,8 +60,8 @@ protected: virtual std::vector<SwatchPage*> _getSwatchSets() const; private: - SwatchesPanel(SwatchesPanel const &); // no copy - SwatchesPanel &operator=(SwatchesPanel const &); // no assign + SwatchesPanel(SwatchesPanel const &) = delete; // no copy + SwatchesPanel &operator=(SwatchesPanel const &) = delete; // no assign void _build_menu(); diff --git a/src/ui/dialog/symbols.h b/src/ui/dialog/symbols.h index 5f341c3b1..a9be79a0c 100644 --- a/src/ui/dialog/symbols.h +++ b/src/ui/dialog/symbols.h @@ -61,8 +61,8 @@ public: static SymbolsDialog& getInstance(); private: - SymbolsDialog(SymbolsDialog const &); // no copy - SymbolsDialog &operator=(SymbolsDialog const &); // no assign + SymbolsDialog(SymbolsDialog const &) = delete; // no copy + SymbolsDialog &operator=(SymbolsDialog const &) = delete; // no assign static SymbolColumns *getColumns(); diff --git a/src/ui/dialog/tags.h b/src/ui/dialog/tags.h index 84b67c422..5f72f6f2f 100644 --- a/src/ui/dialog/tags.h +++ b/src/ui/dialog/tags.h @@ -55,8 +55,8 @@ private: class InternalUIBounce; class ObjectWatcher; - TagsPanel(TagsPanel const &); // no copy - TagsPanel &operator=(TagsPanel const &); // no assign + TagsPanel(TagsPanel const &) = delete; // no copy + TagsPanel &operator=(TagsPanel const &) = delete; // no assign void _styleButton( Gtk::Button& btn, char const* iconName, char const* tooltip ); void _fireAction( unsigned int code ); diff --git a/src/ui/dialog/text-edit.h b/src/ui/dialog/text-edit.h index b0ebfe347..8b2f39672 100644 --- a/src/ui/dialog/text-edit.h +++ b/src/ui/dialog/text-edit.h @@ -195,8 +195,8 @@ private: const Glib::ustring samplephrase; - TextEdit(TextEdit const &d); - TextEdit operator=(TextEdit const &d); + TextEdit(TextEdit const &d) = delete; + TextEdit operator=(TextEdit const &d) = delete; }; diff --git a/src/ui/dialog/transformation.h b/src/ui/dialog/transformation.h index 9595e87bc..357f4f8f8 100644 --- a/src/ui/dialog/transformation.h +++ b/src/ui/dialog/transformation.h @@ -218,12 +218,12 @@ private: /** * Copy constructor */ - Transformation(Transformation const &d); + Transformation(Transformation const &d) = delete; /** * Assignment operator */ - Transformation operator=(Transformation const &d); + Transformation operator=(Transformation const &d) = delete; Gtk::Button *applyButton; Gtk::Button *resetButton; diff --git a/src/ui/dialog/undo-history.h b/src/ui/dialog/undo-history.h index 3efc25f15..019cff354 100644 --- a/src/ui/dialog/undo-history.h +++ b/src/ui/dialog/undo-history.h @@ -148,8 +148,8 @@ private: UndoHistory(); // no default constructor, noncopyable, nonassignable - UndoHistory(UndoHistory const &d); - UndoHistory operator=(UndoHistory const &d); + UndoHistory(UndoHistory const &d) = delete; + UndoHistory operator=(UndoHistory const &d) = delete; struct GreaterThan : CellRendererInt::Filter { GreaterThan(int _i) : i (_i) {} diff --git a/src/ui/selected-color.h b/src/ui/selected-color.h index e9e702d43..3d5858d3f 100644 --- a/src/ui/selected-color.h +++ b/src/ui/selected-color.h @@ -51,8 +51,8 @@ public: sigc::signal<void> signal_changed; private: // By default, disallow copy constructor and assignment operator - SelectedColor(SelectedColor const &obj); - SelectedColor& operator=(SelectedColor const &obj); + SelectedColor(SelectedColor const &obj) = delete; + SelectedColor& operator=(SelectedColor const &obj) = delete; SPColor _color; /** diff --git a/src/ui/tool/node.h b/src/ui/tool/node.h index 2d4eb4a7a..231f57b7c 100644 --- a/src/ui/tool/node.h +++ b/src/ui/tool/node.h @@ -233,7 +233,7 @@ protected: private: - Node(Node const &); + Node(Node const &) = delete; void _fixNeighbors(Geom::Point const &old_pos, Geom::Point const &new_pos); void _updateAutoHandles(); @@ -436,8 +436,8 @@ public: static NodeList &get(iterator const &i); private: // no copy or assign - NodeList(NodeList const &); - void operator=(NodeList const &); + NodeList(NodeList const &) = delete; + void operator=(NodeList const &) = delete; SubpathList &_list; bool _closed; diff --git a/src/ui/tools/tool-base.h b/src/ui/tools/tool-base.h index 7185b787e..7cb292aa4 100644 --- a/src/ui/tools/tool-base.h +++ b/src/ui/tools/tool-base.h @@ -227,8 +227,8 @@ protected: bool sp_event_context_knot_mouseover() const; private: - ToolBase(const ToolBase&); - ToolBase& operator=(const ToolBase&); + ToolBase(const ToolBase&) = delete; + ToolBase& operator=(const ToolBase&) = delete; bool _keyboardMove(GdkEventKey const &event, Geom::Point const &dir); diff --git a/src/ui/uxmanager.h b/src/ui/uxmanager.h index f91bde25e..669d8c5a1 100644 --- a/src/ui/uxmanager.h +++ b/src/ui/uxmanager.h @@ -41,8 +41,8 @@ protected: UXManager(); private: - UXManager( UXManager const & ); - UXManager & operator=( UXManager const & ); + UXManager( UXManager const & ) = delete; + UXManager & operator=( UXManager const & ) = delete; }; } // namespace UI diff --git a/src/ui/widget/color-notebook.h b/src/ui/widget/color-notebook.h index 0948e3d46..7c43435d3 100644 --- a/src/ui/widget/color-notebook.h +++ b/src/ui/widget/color-notebook.h @@ -70,8 +70,8 @@ protected: private: // By default, disallow copy constructor and assignment operator - ColorNotebook(const ColorNotebook &obj); - ColorNotebook &operator=(const ColorNotebook &obj); + ColorNotebook(const ColorNotebook &obj) = delete; + ColorNotebook &operator=(const ColorNotebook &obj) = delete; }; } } diff --git a/src/ui/widget/color-scales.h b/src/ui/widget/color-scales.h index 1fc465418..5d681cdfb 100644 --- a/src/ui/widget/color-scales.h +++ b/src/ui/widget/color-scales.h @@ -71,8 +71,8 @@ protected: private: // By default, disallow copy constructor and assignment operator - ColorScales(ColorScales const &obj); - ColorScales &operator=(ColorScales const &obj); + ColorScales(ColorScales const &obj) = delete; + ColorScales &operator=(ColorScales const &obj) = delete; }; class ColorScalesFactory : public Inkscape::UI::ColorSelectorFactory diff --git a/src/ui/widget/color-wheel-selector.h b/src/ui/widget/color-wheel-selector.h index ee7bd9b83..db9f7746b 100644 --- a/src/ui/widget/color-wheel-selector.h +++ b/src/ui/widget/color-wheel-selector.h @@ -59,8 +59,8 @@ protected: private: // By default, disallow copy constructor and assignment operator - ColorWheelSelector(const ColorWheelSelector &obj); - ColorWheelSelector &operator=(const ColorWheelSelector &obj); + ColorWheelSelector(const ColorWheelSelector &obj) = delete; + ColorWheelSelector &operator=(const ColorWheelSelector &obj) = delete; sigc::connection _color_changed_connection; sigc::connection _color_dragged_connection; diff --git a/src/ui/widget/dock-item.h b/src/ui/widget/dock-item.h index 31cdcf080..2b69fab45 100644 --- a/src/ui/widget/dock-item.h +++ b/src/ui/widget/dock-item.h @@ -141,7 +141,7 @@ private: sigc::signal<void, State, State> _signal_state_changed; - DockItem(); + DockItem() = delete; }; } // namespace Widget diff --git a/src/ui/widget/spinbutton.h b/src/ui/widget/spinbutton.h index ae571994b..9c015a3b2 100644 --- a/src/ui/widget/spinbutton.h +++ b/src/ui/widget/spinbutton.h @@ -89,8 +89,8 @@ protected: private: // noncopyable - SpinButton(const SpinButton&); - SpinButton& operator=(const SpinButton&); + SpinButton(const SpinButton&) = delete; + SpinButton& operator=(const SpinButton&) = delete; }; } // namespace Widget diff --git a/src/util/signal-blocker.h b/src/util/signal-blocker.h index 06d9736f2..9d1f3153a 100644 --- a/src/util/signal-blocker.h +++ b/src/util/signal-blocker.h @@ -49,8 +49,8 @@ public: private: // noncopyable, nonassignable - SignalBlocker(SignalBlocker const &other); - SignalBlocker& operator=(SignalBlocker const &other); + SignalBlocker(SignalBlocker const &other) = delete; + SignalBlocker& operator=(SignalBlocker const &other) = delete; sigc::connection *_connection; bool _wasBlocked; diff --git a/src/widgets/sp-color-selector.h b/src/widgets/sp-color-selector.h index 14a9fccdf..f5c194249 100644 --- a/src/widgets/sp-color-selector.h +++ b/src/widgets/sp-color-selector.h @@ -46,8 +46,8 @@ protected: private: // By default, disallow copy constructor and assignment operator - ColorSelector( const ColorSelector& obj ); - ColorSelector& operator=( const ColorSelector& obj ); + ColorSelector( const ColorSelector& obj ) = delete; + ColorSelector& operator=( const ColorSelector& obj ) = delete; gboolean _held; diff --git a/src/widgets/toolbox.h b/src/widgets/toolbox.h index ab1dcdfbd..a61130d33 100644 --- a/src/widgets/toolbox.h +++ b/src/widgets/toolbox.h @@ -63,7 +63,7 @@ public: static GtkIconSize prefToSize(Glib::ustring const &path, int base = 0 ); private: - ToolboxFactory(); + ToolboxFactory() = delete; }; /** |