X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fmarginwidget.hpp;h=b785877299cd49ff508354cb04f6d337d6725a4b;hp=0a24ad2ece705bde08e7c4be1af1421e680e9b7d;hb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;hpb=e9e4e5e7ea46132262fbd53f708dafc039b3b24f

diff --git a/pv/view/marginwidget.hpp b/pv/view/marginwidget.hpp
index 0a24ad2e..b7858772 100644
--- a/pv/view/marginwidget.hpp
+++ b/pv/view/marginwidget.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_MARGINWIDGET_H
-#define PULSEVIEW_PV_MARGINWIDGET_H
+#ifndef PULSEVIEW_PV_MARGINWIDGET_HPP
+#define PULSEVIEW_PV_MARGINWIDGET_HPP
 
 #include <memory>
 
@@ -28,7 +28,8 @@
 #include "viewwidget.hpp"
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 class ViewItem;
 
@@ -37,7 +38,7 @@ class MarginWidget : public ViewWidget
 	Q_OBJECT
 
 public:
-	MarginWidget(pv::view::View &parent);
+	MarginWidget(View &parent);
 
 	/**
 	 * The extended area that the margin widget would like to be sized to.
@@ -52,7 +53,7 @@ protected:
 	 * @param item the view item that has been clicked.
 	 */
 	virtual void item_clicked(
-		const std::shared_ptr<pv::view::ViewItem> &item);
+		const std::shared_ptr<ViewItem> &item);
 
 	/**
 	 * Shows the popup of a the specified @c ViewItem .
@@ -63,10 +64,11 @@ protected:
 protected:
 	virtual void contextMenuEvent(QContextMenuEvent *event);
 
-	virtual void keyPressEvent(QKeyEvent *e);
+	virtual void keyPressEvent(QKeyEvent *event);
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_MARGINWIDGET_H
+#endif // PULSEVIEW_PV_MARGINWIDGET_HPP