projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use std:: in the code directly (where possible).
[pulseview.git]
/
pv
/
view
/
logicsignal.cpp
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index 251190ece03b789df3c568c99fdba35fe905affa..f78170b01a30a0028a95befaf7665e7d8a33e649 100644
(file)
--- a/
pv/view/logicsignal.cpp
+++ b/
pv/view/logicsignal.cpp
@@
-46,6
+46,7
@@
using std::deque;
using std::max;
using std::make_pair;
using std::min;
using std::max;
using std::make_pair;
using std::min;
+using std::none_of;
using std::pair;
using std::shared_ptr;
using std::vector;
using std::pair;
using std::shared_ptr;
using std::vector;
@@
-136,7
+137,7
@@
shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
return base_->logic_data();
}
return base_->logic_data();
}
-
std::
pair<int, int> LogicSignal::v_extents() const
+pair<int, int> LogicSignal::v_extents() const
{
const int signal_margin =
QFontMetrics(QApplication::font()).height() / 2;
{
const int signal_margin =
QFontMetrics(QApplication::font()).height() / 2;
@@
-446,7
+447,7
@@
void LogicSignal::modify_trigger()
if (trigger) {
for (auto stage : trigger->stages()) {
const auto &matches = stage->matches();
if (trigger) {
for (auto stage : trigger->stages()) {
const auto &matches = stage->matches();
- if (
std::
none_of(matches.begin(), matches.end(),
+ if (none_of(matches.begin(), matches.end(),
[&](shared_ptr<TriggerMatch> match) {
return match->channel() != base_->channel(); }))
continue;
[&](shared_ptr<TriggerMatch> match) {
return match->channel() != base_->channel(); }))
continue;