X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.hpp;h=c6f81ae5e5b96a4fd32bcc56a4835bd20e2bc2ff;hp=ade6d330affb57b3db9a616541fb97407b6f3a83;hb=c063290ac7189bdd15221450f598504f43286b43;hpb=af503b104d890a357c736c678bb00296d889c090

diff --git a/pv/view/header.hpp b/pv/view/header.hpp
index ade6d330..c6f81ae5 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 <http://www.gnu.org/licenses/>.
  */
 
-#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 <list>
 #include <memory>
@@ -27,8 +26,12 @@
 
 #include "marginwidget.hpp"
 
+using std::shared_ptr;
+using std::vector;
+
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 class TraceTreeItem;
 class View;
@@ -63,7 +66,7 @@ private:
 	/**
 	 * Gets the row items.
 	 */
-	std::vector< std::shared_ptr<pv::view::ViewItem> > items();
+	vector< shared_ptr<ViewItem> > 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<pv::view::ViewItem> get_mouse_over_item(
-		const QPoint &pt);
+	shared_ptr<ViewItem> 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