Don't use std:: in the code directly (where possible).

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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 6e07a2a8baa48a7ba0f0286e867235aad701873c..2d10f2a054fadb31dc47783d3395460c54fb2c0a 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>
@@ -32,6 +31,8 @@
 
 #include <QMouseEvent>
 
+#include <QDebug>
+
 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<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 +225,6 @@ void Viewport::wheelEvent(QWheelEvent *event)
        }
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv