X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fview%2Fviewport.cpp;h=4b5fe245e0c11a9c6af77fdd038201d4427e997e;hb=5d9fe823db16bc4a537e600451876a735d20a98d;hp=6e07a2a8baa48a7ba0f0286e867235aad701873c;hpb=d9ea96280ab1128427143660ae375c30b19aa0cb;p=pulseview.git
diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 6e07a2a..4b5fe24 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -14,8 +14,7 @@
* 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 .
*/
#include
@@ -32,20 +31,20 @@
#include
+#include
+
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 Viewport::get_mouse_over_item(const QPoint &pt)
const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());
const vector< shared_ptr > 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 > Viewport::items()
{
vector< shared_ptr > items;
- const std::vector< shared_ptr > view_items(
+ const vector< shared_ptr > view_items(
view_.list_by_type());
copy(view_items.begin(), view_items.end(), back_inserter(items));
const vector< shared_ptr > time_items(view_.time_items());
@@ -223,5 +221,6 @@ void Viewport::wheelEvent(QWheelEvent *event)
}
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv