From b008aefee41a21b24f1d2f1f23cd6c78b888ede5 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 26 May 2016 17:09:17 +0200 Subject: many modules: trivial cleanups only - Remove "this->" where it's not needed. Possibly rename shadowed vars. - Don't reload the options bundle manually since `options::opts' exists for that very reason. - Remove '^ \+$' whitespace - :retab --- filter-accela/ftnoir_filter_accela.h | 1 - filter-accela/ftnoir_filter_accela_dialog.cpp | 12 +++--------- 2 files changed, 3 insertions(+), 10 deletions(-) (limited to 'filter-accela') diff --git a/filter-accela/ftnoir_filter_accela.h b/filter-accela/ftnoir_filter_accela.h index 289b84f0..8ee35da6 100644 --- a/filter-accela/ftnoir_filter_accela.h +++ b/filter-accela/ftnoir_filter_accela.h @@ -57,7 +57,6 @@ public: void unregister_filter(); private: Ui::AccelaUICFilterControls ui; - void discard(); void save(); FTNoIR_Filter* accela_filter; settings_accela s; diff --git a/filter-accela/ftnoir_filter_accela_dialog.cpp b/filter-accela/ftnoir_filter_accela_dialog.cpp index 599cb716..451f476e 100644 --- a/filter-accela/ftnoir_filter_accela_dialog.cpp +++ b/filter-accela/ftnoir_filter_accela_dialog.cpp @@ -20,7 +20,7 @@ FilterControls::FilterControls() : connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(doOK())); connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel())); - + connect(ui.rotation_slider, SIGNAL(valueChanged(int)), this, SLOT(update_rot_display(int))); connect(ui.translation_slider, SIGNAL(valueChanged(int)), this, SLOT(update_trans_display(int))); connect(ui.ewma_slider, SIGNAL(valueChanged(int)), this, SLOT(update_ewma_display(int))); @@ -32,7 +32,7 @@ FilterControls::FilterControls() : tie_setting(s.ewma, ui.ewma_slider); tie_setting(s.rot_deadzone, ui.rot_dz_slider); tie_setting(s.trans_deadzone, ui.trans_dz_slider); - + update_rot_display(ui.rotation_slider->value()); update_trans_display(ui.translation_slider->value()); update_ewma_display(ui.ewma_slider->value()); @@ -61,19 +61,13 @@ void FilterControls::unregister_filter() void FilterControls::doOK() { save(); - this->close(); + close(); } void FilterControls::doCancel() { - discard(); close(); } -void FilterControls::discard() -{ - s.b->reload(); -} - void FilterControls::save() { s.b->save(); } -- cgit v1.2.3