projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Segment: Rework append_samples() so it can handle large input
[pulseview.git]
/
pv
/
view
/
flag.hpp
diff --git
a/pv/view/flag.hpp
b/pv/view/flag.hpp
index 265621029d3ec99797a26f465abc893b55659c2d..5dec187c4efa3035c1a36f0926d7225604b8a782 100644
(file)
--- a/
pv/view/flag.hpp
+++ b/
pv/view/flag.hpp
@@
-14,24
+14,25
@@
* 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_VIEW_FLAG_HPP
-#define PULSEVIEW_PV_VIEW_FLAG_HPP
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW
_FLAG_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW
_FLAG_HPP
#include <memory>
#include "timemarker.hpp"
#include <memory>
#include "timemarker.hpp"
+using std::enable_shared_from_this;
+
class QMenu;
namespace pv {
class QMenu;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
-class Flag : public TimeMarker,
- public std::enable_shared_from_this<pv::view::Flag>
+class Flag : public TimeMarker, public enable_shared_from_this<Flag>
{
Q_OBJECT
{
Q_OBJECT
@@
-45,7
+46,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.
@@
-77,7
+78,8
@@
private:
QString text_;
};
QString text_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_FLAG_HPP
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW
_FLAG_HPP