From 1ec6194c3bafb37c6c5854820e66adf1ba7f9fb0 Mon Sep 17 00:00:00 2001 From: tweenk Date: Mon, 9 Feb 2009 21:25:51 +0000 Subject: [PATCH] Fix some console warning spam (most cannot be fixed, unfortunately) --- src/extension/param/float.cpp | 2 +- src/extension/param/int.cpp | 2 +- src/ui/dialog/align-and-distribute.cpp | 4 ++-- src/ui/dialog/filter-effects-dialog.cpp | 6 +++--- src/ui/dialog/svg-fonts-dialog.cpp | 2 +- src/ui/dialog/tile.cpp | 8 ++++---- src/ui/dialog/tracedialog.cpp | 16 ++++++++-------- src/ui/widget/preferences-widget.cpp | 8 ++++---- src/ui/widget/scalar.cpp | 8 +++++--- 9 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp index 40cb81ddd..11e3a8d97 100644 --- a/src/extension/param/float.cpp +++ b/src/extension/param/float.cpp @@ -110,7 +110,7 @@ public: /** \brief Make the adjustment using an extension and the string describing the parameter. */ ParamFloatAdjustment (ParamFloat * param, SPDocument * doc, Inkscape::XML::Node * node, sigc::signal * changeSignal) : - Gtk::Adjustment(0.0, param->min(), param->max(), 0.1), _pref(param), _doc(doc), _node(node), _changeSignal(changeSignal) { + Gtk::Adjustment(0.0, param->min(), param->max(), 0.1, 0), _pref(param), _doc(doc), _node(node), _changeSignal(changeSignal) { this->set_value(_pref->get(NULL, NULL) /* \todo fix */); this->signal_value_changed().connect(sigc::mem_fun(this, &ParamFloatAdjustment::val_changed)); return; diff --git a/src/extension/param/int.cpp b/src/extension/param/int.cpp index db7f9c67b..301d54ed0 100644 --- a/src/extension/param/int.cpp +++ b/src/extension/param/int.cpp @@ -95,7 +95,7 @@ public: /** \brief Make the adjustment using an extension and the string describing the parameter. */ ParamIntAdjustment (ParamInt * param, SPDocument * doc, Inkscape::XML::Node * node, sigc::signal * changeSignal) : - Gtk::Adjustment(0.0, param->min(), param->max(), 1.0), _pref(param), _doc(doc), _node(node), _changeSignal(changeSignal) { + Gtk::Adjustment(0.0, param->min(), param->max(), 1.0, 0), _pref(param), _doc(doc), _node(node), _changeSignal(changeSignal) { this->set_value(_pref->get(NULL, NULL) /* \todo fix */); this->signal_value_changed().connect(sigc::mem_fun(this, &ParamIntAdjustment::val_changed)); return; diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp index 3203816d3..0014a3ce5 100644 --- a/src/ui/dialog/align-and-distribute.cpp +++ b/src/ui/dialog/align-and-distribute.cpp @@ -468,7 +468,7 @@ public: removeOverlapXGap.set_digits(1); removeOverlapXGap.set_size_request(60, -1); - removeOverlapXGap.set_increments(1.0, 5.0); + removeOverlapXGap.set_increments(1.0, 0); removeOverlapXGap.set_range(-1000.0, 1000.0); removeOverlapXGap.set_value(0); dialog.tooltips().set_tip(removeOverlapXGap, @@ -478,7 +478,7 @@ public: removeOverlapYGap.set_digits(1); removeOverlapYGap.set_size_request(60, -1); - removeOverlapYGap.set_increments(1.0, 5.0); + removeOverlapYGap.set_increments(1.0, 0); removeOverlapYGap.set_range(-1000.0, 1000.0); removeOverlapYGap.set_value(0); dialog.tooltips().set_tip(removeOverlapYGap, diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp index c19e5ceda..fc5eb81f7 100644 --- a/src/ui/dialog/filter-effects-dialog.cpp +++ b/src/ui/dialog/filter-effects-dialog.cpp @@ -136,7 +136,7 @@ public: { if (tip_text) _tt.set_tip(*this, tip_text); set_range(lower, upper); - set_increments(step_inc, step_inc * 5); + set_increments(step_inc, 0); signal_value_changed().connect(signal_attr_changed().make_slot()); } @@ -231,8 +231,8 @@ public: if (tt2) _tt.set_tip(_s2, tt2); _s1.set_range(lower, upper); _s2.set_range(lower, upper); - _s1.set_increments(step_inc, step_inc * 5); - _s2.set_increments(step_inc, step_inc * 5); + _s1.set_increments(step_inc, 0); + _s2.set_increments(step_inc, 0); _s1.signal_value_changed().connect(signal_attr_changed().make_slot()); _s2.signal_value_changed().connect(signal_attr_changed().make_slot()); diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp index ad8539775..c81780321 100644 --- a/src/ui/dialog/svg-fonts-dialog.cpp +++ b/src/ui/dialog/svg-fonts-dialog.cpp @@ -376,7 +376,7 @@ Gtk::VBox* SvgFontsDialog::global_settings_tab(){ setwidth_spin.signal_changed().connect(sigc::mem_fun(*this, &SvgFontsDialog::on_setwidth_changed)); setwidth_spin.set_range(0, 4096); - setwidth_spin.set_increments(10, 100); + setwidth_spin.set_increments(10, 0); global_vbox.pack_start(*setwidth_hbox, false, false); return &global_vbox; diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp index 5741fee4d..a383f7b1a 100644 --- a/src/ui/dialog/tile.cpp +++ b/src/ui/dialog/tile.cpp @@ -653,7 +653,7 @@ TileDialog::TileDialog() NoOfRowsBox.pack_start(NoOfRowsLabel, false, false, MARGIN); NoOfRowsSpinner.set_digits(0); - NoOfRowsSpinner.set_increments(1, 5); + NoOfRowsSpinner.set_increments(1, 0); NoOfRowsSpinner.set_range(1.0, 100.0); NoOfRowsSpinner.set_value(PerCol); NoOfRowsSpinner.signal_changed().connect(sigc::mem_fun(*this, &TileDialog::on_col_spinbutton_changed)); @@ -723,7 +723,7 @@ TileDialog::TileDialog() NoOfColsBox.pack_start(NoOfColsLabel, false, false, MARGIN); NoOfColsSpinner.set_digits(0); - NoOfColsSpinner.set_increments(1, 5); + NoOfColsSpinner.set_increments(1, 0); NoOfColsSpinner.set_range(1.0, 100.0); NoOfColsSpinner.set_value(PerRow); NoOfColsSpinner.signal_changed().connect(sigc::mem_fun(*this, &TileDialog::on_row_spinbutton_changed)); @@ -807,7 +807,7 @@ TileDialog::TileDialog() YPadBox.pack_start (*(Glib::wrap(i)), false, false, MARGIN); YPadSpinner.set_digits(1); - YPadSpinner.set_increments(0.2, 2); + YPadSpinner.set_increments(0.2, 0); YPadSpinner.set_range(-10000, 10000); double YPad = prefs->getDouble("/dialogs/gridtiler/YPad", 15); YPadSpinner.set_value(YPad); @@ -832,7 +832,7 @@ TileDialog::TileDialog() XPadBox.pack_start (*(Glib::wrap(i)), false, false, MARGIN); XPadSpinner.set_digits(1); - XPadSpinner.set_increments(0.2, 2); + XPadSpinner.set_increments(0.2, 0); XPadSpinner.set_range(-10000, 10000); double XPad = prefs->getDouble("/dialogs/gridtiler/XPad", 15); XPadSpinner.set_value(XPad); diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp index 74404c2f8..f6dd6cb28 100644 --- a/src/ui/dialog/tracedialog.cpp +++ b/src/ui/dialog/tracedialog.cpp @@ -410,7 +410,7 @@ TraceDialogImpl::TraceDialogImpl() : _("Trace by a given brightness level")); modeBrightnessSpinner.set_digits(3); - modeBrightnessSpinner.set_increments(0.01, 0.1); + modeBrightnessSpinner.set_increments(0.01, 0); modeBrightnessSpinner.set_range(0.0, 1.0); modeBrightnessSpinner.set_value(0.45); modeBrightnessBox.pack_end(modeBrightnessSpinner, false, false, MARGIN); @@ -437,13 +437,13 @@ TraceDialogImpl::TraceDialogImpl() : modeCannyLoSpinnerLabel.set_label(_("Low")); modeCannyBox.pack_start(modeCannyLoSpinnerLabel); modeCannyLoSpinner.set_digits(5); - modeCannyLoSpinner.set_increments(0.01, 0.1); + modeCannyLoSpinner.set_increments(0.01, 0); modeCannyLoSpinner.set_range(0.0, 1.0); modeCannyLoSpinner.set_value(0.1); modeCannyBox.pack_start(modeCannyLoSpinner); */ modeCannyHiSpinner.set_digits(3); - modeCannyHiSpinner.set_increments(0.01, 0.1); + modeCannyHiSpinner.set_increments(0.01, 0); modeCannyHiSpinner.set_range(0.0, 1.0); modeCannyHiSpinner.set_value(0.65); modeCannyBox.pack_end(modeCannyHiSpinner, false, false, MARGIN); @@ -467,7 +467,7 @@ TraceDialogImpl::TraceDialogImpl() : _("Trace along the boundaries of reduced colors")); modeQuantNrColorSpinner.set_digits(0); - modeQuantNrColorSpinner.set_increments(1.0, 4.0); + modeQuantNrColorSpinner.set_increments(1.0, 0); modeQuantNrColorSpinner.set_range(2.0, 64.0); modeQuantNrColorSpinner.set_value(8.0); modeQuantBox.pack_end(modeQuantNrColorSpinner, false, false, MARGIN); @@ -501,7 +501,7 @@ TraceDialogImpl::TraceDialogImpl() : _("Trace the given number of brightness levels")); modeMultiScanNrColorSpinner.set_digits(0); - modeMultiScanNrColorSpinner.set_increments(1.0, 4.0); + modeMultiScanNrColorSpinner.set_increments(1.0, 0); modeMultiScanNrColorSpinner.set_range(2.0, 256.0); modeMultiScanNrColorSpinner.set_value(8.0); modeMultiScanHBox1.pack_end(modeMultiScanNrColorSpinner, false, false, MARGIN); @@ -572,7 +572,7 @@ TraceDialogImpl::TraceDialogImpl() : optionsSpecklesButton.set_active(true); optionsSpecklesBox.pack_start(optionsSpecklesButton, false, false, MARGIN); optionsSpecklesSizeSpinner.set_digits(0); - optionsSpecklesSizeSpinner.set_increments(1, 10); + optionsSpecklesSizeSpinner.set_increments(1, 0); optionsSpecklesSizeSpinner.set_range(0, 1000); optionsSpecklesSizeSpinner.set_value(2); tips.set_tip(optionsSpecklesSizeSpinner, @@ -587,7 +587,7 @@ TraceDialogImpl::TraceDialogImpl() : optionsCornersButton.set_active(true); optionsCornersBox.pack_start(optionsCornersButton, false, false, MARGIN); optionsCornersThresholdSpinner.set_digits(2); - optionsCornersThresholdSpinner.set_increments(0.01, 0.1); + optionsCornersThresholdSpinner.set_increments(0.01, 0); optionsCornersThresholdSpinner.set_range(0.0, 1.34); optionsCornersThresholdSpinner.set_value(1.0); optionsCornersBox.pack_end(optionsCornersThresholdSpinner, false, false, MARGIN); @@ -602,7 +602,7 @@ TraceDialogImpl::TraceDialogImpl() : _("Try to optimize paths by joining adjacent Bezier curve segments")); optionsOptimBox.pack_start(optionsOptimButton, false, false, MARGIN); optionsOptimToleranceSpinner.set_digits(2); - optionsOptimToleranceSpinner.set_increments(0.05, 0.25); + optionsOptimToleranceSpinner.set_increments(0.05, 0); optionsOptimToleranceSpinner.set_range(0.0, 5.0); optionsOptimToleranceSpinner.set_value(0.2); optionsOptimBox.pack_end(optionsOptimToleranceSpinner, false, false, MARGIN); diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp index e21410df6..70aed505e 100644 --- a/src/ui/widget/preferences-widget.cpp +++ b/src/ui/widget/preferences-widget.cpp @@ -200,7 +200,7 @@ void PrefRadioButton::on_toggled() } void PrefSpinButton::init(Glib::ustring const &prefs_path, - double lower, double upper, double step_increment, double page_increment, + double lower, double upper, double step_increment, double /*page_increment*/, double default_value, bool is_int, bool is_percent) { _prefs_path = prefs_path; @@ -219,7 +219,7 @@ void PrefSpinButton::init(Glib::ustring const &prefs_path, } this->set_range (lower, upper); - this->set_increments (step_increment, page_increment); + this->set_increments (step_increment, 0); this->set_numeric(); this->set_value (value); this->set_width_chars(6); @@ -438,7 +438,7 @@ ZoomCorrRulerSlider::init(int ruler_width, int ruler_height, double lower, doubl _unit.signal_changed().connect(sigc::mem_fun(*this, &ZoomCorrRulerSlider::on_unit_changed)); _sb.set_range (lower, upper); - _sb.set_increments (step_increment, page_increment); + _sb.set_increments (step_increment, 0); _sb.set_value (value); _sb.set_digits(2); @@ -506,7 +506,7 @@ PrefSlider::init(Glib::ustring const &prefs_path, _sb.signal_value_changed().connect(sigc::mem_fun(*this, &PrefSlider::on_spinbutton_value_changed)); _sb.set_range (lower, upper); - _sb.set_increments (step_increment, page_increment); + _sb.set_increments (step_increment, 0); _sb.set_value (value); _sb.set_digits(digits); diff --git a/src/ui/widget/scalar.cpp b/src/ui/widget/scalar.cpp index 743c879f0..17fb4964d 100644 --- a/src/ui/widget/scalar.cpp +++ b/src/ui/widget/scalar.cpp @@ -162,12 +162,14 @@ Scalar::setDigits(unsigned digits) static_cast(_widget)->set_digits(digits); } -/** Sets the step and page increments for the spin button */ +/** Sets the step and page increments for the spin button + * @todo Remove the second parameter - deprecated + */ void -Scalar::setIncrements(double step, double page) +Scalar::setIncrements(double step, double /*page*/) { g_assert(_widget != NULL); - static_cast(_widget)->set_increments(step, page); + static_cast(_widget)->set_increments(step, 0); } /** Sets the minimum and maximum range allowed for the spin button */ -- 2.30.2