X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=d81befae9cb69522ea3a52f82f6b85540bfa6d19;hb=379f6ccf486b331a809dde730695af26ec85991d;hp=564b331cf99e6157c92f857f8126a80700c5efc4;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;p=pulseview.git
diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 564b331..d81befa 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 .
*/
+#include
#include
#include
-#include
#include
#include "signal.hpp"
@@ -38,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;
@@ -63,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;
}
@@ -103,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());