X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.hpp;h=ac4540c91c1c3528aed7d5fa25a93cde30f8acf2;hp=0a6735f59d0787539fec1ef1cdac4e5eb91c645c;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=73a25a6e488f1813c1cd12da085a16e4f91ed4da

diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index 0a6735f..ac4540c 100644
--- a/pv/view/trace.hpp
+++ b/pv/view/trace.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_TRACE_HPP
-#define PULSEVIEW_PV_VIEW_TRACE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
 
 #include <QColor>
 #include <QPainter>
@@ -33,6 +32,8 @@
 
 #include "pv/data/signalbase.hpp"
 
+using std::shared_ptr;
+
 class QFormLayout;
 
 namespace pv {
@@ -41,7 +42,8 @@ namespace widgets {
 class Popup;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class Trace : public TraceTreeItem
 {
@@ -55,7 +57,7 @@ private:
 	static const QColor DarkGrayBGColour;
 
 protected:
-	Trace(std::shared_ptr<data::SignalBase> channel);
+	Trace(shared_ptr<data::SignalBase> channel);
 
 public:
 	/**
@@ -127,7 +129,7 @@ private Q_SLOTS:
 	void on_colouredit_changed(const QColor &colour);
 
 protected:
-	std::shared_ptr<data::SignalBase> base_;
+	shared_ptr<data::SignalBase> base_;
 	bool coloured_bg_, coloured_bg_state_;
 
 private:
@@ -135,7 +137,8 @@ private:
 	QFormLayout *popup_form_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_TRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP