X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fmarginwidget.hpp;h=ebe8cfc08b780ce06f3d4697d1ef277f6d2100c7;hp=0a24ad2ece705bde08e7c4be1af1421e680e9b7d;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=e9e4e5e7ea46132262fbd53f708dafc039b3b24f

diff --git a/pv/view/marginwidget.hpp b/pv/view/marginwidget.hpp
index 0a24ad2..ebe8cfc 100644
--- a/pv/view/marginwidget.hpp
+++ b/pv/view/marginwidget.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_MARGINWIDGET_H
-#define PULSEVIEW_PV_MARGINWIDGET_H
+#ifndef PULSEVIEW_PV_MARGINWIDGET_HPP
+#define PULSEVIEW_PV_MARGINWIDGET_HPP
 
 #include <memory>
 
@@ -27,8 +26,11 @@
 
 #include "viewwidget.hpp"
 
+using std::shared_ptr;
+
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 class ViewItem;
 
@@ -37,7 +39,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.
@@ -51,22 +53,22 @@ protected:
 	 * Indicates the event an a view item has been clicked.
 	 * @param item the view item that has been clicked.
 	 */
-	virtual void item_clicked(
-		const std::shared_ptr<pv::view::ViewItem> &item);
+	virtual void item_clicked(const shared_ptr<ViewItem> &item);
 
 	/**
 	 * Shows the popup of a the specified @c ViewItem .
 	 * @param item The item to show the popup for.
 	 */
-	void show_popup(const std::shared_ptr<ViewItem> &item);
+	void show_popup(const shared_ptr<ViewItem> &item);
 
 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