projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
View: Move assertion after assignment
[pulseview.git]
/
pv
/
view
/
flag.hpp
diff --git
a/pv/view/flag.hpp
b/pv/view/flag.hpp
index fdebe1c0a6b4139b9675aa57c1771ed151fc7041..bc82934e161e5829d5d025f515931c5817a60268 100644
(file)
--- a/
pv/view/flag.hpp
+++ b/
pv/view/flag.hpp
@@
-18,13
+18,15
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_VIEW_FLAG_H
-#define PULSEVIEW_PV_VIEW_FLAG_H
+#ifndef PULSEVIEW_PV_VIEW_FLAG_H
PP
+#define PULSEVIEW_PV_VIEW_FLAG_H
PP
#include <memory>
#include "timemarker.hpp"
#include <memory>
#include "timemarker.hpp"
+class QMenu;
+
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-43,7
+45,7
@@
public:
* @param time The time to set the flag to.
* @param text The text of the marker.
*/
* @param time The time to set the flag to.
* @param text The text of the marker.
*/
- Flag(View &view,
double
time, const QString &text);
+ Flag(View &view,
const pv::util::Timestamp&
time, const QString &text);
/**
* Copy constructor.
/**
* Copy constructor.
@@
-62,9
+64,13
@@
public:
pv::widgets::Popup* create_popup(QWidget *parent);
pv::widgets::Popup* create_popup(QWidget *parent);
+ QMenu* create_context_menu(QWidget *parent);
+
void delete_pressed();
private Q_SLOTS:
void delete_pressed();
private Q_SLOTS:
+ void on_delete();
+
void on_text_changed(const QString &text);
private:
void on_text_changed(const QString &text);
private:
@@
-74,4
+80,4
@@
private:
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_FLAG_H
+#endif // PULSEVIEW_PV_VIEW_FLAG_H
PP