X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fviewwidget.hpp;h=364ed02a111240f169f44bded63cabc1b742f57d;hb=e6d42eec32b61b6831b7926a9d6a5cd03d1f3430;hp=7051c66608792bb1304cdeb03193dda3380dca76;hpb=520362f8c4082820193f09e43b27a8c7df2ef011;p=pulseview.git
diff --git a/pv/view/viewwidget.hpp b/pv/view/viewwidget.hpp
index 7051c66..364ed02 100644
--- 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 .
*/
#ifndef PULSEVIEW_PV_VIEWWIDGET_HPP
@@ -28,7 +27,8 @@
class QTouchEvent;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
class View;
class ViewItem;
@@ -47,7 +47,7 @@ protected:
* @remarks the default implementation does nothing.
*/
virtual void item_hover(
- const std::shared_ptr &item);
+ const std::shared_ptr &item);
/**
* Indicates the event an a view item has been clicked.
@@ -55,7 +55,7 @@ protected:
* @remarks the default implementation does nothing.
*/
virtual void item_clicked(
- const std::shared_ptr &item);
+ const std::shared_ptr &item);
/**
* Returns true if the selection of row items allows dragging.
@@ -94,7 +94,7 @@ protected:
/**
* Gets the items in the view widget.
*/
- virtual std::vector< std::shared_ptr > items() = 0;
+ virtual std::vector< std::shared_ptr > items() = 0;
/**
* Gets the first view item which has a hit-box that contains @c pt .
@@ -102,7 +102,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 get_mouse_over_item(
+ virtual std::shared_ptr get_mouse_over_item(
const QPoint &pt) = 0;
/**
@@ -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 mouse_down_item_;
bool item_dragging_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
#endif // PULSEVIEW_PV_VIEWWIDGET_HPP