diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-06-19 13:55:58 +0000 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-06-19 13:55:58 +0000 |
| commit | 884fe02952017ac219cd23f9407d27ed4d8a8620 (patch) | |
| tree | a86d66e240ae1e72007ba75b23757c71d5a9a28c /src/ui/dialog | |
| parent | Run clang-tidy’s modernize-use-emplace pass. (diff) | |
| download | inkscape-884fe02952017ac219cd23f9407d27ed4d8a8620.tar.gz inkscape-884fe02952017ac219cd23f9407d27ed4d8a8620.zip | |
Run clang-tidy’s modernize-redundant-void-arg pass.
Diffstat (limited to 'src/ui/dialog')
| -rw-r--r-- | src/ui/dialog/clonetiler.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/export.cpp | 4 | ||||
| -rw-r--r-- | src/ui/dialog/extension-editor.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/extension-editor.h | 2 | ||||
| -rw-r--r-- | src/ui/dialog/filedialogimpl-gtkmm.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/find.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/find.h | 2 | ||||
| -rw-r--r-- | src/ui/dialog/floating-behavior.cpp | 4 | ||||
| -rw-r--r-- | src/ui/dialog/floating-behavior.h | 4 | ||||
| -rw-r--r-- | src/ui/dialog/object-attributes.cpp | 6 | ||||
| -rw-r--r-- | src/ui/dialog/object-attributes.h | 2 | ||||
| -rw-r--r-- | src/ui/dialog/spellcheck.cpp | 4 | ||||
| -rw-r--r-- | src/ui/dialog/text-edit.cpp | 4 | ||||
| -rw-r--r-- | src/ui/dialog/text-edit.h | 4 | ||||
| -rw-r--r-- | src/ui/dialog/xml-tree.cpp | 2 |
15 files changed, 23 insertions, 23 deletions
diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp index 3346dd595..9e7d71c32 100644 --- a/src/ui/dialog/clonetiler.cpp +++ b/src/ui/dialog/clonetiler.cpp @@ -1167,7 +1167,7 @@ CloneTiler::CloneTiler () : } -CloneTiler::~CloneTiler (void) +CloneTiler::~CloneTiler () { //subselChangedConn.disconnect(); //selectModifiedConn.disconnect(); diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp index 392587bef..f484f7e47 100644 --- a/src/ui/dialog/export.cpp +++ b/src/ui/dialog/export.cpp @@ -121,7 +121,7 @@ static const char * selection_labels[SELECTION_NUMBER_OF] = { N_("_Page"), N_("_Drawing"), N_("_Selection"), N_("_Custom") }; -Export::Export (void) : +Export::Export () : UI::Widget::Panel("/dialogs/export/", SP_VERB_DIALOG_EXPORT), current_key(SELECTION_PAGE), original_name(), @@ -386,7 +386,7 @@ Export::Export (void) : onAreaToggled(); } -Export::~Export (void) +Export::~Export () { was_empty = TRUE; diff --git a/src/ui/dialog/extension-editor.cpp b/src/ui/dialog/extension-editor.cpp index fdbf59c1d..5e1a0cda5 100644 --- a/src/ui/dialog/extension-editor.cpp +++ b/src/ui/dialog/extension-editor.cpp @@ -121,7 +121,7 @@ ExtensionEditor::setExtensionIter(const Gtk::TreeModel::iterator &iter) * from the tree view in the left pane. It figure out which extension * is selected and updates the widgets to have data for that extension. */ -void ExtensionEditor::on_pagelist_selection_changed(void) +void ExtensionEditor::on_pagelist_selection_changed() { Glib::RefPtr<Gtk::TreeSelection> selection = _page_list.get_selection(); Gtk::TreeModel::iterator iter = selection->get_selected(); diff --git a/src/ui/dialog/extension-editor.h b/src/ui/dialog/extension-editor.h index f4e1bfb56..a0949dcd3 100644 --- a/src/ui/dialog/extension-editor.h +++ b/src/ui/dialog/extension-editor.h @@ -70,7 +70,7 @@ private: ExtensionEditor(ExtensionEditor const &d); ExtensionEditor& operator=(ExtensionEditor const &d); - void on_pagelist_selection_changed(void); + void on_pagelist_selection_changed(); static void dbfunc (Inkscape::Extension::Extension * in_plug, gpointer in_data); Gtk::TreeModel::iterator add_extension (Inkscape::Extension::Extension * ext); bool setExtensionIter(const Gtk::TreeModel::iterator &iter); diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp index 4d3a1fb62..e7b7be9b9 100644 --- a/src/ui/dialog/filedialogimpl-gtkmm.cpp +++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp @@ -898,7 +898,7 @@ Inkscape::Extension::Extension *FileOpenDialogImplGtk::getSelectionType() /** * Get the file name chosen by the user. Valid after an [OK] */ -Glib::ustring FileOpenDialogImplGtk::getFilename(void) +Glib::ustring FileOpenDialogImplGtk::getFilename() { return myFilename; } diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp index 64045f252..f8de11f42 100644 --- a/src/ui/dialog/find.cpp +++ b/src/ui/dialog/find.cpp @@ -274,7 +274,7 @@ void Find::setTargetDesktop(SPDesktop *desktop) } } -void Find::onSelectionChange(void) +void Find::onSelectionChange() { if (!blocked) { status.set_text(""); diff --git a/src/ui/dialog/find.h b/src/ui/dialog/find.h index c695bd9ac..2ed341122 100644 --- a/src/ui/dialog/find.h +++ b/src/ui/dialog/find.h @@ -196,7 +196,7 @@ protected: /** * Called when desktop selection changes */ - void onSelectionChange(void); + void onSelectionChange(); private: Find(Find const &d) = delete; diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp index 0cc3af606..dccbd76b7 100644 --- a/src/ui/dialog/floating-behavior.cpp +++ b/src/ui/dialog/floating-behavior.cpp @@ -62,7 +62,7 @@ FloatingBehavior::FloatingBehavior(Dialog &dialog) : * zero so that the transition happens instantaneously. This occurs on * windows as opacity changes cause flicker there. */ -void FloatingBehavior::_focus_event (void) +void FloatingBehavior::_focus_event () { Inkscape::Preferences *prefs = Inkscape::Preferences::get(); _steps = 0; @@ -96,7 +96,7 @@ void FloatingBehavior::_focus_event (void) * the opacity half way to the goal until it runs out of steps, and then * it just forces the goal. */ -bool FloatingBehavior::_trans_timer (void) { +bool FloatingBehavior::_trans_timer () { // printf("Go go gadget timer: %d\n", _steps); if (_steps == 0) { if (_dialog_active.get_value()) { diff --git a/src/ui/dialog/floating-behavior.h b/src/ui/dialog/floating-behavior.h index 4c998940a..015ddfa27 100644 --- a/src/ui/dialog/floating-behavior.h +++ b/src/ui/dialog/floating-behavior.h @@ -66,8 +66,8 @@ private: Gtk::Dialog *_d; //< the actual dialog - void _focus_event (void); - bool _trans_timer (void); + void _focus_event (); + bool _trans_timer (); Glib::PropertyProxy_ReadOnly<bool> _dialog_active; //< Variable proxy to track whether the dialog is the active window int _steps; //< Number of steps for the timer to animate the transparent dialog diff --git a/src/ui/dialog/object-attributes.cpp b/src/ui/dialog/object-attributes.cpp index 629f8c1c8..ec3ce1b71 100644 --- a/src/ui/dialog/object-attributes.cpp +++ b/src/ui/dialog/object-attributes.cpp @@ -79,7 +79,7 @@ static const SPAttrDesc image_nohref_desc[] = { { nullptr, nullptr} }; -ObjectAttributes::ObjectAttributes (void) : +ObjectAttributes::ObjectAttributes () : UI::Widget::Panel("/dialogs/objectattr/", SP_VERB_DIALOG_ATTR), blocked (false), CurrentItem(nullptr), @@ -97,7 +97,7 @@ ObjectAttributes::ObjectAttributes (void) : deskTrack.connect(GTK_WIDGET(gobj())); } -ObjectAttributes::~ObjectAttributes (void) +ObjectAttributes::~ObjectAttributes () { selectModifiedConn.disconnect(); subselChangedConn.disconnect(); @@ -106,7 +106,7 @@ ObjectAttributes::~ObjectAttributes (void) deskTrack.disconnect(); } -void ObjectAttributes::widget_setup (void) +void ObjectAttributes::widget_setup () { if (blocked) { diff --git a/src/ui/dialog/object-attributes.h b/src/ui/dialog/object-attributes.h index f10667093..a1264b8cf 100644 --- a/src/ui/dialog/object-attributes.h +++ b/src/ui/dialog/object-attributes.h @@ -50,7 +50,7 @@ public: /** * Updates entries and other child widgets on selection change, object modification, etc. */ - void widget_setup(void); + void widget_setup(); private: /** diff --git a/src/ui/dialog/spellcheck.cpp b/src/ui/dialog/spellcheck.cpp index ff3dd2636..972f2d1f9 100644 --- a/src/ui/dialog/spellcheck.cpp +++ b/src/ui/dialog/spellcheck.cpp @@ -53,7 +53,7 @@ namespace UI { namespace Dialog { -SpellCheck::SpellCheck (void) : +SpellCheck::SpellCheck () : UI::Widget::Panel("/dialogs/spellcheck/", SP_VERB_DIALOG_SPELLCHECK), _text(nullptr), _layout(nullptr), @@ -170,7 +170,7 @@ SpellCheck::SpellCheck (void) : onStart (); } -SpellCheck::~SpellCheck(void) +SpellCheck::~SpellCheck() { clearRects(); disconnect(); diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp index 7b43977bb..16a79acdb 100644 --- a/src/ui/dialog/text-edit.cpp +++ b/src/ui/dialog/text-edit.cpp @@ -317,7 +317,7 @@ void TextEdit::setPreviewText (Glib::ustring font_spec, Glib::ustring font_featu } -SPItem *TextEdit::getSelectedTextItem (void) +SPItem *TextEdit::getSelectedTextItem () { if (!SP_ACTIVE_DESKTOP) return nullptr; @@ -333,7 +333,7 @@ SPItem *TextEdit::getSelectedTextItem (void) } -unsigned TextEdit::getSelectedTextCount (void) +unsigned TextEdit::getSelectedTextCount () { if (!SP_ACTIVE_DESKTOP) return 0; diff --git a/src/ui/dialog/text-edit.h b/src/ui/dialog/text-edit.h index bcf14d63f..f6ca8cdd3 100644 --- a/src/ui/dialog/text-edit.h +++ b/src/ui/dialog/text-edit.h @@ -112,12 +112,12 @@ protected: * * @return SPItem pointer to the selected text object */ - SPItem *getSelectedTextItem (void); + SPItem *getSelectedTextItem (); /** * Count the number of text objects in the selection on the canvas. */ - unsigned getSelectedTextCount (void); + unsigned getSelectedTextCount (); /** * Helper function to create markup from a fontspec and display in the preview label. diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index 6be6d9f22..c7c5424eb 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -303,7 +303,7 @@ void XmlTree::present() UI::Widget::Panel::present(); } -XmlTree::~XmlTree (void) +XmlTree::~XmlTree () { set_tree_desktop(nullptr); |
