diff options
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/contextmenu.cpp | 80 | ||||
| -rw-r--r-- | src/ui/contextmenu.h | 82 | ||||
| -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 | ||||
| -rw-r--r-- | src/ui/interface.cpp | 2 | ||||
| -rw-r--r-- | src/ui/interface.h | 6 | ||||
| -rw-r--r-- | src/ui/view/view-widget.h | 2 | ||||
| -rw-r--r-- | src/ui/widget/color-scales.cpp | 2 | ||||
| -rw-r--r-- | src/ui/widget/selected-style.cpp | 10 |
22 files changed, 115 insertions, 115 deletions
diff --git a/src/ui/contextmenu.cpp b/src/ui/contextmenu.cpp index 7a6c4e7cf..361a68f93 100644 --- a/src/ui/contextmenu.cpp +++ b/src/ui/contextmenu.cpp @@ -167,7 +167,7 @@ ContextMenu::ContextMenu(SPDesktop *desktop, SPItem *item) : ContextMenu::~ContextMenu(void) = default; -Gtk::SeparatorMenuItem* ContextMenu::AddSeparator(void) +Gtk::SeparatorMenuItem* ContextMenu::AddSeparator() { Gtk::SeparatorMenuItem* sep = Gtk::manage(new Gtk::SeparatorMenuItem()); sep->show(); @@ -181,12 +181,12 @@ void ContextMenu::EnterGroup(Gtk::MenuItem* mi) _desktop->selection->clear(); } -void ContextMenu::LeaveGroup(void) +void ContextMenu::LeaveGroup() { _desktop->setCurrentLayer(_desktop->currentLayer()->parent); } -void ContextMenu::LockSelected(void) +void ContextMenu::LockSelected() { auto itemlist = _desktop->selection->items(); for(auto i=itemlist.begin();i!=itemlist.end(); ++i) { @@ -194,7 +194,7 @@ void ContextMenu::LockSelected(void) } } -void ContextMenu::HideSelected(void) +void ContextMenu::HideSelected() { auto itemlist =_desktop->selection->items(); for(auto i=itemlist.begin();i!=itemlist.end(); ++i) { @@ -288,7 +288,7 @@ void ContextMenu::AppendItemFromVerb(Inkscape::Verb *verb) } } -void ContextMenu::MakeObjectMenu(void) +void ContextMenu::MakeObjectMenu() { if (SP_IS_ITEM(_object)) { MakeItemMenu(); @@ -315,7 +315,7 @@ void ContextMenu::MakeObjectMenu(void) } } -void ContextMenu::MakeItemMenu (void) +void ContextMenu::MakeItemMenu () { Gtk::MenuItem* mi; @@ -480,50 +480,50 @@ void ContextMenu::MakeItemMenu (void) append(*mi); } -void ContextMenu::SelectSameFillStroke(void) +void ContextMenu::SelectSameFillStroke() { sp_select_same_fill_stroke_style(_desktop, true, true, true); } -void ContextMenu::SelectSameFillColor(void) +void ContextMenu::SelectSameFillColor() { sp_select_same_fill_stroke_style(_desktop, true, false, false); } -void ContextMenu::SelectSameStrokeColor(void) +void ContextMenu::SelectSameStrokeColor() { sp_select_same_fill_stroke_style(_desktop, false, true, false); } -void ContextMenu::SelectSameStrokeStyle(void) +void ContextMenu::SelectSameStrokeStyle() { sp_select_same_fill_stroke_style(_desktop, false, false, true); } -void ContextMenu::SelectSameObjectType(void) +void ContextMenu::SelectSameObjectType() { sp_select_same_object_type(_desktop); } -void ContextMenu::ItemProperties(void) +void ContextMenu::ItemProperties() { _desktop->selection->set(_item); _desktop->_dlg_mgr->showDialog("ObjectProperties"); } -void ContextMenu::ItemSelectThis(void) +void ContextMenu::ItemSelectThis() { _desktop->selection->set(_item); } -void ContextMenu::ItemMoveTo(void) +void ContextMenu::ItemMoveTo() { Inkscape::UI::Dialogs::LayerPropertiesDialog::showMove(_desktop, _desktop->currentLayer()); } -void ContextMenu::ItemCreateLink(void) +void ContextMenu::ItemCreateLink() { Inkscape::XML::Document *xml_doc = _desktop->doc()->getReprDoc(); Inkscape::XML::Node *repr = xml_doc->createElement("svg:a"); @@ -546,33 +546,33 @@ void ContextMenu::ItemCreateLink(void) _desktop->_dlg_mgr->showDialog("ObjectAttributes"); } -void ContextMenu::SetMask(void) +void ContextMenu::SetMask() { _desktop->selection->setMask(false, false); } -void ContextMenu::ReleaseMask(void) +void ContextMenu::ReleaseMask() { _desktop->selection->unsetMask(false); } -void ContextMenu::CreateGroupClip(void) +void ContextMenu::CreateGroupClip() { _desktop->selection->setClipGroup(); } -void ContextMenu::SetClip(void) +void ContextMenu::SetClip() { _desktop->selection->setMask(true, false); } -void ContextMenu::ReleaseClip(void) +void ContextMenu::ReleaseClip() { _desktop->selection->unsetMask(true); } -void ContextMenu::MakeGroupMenu(void) +void ContextMenu::MakeGroupMenu() { /* Ungroup */ Gtk::MenuItem* mi = Gtk::manage(new Gtk::MenuItem(_("_Ungroup"), true)); @@ -581,12 +581,12 @@ void ContextMenu::MakeGroupMenu(void) append(*mi); } -void ContextMenu::ActivateGroup(void) +void ContextMenu::ActivateGroup() { _desktop->selection->group(); } -void ContextMenu::ActivateUngroup(void) +void ContextMenu::ActivateUngroup() { std::vector<SPItem*> children; @@ -594,13 +594,13 @@ void ContextMenu::ActivateUngroup(void) _desktop->selection->setList(children); } -void ContextMenu::ActivateUngroupPopSelection(void) +void ContextMenu::ActivateUngroupPopSelection() { _desktop->selection->popFromGroup(); } -void ContextMenu::MakeAnchorMenu(void) +void ContextMenu::MakeAnchorMenu() { Gtk::MenuItem* mi; @@ -623,12 +623,12 @@ void ContextMenu::MakeAnchorMenu(void) append(*mi); } -void ContextMenu::AnchorLinkProperties(void) +void ContextMenu::AnchorLinkProperties() { _desktop->_dlg_mgr->showDialog("ObjectAttributes"); } -void ContextMenu::AnchorLinkFollow(void) +void ContextMenu::AnchorLinkFollow() { if (_desktop->selection->isEmpty()) { @@ -644,14 +644,14 @@ void ContextMenu::AnchorLinkFollow(void) } } -void ContextMenu::AnchorLinkRemove(void) +void ContextMenu::AnchorLinkRemove() { std::vector<SPItem*> children; sp_item_group_ungroup(static_cast<SPAnchor*>(_item), children, false); Inkscape::DocumentUndo::done(_desktop->doc(), SP_VERB_NONE, _("Remove link")); } -void ContextMenu::MakeImageMenu (void) +void ContextMenu::MakeImageMenu () { Gtk::MenuItem* mi; Inkscape::XML::Node *ir = _object->getRepr(); @@ -713,7 +713,7 @@ void ContextMenu::MakeImageMenu (void) } } -void ContextMenu::ImageProperties(void) +void ContextMenu::ImageProperties() { _desktop->_dlg_mgr->showDialog("ObjectAttributes"); } @@ -741,7 +741,7 @@ Glib::ustring ContextMenu::getImageEditorName(bool is_svg) { return value; } -void ContextMenu::ImageEdit(void) +void ContextMenu::ImageEdit() { if (_desktop->selection->isEmpty()) { _desktop->selection->set(_item); @@ -817,19 +817,19 @@ void ContextMenu::ImageEdit(void) } } -void ContextMenu::ImageTraceBitmap(void) +void ContextMenu::ImageTraceBitmap() { INKSCAPE.dialogs_unhide(); _desktop->_dlg_mgr->showDialog("Trace"); } -void ContextMenu::ImageTracePixelArt(void) +void ContextMenu::ImageTracePixelArt() { INKSCAPE.dialogs_unhide(); _desktop->_dlg_mgr->showDialog("PixelArt"); } -void ContextMenu::ImageEmbed(void) +void ContextMenu::ImageEmbed() { if (_desktop->selection->isEmpty()) { _desktop->selection->set(_item); @@ -844,7 +844,7 @@ void ContextMenu::ImageEmbed(void) } } -void ContextMenu::ImageExtract(void) +void ContextMenu::ImageExtract() { if (_desktop->selection->isEmpty()) { _desktop->selection->set(_item); @@ -859,7 +859,7 @@ void ContextMenu::ImageExtract(void) } } -void ContextMenu::MakeShapeMenu (void) +void ContextMenu::MakeShapeMenu () { Gtk::MenuItem* mi; @@ -870,7 +870,7 @@ void ContextMenu::MakeShapeMenu (void) insert(*mi,positionOfLastDialog++); } -void ContextMenu::FillSettings(void) +void ContextMenu::FillSettings() { if (_desktop->selection->isEmpty()) { _desktop->selection->set(_item); @@ -879,7 +879,7 @@ void ContextMenu::FillSettings(void) _desktop->_dlg_mgr->showDialog("FillAndStroke"); } -void ContextMenu::MakeTextMenu (void) +void ContextMenu::MakeTextMenu () { Gtk::MenuItem* mi; @@ -902,7 +902,7 @@ void ContextMenu::MakeTextMenu (void) insert(*mi,positionOfLastDialog++); } -void ContextMenu::TextSettings (void) +void ContextMenu::TextSettings () { if (_desktop->selection->isEmpty()) { _desktop->selection->set(_item); @@ -911,7 +911,7 @@ void ContextMenu::TextSettings (void) _desktop->_dlg_mgr->showDialog("TextFont"); } -void ContextMenu::SpellcheckSettings (void) +void ContextMenu::SpellcheckSettings () { if (_desktop->selection->isEmpty()) { _desktop->selection->set(_item); diff --git a/src/ui/contextmenu.h b/src/ui/contextmenu.h index 29a090530..bd58fde00 100644 --- a/src/ui/contextmenu.h +++ b/src/ui/contextmenu.h @@ -53,7 +53,7 @@ class ContextMenu : public Gtk::Menu * @param item SPItem pointer to the object selected at the time the ContextMenu is created. */ ContextMenu(SPDesktop *desktop, SPItem *item); - ~ContextMenu(void) override; + ~ContextMenu() override; private: SPItem *_item; // pointer to the object selected at the time the ContextMenu is created @@ -68,7 +68,7 @@ class ContextMenu : public Gtk::Menu /** * auxiliary function that adds a separator line in the context menu */ - Gtk::SeparatorMenuItem* AddSeparator(void); + Gtk::SeparatorMenuItem* AddSeparator(); /** * c++ified version of sp_ui_menu_append_item. @@ -81,86 +81,86 @@ class ContextMenu : public Gtk::Menu * main function which is responsible for creating the context sensitive menu items, * calls subfunctions below to create the menu entry widgets. */ - void MakeObjectMenu (void); + void MakeObjectMenu (); /** * creates menu entries for an SP_TYPE_ITEM object */ - void MakeItemMenu (void); + void MakeItemMenu (); /** * creates menu entries for a grouped object */ - void MakeGroupMenu (void); + void MakeGroupMenu (); /** * creates menu entries for an anchor object */ - void MakeAnchorMenu (void); + void MakeAnchorMenu (); /** * creates menu entries for a bitmap image object */ - void MakeImageMenu (void); + void MakeImageMenu (); /** * creates menu entries for a shape object */ - void MakeShapeMenu (void); + void MakeShapeMenu (); /** * creates menu entries for a text object */ - void MakeTextMenu (void); + void MakeTextMenu (); void EnterGroup(Gtk::MenuItem* mi); - void LeaveGroup(void); - void LockSelected(void); - void HideSelected(void); + void LeaveGroup(); + void LockSelected(); + void HideSelected(); void UnLockBelow(std::vector<SPItem *> items); void UnHideBelow(std::vector<SPItem *> items); ////////////////////////////////////////// //callbacks for the context menu entries of an SP_TYPE_ITEM object - void ItemProperties(void); - void ItemSelectThis(void); - void ItemMoveTo(void); - void SelectSameFillStroke(void); - void SelectSameFillColor(void); - void SelectSameStrokeColor(void); - void SelectSameStrokeStyle(void); - void SelectSameObjectType(void); - void ItemCreateLink(void); - void CreateGroupClip(void); - void SetMask(void); - void ReleaseMask(void); - void SetClip(void); - void ReleaseClip(void); + void ItemProperties(); + void ItemSelectThis(); + void ItemMoveTo(); + void SelectSameFillStroke(); + void SelectSameFillColor(); + void SelectSameStrokeColor(); + void SelectSameStrokeStyle(); + void SelectSameObjectType(); + void ItemCreateLink(); + void CreateGroupClip(); + void SetMask(); + void ReleaseMask(); + void SetClip(); + void ReleaseClip(); ////////////////////////////////////////// /** * callback, is executed on clicking the anchor "Group" and "Ungroup" menu entry */ - void ActivateUngroupPopSelection(void); - void ActivateUngroup(void); - void ActivateGroup(void); + void ActivateUngroupPopSelection(); + void ActivateUngroup(); + void ActivateGroup(); - void AnchorLinkProperties(void); + void AnchorLinkProperties(); /** * placeholder for callback to be executed on clicking the anchor "Follow link" context menu entry * @todo add code to follow link externally */ - void AnchorLinkFollow(void); + void AnchorLinkFollow(); /** * callback, is executed on clicking the anchor "Link remove" menu entry */ - void AnchorLinkRemove(void); + void AnchorLinkRemove(); /** * callback, opens the image properties dialog and is executed on clicking the context menu entry with similar name */ - void ImageProperties(void); + void ImageProperties(); /** * callback, is executed on clicking the image "Edit Externally" menu entry */ - void ImageEdit(void); + void ImageEdit(); /** * auxiliary function that loads the external image editor name from the settings. @@ -170,39 +170,39 @@ class ContextMenu : public Gtk::Menu /** * callback, is executed on clicking the "Embed Image" menu entry */ - void ImageEmbed(void); + void ImageEmbed(); /** * callback, is executed on clicking the "Trace Bitmap" menu entry */ - void ImageTraceBitmap(void); + void ImageTraceBitmap(); /** * callback, is executed on clicking the "Trace Pixel Art" menu entry */ - void ImageTracePixelArt(void); + void ImageTracePixelArt(); /** * callback, is executed on clicking the "Extract Image" menu entry */ - void ImageExtract(void); + void ImageExtract(); /** * callback, is executed on clicking the "Fill and Stroke" menu entry */ - void FillSettings(void); + void FillSettings(); /** * callback, is executed on clicking the "Text and Font" menu entry */ - void TextSettings(void); + void TextSettings(); /** * callback, is executed on clicking the "Check spelling" menu entry */ - void SpellcheckSettings(void); + void SpellcheckSettings(); }; #endif // SEEN_CONTEXT_MENU_H 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); diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index f9a30001a..c690e5dfc 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -310,7 +310,7 @@ sp_ui_close_view(GtkWidget */*widget*/) unsigned int -sp_ui_close_all(void) +sp_ui_close_all() { /* Iterate through all the windows, destroying each in the order they become active */ diff --git a/src/ui/interface.h b/src/ui/interface.h index 6e95c161c..83788ca1b 100644 --- a/src/ui/interface.h +++ b/src/ui/interface.h @@ -43,12 +43,12 @@ void sp_create_window (SPViewWidget *vw, bool editable); */ void sp_ui_close_view (GtkWidget *widget); -void sp_ui_new_view (void); +void sp_ui_new_view (); /** * @todo TODO: not yet working. To be re-enabled (by adding to menu) once it works. */ -void sp_ui_new_view_preview (void); +void sp_ui_new_view_preview (); /** * This function is called to exit the program, and iterates through all @@ -59,7 +59,7 @@ void sp_ui_new_view_preview (void); * Returns FALSE if the user cancels the close_all operation, TRUE * otherwise. */ -unsigned int sp_ui_close_all (void); +unsigned int sp_ui_close_all (); /** * Build the main tool bar. diff --git a/src/ui/view/view-widget.h b/src/ui/view/view-widget.h index 668f9d19a..661b7b342 100644 --- a/src/ui/view/view-widget.h +++ b/src/ui/view/view-widget.h @@ -36,7 +36,7 @@ class SPNamedView; /** * Registers the SPViewWidget class with Glib and returns its type number. */ -GType sp_view_widget_get_type(void); +GType sp_view_widget_get_type(); /** * Connects widget to view's 'resized' signal and calls virtual set_view() diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp index 57555a53d..12bb6ad28 100644 --- a/src/ui/widget/color-scales.cpp +++ b/src/ui/widget/color-scales.cpp @@ -702,7 +702,7 @@ void ColorScales::_updateSliders(guint channels) #endif } -static const gchar *sp_color_scales_hue_map(void) +static const gchar *sp_color_scales_hue_map() { static gchar *map = nullptr; diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index b5fdc721d..ceb3ca2ff 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -1118,11 +1118,11 @@ SelectedStyle::update() } } -void SelectedStyle::opacity_0(void) {_opacity_sb.set_value(0);} -void SelectedStyle::opacity_025(void) {_opacity_sb.set_value(25);} -void SelectedStyle::opacity_05(void) {_opacity_sb.set_value(50);} -void SelectedStyle::opacity_075(void) {_opacity_sb.set_value(75);} -void SelectedStyle::opacity_1(void) {_opacity_sb.set_value(100);} +void SelectedStyle::opacity_0() {_opacity_sb.set_value(0);} +void SelectedStyle::opacity_025() {_opacity_sb.set_value(25);} +void SelectedStyle::opacity_05() {_opacity_sb.set_value(50);} +void SelectedStyle::opacity_075() {_opacity_sb.set_value(75);} +void SelectedStyle::opacity_1() {_opacity_sb.set_value(100);} void SelectedStyle::on_opacity_menu (Gtk::Menu *menu) { |
