X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=4b5fe245e0c11a9c6af77fdd038201d4427e997e;hp=1504f482ca3915d605ff9a09d66e6c1584ab7362;hb=c063290ac7189bdd15221450f598504f43286b43;hpb=efdec55aec1a137460fa362a381ed1904182bfed

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 1504f482..4b5fe245 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -37,10 +37,7 @@ using std::abs;
 using std::back_inserter;
 using std::copy;
 using std::dynamic_pointer_cast;
-using std::max;
-using std::min;
-using std::none_of;
-using std::numeric_limits;
+using std::none_of; // Used in assert()s.
 using std::shared_ptr;
 using std::stable_sort;
 using std::vector;
@@ -62,8 +59,7 @@ shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
 	const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());
 	const vector< shared_ptr<ViewItem> > items(this->items());
 	for (auto i = items.rbegin(); i != items.rend(); i++)
-		if ((*i)->enabled() &&
-			(*i)->hit_box_rect(pp).contains(pt))
+		if ((*i)->enabled() && (*i)->hit_box_rect(pp).contains(pt))
 			return *i;
 	return nullptr;
 }
@@ -102,7 +98,7 @@ void Viewport::drag_release()
 vector< shared_ptr<ViewItem> > Viewport::items()
 {
 	vector< shared_ptr<ViewItem> > items;
-	const std::vector< shared_ptr<ViewItem> > view_items(
+	const vector< shared_ptr<ViewItem> > view_items(
 		view_.list_by_type<ViewItem>());
 	copy(view_items.begin(), view_items.end(), back_inserter(items));
 	const vector< shared_ptr<TimeItem> > time_items(view_.time_items());