X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.hpp;h=555d8f5505d5cb485d829bd245928578c4708e15;hp=704e73115514b2183cb4ce058b86bbc9a9000a9d;hb=ae5f66281c38a76dcb7011907d7a86a99b9dd4dd;hpb=838d0522bf01d4e7550f8c124135debd452f0cac

diff --git a/pv/view/viewport.hpp b/pv/view/viewport.hpp
index 704e7311..555d8f55 100644
--- a/pv/view/viewport.hpp
+++ b/pv/view/viewport.hpp
@@ -14,12 +14,11 @@
  * 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/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEW_VIEWPORT_HPP
-#define PULSEVIEW_PV_VIEW_VIEWPORT_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWPORT_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWPORT_HPP
 
 #include <boost/optional.hpp>
 
@@ -34,7 +33,8 @@ class QPaintEvent;
 class Session;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 class View;
 
@@ -51,7 +51,7 @@ private:
 	 * @param item The item that is being hovered over, or @c nullptr
 	 * if no view item is being hovered over.
 	 */
-	void item_hover(const std::shared_ptr<pv::view::ViewItem> &item);
+	void item_hover(const std::shared_ptr<ViewItem> &item);
 
 	/**
 	 * Gets the first view item which has a hit-box that contains @c pt .
@@ -59,8 +59,7 @@ private:
 	 * @return the view item that has been found, or and empty
 	 *   @c shared_ptr if no item was found.
 	 */
-	std::shared_ptr<pv::view::ViewItem> get_mouse_over_item(
-		const QPoint &pt);
+	std::shared_ptr<ViewItem> get_mouse_over_item(const QPoint &pt);
 
 	/**
 	 * Sets this item into the dragged state.
@@ -81,18 +80,18 @@ private:
 	/**
 	 * Gets the items in the view widget.
 	 */
-	std::vector< std::shared_ptr<pv::view::ViewItem> > items();
+	std::vector< std::shared_ptr<ViewItem> > items();
 
 	/**
 	 * Handles touch begin update and end events.
 	 * @param e the event that triggered this handler.
 	 */
-	bool touch_event(QTouchEvent *e);
+	bool touch_event(QTouchEvent *event);
 
 private:
 	void paintEvent(QPaintEvent *event);
 
-	void mouseDoubleClickEvent(QMouseEvent * event);
+	void mouseDoubleClickEvent(QMouseEvent *event);
 	void wheelEvent(QWheelEvent *event);
 
 private:
@@ -104,7 +103,8 @@ private:
 	bool pinch_zoom_active_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_VIEWPORT_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWPORT_HPP