projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #958 by using new method that auto-converts analog samples
[pulseview.git]
/
pv
/
view
/
timemarker.hpp
diff --git
a/pv/view/timemarker.hpp
b/pv/view/timemarker.hpp
index c65dab78a7006f89c98a26298d754c677c0f1ee9..dba52fa4efa5642a76c9c1150750d664bcadfd59 100644
(file)
--- a/
pv/view/timemarker.hpp
+++ b/
pv/view/timemarker.hpp
@@
-14,12
+14,11
@@
* 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_MARKER_HPP
-#define PULSEVIEW_PV_VIEW_MARKER_HPP
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW
_MARKER_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW
_MARKER_HPP
#include <QColor>
#include <QDoubleSpinBox>
#include <QColor>
#include <QDoubleSpinBox>
@@
-37,7
+36,8
@@
namespace widgets {
class TimestampSpinBox;
}
class TimestampSpinBox;
}
-namespace view {
+namespace views {
+namespace TraceView {
class View;
class View;
@@
-108,7
+108,7
@@
public:
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
*/
* @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;
virtual pv::widgets::Popup* create_popup(QWidget *parent) override;
virtual pv::widgets::Popup* create_popup(QWidget *parent) override;
@@
-127,7
+127,8
@@
protected:
bool updating_value_widget_;
};
bool updating_value_widget_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_MARKER_HPP
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW
_MARKER_HPP