X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fview%2Ftrace.hpp;h=62588a16ce07577aa873b9d48ff477e2aa73c9bf;hb=9a267f8dec48c9a28472c1a3bb146c624819e98b;hp=397ec7c0d108380719d13313114eb6d9553dafd8;hpb=bf0edd2b0cbb5f4bd5d69b0f00bcea7d037e2287;p=pulseview.git
diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index 397ec7c..62588a1 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 .
*/
-#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
#include
@@ -27,12 +26,14 @@
#include
#include
-#include
+#include
#include "tracetreeitem.hpp"
#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 channel);
+ Trace(shared_ptr channel);
public:
/**
@@ -127,7 +129,7 @@ private Q_SLOTS:
void on_colouredit_changed(const QColor &colour);
protected:
- std::shared_ptr channel_;
+ shared_ptr 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