Trace: Removed coloured_bg state

[pulseview.git] / pv / view / viewwidget.hpp

diff --git a/pv/view/viewwidget.hpp b/pv/view/viewwidget.hpp
index 7051c66608792bb1304cdeb03193dda3380dca76..02c842a84b8f592cdbb340b66e012df568468b85 100644 (file)
--- a/pv/view/viewwidget.hpp
+++ b/pv/view/viewwidget.hpp
@@ -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/>.
  */
 
 #ifndef PULSEVIEW_PV_VIEWWIDGET_HPP
@@ -25,10 +24,14 @@
 
 #include <QWidget>
 
+using std::shared_ptr;
+using std::vector;
+
 class QTouchEvent;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 class View;
 class ViewItem;
@@ -46,16 +49,14 @@ protected:
         * if no view item is being hovered over.
         * @remarks the default implementation does nothing.
         */
-       virtual void item_hover(
-               const std::shared_ptr<pv::view::ViewItem> &item);
+       virtual void item_hover(const shared_ptr<ViewItem> &item);
 
        /**
         * Indicates the event an a view item has been clicked.
         * @param item the view item that has been clicked.
         * @remarks the default implementation does nothing.
         */
-       virtual void item_clicked(
-               const std::shared_ptr<pv::view::ViewItem> &item);
+       virtual void item_clicked(const shared_ptr<ViewItem> &item);
 
        /**
         * Returns true if the selection of row items allows dragging.
@@ -94,7 +95,7 @@ protected:
        /**
         * Gets the items in the view widget.
         */
-       virtual std::vector< std::shared_ptr<pv::view::ViewItem> > items() = 0;
+       virtual vector< shared_ptr<ViewItem> > items() = 0;
 
        /**
         * Gets the first view item which has a hit-box that contains @c pt .
@@ -102,8 +103,7 @@ protected:
         * @return the view item that has been found, or and empty
         *   @c shared_ptr if no item was found.
         */
-       virtual std::shared_ptr<pv::view::ViewItem> get_mouse_over_item(
-               const QPoint &pt) = 0;
+       virtual shared_ptr<ViewItem> get_mouse_over_item(const QPoint &pt) = 0;
 
        /**
         * Handles left mouse button press events.
@@ -121,14 +121,14 @@ protected:
         * Handles touch begin update and end events.
         * @param e the event that triggered this handler.
         */
-       virtual bool touch_event(QTouchEvent *e);
+       virtual bool touch_event(QTouchEvent *event);
 
 protected:
        bool event(QEvent *event);
 
-       void mousePressEvent(QMouseEvent * event);
+       void mousePressEvent(QMouseEvent *event);
        void mouseReleaseEvent(QMouseEvent *event);
-       void mouseMoveEvent(QMouseEvent *e);
+       void mouseMoveEvent(QMouseEvent *event);
 
        void leaveEvent(QEvent *event);
 
@@ -139,14 +139,15 @@ Q_SIGNALS:
        void selection_changed();
 
 protected:
-       pv::view::View &view_;
+       pv::views::TraceView::View &view_;
        QPoint mouse_point_;
        QPoint mouse_down_point_;
-       std::shared_ptr<ViewItem> mouse_down_item_;
+       shared_ptr<ViewItem> mouse_down_item_;
        bool item_dragging_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
 #endif // PULSEVIEW_PV_VIEWWIDGET_HPP