projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow: Don't try to close a session when there is none
[pulseview.git]
/
pv
/
view
/
triggermarker.hpp
diff --git
a/pv/view/triggermarker.hpp
b/pv/view/triggermarker.hpp
index bb04911c44296978cdceb46260bf332bd524e3bf..b1610a5be7a95c2cc7616839b8198c307ae75401 100644
(file)
--- a/
pv/view/triggermarker.hpp
+++ b/
pv/view/triggermarker.hpp
@@
-14,17
+14,17
@@
* 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_TRIGGER_MARKER_HPP
-#define PULSEVIEW_PV_VIEW_TRIGGER_MARKER_HPP
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW
_TRIGGER_MARKER_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW
_TRIGGER_MARKER_HPP
#include "timeitem.hpp"
namespace pv {
#include "timeitem.hpp"
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
class TriggerMarker : public TimeItem
{
class TriggerMarker : public TimeItem
{
@@
-73,14
+73,15
@@
public:
* Paints the foreground layer of the item with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
* Paints the foreground layer of the item with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
- *
*
/
- void paint_fore(QPainter &p,
const
ViewItemPaintParams &pp) override;
+ */
+ void paint_fore(QPainter &p, ViewItemPaintParams &pp) override;
private:
pv::util::Timestamp time_;
};
private:
pv::util::Timestamp time_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_TRIGGER_MARKER_HPP
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW
_TRIGGER_MARKER_HPP