X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=d81befae9cb69522ea3a52f82f6b85540bfa6d19;hp=6e07a2a8baa48a7ba0f0286e867235aad701873c;hb=aca9aa834c742ba70f49d1ac3eb2d1e02e759416;hpb=d9ea96280ab1128427143660ae375c30b19aa0cb

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 6e07a2a8..d81befae 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -14,13 +14,12 @@
  * 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 <algorithm>
 #include <cassert>
 #include <cmath>
-#include <algorithm>
 #include <limits>
 
 #include "signal.hpp"
@@ -32,20 +31,20 @@
 
 #include <QMouseEvent>
 
+#include <QDebug>
+
 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;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 Viewport::Viewport(View &parent) :
 	ViewWidget(parent),
@@ -60,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;
 }
@@ -100,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());
@@ -223,5 +221,6 @@ void Viewport::wheelEvent(QWheelEvent *event)
 	}
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv