projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GlobalSettings: Remove unneeded include/using
[pulseview.git]
/
pv
/
widgets
/
sweeptimingwidget.cpp
diff --git
a/pv/widgets/sweeptimingwidget.cpp
b/pv/widgets/sweeptimingwidget.cpp
index 1c1581bb7c086ae649fd2e2f753877004eb66f37..b4943225dd8d44ddae54fad59b7231e70a8c6e3f 100644
(file)
--- a/
pv/widgets/sweeptimingwidget.cpp
+++ b/
pv/widgets/sweeptimingwidget.cpp
@@
-14,18
+14,15
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
*/
-#include "sweeptimingwidget.h"
+#include "sweeptimingwidget.h
pp
"
+#include <cassert>
#include <cstdlib>
#include <cstdlib>
-
#include <vector>
#include <vector>
-#include <assert.h>
-
#include <extdef.h>
using std::abs;
#include <extdef.h>
using std::abs;
@@
-88,11
+85,9
@@
void SweepTimingWidget::show_list(const uint64_t *vals, size_t count)
value_type_ = List;
list_.clear();
value_type_ = List;
list_.clear();
- for (size_t i = 0; i < count; i++)
- {
+ for (size_t i = 0; i < count; i++) {
char *const s = sr_si_string_u64(vals[i], suffix_);
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);
}
g_free(s);
}
@@
-142,24
+137,20
@@
void SweepTimingWidget::show_125_list(uint64_t min, uint64_t max)
uint64_t SweepTimingWidget::value() const
{
uint64_t SweepTimingWidget::value() const
{
- switch(value_type_)
- {
+ switch (value_type_) {
case None:
return 0;
case None:
return 0;
-
case MinMaxStep:
return (uint64_t)value_.value();
case MinMaxStep:
return (uint64_t)value_.value();
-
case List:
{
const int index = list_.currentIndex();
return (index >= 0) ? list_.itemData(
index).value<uint64_t>() : 0;
}
case List:
{
const int index = list_.currentIndex();
return (index >= 0) ? list_.itemData(
index).value<uint64_t>() : 0;
}
-
default:
// Unexpected value type
default:
// Unexpected value type
- assert(
0
);
+ assert(
false
);
return 0;
}
}
return 0;
}
}
@@
-183,5
+174,5
@@
void SweepTimingWidget::set_value(uint64_t value)
list_.setCurrentIndex(best_match);
}
list_.setCurrentIndex(best_match);
}
-}
//
widgets
-}
//
pv
+}
// namespace
widgets
+}
// namespace
pv