projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced boost::shared_ptr with std::shared_ptr
[pulseview.git]
/
pv
/
view
/
header.h
diff --git
a/pv/view/header.h
b/pv/view/header.h
index 35d5d20f49f7b5bcf89f1ca1c91a127188d07abb..641f203bb9325745d9abdf5b3849424ef642a6c4 100644
(file)
--- a/
pv/view/header.h
+++ b/
pv/view/header.h
@@
-21,10
+21,8
@@
#ifndef PULSEVIEW_PV_VIEW_HEADER_H
#define PULSEVIEW_PV_VIEW_HEADER_H
#ifndef PULSEVIEW_PV_VIEW_HEADER_H
#define PULSEVIEW_PV_VIEW_HEADER_H
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
#include <list>
#include <list>
+#include <memory>
#include <utility>
#include "marginwidget.h"
#include <utility>
#include "marginwidget.h"
@@
-39,11
+37,16
@@
class Header : public MarginWidget
{
Q_OBJECT
{
Q_OBJECT
+private:
+ static const int Padding;
+
public:
Header(View &parent);
public:
Header(View &parent);
+ QSize sizeHint() const;
+
private:
private:
-
boost
::shared_ptr<pv::view::Trace> get_mouse_over_trace(
+
std
::shared_ptr<pv::view::Trace> get_mouse_over_trace(
const QPoint &pt);
void clear_selection();
const QPoint &pt);
void clear_selection();
@@
-62,19
+65,24
@@
private:
void contextMenuEvent(QContextMenuEvent *event);
void contextMenuEvent(QContextMenuEvent *event);
+ void keyPressEvent(QKeyEvent *e);
+
private slots:
void on_signals_changed();
void on_signals_moved();
private slots:
void on_signals_changed();
void on_signals_moved();
+ void on_trace_changed();
+
signals:
void signals_moved();
private:
QPoint _mouse_point;
QPoint _mouse_down_point;
signals:
void signals_moved();
private:
QPoint _mouse_point;
QPoint _mouse_down_point;
+ bool _dragging;
- std::list<std::pair<
boost
::weak_ptr<Trace>, int> >
+ std::list<std::pair<
std
::weak_ptr<Trace>, int> >
_drag_traces;
};
_drag_traces;
};