X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.hpp;h=11f80ccbeb6426b0d163eecd7a2b8f36d20a7a7a;hb=067bb62415847791709f4c3cad8bb252a63f45f8;hp=397ec7c0d108380719d13313114eb6d9553dafd8;hpb=bf0edd2b0cbb5f4bd5d69b0f00bcea7d037e2287;p=pulseview.git

diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index 397ec7c0..11f80ccb 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>
@@ -41,7 +40,8 @@ namespace widgets {
 class Popup;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class Trace : public TraceTreeItem
 {
@@ -127,7 +127,7 @@ private Q_SLOTS:
 	void on_colouredit_changed(const QColor &colour);
 
 protected:
-	std::shared_ptr<data::SignalBase> channel_;
+	std::shared_ptr<data::SignalBase> base_;
 	bool coloured_bg_, coloured_bg_state_;
 
 private:
@@ -135,7 +135,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