projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow, View::View: Fix two memory errors reported by valgrind
[pulseview.git]
/
pv
/
view
/
viewitempaintparams.cpp
diff --git
a/pv/view/viewitempaintparams.cpp
b/pv/view/viewitempaintparams.cpp
index 83dda4e59e0a02bee325662655c08aa007a1a7bf..1727bd5ae761a11b35e567b61c77510674ac878b 100644
(file)
--- a/
pv/view/viewitempaintparams.cpp
+++ b/
pv/view/viewitempaintparams.cpp
@@
-26,13
+26,15
@@
#include "viewitempaintparams.hpp"
namespace pv {
#include "viewitempaintparams.hpp"
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
ViewItemPaintParams::ViewItemPaintParams(
ViewItemPaintParams::ViewItemPaintParams(
- const QRect &rect, double scale,
double
offset) :
+ const QRect &rect, double scale,
const pv::util::Timestamp&
offset) :
rect_(rect),
scale_(scale),
rect_(rect),
scale_(scale),
- offset_(offset) {
+ offset_(offset)
+{
assert(scale > 0.0);
}
assert(scale > 0.0);
}
@@
-41,9
+43,11
@@
QFont ViewItemPaintParams::font()
return QApplication::font();
}
return QApplication::font();
}
-int ViewItemPaintParams::text_height() {
+int ViewItemPaintParams::text_height()
+{
return QFontMetrics(font()).height();
}
return QFontMetrics(font()).height();
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv