X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fheader.hpp;h=c6f81ae5e5b96a4fd32bcc56a4835bd20e2bc2ff;hb=e1e2666e31d80016612762940605fc5bdbc63971;hp=91612b956bb7c1d893f46d7145fcd5043b9aed93;hpb=7a01bd3654ed046216308fa64edfd79be7cd525f;p=pulseview.git
diff --git a/pv/view/header.hpp b/pv/view/header.hpp
index 91612b9..c6f81ae 100644
--- a/pv/view/header.hpp
+++ b/pv/view/header.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 .
*/
-#ifndef PULSEVIEW_PV_VIEW_HEADER_HPP
-#define PULSEVIEW_PV_VIEW_HEADER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_HEADER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_HEADER_HPP
#include
#include
@@ -27,10 +26,14 @@
#include "marginwidget.hpp"
+using std::shared_ptr;
+using std::vector;
+
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
-class RowItem;
+class TraceTreeItem;
class View;
class ViewItem;
@@ -63,7 +66,7 @@ private:
/**
* Gets the row items.
*/
- std::vector< std::shared_ptr > items();
+ vector< shared_ptr > items();
/**
* Gets the first view item which has a label that contains @c pt .
@@ -71,8 +74,7 @@ private:
* @return the view item that has been found, or and empty
* @c shared_ptr if no item was found.
*/
- std::shared_ptr get_mouse_over_item(
- const QPoint &pt);
+ shared_ptr get_mouse_over_item(const QPoint &pt);
private:
void paintEvent(QPaintEvent *event);
@@ -80,7 +82,7 @@ private:
private:
void contextMenuEvent(QContextMenuEvent *event);
- void keyPressEvent(QKeyEvent *e);
+ void keyPressEvent(QKeyEvent *event);
private Q_SLOTS:
void on_group();
@@ -88,7 +90,8 @@ private Q_SLOTS:
void on_ungroup();
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_HEADER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_HEADER_HPP