X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fflag.hpp;h=5dec187c4efa3035c1a36f0926d7225604b8a782;hb=64a21e782d6c9081f13f8398e6408c13648d1d14;hp=265621029d3ec99797a26f465abc893b55659c2d;hpb=7a01bd3654ed046216308fa64edfd79be7cd525f;p=pulseview.git diff --git a/pv/view/flag.hpp b/pv/view/flag.hpp index 26562102..5dec187c 100644 --- 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 - * 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 . */ -#ifndef PULSEVIEW_PV_VIEW_FLAG_HPP -#define PULSEVIEW_PV_VIEW_FLAG_HPP +#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_FLAG_HPP +#define PULSEVIEW_PV_VIEWS_TRACEVIEW_FLAG_HPP #include #include "timemarker.hpp" +using std::enable_shared_from_this; + class QMenu; namespace pv { -namespace view { +namespace views { +namespace TraceView { -class Flag : public TimeMarker, - public std::enable_shared_from_this +class Flag : public TimeMarker, public enable_shared_from_this { Q_OBJECT @@ -45,7 +46,7 @@ public: * @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. @@ -77,7 +78,8 @@ private: QString text_; }; -} // namespace view +} // namespace TraceView +} // namespace views } // namespace pv -#endif // PULSEVIEW_PV_VIEW_FLAG_HPP +#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_FLAG_HPP