Random simplifications, cosmetics/whitespace/consistency fixes.

[pulseview.git] / pv / view / viewport.cpp

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 564b331cf99e6157c92f857f8126a80700c5efc4..4b5fe245e0c11a9c6af77fdd038201d4427e997e 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
 
 #include <cassert>
@@ -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<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;
 }
@@ -103,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());