From 109e6513fe12819f639b71b6ae98b28d1fce4aab Mon Sep 17 00:00:00 2001 From: joncruz Date: Sun, 11 Nov 2007 07:52:54 +0000 Subject: [PATCH] Minor cleanup --- src/application/editor.h | 10 +++++----- src/sp-namedview.h | 2 +- src/ui/view/view.h | 28 ++++++++++++++-------------- src/ui/widget/style-swatch.cpp | 34 +++++++++++++++++----------------- src/widgets/button.cpp | 8 ++++---- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/application/editor.h b/src/application/editor.h index a6fe66688..1eed9a267 100644 --- a/src/application/editor.h +++ b/src/application/editor.h @@ -41,7 +41,7 @@ namespace Inkscape { class Editor : public AppPrototype { public: - static Editor *create (int argc, char **argv); + static Editor *create (int argc, char **argv); virtual ~Editor(); void* getWindow(); @@ -54,7 +54,7 @@ public: void exit(); bool lastViewOfDocument(SPDocument* doc, SPDesktop* view) const; - + bool addView(SPDesktop* view); bool deleteView(SPDesktop* view); @@ -67,7 +67,7 @@ public: static void activateDesktop (SPDesktop* dt); static void reactivateDesktop (SPDesktop* dt); static bool isDuplicatedView (SPDesktop* dt); - + static SPDocument* getActiveDocument(); static void addDocument (SPDocument* doc); static void removeDocument (SPDocument* doc); @@ -92,7 +92,7 @@ public: static sigc::connection connectDialogsUnhidden (const sigc::slot &slot); static sigc::connection connectExternalChange (const sigc::slot &slot); - + protected: Editor(Editor const &); Editor& operator=(Editor const &); @@ -117,7 +117,7 @@ protected: sigc::signal _external_change_signal; private: - Editor(int argc, char **argv); + Editor(int argc, char **argv); bool init(); }; diff --git a/src/sp-namedview.h b/src/sp-namedview.h index 8b6dbcc92..dc5c164b8 100644 --- a/src/sp-namedview.h +++ b/src/sp-namedview.h @@ -65,7 +65,7 @@ struct SPNamedView : public SPObjectGroup { gdouble objecttolerance; GQuark default_layer_id; - + double connector_spacing; guint32 guidecolor; diff --git a/src/ui/view/view.h b/src/ui/view/view.h index 6f0a29543..e1d4e491f 100644 --- a/src/ui/view/view.h +++ b/src/ui/view/view.h @@ -30,10 +30,10 @@ struct StopOnTrue { typedef bool result_type; template - result_type operator()(T_iterator first, T_iterator last) const{ - for (; first != last; ++first) - if (*first) return true; - return false; + result_type operator()(T_iterator first, T_iterator last) const{ + for (; first != last; ++first) + if (*first) return true; + return false; } }; @@ -45,10 +45,10 @@ struct StopOnNonZero { typedef int result_type; template - result_type operator()(T_iterator first, T_iterator last) const{ - for (; first != last; ++first) - if (*first) return *first; - return 0; + result_type operator()(T_iterator first, T_iterator last) const{ + for (; first != last; ++first) + if (*first) return *first; + return 0; } }; @@ -83,22 +83,22 @@ public: void close() { _close(); } /// Returns a pointer to the view's document. - SPDocument *doc() const + SPDocument *doc() const { return _doc; } /// Returns a pointer to the view's message stack. - Inkscape::MessageStack *messageStack() const + Inkscape::MessageStack *messageStack() const { return _message_stack; } /// Returns a pointer to the view's tipsMessageContext. - Inkscape::MessageContext *tipsMessageContext() const + Inkscape::MessageContext *tipsMessageContext() const { return _tips_message_context; } void setPosition(gdouble x, gdouble y); - void setPosition(NR::Point const &p); + void setPosition(NR::Point const &p); void emitResized(gdouble width, gdouble height); - void requestRedraw(); + void requestRedraw(); // view subclasses must give implementations of these methods - + virtual bool shutdown() = 0; virtual void mouseover() = 0; virtual void mouseout() = 0; diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp index df543c8d3..e5e8d5d78 100644 --- a/src/ui/widget/style-swatch.cpp +++ b/src/ui/widget/style-swatch.cpp @@ -34,9 +34,9 @@ enum { SS_STROKE }; -static void style_swatch_attr_changed(Inkscape::XML::Node *repr, gchar const *name, - gchar const *old_value, gchar const *new_value, - bool is_interactive, gpointer data) +static void style_swatch_attr_changed( Inkscape::XML::Node *repr, gchar const *name, + gchar const */*old_value*/, gchar const */*new_value*/, + bool /*is_interactive*/, gpointer data) { Inkscape::UI::Widget::StyleSwatch *ss = (Inkscape::UI::Widget::StyleSwatch *) data; @@ -57,12 +57,12 @@ static Inkscape::XML::NodeEventVector style_swatch_repr_events = }; -static void style_swatch_tool_attr_changed(Inkscape::XML::Node *repr, gchar const *name, - gchar const *old_value, gchar const *new_value, - bool is_interactive, gpointer data) +static void style_swatch_tool_attr_changed( Inkscape::XML::Node */*repr*/, gchar const *name, + gchar const */*old_value*/, gchar const *new_value, + bool /*is_interactive*/, gpointer data) { Inkscape::UI::Widget::StyleSwatch *ss = (Inkscape::UI::Widget::StyleSwatch *) data; - + if (!strcmp (name, "usecurrent")) { // FIXME: watching only for the style attr, no CSS attrs if (!strcmp (new_value, "1")) { ss->setWatched (inkscape_get_repr(INKSCAPE, "desktop"), inkscape_get_repr(INKSCAPE, ss->_tool_path)); @@ -71,7 +71,7 @@ static void style_swatch_tool_attr_changed(Inkscape::XML::Node *repr, gchar cons } // UGLY HACK: we have to reconnect to the watched tool repr again, retrieving it from the stored // tool_path, because the actual repr keeps shifting with each change, no idea why - ss->setWatchedTool(ss->_tool_path, false); + ss->setWatchedTool(ss->_tool_path, false); } } @@ -89,7 +89,7 @@ namespace UI { namespace Widget { StyleSwatch::StyleSwatch(SPCSSAttr *css, gchar const *main_tip) - : + : _tool_path(NULL), _css (NULL), @@ -159,8 +159,8 @@ void StyleSwatch::setDesktop(SPDesktop *desktop) { _desktop = desktop; } -bool -StyleSwatch::on_click(GdkEventButton *event) +bool +StyleSwatch::on_click(GdkEventButton */*event*/) { if (this->_desktop && this->_verb_t != SP_VERB_NONE) { Inkscape::Verb *verb = Inkscape::Verb::get(this->_verb_t); @@ -173,7 +173,7 @@ StyleSwatch::on_click(GdkEventButton *event) StyleSwatch::~StyleSwatch() { - if (_css) + if (_css) sp_repr_css_attr_unref (_css); for (int i = SS_FILL; i <= SS_STROKE; i++) { @@ -252,7 +252,7 @@ StyleSwatch::setWatchedTool(const char *path, bool synthesize) void StyleSwatch::setStyle(SPCSSAttr *css) { - if (_css) + if (_css) sp_repr_css_attr_unref (_css); if (!css) @@ -347,8 +347,8 @@ StyleSwatch::setStyle(SPStyle *query) g_free (str); } { - gchar *str = g_strdup_printf(_("Stroke width: %.5g%s"), - w, + gchar *str = g_strdup_printf(_("Stroke width: %.5g%s"), + w, _sw_unit? sp_unit_get_abbreviation(_sw_unit) : "px"); _tooltips.set_tip(_stroke_width_place, str); g_free (str); @@ -364,7 +364,7 @@ StyleSwatch::setStyle(SPStyle *query) gchar *str; if (op == 0) str = g_strdup_printf(_("O:%.3g"), op); - else + else str = g_strdup_printf(_("O:.%d"), (int) (op*10)); _opacity_value.set_markup (str); g_free (str); @@ -386,7 +386,7 @@ StyleSwatch::setStyle(SPStyle *query) } // namespace UI } // namespace Inkscape -/* +/* Local Variables: mode:c++ c-file-style:"stroustrup" diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp index f9e854302..95d5859e8 100644 --- a/src/widgets/button.cpp +++ b/src/widgets/button.cpp @@ -172,7 +172,7 @@ sp_button_process_event (SPButton *button, GdkEvent *event) } static void -sp_button_perform_action (SPButton *button, gpointer data) +sp_button_perform_action (SPButton *button, gpointer /*data*/) { if (button->action) { sp_action_perform (button->action, NULL); @@ -254,7 +254,7 @@ sp_button_set_action (SPButton *button, SPAction *action) } static void -sp_button_action_set_active (SPAction *action, unsigned int active, void *data) +sp_button_action_set_active (SPAction */*action*/, unsigned int active, void *data) { SPButton *button; button = (SPButton *) data; @@ -269,13 +269,13 @@ sp_button_action_set_active (SPAction *action, unsigned int active, void *data) } static void -sp_button_action_set_sensitive (SPAction *action, unsigned int sensitive, void *data) +sp_button_action_set_sensitive (SPAction */*action*/, unsigned int sensitive, void *data) { gtk_widget_set_sensitive (GTK_WIDGET (data), sensitive); } static void -sp_button_action_set_shortcut (SPAction *action, unsigned int shortcut, void *data) +sp_button_action_set_shortcut (SPAction *action, unsigned int /*shortcut*/, void *data) { SPButton *button=SP_BUTTON (data); if (button->tooltips) { -- 2.30.2