X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewwidget.hpp;h=364ed02a111240f169f44bded63cabc1b742f57d;hp=e6d2aa60125db71cba6fcb07b79403d4af90d4a7;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=219b3ab99786d31cfbf010b931293c57daedacc9

diff --git a/pv/view/viewwidget.hpp b/pv/view/viewwidget.hpp
index e6d2aa6..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 <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PULSEVIEW_PV_VIEWWIDGET_HPP
@@ -28,12 +27,8 @@
 class QTouchEvent;
 
 namespace pv {
-namespace view {
-
-enum ViewType {
-	TraceView,
-	TabularDecodeView
-};
+namespace views {
+namespace TraceView {
 
 class View;
 class ViewItem;
@@ -52,7 +47,7 @@ protected:
 	 * @remarks the default implementation does nothing.
 	 */
 	virtual void item_hover(
-		const std::shared_ptr<pv::view::ViewItem> &item);
+		const std::shared_ptr<ViewItem> &item);
 
 	/**
 	 * Indicates the event an a view item has been clicked.
@@ -60,7 +55,7 @@ protected:
 	 * @remarks the default implementation does nothing.
 	 */
 	virtual void item_clicked(
-		const std::shared_ptr<pv::view::ViewItem> &item);
+		const std::shared_ptr<ViewItem> &item);
 
 	/**
 	 * Returns true if the selection of row items allows dragging.
@@ -99,7 +94,7 @@ protected:
 	/**
 	 * Gets the items in the view widget.
 	 */
-	virtual std::vector< std::shared_ptr<pv::view::ViewItem> > items() = 0;
+	virtual std::vector< std::shared_ptr<ViewItem> > items() = 0;
 
 	/**
 	 * Gets the first view item which has a hit-box that contains @c pt .
@@ -107,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<pv::view::ViewItem> get_mouse_over_item(
+	virtual std::shared_ptr<ViewItem> get_mouse_over_item(
 		const QPoint &pt) = 0;
 
 	/**
@@ -144,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_;
 	bool item_dragging_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
 #endif // PULSEVIEW_PV_VIEWWIDGET_HPP