X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=960cefa6b20b6c3d4e027f57751eb361ed3e26fb;hb=e1e2666e31d80016612762940605fc5bdbc63971;hp=ad139f7e4ad21cbbb79a03355aa1917fdfbd2d03;hpb=3a21afa6a5dfc06c17f127960bb0038fd322f213;p=pulseview.git
diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index ad139f7..960cefa 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -14,13 +14,12 @@
* 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 .
*/
#include
-#include
+#include
#include
#include
@@ -40,7 +39,8 @@ using std::shared_ptr;
using std::make_shared;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const char *const ChannelNames[] = {
"CLK",
@@ -60,7 +60,7 @@ const char *const ChannelNames[] = {
};
Signal::Signal(pv::Session &session,
- std::shared_ptr channel) :
+ shared_ptr channel) :
Trace(channel),
session_(session),
scale_handle_(make_shared(*this)),
@@ -106,7 +106,7 @@ const ViewItemOwner::item_list& Signal::child_items() const
return items_;
}
-void Signal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
+void Signal::paint_back(QPainter &p, ViewItemPaintParams &pp)
{
if (base_->enabled())
Trace::paint_back(p, pp);
@@ -183,5 +183,6 @@ void Signal::on_enabled_changed(bool enabled)
owner_->extents_changed(true, true);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv