projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: Add missing check for glib.
[pulseview.git]
/
pv
/
view
/
signal.cpp
diff --git
a/pv/view/signal.cpp
b/pv/view/signal.cpp
index 59817eba2c334fcad882d296f5f0a4ac158e7d17..960cefa6b20b6c3d4e027f57751eb361ed3e26fb 100644
(file)
--- 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
* 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/>.
*/
#include <extdef.h>
*/
#include <extdef.h>
-#include <
assert.h
>
+#include <
cassert
>
#include <cmath>
#include <QApplication>
#include <cmath>
#include <QApplication>
@@
-61,7
+60,7
@@
const char *const ChannelNames[] = {
};
Signal::Signal(pv::Session &session,
};
Signal::Signal(pv::Session &session,
- s
td::s
hared_ptr<data::SignalBase> channel) :
+ shared_ptr<data::SignalBase> channel) :
Trace(channel),
session_(session),
scale_handle_(make_shared<SignalScaleHandle>(*this)),
Trace(channel),
session_(session),
scale_handle_(make_shared<SignalScaleHandle>(*this)),
@@
-107,7
+106,7
@@
const ViewItemOwner::item_list& Signal::child_items() const
return items_;
}
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);
{
if (base_->enabled())
Trace::paint_back(p, pp);