diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-06-15 17:02:56 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2018-06-18 12:27:01 +0000 |
| commit | 004e50d84773242a000f5cadb89466bbc793e1a8 (patch) | |
| tree | 019c32e65caa08fe7cf90b521787531a7b1d2225 /src/ui | |
| parent | Run clang-tidy’s modernize-use-nullptr pass. (diff) | |
| download | inkscape-004e50d84773242a000f5cadb89466bbc793e1a8.tar.gz inkscape-004e50d84773242a000f5cadb89466bbc793e1a8.zip | |
Run clang-tidy’s modernize-use-equals-default pass.
This replaces empty constructors and destructors with the default
keyword.
Diffstat (limited to 'src/ui')
73 files changed, 110 insertions, 151 deletions
diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp index 0665f474f..5d369c9fa 100644 --- a/src/ui/cache/svg_preview_cache.cpp +++ b/src/ui/cache/svg_preview_cache.cpp @@ -72,8 +72,7 @@ namespace UI { namespace Cache { SvgPreview::SvgPreview() -{ -} += default; SvgPreview::~SvgPreview() { diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp index 1da3bf9bc..500da4147 100644 --- a/src/ui/clipboard.cpp +++ b/src/ui/clipboard.cpp @@ -188,7 +188,7 @@ ClipboardManagerImpl::ClipboardManagerImpl() } -ClipboardManagerImpl::~ClipboardManagerImpl() {} +ClipboardManagerImpl::~ClipboardManagerImpl() = default; /** @@ -1533,8 +1533,8 @@ void ClipboardManagerImpl::_userWarn(SPDesktop *desktop, char const *msg) ClipboardManager *ClipboardManager::_instance = nullptr; -ClipboardManager::ClipboardManager() {} -ClipboardManager::~ClipboardManager() {} +ClipboardManager::ClipboardManager() = default; +ClipboardManager::~ClipboardManager() = default; ClipboardManager *ClipboardManager::get() { if ( _instance == nullptr ) { diff --git a/src/ui/contextmenu.cpp b/src/ui/contextmenu.cpp index e9ff59f36..f66a71cd8 100644 --- a/src/ui/contextmenu.cpp +++ b/src/ui/contextmenu.cpp @@ -165,8 +165,7 @@ ContextMenu::ContextMenu(SPDesktop *desktop, SPItem *item) : } ContextMenu::~ContextMenu(void) -{ -} += default; Gtk::SeparatorMenuItem* ContextMenu::AddSeparator(void) { diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp index 2f6cf533f..93173aa35 100644 --- a/src/ui/control-manager.cpp +++ b/src/ui/control-manager.cpp @@ -65,7 +65,7 @@ class ControlManagerImpl public: ControlManagerImpl(ControlManager &manager); - ~ControlManagerImpl() {} + ~ControlManagerImpl() = default; SPCanvasItem *createControl(SPCanvasGroup *parent, ControlType type); @@ -92,7 +92,7 @@ private: { public: PrefListener(ControlManagerImpl &manager) : Inkscape::Preferences::Observer("/options/grabsize/value"), _mgr(manager) {} - ~PrefListener() override {} + ~PrefListener() override = default; void notify(Inkscape::Preferences::Entry const &val) override { int size = val.getIntLimited(3, 1, 7); @@ -369,8 +369,7 @@ ControlManager::ControlManager() : } ControlManager::~ControlManager() -{ -} += default; ControlManager &ControlManager::getManager() { diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp index 23a925de1..02893d5e1 100644 --- a/src/ui/dialog/align-and-distribute.cpp +++ b/src/ui/dialog/align-and-distribute.cpp @@ -253,13 +253,11 @@ BBoxSort::BBoxSort(SPItem *pItem, Geom::Rect const &bounds, Geom::Dim2 orientati { anchor = kBegin * bbox.min()[orientation] + kEnd * bbox.max()[orientation]; } -BBoxSort::BBoxSort(const BBoxSort &rhs) : +BBoxSort::BBoxSort(const BBoxSort &rhs) //NOTE : this copy ctor is called O(sort) when sorting the vector //this is bad. The vector should be a vector of pointers. //But I'll wait the bohem GC before doing that - item(rhs.item), anchor(rhs.anchor), bbox(rhs.bbox) -{ -} += default; bool operator< (const BBoxSort &a, const BBoxSort &b) { diff --git a/src/ui/dialog/align-and-distribute.h b/src/ui/dialog/align-and-distribute.h index d34bb8cc8..f8099908d 100644 --- a/src/ui/dialog/align-and-distribute.h +++ b/src/ui/dialog/align-and-distribute.h @@ -145,7 +145,7 @@ public : Gtk::Grid &parent, AlignAndDistribute &dialog); - virtual ~Action(){} + virtual ~Action()= default; AlignAndDistribute &_dialog; diff --git a/src/ui/dialog/arrange-tab.h b/src/ui/dialog/arrange-tab.h index 55baf775f..cbc6cfd4f 100644 --- a/src/ui/dialog/arrange-tab.h +++ b/src/ui/dialog/arrange-tab.h @@ -25,8 +25,8 @@ namespace Dialog { class ArrangeTab : public Gtk::VBox { public: - ArrangeTab() {}; - ~ArrangeTab() override {}; + ArrangeTab() = default;; + ~ArrangeTab() override = default;; /** * Do the actual work! This method is invoked to actually arrange the diff --git a/src/ui/dialog/behavior.h b/src/ui/dialog/behavior.h index fbe47c635..28cbf99a2 100644 --- a/src/ui/dialog/behavior.h +++ b/src/ui/dialog/behavior.h @@ -39,7 +39,7 @@ Behavior *create(Dialog &dialog) class Behavior { public: - virtual ~Behavior() { } + virtual ~Behavior() = default; /** Gtk::Dialog methods */ virtual operator Gtk::Widget&() =0; diff --git a/src/ui/dialog/calligraphic-profile-rename.h b/src/ui/dialog/calligraphic-profile-rename.h index 6d8fa5c64..0e5bce9ba 100644 --- a/src/ui/dialog/calligraphic-profile-rename.h +++ b/src/ui/dialog/calligraphic-profile-rename.h @@ -32,7 +32,7 @@ namespace Dialog { class CalligraphicProfileRename : public Gtk::Dialog { public: CalligraphicProfileRename(); - ~CalligraphicProfileRename() override {} + ~CalligraphicProfileRename() override = default; Glib::ustring getName() const { return "CalligraphicProfileRename"; } diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp index 04ade3d1e..4ebee6834 100644 --- a/src/ui/dialog/color-item.cpp +++ b/src/ui/dialog/color-item.cpp @@ -259,8 +259,7 @@ SwatchPage::SwatchPage() } SwatchPage::~SwatchPage() -{ -} += default; ColorItem::ColorItem(ege::PaintDef::ColorType type) : diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp index a34185f49..36f4607fb 100644 --- a/src/ui/dialog/debug.cpp +++ b/src/ui/dialog/debug.cpp @@ -117,8 +117,7 @@ DebugDialog *DebugDialog::create() } DebugDialogImpl::~DebugDialogImpl() -{ -} += default; void DebugDialogImpl::show() { diff --git a/src/ui/dialog/debug.h b/src/ui/dialog/debug.h index 34785a617..416959fb3 100644 --- a/src/ui/dialog/debug.h +++ b/src/ui/dialog/debug.h @@ -27,7 +27,7 @@ namespace Dialog { class DebugDialog { public: - DebugDialog() {}; + DebugDialog() = default;; /** * Factory method */ @@ -36,7 +36,7 @@ public: /** * Destructor */ - virtual ~DebugDialog() {}; + virtual ~DebugDialog() = default;; /** diff --git a/src/ui/dialog/dock-behavior.cpp b/src/ui/dialog/dock-behavior.cpp index bff2b2b64..7d1131a5f 100644 --- a/src/ui/dialog/dock-behavior.cpp +++ b/src/ui/dialog/dock-behavior.cpp @@ -59,8 +59,7 @@ DockBehavior::DockBehavior(Dialog &dialog) : } DockBehavior::~DockBehavior() -{ -} += default; Behavior * diff --git a/src/ui/dialog/extension-editor.cpp b/src/ui/dialog/extension-editor.cpp index 2413d51e0..fdbf59c1d 100644 --- a/src/ui/dialog/extension-editor.cpp +++ b/src/ui/dialog/extension-editor.cpp @@ -94,8 +94,7 @@ ExtensionEditor::ExtensionEditor() * Destroys the extension editor dialog. */ ExtensionEditor::~ExtensionEditor() -{ -} += default; void ExtensionEditor::setExtension(Glib::ustring extension_id) { diff --git a/src/ui/dialog/filedialog.h b/src/ui/dialog/filedialog.h index 071824ab9..a652266c7 100644 --- a/src/ui/dialog/filedialog.h +++ b/src/ui/dialog/filedialog.h @@ -88,7 +88,7 @@ public: * @param title the title of the dialog */ FileOpenDialog() - {}; + = default;; /** * Factory. @@ -106,7 +106,7 @@ public: * Destructor. * Perform any necessary cleanups. */ - virtual ~FileOpenDialog() {}; + virtual ~FileOpenDialog() = default;; /** * Show an OpenFile file selector. @@ -158,7 +158,7 @@ public: * @param key a list of file types from which the user can select */ FileSaveDialog () - {}; + = default;; /** * Factory. @@ -180,7 +180,7 @@ public: * Destructor. * Perform any necessary cleanups. */ - virtual ~FileSaveDialog() {}; + virtual ~FileSaveDialog() = default;; /** diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp index 4466c888a..006a59ece 100644 --- a/src/ui/dialog/filedialogimpl-gtkmm.cpp +++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp @@ -595,8 +595,7 @@ SVGPreview::SVGPreview() } SVGPreview::~SVGPreview() -{ -} += default; /*######################################################################### @@ -739,8 +738,7 @@ FileOpenDialogImplGtk::FileOpenDialogImplGtk(Gtk::Window &parentWindow, const Gl * Destructor */ FileOpenDialogImplGtk::~FileOpenDialogImplGtk() -{ -} += default; void FileOpenDialogImplGtk::addFilterMenu(Glib::ustring name, Glib::ustring pattern) { @@ -1049,8 +1047,7 @@ FileSaveDialogImplGtk::FileSaveDialogImplGtk(Gtk::Window &parentWindow, const Gl * Destructor */ FileSaveDialogImplGtk::~FileSaveDialogImplGtk() -{ -} += default; /** * Callback for fileNameEntry widget diff --git a/src/ui/dialog/filedialogimpl-gtkmm.h b/src/ui/dialog/filedialogimpl-gtkmm.h index 65018efa7..771b08df7 100644 --- a/src/ui/dialog/filedialogimpl-gtkmm.h +++ b/src/ui/dialog/filedialogimpl-gtkmm.h @@ -68,7 +68,7 @@ class FileType { public: FileType(): name(), pattern(),extension(nullptr) {} - ~FileType() {} + ~FileType() = default; Glib::ustring name; Glib::ustring pattern; Inkscape::Extension::Extension *extension; @@ -170,7 +170,7 @@ public: * */ ~FileDialogBaseGtk() override - {} + = default; protected: void cleanup( bool showConfirmed ); diff --git a/src/ui/dialog/filter-editor.cpp b/src/ui/dialog/filter-editor.cpp index ef702aba4..de1d8f6ae 100644 --- a/src/ui/dialog/filter-editor.cpp +++ b/src/ui/dialog/filter-editor.cpp @@ -104,7 +104,7 @@ FilterEditorDialog::FilterEditorDialog() : UI::Widget::Panel("/dialogs/filtereff } -FilterEditorDialog::~FilterEditorDialog(){} +FilterEditorDialog::~FilterEditorDialog()= default; diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp index 7ec7cb3e1..df7a3349e 100644 --- a/src/ui/dialog/font-substitution.cpp +++ b/src/ui/dialog/font-substitution.cpp @@ -45,12 +45,10 @@ namespace UI { namespace Dialog { FontSubstitution::FontSubstitution() -{ -} += default; FontSubstitution::~FontSubstitution() -{ -} += default; void FontSubstitution::checkFontSubstitutions(SPDocument* doc) diff --git a/src/ui/dialog/grid-arrange-tab.h b/src/ui/dialog/grid-arrange-tab.h index 5dff1bcf6..c908d74bf 100644 --- a/src/ui/dialog/grid-arrange-tab.h +++ b/src/ui/dialog/grid-arrange-tab.h @@ -39,7 +39,7 @@ class ArrangeDialog; class GridArrangeTab : public ArrangeTab { public: GridArrangeTab(ArrangeDialog *parent); - ~GridArrangeTab() override {}; + ~GridArrangeTab() override = default;; /** * Do the actual work diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 3261a0376..06309885c 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -179,8 +179,7 @@ InkscapePreferences::InkscapePreferences() } InkscapePreferences::~InkscapePreferences() -{ -} += default; Gtk::TreeModel::iterator InkscapePreferences::AddPage(DialogPage& p, Glib::ustring title, int id) { diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h index 2a6e3040c..7aaef90b4 100644 --- a/src/ui/dialog/inkscape-preferences.h +++ b/src/ui/dialog/inkscape-preferences.h @@ -468,8 +468,7 @@ protected: add(shortcutid); add(user_set); } - ~ModelColumns() override { - } + ~ModelColumns() override = default; Gtk::TreeModelColumn<Glib::ustring> name; Gtk::TreeModelColumn<Glib::ustring> id; diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp index 34a8c3820..012b76a38 100644 --- a/src/ui/dialog/input.cpp +++ b/src/ui/dialog/input.cpp @@ -377,7 +377,7 @@ static std::map<Glib::ustring, Gdk::InputMode> &getStringToMode() class InputDialogImpl : public InputDialog { public: InputDialogImpl(); - ~InputDialogImpl() override {} + ~InputDialogImpl() override = default; private: class ConfPanel : public Gtk::VBox @@ -436,7 +436,7 @@ private: add(name); add(value); } - ~KeysColumns() override {} + ~KeysColumns() override = default; Gtk::TreeModelColumn<Glib::ustring> name; Gtk::TreeModelColumn<Glib::ustring> value; @@ -743,7 +743,7 @@ InputDialogImpl::InputDialogImpl() : class TabletTmp { public: - TabletTmp() {} + TabletTmp() = default; Glib::ustring name; std::list<Glib::RefPtr<InputDevice const> > devices; @@ -1060,8 +1060,7 @@ InputDialogImpl::ConfPanel::ConfPanel() : } InputDialogImpl::ConfPanel::~ConfPanel() -{ -} += default; void InputDialogImpl::ConfPanel::setModeCellString(Gtk::CellRenderer *rndr, Gtk::TreeIter const &iter) { diff --git a/src/ui/dialog/input.h b/src/ui/dialog/input.h index e79e32854..bd102d8d1 100644 --- a/src/ui/dialog/input.h +++ b/src/ui/dialog/input.h @@ -26,7 +26,7 @@ public: static InputDialog &getInstance(); InputDialog() : UI::Widget::Panel("/dialogs/inputdevices", SP_VERB_DIALOG_INPUT) {} - ~InputDialog() override {} + ~InputDialog() override = default; }; } // namespace Dialog diff --git a/src/ui/dialog/layer-properties.h b/src/ui/dialog/layer-properties.h index 0e7f8b10d..f263f383b 100644 --- a/src/ui/dialog/layer-properties.h +++ b/src/ui/dialog/layer-properties.h @@ -55,7 +55,7 @@ class LayerPropertiesDialog : public Gtk::Dialog { protected: struct Strategy { - virtual ~Strategy() {} + virtual ~Strategy() = default; virtual void setup(LayerPropertiesDialog &)=0; virtual void perform(LayerPropertiesDialog &)=0; }; @@ -112,7 +112,7 @@ protected: add(_colLocked); add(_colLabel); } - ~ModelColumns() override {} + ~ModelColumns() override = default; Gtk::TreeModelColumn<SPObject*> _colObject; Gtk::TreeModelColumn<Glib::ustring> _colLabel; diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp index c836f9925..fe528d34d 100644 --- a/src/ui/dialog/layers.cpp +++ b/src/ui/dialog/layers.cpp @@ -312,7 +312,7 @@ public: add(_colLocked); add(_colLabel); } - ~ModelColumns() override {} + ~ModelColumns() override = default; Gtk::TreeModelColumn<SPObject*> _colObject; Gtk::TreeModelColumn<Glib::ustring> _colLabel; diff --git a/src/ui/dialog/livepatheffect-add.h b/src/ui/dialog/livepatheffect-add.h index 790feae29..7bfb1ab5d 100644 --- a/src/ui/dialog/livepatheffect-add.h +++ b/src/ui/dialog/livepatheffect-add.h @@ -30,7 +30,7 @@ namespace Dialog { class LivePathEffectAdd : public Gtk::Dialog { public: LivePathEffectAdd(); - ~LivePathEffectAdd() override {} + ~LivePathEffectAdd() override = default; /** * Show the dialog @@ -86,7 +86,7 @@ private: //add(desc); add(data); } - ~ModelColumns() override {} + ~ModelColumns() override = default; Gtk::TreeModelColumn<Glib::ustring> name; /** diff --git a/src/ui/dialog/livepatheffect-editor.h b/src/ui/dialog/livepatheffect-editor.h index e355bba6e..26e278071 100644 --- a/src/ui/dialog/livepatheffect-editor.h +++ b/src/ui/dialog/livepatheffect-editor.h @@ -88,7 +88,7 @@ private: add(lperef); add(col_visible); } - ~ModelColumns() override {} + ~ModelColumns() override = default; Gtk::TreeModelColumn<Glib::ustring> col_name; Gtk::TreeModelColumn<LivePathEffect::LPEObjectReference *> lperef; diff --git a/src/ui/dialog/messages.cpp b/src/ui/dialog/messages.cpp index 5ff0d24e8..887f77c07 100644 --- a/src/ui/dialog/messages.cpp +++ b/src/ui/dialog/messages.cpp @@ -101,8 +101,7 @@ Messages::Messages() } Messages::~Messages() -{ -} += default; //######################################################################### diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp index a5b86a561..397f5690e 100644 --- a/src/ui/dialog/objects.cpp +++ b/src/ui/dialog/objects.cpp @@ -213,7 +213,7 @@ public: add(_colClipMask); //add(_colInsertOrder); } - ~ModelColumns() override {} + ~ModelColumns() override = default; Gtk::TreeModelColumn<SPItem*> _colObject; Gtk::TreeModelColumn<Glib::ustring> _colLabel; diff --git a/src/ui/dialog/ocaldialogs.h b/src/ui/dialog/ocaldialogs.h index 49befd411..ebae47a1b 100644 --- a/src/ui/dialog/ocaldialogs.h +++ b/src/ui/dialog/ocaldialogs.h @@ -85,7 +85,7 @@ public: * Destructor */ ~FileDialogBase() override - {} + = default; protected: void cleanup( bool showConfirmed ); diff --git a/src/ui/dialog/panel-dialog.h b/src/ui/dialog/panel-dialog.h index 47bb8db4f..0a8704445 100644 --- a/src/ui/dialog/panel-dialog.h +++ b/src/ui/dialog/panel-dialog.h @@ -42,7 +42,7 @@ public: _panel (panel) { } virtual void present() = 0; - virtual ~PanelDialogBase() {} + virtual ~PanelDialogBase() = default; virtual UI::Widget::Panel &getPanel() { return _panel; } @@ -77,7 +77,7 @@ public: */ PanelDialog(UI::Widget::Panel &contents, char const *prefs_path, int const verb_num); - ~PanelDialog() override {} + ~PanelDialog() override = default; template <typename T> static PanelDialog<Behavior> *create(); @@ -100,7 +100,7 @@ class PanelDialog<Behavior::FloatingBehavior> : public: inline PanelDialog(UI::Widget::Panel &contents, char const *prefs_path, int const verb_num); - ~PanelDialog() override {} + ~PanelDialog() override = default; template <typename T> static PanelDialog<Behavior::FloatingBehavior> *create(); diff --git a/src/ui/dialog/pixelartdialog.h b/src/ui/dialog/pixelartdialog.h index d0eac9296..a0add2e94 100644 --- a/src/ui/dialog/pixelartdialog.h +++ b/src/ui/dialog/pixelartdialog.h @@ -36,7 +36,7 @@ public: static PixelArtDialog &getInstance(); - ~PixelArtDialog() override {}; + ~PixelArtDialog() override = default;; }; diff --git a/src/ui/dialog/polar-arrange-tab.h b/src/ui/dialog/polar-arrange-tab.h index aeb8613ee..0df26423a 100644 --- a/src/ui/dialog/polar-arrange-tab.h +++ b/src/ui/dialog/polar-arrange-tab.h @@ -35,7 +35,7 @@ class ArrangeDialog; class PolarArrangeTab : public ArrangeTab { public: PolarArrangeTab(ArrangeDialog *parent_); - ~PolarArrangeTab() override {}; + ~PolarArrangeTab() override = default;; /** * Do the actual arrangement diff --git a/src/ui/dialog/spellcheck.h b/src/ui/dialog/spellcheck.h index 5156d0e00..a65b25440 100644 --- a/src/ui/dialog/spellcheck.h +++ b/src/ui/dialog/spellcheck.h @@ -262,7 +262,7 @@ private: { add(suggestions); } - ~TreeColumns() override {} + ~TreeColumns() override = default; Gtk::TreeModelColumn<Glib::ustring> suggestions; }; TreeColumns tree_columns; diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp index 307c6f6a7..db284466d 100644 --- a/src/ui/dialog/styledialog.cpp +++ b/src/ui/dialog/styledialog.cpp @@ -168,8 +168,7 @@ StyleDialog::_nodeChanged( Inkscape::XML::Node &object ) { } StyleDialog::TreeStore::TreeStore() -{ -} += default; /** @@ -1045,7 +1044,7 @@ bool StyleDialog::_handleButtonEvent(GdkEventButton *event) class PropertyData { public: - PropertyData() {}; + PropertyData() = default;; PropertyData(Glib::ustring name) : _name(name) {}; void _setSheetValue(Glib::ustring value) { _sheetValue = value; }; diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp index 1c418a76d..5c3732ff2 100644 --- a/src/ui/dialog/svg-fonts-dialog.cpp +++ b/src/ui/dialog/svg-fonts-dialog.cpp @@ -236,8 +236,7 @@ Gtk::HBox* SvgFontsDialog::AttrSpin(gchar* lbl){ /*** SvgFontsDialog ***/ -GlyphComboBox::GlyphComboBox(){ -} +GlyphComboBox::GlyphComboBox()= default; void GlyphComboBox::update(SPFont* spfont){ if (!spfont) return; @@ -1049,7 +1048,7 @@ SvgFontsDialog::SvgFontsDialog() _getContents()->show_all(); } -SvgFontsDialog::~SvgFontsDialog(){} +SvgFontsDialog::~SvgFontsDialog()= default; } // namespace Dialog } // namespace UI diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp index 720cf0507..ed8c00c61 100644 --- a/src/ui/dialog/tags.cpp +++ b/src/ui/dialog/tags.cpp @@ -279,7 +279,7 @@ public: add(_colAddRemove); add(_colAllowAddRemove); } - ~ModelColumns() override {} + ~ModelColumns() override = default; Gtk::TreeModelColumn<SPObject*> _colParentObject; Gtk::TreeModelColumn<SPObject*> _colObject; diff --git a/src/ui/dialog/template-load-tab.cpp b/src/ui/dialog/template-load-tab.cpp index 8e4a3c667..9e710f0fb 100644 --- a/src/ui/dialog/template-load-tab.cpp +++ b/src/ui/dialog/template-load-tab.cpp @@ -65,8 +65,7 @@ TemplateLoadTab::TemplateLoadTab(NewFromTemplate* parent) TemplateLoadTab::~TemplateLoadTab() -{ -} += default; void TemplateLoadTab::createTemplate() diff --git a/src/ui/dialog/tile.h b/src/ui/dialog/tile.h index a368c7072..70e4770f7 100644 --- a/src/ui/dialog/tile.h +++ b/src/ui/dialog/tile.h @@ -52,7 +52,7 @@ private: public: ArrangeDialog(); - ~ArrangeDialog() override {}; + ~ArrangeDialog() override = default;; /** * Callback from Apply diff --git a/src/ui/dialog/tracedialog.h b/src/ui/dialog/tracedialog.h index 2a6b7a1a0..9d7138d08 100644 --- a/src/ui/dialog/tracedialog.h +++ b/src/ui/dialog/tracedialog.h @@ -44,7 +44,7 @@ public: /** * Destructor */ - ~TraceDialog() override {}; + ~TraceDialog() override = default;; }; diff --git a/src/ui/dialog/undo-history.h b/src/ui/dialog/undo-history.h index ae5be30ff..294479816 100644 --- a/src/ui/dialog/undo-history.h +++ b/src/ui/dialog/undo-history.h @@ -67,7 +67,7 @@ class CellRendererInt : public Gtk::CellRendererText { public: struct Filter : std::unary_function<int, bool> { - virtual ~Filter() {} + virtual ~Filter() = default; virtual bool operator() (const int&) const =0; }; diff --git a/src/ui/previewable.h b/src/ui/previewable.h index 377e109fb..c733c31df 100644 --- a/src/ui/previewable.h +++ b/src/ui/previewable.h @@ -40,7 +40,7 @@ class Previewable { public: // TODO need to add some nice parameters - virtual ~Previewable() {} + virtual ~Previewable() = default; virtual Gtk::Widget* getPreview( PreviewStyle style, ViewType view, ::PreviewSize size, guint ratio, guint border) = 0; }; diff --git a/src/ui/previewholder.cpp b/src/ui/previewholder.cpp index 8198e709c..ae6907cc7 100644 --- a/src/ui/previewholder.cpp +++ b/src/ui/previewholder.cpp @@ -65,8 +65,7 @@ PreviewHolder::PreviewHolder() : } PreviewHolder::~PreviewHolder() -{ -} += default; bool PreviewHolder::on_scroll_event(GdkEventScroll *event) { diff --git a/src/ui/selected-color.cpp b/src/ui/selected-color.cpp index 422088ed2..f7ba74a5a 100644 --- a/src/ui/selected-color.cpp +++ b/src/ui/selected-color.cpp @@ -35,9 +35,7 @@ SelectedColor::SelectedColor() } -SelectedColor::~SelectedColor() { - -} +SelectedColor::~SelectedColor() = default; void SelectedColor::setColor(SPColor const &color) { diff --git a/src/ui/selected-color.h b/src/ui/selected-color.h index 3d5858d3f..36d5e5233 100644 --- a/src/ui/selected-color.h +++ b/src/ui/selected-color.h @@ -73,8 +73,7 @@ private: class ColorSelectorFactory { public: - virtual ~ColorSelectorFactory() { - } + virtual ~ColorSelectorFactory() = default; virtual Gtk::Widget* createWidget(SelectedColor &color) const = 0; virtual Glib::ustring modeName() const = 0; diff --git a/src/ui/shape-editor-knotholders.cpp b/src/ui/shape-editor-knotholders.cpp index d3bd6fa1b..abcab90f2 100644 --- a/src/ui/shape-editor-knotholders.cpp +++ b/src/ui/shape-editor-knotholders.cpp @@ -41,49 +41,49 @@ class RectKnotHolder : public KnotHolder { public: RectKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler); - ~RectKnotHolder() override {}; + ~RectKnotHolder() override = default;; }; class Box3DKnotHolder : public KnotHolder { public: Box3DKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler); - ~Box3DKnotHolder() override {}; + ~Box3DKnotHolder() override = default;; }; class ArcKnotHolder : public KnotHolder { public: ArcKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler); - ~ArcKnotHolder() override {}; + ~ArcKnotHolder() override = default;; }; class StarKnotHolder : public KnotHolder { public: StarKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler); - ~StarKnotHolder() override {}; + ~StarKnotHolder() override = default;; }; class SpiralKnotHolder : public KnotHolder { public: SpiralKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler); - ~SpiralKnotHolder() override {}; + ~SpiralKnotHolder() override = default;; }; class OffsetKnotHolder : public KnotHolder { public: OffsetKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler); - ~OffsetKnotHolder() override {}; + ~OffsetKnotHolder() override = default;; }; class FlowtextKnotHolder : public KnotHolder { public: FlowtextKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler); - ~FlowtextKnotHolder() override {}; + ~FlowtextKnotHolder() override = default;; }; class MiscKnotHolder : public KnotHolder { public: MiscKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler); - ~MiscKnotHolder() override {}; + ~MiscKnotHolder() override = default;; }; namespace { diff --git a/src/ui/tool/manipulator.h b/src/ui/tool/manipulator.h index 96861e660..25862a039 100644 --- a/src/ui/tool/manipulator.h +++ b/src/ui/tool/manipulator.h @@ -36,7 +36,7 @@ public: Manipulator(SPDesktop *d) : _desktop(d) {} - virtual ~Manipulator() {} + virtual ~Manipulator() = default; /// Handle input event. Returns true if handled. virtual bool event(Inkscape::UI::Tools::ToolBase *, GdkEvent *)=0; diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp index 0c81e179c..d11ed1d83 100644 --- a/src/ui/tools/dropper-tool.cpp +++ b/src/ui/tools/dropper-tool.cpp @@ -78,8 +78,7 @@ DropperTool::DropperTool() { } -DropperTool::~DropperTool() { -} +DropperTool::~DropperTool() = default; void DropperTool::setup() { ToolBase::setup(); diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp index a76234aa4..1cd9db6b2 100644 --- a/src/ui/tools/eraser-tool.cpp +++ b/src/ui/tools/eraser-tool.cpp @@ -103,8 +103,7 @@ EraserTool::EraserTool() { } -EraserTool::~EraserTool() { -} +EraserTool::~EraserTool() = default; void EraserTool::setup() { DynamicBase::setup(); diff --git a/src/ui/tools/zoom-tool.cpp b/src/ui/tools/zoom-tool.cpp index dcd6eac80..5310e0f17 100644 --- a/src/ui/tools/zoom-tool.cpp +++ b/src/ui/tools/zoom-tool.cpp @@ -42,8 +42,7 @@ ZoomTool::ZoomTool() { } -ZoomTool::~ZoomTool() { -} +ZoomTool::~ZoomTool() = default; void ZoomTool::finish() { this->enableGrDrag(false); diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp index 5256ecf88..d7f7ba87b 100644 --- a/src/ui/uxmanager.cpp +++ b/src/ui/uxmanager.cpp @@ -106,12 +106,10 @@ UXManager* UXManager::getInstance() UXManager::UXManager() -{ -} += default; UXManager::~UXManager() -{ -} += default; UXManagerImpl::UXManagerImpl() : _widescreen(false) @@ -136,8 +134,7 @@ UXManagerImpl::UXManagerImpl() : } UXManagerImpl::~UXManagerImpl() -{ -} += default; bool UXManagerImpl::isWidescreen() const { diff --git a/src/ui/view/edit-widget-interface.h b/src/ui/view/edit-widget-interface.h index a8f68518f..f2e34b534 100644 --- a/src/ui/view/edit-widget-interface.h +++ b/src/ui/view/edit-widget-interface.h @@ -34,8 +34,8 @@ namespace View { */ struct EditWidgetInterface { - EditWidgetInterface() {} - virtual ~EditWidgetInterface() {} + EditWidgetInterface() = default; + virtual ~EditWidgetInterface() = default; /// Returns pointer to window UI object as void* virtual Gtk::Window *getWindow() = 0; diff --git a/src/ui/widget/addtoicon.h b/src/ui/widget/addtoicon.h index f79d12cdf..60c773e84 100644 --- a/src/ui/widget/addtoicon.h +++ b/src/ui/widget/addtoicon.h @@ -24,7 +24,7 @@ namespace Widget { class AddToIcon : public Gtk::CellRendererPixbuf { public: AddToIcon(); - ~AddToIcon() override {}; + ~AddToIcon() override = default;; Glib::PropertyProxy<bool> property_active() { return _property_active.get_proxy(); } Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_on(); diff --git a/src/ui/widget/attr-widget.h b/src/ui/widget/attr-widget.h index 8dbff8874..d50bdc65a 100644 --- a/src/ui/widget/attr-widget.h +++ b/src/ui/widget/attr-widget.h @@ -134,7 +134,7 @@ public: {} virtual ~AttrWidget() - {} + = default; virtual Glib::ustring get_as_attribute() const = 0; virtual void set_from_attribute(SPObject*) = 0; diff --git a/src/ui/widget/clipmaskicon.h b/src/ui/widget/clipmaskicon.h index d355a1caf..25725e33a 100644 --- a/src/ui/widget/clipmaskicon.h +++ b/src/ui/widget/clipmaskicon.h @@ -24,7 +24,7 @@ namespace Widget { class ClipMaskIcon : public Gtk::CellRendererPixbuf { public: ClipMaskIcon(); - ~ClipMaskIcon() override {}; + ~ClipMaskIcon() override = default;; Glib::PropertyProxy<int> property_active() { return _property_active.get_proxy(); } Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_on(); diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp index 620e77cbf..57555a53d 100644 --- a/src/ui/widget/color-scales.cpp +++ b/src/ui/widget/color-scales.cpp @@ -729,7 +729,7 @@ ColorScalesFactory::ColorScalesFactory(SPColorScalesMode submode) { } -ColorScalesFactory::~ColorScalesFactory() {} +ColorScalesFactory::~ColorScalesFactory() = default; Gtk::Widget *ColorScalesFactory::createWidget(Inkscape::UI::SelectedColor &color) const { diff --git a/src/ui/widget/highlight-picker.cpp b/src/ui/widget/highlight-picker.cpp index 3d8ab50ea..a3abc32bb 100644 --- a/src/ui/widget/highlight-picker.cpp +++ b/src/ui/widget/highlight-picker.cpp @@ -28,8 +28,7 @@ HighlightPicker::HighlightPicker() : } HighlightPicker::~HighlightPicker() -{ -} += default; void HighlightPicker::get_preferred_height_vfunc(Gtk::Widget& widget, int& min_h, diff --git a/src/ui/widget/imagetoggler.h b/src/ui/widget/imagetoggler.h index f537cc74c..86c12bc03 100644 --- a/src/ui/widget/imagetoggler.h +++ b/src/ui/widget/imagetoggler.h @@ -25,7 +25,7 @@ namespace Widget { class ImageToggler : public Gtk::CellRendererPixbuf { public: ImageToggler( char const *on, char const *off); - ~ImageToggler() override {}; + ~ImageToggler() override = default;; sigc::signal<void, const Glib::ustring&> signal_toggled() { return _signal_toggled;} sigc::signal<void, GdkEvent const *> signal_pre_toggle() { return _signal_pre_toggle; } diff --git a/src/ui/widget/ink-spinscale.h b/src/ui/widget/ink-spinscale.h index 7cb82c92a..a5807f8dc 100644 --- a/src/ui/widget/ink-spinscale.h +++ b/src/ui/widget/ink-spinscale.h @@ -31,7 +31,7 @@ class InkScale : public Gtk::Scale { public: InkScale(Glib::RefPtr<Gtk::Adjustment>, Gtk::SpinButton* spinbutton); - ~InkScale() override {}; + ~InkScale() override = default;; void set_label(Glib::ustring label); @@ -71,7 +71,7 @@ class InkSpinScale : public Gtk::Box // Create an InkSpinScale with a preexisting adjustment. InkSpinScale(Glib::RefPtr<Gtk::Adjustment>); - ~InkSpinScale() override {}; + ~InkSpinScale() override = default;; void set_label(Glib::ustring label); void set_digits(int digits); diff --git a/src/ui/widget/insertordericon.h b/src/ui/widget/insertordericon.h index 5c4c19603..b736007f4 100644 --- a/src/ui/widget/insertordericon.h +++ b/src/ui/widget/insertordericon.h @@ -25,7 +25,7 @@ namespace Widget { class InsertOrderIcon : public Gtk::CellRendererPixbuf { public: InsertOrderIcon(); - ~InsertOrderIcon() override {}; + ~InsertOrderIcon() override = default;; Glib::PropertyProxy<int> property_active() { return _property_active.get_proxy(); } Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_on(); diff --git a/src/ui/widget/layertypeicon.h b/src/ui/widget/layertypeicon.h index 5f7e79c29..e84bef261 100644 --- a/src/ui/widget/layertypeicon.h +++ b/src/ui/widget/layertypeicon.h @@ -24,7 +24,7 @@ namespace Widget { class LayerTypeIcon : public Gtk::CellRendererPixbuf { public: LayerTypeIcon(); - ~LayerTypeIcon() override {}; + ~LayerTypeIcon() override = default;; sigc::signal<void, const Glib::ustring&> signal_toggled() { return _signal_toggled;} sigc::signal<void, GdkEvent const *> signal_pre_toggle() { return _signal_pre_toggle; } diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp index 579049d29..b8eeca00d 100644 --- a/src/ui/widget/page-sizer.cpp +++ b/src/ui/widget/page-sizer.cpp @@ -464,8 +464,7 @@ PageSizer::PageSizer(Registry & _wr) * Destructor */ PageSizer::~PageSizer() -{ -} += default; diff --git a/src/ui/widget/page-sizer.h b/src/ui/widget/page-sizer.h index 001c6a65d..edc9f5b0c 100644 --- a/src/ui/widget/page-sizer.h +++ b/src/ui/widget/page-sizer.h @@ -81,7 +81,7 @@ public: * Destructor */ virtual ~PaperSize() - {} + = default; /** * Name of this paper specification diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp index 7b54995c1..73897aeb5 100644 --- a/src/ui/widget/panel.cpp +++ b/src/ui/widget/panel.cpp @@ -59,8 +59,7 @@ Panel::Panel(gchar const *prefs_path, int verb_num) : } Panel::~Panel() -{ -} += default; void Panel::present() { diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h index 129a7b336..acd59fe94 100644 --- a/src/ui/widget/preferences-widget.h +++ b/src/ui/widget/preferences-widget.h @@ -251,7 +251,7 @@ class PrefColorPicker : public ColorPicker { public: PrefColorPicker() : ColorPicker("", "", 0, false) {}; - ~PrefColorPicker() override {}; + ~PrefColorPicker() override = default;; void init(Glib::ustring const &abel, Glib::ustring const &prefs_path, guint32 default_rgba); diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h index bb0f6da8a..033ab9541 100644 --- a/src/ui/widget/registered-widget.h +++ b/src/ui/widget/registered-widget.h @@ -83,7 +83,7 @@ protected: template< typename A, typename B, typename C, typename D, typename E , typename F, typename G> RegisteredWidget( A& a, B& b, C& c, D& d, E& e, F f, G& g): W( a, b, c, d, e, f, g) { construct(); } - ~RegisteredWidget() override {}; + ~RegisteredWidget() override = default;; void init_parent(const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in, SPDocument *doc_in) { diff --git a/src/ui/widget/registry.cpp b/src/ui/widget/registry.cpp index ea8198422..9972e1acd 100644 --- a/src/ui/widget/registry.cpp +++ b/src/ui/widget/registry.cpp @@ -23,7 +23,7 @@ namespace Widget { Registry::Registry() : _updating(false) {} -Registry::~Registry() {} +Registry::~Registry() = default; bool Registry::isUpdating() diff --git a/src/ui/widget/rotateable.cpp b/src/ui/widget/rotateable.cpp index 0e290730d..64b37a07f 100644 --- a/src/ui/widget/rotateable.cpp +++ b/src/ui/widget/rotateable.cpp @@ -160,8 +160,7 @@ bool Rotateable::on_scroll(GdkEventScroll* event) return TRUE; } -Rotateable::~Rotateable() { -} +Rotateable::~Rotateable() = default; diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index c0b0a7f56..b5fdc721d 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -1207,8 +1207,7 @@ RotateableSwatch::RotateableSwatch(SelectedStyle *parent, guint mode) : { } -RotateableSwatch::~RotateableSwatch() { -} +RotateableSwatch::~RotateableSwatch() = default; double RotateableSwatch::color_adjust(float *hsla, double by, guint32 cc, guint modifier) @@ -1408,8 +1407,7 @@ RotateableStrokeWidth::RotateableStrokeWidth(SelectedStyle *parent) : { } -RotateableStrokeWidth::~RotateableStrokeWidth() { -} +RotateableStrokeWidth::~RotateableStrokeWidth() = default; double RotateableStrokeWidth::value_adjust(double current, double by, guint /*modifier*/, bool final) diff --git a/src/ui/widget/spinbutton.h b/src/ui/widget/spinbutton.h index 28d9849a8..918e7047f 100644 --- a/src/ui/widget/spinbutton.h +++ b/src/ui/widget/spinbutton.h @@ -45,7 +45,7 @@ public: connect_signals(); }; - ~SpinButton() override {}; + ~SpinButton() override = default;; void setUnitMenu(UnitMenu* unit_menu) { _unit_menu = unit_menu; }; diff --git a/src/ui/widget/style-subject.cpp b/src/ui/widget/style-subject.cpp index 5eccc67cf..04de4b162 100644 --- a/src/ui/widget/style-subject.cpp +++ b/src/ui/widget/style-subject.cpp @@ -38,11 +38,9 @@ void StyleSubject::setDesktop(SPDesktop *desktop) { } } -StyleSubject::Selection::Selection() { -} +StyleSubject::Selection::Selection() = default; -StyleSubject::Selection::~Selection() { -} +StyleSubject::Selection::~Selection() = default; Inkscape::Selection *StyleSubject::Selection::_getSelection() const { SPDesktop *desktop = getDesktop(); @@ -105,8 +103,7 @@ StyleSubject::CurrentLayer::CurrentLayer() { _element = nullptr; } -StyleSubject::CurrentLayer::~CurrentLayer() { -} +StyleSubject::CurrentLayer::~CurrentLayer() = default; void StyleSubject::CurrentLayer::_setLayer(SPObject *layer) { _layer_release.disconnect(); diff --git a/src/ui/widget/unit-menu.cpp b/src/ui/widget/unit-menu.cpp index 423313a1f..fd10b567e 100644 --- a/src/ui/widget/unit-menu.cpp +++ b/src/ui/widget/unit-menu.cpp @@ -26,8 +26,7 @@ UnitMenu::UnitMenu() : _type(UNIT_TYPE_NONE) set_active(0); } -UnitMenu::~UnitMenu() { -} +UnitMenu::~UnitMenu() = default; bool UnitMenu::setUnitType(UnitType unit_type) { |
