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/ui/dialog | |
| 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/ui/dialog')
30 files changed, 66 insertions, 66 deletions
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) {} |
