X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fwidgets%2Fsweeptimingwidget.cpp;h=b4943225dd8d44ddae54fad59b7231e70a8c6e3f;hp=9e78cae9fbc0f7fb5aca83f430c96ad7a696363a;hb=dbed5609ae31cdfc3e9db10f3ab91b7607c08372;hpb=efdec55aec1a137460fa362a381ed1904182bfed;ds=sidebyside diff --git a/pv/widgets/sweeptimingwidget.cpp b/pv/widgets/sweeptimingwidget.cpp index 9e78cae9..b4943225 100644 --- a/pv/widgets/sweeptimingwidget.cpp +++ b/pv/widgets/sweeptimingwidget.cpp @@ -19,12 +19,10 @@ #include "sweeptimingwidget.hpp" +#include #include - #include -#include - #include using std::abs; @@ -89,8 +87,7 @@ void SweepTimingWidget::show_list(const uint64_t *vals, size_t count) list_.clear(); for (size_t i = 0; i < count; i++) { char *const s = sr_si_string_u64(vals[i], suffix_); - list_.addItem(QString::fromUtf8(s), - qVariantFromValue(vals[i])); + list_.addItem(QString::fromUtf8(s), qVariantFromValue(vals[i])); g_free(s); } @@ -140,23 +137,20 @@ void SweepTimingWidget::show_125_list(uint64_t min, uint64_t max) uint64_t SweepTimingWidget::value() const { - switch(value_type_) { + switch (value_type_) { case None: return 0; - case MinMaxStep: return (uint64_t)value_.value(); - case List: { const int index = list_.currentIndex(); return (index >= 0) ? list_.itemData( index).value() : 0; } - default: // Unexpected value type - assert(0); + assert(false); return 0; } } @@ -180,5 +174,5 @@ void SweepTimingWidget::set_value(uint64_t value) list_.setCurrentIndex(best_match); } -} // widgets -} // pv +} // namespace widgets +} // namespace pv