projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use std:: in the code directly (where possible).
[pulseview.git]
/
pv
/
view
/
tracetreeitem.hpp
diff --git
a/pv/view/tracetreeitem.hpp
b/pv/view/tracetreeitem.hpp
index 56e1d73cbf2831e6785e009361a8e6ad28b0e338..d1dd67ccfc7bcbb2ca464f432a770025e1af3af9 100644
(file)
--- a/
pv/view/tracetreeitem.hpp
+++ b/
pv/view/tracetreeitem.hpp
@@
-14,8
+14,7
@@
* 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/>.
*/
#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEM_HPP
*/
#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEM_HPP
@@
-27,6
+26,9
@@
#include "rowitem.hpp"
#include "rowitem.hpp"
+using std::enable_shared_from_this;
+using std::pair;
+
namespace pv {
namespace views {
namespace TraceView {
namespace pv {
namespace views {
namespace TraceView {
@@
-34,7
+36,7
@@
namespace TraceView {
class TraceTreeItemOwner;
class TraceTreeItem : public RowItem,
class TraceTreeItemOwner;
class TraceTreeItem : public RowItem,
- public
std::
enable_shared_from_this<TraceTreeItem>
+ public enable_shared_from_this<TraceTreeItem>
{
Q_OBJECT
Q_PROPERTY(int visual_v_offset
{
Q_OBJECT
Q_PROPERTY(int visual_v_offset
@@
-123,7
+125,7
@@
public:
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
*/
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
*/
- virtual
std::
pair<int, int> v_extents() const = 0;
+ virtual pair<int, int> v_extents() const = 0;
protected:
TraceTreeItemOwner *owner_;
protected:
TraceTreeItemOwner *owner_;