X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=2d10f2a054fadb31dc47783d3395460c54fb2c0a;hp=6e07a2a8baa48a7ba0f0286e867235aad701873c;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=d9ea96280ab1128427143660ae375c30b19aa0cb diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index 6e07a2a..2d10f2a 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,6 +31,8 @@ #include +#include + using std::abs; using std::back_inserter; using std::copy; @@ -45,7 +46,8 @@ using std::stable_sort; using std::vector; namespace pv { -namespace view { +namespace views { +namespace TraceView { Viewport::Viewport(View &parent) : ViewWidget(parent), @@ -100,7 +102,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 +225,6 @@ void Viewport::wheelEvent(QWheelEvent *event) } } -} // namespace view +} // namespace TraceView +} // namespace views } // namespace pv