From caf60ce95aac2d44c7cdd41125e9f4ab32ded886 Mon Sep 17 00:00:00 2001 From: joncruz Date: Fri, 2 Nov 2007 08:00:40 +0000 Subject: [PATCH] warning cleanup --- src/application/editor.cpp | 2 +- src/box3d-context.cpp | 2 +- src/conditions.cpp | 4 +-- src/conn-avoid-ref.cpp | 2 +- src/connector-context.cpp | 12 +++---- src/console-output-undo-observer.cpp | 6 ++-- src/desktop-events.cpp | 2 +- src/document-undo.cpp | 2 +- src/draw-context.cpp | 6 ++-- src/event-context.cpp | 12 +++---- src/file.cpp | 16 ++++----- src/gradient-context.cpp | 4 +-- src/interface.cpp | 50 ++++++++++++++-------------- src/io/simple-sax.cpp | 4 +-- src/io/simple-sax.h | 6 ++-- src/knotholder.cpp | 2 +- src/layer-manager.cpp | 12 +++---- src/path-chemistry.cpp | 4 +-- src/pen-context.cpp | 2 +- src/pencil-context.cpp | 2 +- src/svg-view-widget.cpp | 2 +- src/svg-view.cpp | 2 +- src/svg-view.h | 4 +-- src/trace/trace.h | 2 +- src/ui/view/edit-widget.cpp | 6 ++-- src/ui/widget/rotateable.h | 32 +++++++++--------- src/xml/simple-node.cpp | 4 +-- 27 files changed, 102 insertions(+), 102 deletions(-) diff --git a/src/application/editor.cpp b/src/application/editor.cpp index 56984dcbb..8f9638f82 100644 --- a/src/application/editor.cpp +++ b/src/application/editor.cpp @@ -55,7 +55,7 @@ Editor::create (gint argc, char **argv) return _instance; } -Editor::Editor (gint argc, char **argv) +Editor::Editor (gint /*argc*/, char **argv) : _documents (0), _desktops (0), _argv0 (argv[0]), diff --git a/src/box3d-context.cpp b/src/box3d-context.cpp index db1eef311..7ceed0aca 100644 --- a/src/box3d-context.cpp +++ b/src/box3d-context.cpp @@ -245,7 +245,7 @@ static void sp_3dbox_context_setup(SPEventContext *ec) bc->_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack()); } -static void sp_3dbox_context_set(SPEventContext *ec, gchar const *key, gchar const *val) +static void sp_3dbox_context_set(SPEventContext */*ec*/, gchar const */*key*/, gchar const */*val*/) { //SP3DBoxContext *bc = SP_3DBOX_CONTEXT(ec); diff --git a/src/conditions.cpp b/src/conditions.cpp index 936346f25..9a46f27d1 100644 --- a/src/conditions.cpp +++ b/src/conditions.cpp @@ -258,7 +258,7 @@ static bool evaluateSingleFeature(gchar const *value) { return false; } -static bool evaluateRequiredFeatures(SPItem const *item, gchar const *value) { +static bool evaluateRequiredFeatures(SPItem const */*item*/, gchar const *value) { if ( NULL == value ) return true; @@ -275,7 +275,7 @@ static bool evaluateRequiredFeatures(SPItem const *item, gchar const *value) { return true; } -static bool evaluateRequiredExtensions(SPItem const *item, gchar const *value) { +static bool evaluateRequiredExtensions(SPItem const */*item*/, gchar const *value) { if ( NULL == value ) return true; return false; diff --git a/src/conn-avoid-ref.cpp b/src/conn-avoid-ref.cpp index 67538fb77..0bbefa3c0 100644 --- a/src/conn-avoid-ref.cpp +++ b/src/conn-avoid-ref.cpp @@ -236,7 +236,7 @@ GSList *get_avoided_items(GSList *list, SPObject *from, SPDesktop *desktop, } -void avoid_item_move(NR::Matrix const *mp, SPItem *moved_item) +void avoid_item_move(NR::Matrix const */*mp*/, SPItem *moved_item) { Avoid::ShapeRef *shapeRef = moved_item->avoidRef->shapeRef; g_assert(shapeRef); diff --git a/src/connector-context.cpp b/src/connector-context.cpp index a072afeda..3e04883b7 100644 --- a/src/connector-context.cpp +++ b/src/connector-context.cpp @@ -965,7 +965,7 @@ spcc_flush_white(SPConnectorContext *cc, SPCurve *gc) static void -spcc_connector_finish_segment(SPConnectorContext *const cc, NR::Point const p) +spcc_connector_finish_segment(SPConnectorContext *const cc, NR::Point const /*p*/) { if (!sp_curve_empty(cc->red_curve)) { sp_curve_append_continuous(cc->green_curve, cc->red_curve, 0.0625); @@ -1047,7 +1047,7 @@ cc_generic_knot_handler(SPCanvasItem *, GdkEvent *event, SPKnot *knot) static gboolean -endpt_handler(SPKnot *knot, GdkEvent *event, SPConnectorContext *cc) +endpt_handler(SPKnot */*knot*/, GdkEvent *event, SPConnectorContext *cc) { g_assert( SP_IS_CONNECTOR_CONTEXT(cc) ); @@ -1348,8 +1348,8 @@ cc_selection_changed(Inkscape::Selection *selection, gpointer data) static void -shape_event_attr_deleted(Inkscape::XML::Node *repr, Inkscape::XML::Node *child, - Inkscape::XML::Node *ref, gpointer data) +shape_event_attr_deleted(Inkscape::XML::Node */*repr*/, Inkscape::XML::Node *child, + Inkscape::XML::Node */*ref*/, gpointer data) { g_assert(data); SPConnectorContext *cc = SP_CONNECTOR_CONTEXT(data); @@ -1363,8 +1363,8 @@ shape_event_attr_deleted(Inkscape::XML::Node *repr, Inkscape::XML::Node *child, static void shape_event_attr_changed(Inkscape::XML::Node *repr, gchar const *name, - gchar const *old_value, gchar const *new_value, - bool is_interactive, gpointer data) + gchar const */*old_value*/, gchar const */*new_value*/, + bool /*is_interactive*/, gpointer data) { g_assert(data); SPConnectorContext *cc = SP_CONNECTOR_CONTEXT(data); diff --git a/src/console-output-undo-observer.cpp b/src/console-output-undo-observer.cpp index 98e6c69a6..84d8af3a8 100644 --- a/src/console-output-undo-observer.cpp +++ b/src/console-output-undo-observer.cpp @@ -17,19 +17,19 @@ namespace Inkscape { void -ConsoleOutputUndoObserver::notifyUndoEvent(Event* log) +ConsoleOutputUndoObserver::notifyUndoEvent(Event* /*log*/) { // g_message("notifyUndoEvent (sp_document_undo) called; log=%p\n", log->event); } void -ConsoleOutputUndoObserver::notifyRedoEvent(Event* log) +ConsoleOutputUndoObserver::notifyRedoEvent(Event* /*log*/) { // g_message("notifyRedoEvent (sp_document_redo) called; log=%p\n", log->event); } void -ConsoleOutputUndoObserver::notifyUndoCommitEvent(Event* log) +ConsoleOutputUndoObserver::notifyUndoCommitEvent(Event* /*log*/) { //g_message("notifyUndoCommitEvent (sp_document_maybe_done) called; log=%p\n", log->event); } diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index b71cc155c..98e96c38c 100644 --- a/src/desktop-events.cpp +++ b/src/desktop-events.cpp @@ -34,7 +34,7 @@ /* Root item handler */ -int sp_desktop_root_handler(SPCanvasItem *item, GdkEvent *event, SPDesktop *desktop) +int sp_desktop_root_handler(SPCanvasItem */*item*/, GdkEvent *event, SPDesktop *desktop) { return sp_event_context_root_handler(desktop->event_context, event); } diff --git a/src/document-undo.cpp b/src/document-undo.cpp index 811258331..53c272566 100644 --- a/src/document-undo.cpp +++ b/src/document-undo.cpp @@ -124,7 +124,7 @@ sp_document_done (SPDocument *doc, const unsigned int event_type, Glib::ustring } void -sp_document_reset_key (Inkscape::Application *inkscape, SPDesktop *desktop, GtkObject *base) +sp_document_reset_key (Inkscape::Application */*inkscape*/, SPDesktop *desktop, GtkObject *base) { SPDocument *doc = (SPDocument *) base; doc->actionkey = NULL; diff --git a/src/draw-context.cpp b/src/draw-context.cpp index 43e028aa5..649f13572 100644 --- a/src/draw-context.cpp +++ b/src/draw-context.cpp @@ -202,7 +202,7 @@ sp_draw_context_finish(SPEventContext *ec) } static void -sp_draw_context_set(SPEventContext *ec, const gchar *key, const gchar *value) +sp_draw_context_set(SPEventContext */*ec*/, const gchar */*key*/, const gchar */*value*/) { } @@ -256,7 +256,7 @@ spdc_selection_changed(Inkscape::Selection *sel, SPDrawContext *dc) /* fixme: We have to ensure this is not delayed (Lauris) */ static void -spdc_selection_modified(Inkscape::Selection *sel, guint flags, SPDrawContext *dc) +spdc_selection_modified(Inkscape::Selection *sel, guint /*flags*/, SPDrawContext *dc) { if (dc->attach) { spdc_attach_selection(dc, sel); @@ -264,7 +264,7 @@ spdc_selection_modified(Inkscape::Selection *sel, guint flags, SPDrawContext *dc } static void -spdc_attach_selection(SPDrawContext *dc, Inkscape::Selection *sel) +spdc_attach_selection(SPDrawContext *dc, Inkscape::Selection */*sel*/) { /* We reset white and forget white/start/end anchors */ spdc_reset_white(dc); diff --git a/src/event-context.cpp b/src/event-context.cpp index 7e14d5a49..1bf273b31 100644 --- a/src/event-context.cpp +++ b/src/event-context.cpp @@ -279,7 +279,7 @@ sp_toggle_selector(SPDesktop *dt) * Calculates and keeps track of scroll acceleration. * Subroutine of sp_event_context_private_root_handler(). */ -static gdouble accelerate_scroll(GdkEvent *event, gdouble acceleration, SPCanvas *canvas) +static gdouble accelerate_scroll(GdkEvent *event, gdouble acceleration, SPCanvas */*canvas*/) { guint32 time_diff = ((GdkEventKey *) event)->time - scroll_event_time; @@ -685,8 +685,8 @@ sp_event_context_private_item_handler(SPEventContext *ec, SPItem *item, GdkEvent * Gets called when attribute changes value. */ static void -sp_ec_repr_attr_changed(Inkscape::XML::Node *prefs_repr, gchar const *key, gchar const *oldval, gchar const *newval, - bool is_interactive, gpointer data) +sp_ec_repr_attr_changed(Inkscape::XML::Node */*prefs_repr*/, gchar const *key, gchar const */*oldval*/, gchar const *newval, + bool /*is_interactive*/, gpointer data) { SPEventContext *ec; @@ -1003,9 +1003,9 @@ sp_event_context_over_item (SPDesktop *desktop, SPItem *item, NR::Point const p) * Called when SPEventContext subclass node attribute changed. */ void -ec_shape_event_attr_changed(Inkscape::XML::Node *shape_repr, gchar const *name, - gchar const *old_value, gchar const *new_value, - bool const is_interactive, gpointer const data) +ec_shape_event_attr_changed(Inkscape::XML::Node */*shape_repr*/, gchar const *name, + gchar const */*old_value*/, gchar const */*new_value*/, + bool const /*is_interactive*/, gpointer const data) { if (!name || !strcmp(name, "style") diff --git a/src/file.cpp b/src/file.cpp index abb00be4c..8cffa6b7a 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -374,7 +374,7 @@ static Inkscape::UI::Dialog::FileOpenDialog *openDialogInstance = NULL; * Can select single or multiple files for opening. */ void -sp_file_open_dialog(Gtk::Window &parentWindow, gpointer object, gpointer data) +sp_file_open_dialog(Gtk::Window &parentWindow, gpointer /*object*/, gpointer /*data*/) { //# Get the current directory for finding files @@ -546,8 +546,8 @@ file_save(Gtk::Window &parentWindow, SPDocument *doc, const Glib::ustring &uri, * Used only for remote saving using VFS and a specific uri. Gets the file at the /tmp. */ bool -file_save_remote(SPDocument *doc, const Glib::ustring &uri, - Inkscape::Extension::Extension *key, bool saveas, bool official) +file_save_remote(SPDocument */*doc*/, const Glib::ustring &uri, + Inkscape::Extension::Extension */*key*/, bool /*saveas*/, bool official) { #ifdef WITH_GNOME_VFS @@ -792,7 +792,7 @@ sp_file_save_document(Gtk::Window &parentWindow, SPDocument *doc) * Save a document. */ bool -sp_file_save(Gtk::Window &parentWindow, gpointer object, gpointer data) +sp_file_save(Gtk::Window &parentWindow, gpointer /*object*/, gpointer /*data*/) { if (!SP_ACTIVE_DOCUMENT) return false; @@ -808,7 +808,7 @@ sp_file_save(Gtk::Window &parentWindow, gpointer object, gpointer data) * Save a document, always displaying the SaveAs dialog. */ bool -sp_file_save_as(Gtk::Window &parentWindow, gpointer object, gpointer data) +sp_file_save_as(Gtk::Window &parentWindow, gpointer /*object*/, gpointer /*data*/) { if (!SP_ACTIVE_DOCUMENT) return false; @@ -822,7 +822,7 @@ sp_file_save_as(Gtk::Window &parentWindow, gpointer object, gpointer data) * Save a copy of a document, always displaying a sort of SaveAs dialog. */ bool -sp_file_save_a_copy(Gtk::Window &parentWindow, gpointer object, gpointer data) +sp_file_save_a_copy(Gtk::Window &parentWindow, gpointer /*object*/, gpointer /*data*/) { if (!SP_ACTIVE_DOCUMENT) return false; @@ -1145,7 +1145,7 @@ sp_file_export_dialog(void *widget) * */ bool -sp_file_export_dialog(void *widget) +sp_file_export_dialog(void */*widget*/) { sp_export_dialog(); return true; @@ -1395,7 +1395,7 @@ sp_file_print_direct() * printed. */ void -sp_file_print_preview(gpointer object, gpointer data) +sp_file_print_preview(gpointer /*object*/, gpointer /*data*/) { SPDocument *doc = SP_ACTIVE_DOCUMENT; diff --git a/src/gradient-context.cpp b/src/gradient-context.cpp index 854811335..5424b7a3d 100644 --- a/src/gradient-context.cpp +++ b/src/gradient-context.cpp @@ -447,7 +447,7 @@ sp_gradient_simplify(SPGradientContext *rc, double tolerance) static void -sp_gradient_context_add_stop_near_point (SPGradientContext *rc, SPItem *item, NR::Point mouse_p, guint32 etime) +sp_gradient_context_add_stop_near_point (SPGradientContext *rc, SPItem *item, NR::Point mouse_p, guint32 /*etime*/) { // item is the selected item. mouse_p the location in doc coordinates of where to add the stop @@ -827,7 +827,7 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event) return ret; } -static void sp_gradient_drag(SPGradientContext &rc, NR::Point const pt, guint state, guint32 etime) +static void sp_gradient_drag(SPGradientContext &rc, NR::Point const pt, guint /*state*/, guint32 etime) { SPDesktop *desktop = SP_EVENT_CONTEXT(&rc)->desktop; Inkscape::Selection *selection = sp_desktop_selection(desktop); diff --git a/src/interface.cpp b/src/interface.cpp index 775f53b35..114f9b34a 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -310,7 +310,7 @@ sp_ui_new_view_preview() * \param widget unused */ void -sp_ui_close_view(GtkWidget *widget) +sp_ui_close_view(GtkWidget */*widget*/) { if (SP_ACTIVE_DESKTOP == NULL) { return; @@ -357,19 +357,19 @@ sp_ui_close_all(void) * investigate when they're called. */ static void -sp_ui_menu_activate(void *object, SPAction *action) +sp_ui_menu_activate(void */*object*/, SPAction *action) { sp_action_perform(action, NULL); } static void -sp_ui_menu_select_action(void *object, SPAction *action) +sp_ui_menu_select_action(void */*object*/, SPAction *action) { action->view->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, action->tip); } static void -sp_ui_menu_deselect_action(void *object, SPAction *action) +sp_ui_menu_deselect_action(void */*object*/, SPAction *action) { action->view->tipsMessageContext()->clear(); } @@ -643,7 +643,7 @@ checkitem_toggled(GtkCheckMenuItem *menuitem, gpointer user_data) } static gboolean -checkitem_update(GtkWidget *widget, GdkEventExpose *event, gpointer user_data) +checkitem_update(GtkWidget *widget, GdkEventExpose */*event*/, gpointer user_data) { GtkCheckMenuItem *menuitem=GTK_CHECK_MENU_ITEM(widget); @@ -730,13 +730,13 @@ sp_ui_menu_append_check_item_from_verb(GtkMenu *menu, Inkscape::UI::View::View * } static void -sp_recent_open(GtkWidget *widget, gchar const *uri) +sp_recent_open(GtkWidget */*widget*/, gchar const *uri) { sp_file_open(uri, NULL); } static void -sp_file_new_from_template(GtkWidget *widget, gchar const *uri) +sp_file_new_from_template(GtkWidget */*widget*/, gchar const *uri) { sp_file_new(uri); } @@ -1038,8 +1038,8 @@ sp_ui_drag_data_received(GtkWidget *widget, gint x, gint y, GtkSelectionData *data, guint info, - guint event_time, - gpointer user_data) + guint /*event_time*/, + gpointer /*user_data*/) { SPDocument *doc = SP_ACTIVE_DOCUMENT; SPDesktop *desktop = SP_ACTIVE_DESKTOP; @@ -1317,25 +1317,25 @@ sp_ui_drag_data_received(GtkWidget *widget, #include "gradient-context.h" -void sp_ui_drag_motion( GtkWidget *widget, - GdkDragContext *drag_context, - gint x, gint y, - GtkSelectionData *data, - guint info, - guint event_time, - gpointer user_data) +void sp_ui_drag_motion( GtkWidget */*widget*/, + GdkDragContext */*drag_context*/, + gint /*x*/, gint /*y*/, + GtkSelectionData */*data*/, + guint /*info*/, + guint /*event_time*/, + gpointer /*user_data*/) { - SPDocument *doc = SP_ACTIVE_DOCUMENT; - SPDesktop *desktop = SP_ACTIVE_DESKTOP; +// SPDocument *doc = SP_ACTIVE_DOCUMENT; +// SPDesktop *desktop = SP_ACTIVE_DESKTOP; // g_message("drag-n-drop motion (%4d, %4d) at %d", x, y, event_time); } -static void sp_ui_drag_leave( GtkWidget *widget, - GdkDragContext *drag_context, - guint event_time, - gpointer user_data ) +static void sp_ui_drag_leave( GtkWidget */*widget*/, + GdkDragContext */*drag_context*/, + guint /*event_time*/, + gpointer /*user_data*/ ) { // g_message("drag-n-drop leave at %d", event_time); } @@ -1352,7 +1352,7 @@ sp_ui_import_files(gchar *buffer) } static void -sp_ui_import_one_file_with_check(gpointer filename, gpointer unused) +sp_ui_import_one_file_with_check(gpointer filename, gpointer /*unused*/) { if (filename) { if (strlen((char const *)filename) > 2) @@ -1428,13 +1428,13 @@ sp_ui_overwrite_file(gchar const *filename) } static void -sp_ui_menu_item_set_sensitive(SPAction *action, unsigned int sensitive, void *data) +sp_ui_menu_item_set_sensitive(SPAction */*action*/, unsigned int sensitive, void *data) { return gtk_widget_set_sensitive(GTK_WIDGET(data), sensitive); } static void -sp_ui_menu_item_set_name(SPAction *action, Glib::ustring name, void *data) +sp_ui_menu_item_set_name(SPAction */*action*/, Glib::ustring name, void *data) { void *child = GTK_BIN (data)->child; //child is either diff --git a/src/io/simple-sax.cpp b/src/io/simple-sax.cpp index 2dd78b451..2ba103cd3 100644 --- a/src/io/simple-sax.cpp +++ b/src/io/simple-sax.cpp @@ -1461,12 +1461,12 @@ FlatSaxHandler::~FlatSaxHandler() { } -void FlatSaxHandler::_startElement(const xmlChar *name, const xmlChar **attrs) +void FlatSaxHandler::_startElement(const xmlChar */*name*/, const xmlChar **/*attrs*/) { data.clear(); } -void FlatSaxHandler::_endElement(const xmlChar *name) +void FlatSaxHandler::_endElement(const xmlChar */*name*/) { //g_message("<%s>%s", name, data.c_str(), name); data.clear(); diff --git a/src/io/simple-sax.h b/src/io/simple-sax.h index 7de816a14..17c571e19 100644 --- a/src/io/simple-sax.h +++ b/src/io/simple-sax.h @@ -33,9 +33,9 @@ public: protected: virtual void _startDocument() {} virtual void _endDocument() {} - virtual void _startElement(const xmlChar *name, const xmlChar **attrs) {} - virtual void _endElement(const xmlChar *name) {} - virtual void _characters(const xmlChar *ch, int len) {} + virtual void _startElement(const xmlChar */*name*/, const xmlChar **/*attrs*/) {} + virtual void _endElement(const xmlChar */*name*/) {} + virtual void _characters(const xmlChar */*ch*/, int /*len*/) {} private: static void startDocument(void *user_data); diff --git a/src/knotholder.cpp b/src/knotholder.cpp index d8776cca7..3c61e980b 100644 --- a/src/knotholder.cpp +++ b/src/knotholder.cpp @@ -281,7 +281,7 @@ static void knot_moved_handler(SPKnot *knot, NR::Point const *p, guint state, gp knotholder_update_knots(knot_holder, item); } -static void knot_ungrabbed_handler(SPKnot *knot, unsigned int state, SPKnotHolder *kh) +static void knot_ungrabbed_handler(SPKnot */*knot*/, unsigned int /*state*/, SPKnotHolder *kh) { if (kh->released) { kh->released(kh->item); diff --git a/src/layer-manager.cpp b/src/layer-manager.cpp index e6a34852d..34a909a79 100644 --- a/src/layer-manager.cpp +++ b/src/layer-manager.cpp @@ -38,11 +38,11 @@ public: _labelAttr(g_quark_from_string("inkscape:label")) {} - virtual void notifyChildAdded( Node &node, Node &child, Node *prev ) {} - virtual void notifyChildRemoved( Node &node, Node &child, Node *prev ) {} - virtual void notifyChildOrderChanged( Node &node, Node &child, Node *old_prev, Node *new_prev ) {} - virtual void notifyContentChanged( Node &node, Util::ptr_shared old_content, Util::ptr_shared new_content ) {} - virtual void notifyAttributeChanged( Node &node, GQuark name, Util::ptr_shared old_value, Util::ptr_shared new_value ) { + virtual void notifyChildAdded( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) {} + virtual void notifyChildRemoved( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) {} + virtual void notifyChildOrderChanged( Node &/*node*/, Node &/*child*/, Node */*old_prev*/, Node */*new_prev*/ ) {} + virtual void notifyContentChanged( Node &/*node*/, Util::ptr_shared /*old_content*/, Util::ptr_shared /*new_content*/ ) {} + virtual void notifyAttributeChanged( Node &/*node*/, GQuark name, Util::ptr_shared /*old_value*/, Util::ptr_shared /*new_value*/ ) { if ( name == _lockedAttr || name == _labelAttr ) { if ( _mgr && _obj ) { _mgr->_objectModified( _obj, 0 ); @@ -148,7 +148,7 @@ void LayerManager::_setDocument(SPDocument *document) { _rebuild(); } -void LayerManager::_objectModified( SPObject* obj, guint flags ) +void LayerManager::_objectModified( SPObject* obj, guint /*flags*/ ) { _details_changed_signal.emit( obj ); } diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp index 2d5aa9e83..b09d63ec0 100644 --- a/src/path-chemistry.cpp +++ b/src/path-chemistry.cpp @@ -258,7 +258,7 @@ sp_selected_path_to_curves(void) } static void -sp_selected_path_to_curves0(gboolean interactive, guint32 text_grouping_policy) +sp_selected_path_to_curves0(gboolean interactive, guint32 /*text_grouping_policy*/) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; @@ -341,7 +341,7 @@ sp_selected_path_to_curves0(gboolean interactive, guint32 text_grouping_policy) } Inkscape::XML::Node * -sp_selected_item_to_curved_repr(SPItem *item, guint32 text_grouping_policy) +sp_selected_item_to_curved_repr(SPItem *item, guint32 /*text_grouping_policy*/) { if (!item) return NULL; diff --git a/src/pen-context.cpp b/src/pen-context.cpp index 76fc3a61b..326791275 100644 --- a/src/pen-context.cpp +++ b/src/pen-context.cpp @@ -1162,7 +1162,7 @@ spdc_pen_set_ctrl(SPPenContext *const pc, NR::Point const p, guint const state) } static void -spdc_pen_finish_segment(SPPenContext *const pc, NR::Point const p, guint const state) +spdc_pen_finish_segment(SPPenContext *const pc, NR::Point const /*p*/, guint const /*state*/) { if (!sp_curve_empty(pc->red_curve)) { sp_curve_append_continuous(pc->green_curve, pc->red_curve, 0.0625); diff --git a/src/pencil-context.cpp b/src/pencil-context.cpp index cdadd0c71..32ea8aafa 100644 --- a/src/pencil-context.cpp +++ b/src/pencil-context.cpp @@ -556,7 +556,7 @@ spdc_finish_endpoint(SPPencilContext *const pc) } static void -spdc_add_freehand_point(SPPencilContext *pc, NR::Point p, guint state) +spdc_add_freehand_point(SPPencilContext *pc, NR::Point p, guint /*state*/) { g_assert( pc->npoints > 0 ); g_return_if_fail(unsigned(pc->npoints) < G_N_ELEMENTS(pc->p)); diff --git a/src/svg-view-widget.cpp b/src/svg-view-widget.cpp index 7c6925ad2..783a09cf6 100644 --- a/src/svg-view-widget.cpp +++ b/src/svg-view-widget.cpp @@ -188,7 +188,7 @@ sp_svg_view_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation) * Callback connected with view_resized signal. */ static void -sp_svg_view_widget_view_resized (SPViewWidget *vw, Inkscape::UI::View::View *view, gdouble width, gdouble height) +sp_svg_view_widget_view_resized (SPViewWidget *vw, Inkscape::UI::View::View */*view*/, gdouble width, gdouble height) { SPSVGSPViewWidget *svgvw = SP_SVG_VIEW_WIDGET (vw); diff --git a/src/svg-view.cpp b/src/svg-view.cpp index 22d9dd120..1ca269d70 100644 --- a/src/svg-view.cpp +++ b/src/svg-view.cpp @@ -129,7 +129,7 @@ SPSVGView::mouseout() */ /// \todo fixme. static gint -arena_handler (SPCanvasArena *arena, NRArenaItem *ai, GdkEvent *event, SPSVGView *svgview) +arena_handler (SPCanvasArena */*arena*/, NRArenaItem *ai, GdkEvent *event, SPSVGView *svgview) { static gdouble x, y; static gboolean active = FALSE; diff --git a/src/svg-view.h b/src/svg-view.h index 4494945d5..838a95b03 100644 --- a/src/svg-view.h +++ b/src/svg-view.h @@ -56,8 +56,8 @@ private: virtual void onPositionSet (double, double) {} virtual void onResized (double, double) {} virtual void onRedrawRequested() {} - virtual void onStatusMessage (Inkscape::MessageType type, gchar const *message) {} - virtual void onDocumentURISet (gchar const* uri) {} + virtual void onStatusMessage (Inkscape::MessageType /*type*/, gchar const */*message*/) {} + virtual void onDocumentURISet (gchar const* /*uri*/) {} virtual void onDocumentResized (double, double); }; diff --git a/src/trace/trace.h b/src/trace/trace.h index 1341e3d46..2c9922e10 100644 --- a/src/trace/trace.h +++ b/src/trace/trace.h @@ -137,7 +137,7 @@ class TracingEngine * of an SVG element. */ virtual std::vector trace( - Glib::RefPtr pixbuf) + Glib::RefPtr /*pixbuf*/) { std::vector dummy; return dummy; } diff --git a/src/ui/view/edit-widget.cpp b/src/ui/view/edit-widget.cpp index 066d4d0ba..f99658f97 100644 --- a/src/ui/view/edit-widget.cpp +++ b/src/ui/view/edit-widget.cpp @@ -937,7 +937,7 @@ EditWidget::initAccelMap() } bool -EditWidget::onEntryFocusIn (GdkEventFocus* ev) +EditWidget::onEntryFocusIn (GdkEventFocus* /*ev*/) { Gdk::ModifierType m = static_cast(0); Gtk::AccelMap::change_entry ("//Zoom100", 0, m, false); @@ -950,7 +950,7 @@ EditWidget::onEntryFocusIn (GdkEventFocus* ev) } bool -EditWidget::onEntryFocusOut (GdkEventFocus* ev) +EditWidget::onEntryFocusOut (GdkEventFocus* /*ev*/) { Gdk::ModifierType m = static_cast(0); Gtk::AccelMap::change_entry ("//Zoom100", '1', m, false); @@ -1514,7 +1514,7 @@ EditWidget::setCoordinateStatus (NR::Point p) } void -EditWidget::setMessage (Inkscape::MessageType type, gchar const* msg) +EditWidget::setMessage (Inkscape::MessageType /*type*/, gchar const* msg) { _select_status.set_markup (msg? msg : ""); } diff --git a/src/ui/widget/rotateable.h b/src/ui/widget/rotateable.h index 65f3c598c..79a6daa5b 100644 --- a/src/ui/widget/rotateable.h +++ b/src/ui/widget/rotateable.h @@ -23,29 +23,29 @@ namespace Widget { class Rotateable: public Gtk::EventBox { public: - Rotateable(); + Rotateable(); - ~Rotateable(); + ~Rotateable(); - bool on_click(GdkEventButton *event); - bool on_motion(GdkEventMotion *event); - bool on_release(GdkEventButton *event); + bool on_click(GdkEventButton *event); + bool on_motion(GdkEventMotion *event); + bool on_release(GdkEventButton *event); - double axis; - double current_axis; - double maxdecl; + double axis; + double current_axis; + double maxdecl; private: - double drag_started_x; - double drag_started_y; - guint modifier; - bool dragging; - bool working; + double drag_started_x; + double drag_started_y; + guint modifier; + bool dragging; + bool working; guint get_single_modifier(guint old, guint state); - virtual void do_motion (double by, guint state) {} - virtual void do_release (double by, guint state) {} + virtual void do_motion (double /*by*/, guint /*state*/) {} + virtual void do_release (double /*by*/, guint /*state*/) {} }; } // namespace Widget @@ -54,7 +54,7 @@ private: #endif // INKSCAPE_UI_ROTATEABLE_H -/* +/* Local Variables: mode:c++ c-file-style:"stroustrup" diff --git a/src/xml/simple-node.cpp b/src/xml/simple-node.cpp index 554752941..d38e14b3f 100644 --- a/src/xml/simple-node.cpp +++ b/src/xml/simple-node.cpp @@ -304,7 +304,7 @@ void SimpleNode::setContent(gchar const *content) { } void -SimpleNode::setAttribute(gchar const *name, gchar const *value, bool const is_interactive) +SimpleNode::setAttribute(gchar const *name, gchar const *value, bool const /*is_interactive*/) { g_return_if_fail(name && *name); @@ -523,7 +523,7 @@ void content_changed(Node *node, gchar const *old_content, gchar const *new_cont reinterpret_cast(data)->notifyContentChanged(*node, Util::share_unsafe((const char *)old_content), Util::share_unsafe((const char *)new_content)); } -void attr_changed(Node *node, gchar const *name, gchar const *old_value, gchar const *new_value, bool is_interactive, void *data) { +void attr_changed(Node *node, gchar const *name, gchar const *old_value, gchar const *new_value, bool /*is_interactive*/, void *data) { reinterpret_cast(data)->notifyAttributeChanged(*node, g_quark_from_string(name), Util::share_unsafe((const char *)old_value), Util::share_unsafe((const char *)new_value)); } -- 2.30.2