projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use bool literals for boolean values.
[pulseview.git]
/
pv
/
view
/
cursorpair.hpp
diff --git
a/pv/view/cursorpair.hpp
b/pv/view/cursorpair.hpp
index 2d47212ef77f1879ff3e7e9b0c761d609b33394c..458f5cac0af186f08f7c4b3fa47e851bb815a68e 100644
(file)
--- a/
pv/view/cursorpair.hpp
+++ b/
pv/view/cursorpair.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_CURSORPAIR_HPP
-#define PULSEVIEW_PV_VIEW_CURSORPAIR_HPP
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW
_CURSORPAIR_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW
_CURSORPAIR_HPP
#include "cursor.hpp"
#include "cursor.hpp"
@@
-27,10
+26,14
@@
#include <QPainter>
#include <QPainter>
+using std::pair;
+using std::shared_ptr;
+
class QPainter;
namespace pv {
class QPainter;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
class CursorPair : public TimeItem
{
class CursorPair : public TimeItem
{
@@
-49,31
+52,31
@@
public:
/**
* Returns true if the item is visible and enabled.
*/
/**
* Returns true if the item is visible and enabled.
*/
- bool enabled() const;
+ bool enabled() const
override
;
/**
* Returns a pointer to the first cursor.
*/
/**
* Returns a pointer to the first cursor.
*/
- s
td::s
hared_ptr<Cursor> first() const;
+ shared_ptr<Cursor> first() const;
/**
* Returns a pointer to the second cursor.
*/
/**
* Returns a pointer to the second cursor.
*/
- s
td::s
hared_ptr<Cursor> second() const;
+ shared_ptr<Cursor> second() const;
/**
* Sets the time of the marker.
*/
void set_time(const pv::util::Timestamp& time) override;
/**
* Sets the time of the marker.
*/
void set_time(const pv::util::Timestamp& time) override;
- float get_x() const;
+ float get_x() const
override
;
- QPoint point(const QRect &rect) const;
+ QPoint point(const QRect &rect) const
override
;
- pv::widgets::Popup* create_popup(QWidget *parent);
+ pv::widgets::Popup* create_popup(QWidget *parent)
override
;
public:
public:
- QRectF label_rect(const QRectF &rect) const;
+ QRectF label_rect(const QRectF &rect) const
override
;
/**
* Paints the marker's label to the ruler.
/**
* Paints the marker's label to the ruler.
@@
-81,14
+84,14
@@
public:
* @param rect The rectangle of the ruler client area.
* @param hover true if the label is being hovered over by the mouse.
*/
* @param rect The rectangle of the ruler client area.
* @param hover true if the label is being hovered over by the mouse.
*/
- void paint_label(QPainter &p, const QRect &rect, bool hover);
+ void paint_label(QPainter &p, const QRect &rect, bool hover)
override
;
/**
* Paints the background 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 background 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_back(QPainter &p, const ViewItemPaintParams &pp);
+ */
+ void paint_back(QPainter &p, const ViewItemPaintParams &pp)
override
;
/**
* Constructs the string to display.
/**
* Constructs the string to display.
@@
-97,15
+100,16
@@
public:
void compute_text_size(QPainter &p);
void compute_text_size(QPainter &p);
-
std::
pair<float, float> get_cursor_offsets() const;
+ pair<float, float> get_cursor_offsets() const;
private:
private:
- s
td::s
hared_ptr<Cursor> first_, second_;
+ shared_ptr<Cursor> first_, second_;
QSizeF text_size_;
};
QSizeF text_size_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_CURSORPAIR_HPP
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW
_CURSORPAIR_HPP