X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.hpp;h=ee91ff427ee11dfae8737f9f28dde0bc4d870b4d;hp=110f9ea087c046fc6afd4c859f715e979cdbbd2c;hb=5ed05b699e5367bae21828f533e3d169b9bab348;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede diff --git a/pv/view/cursorpair.hpp b/pv/view/cursorpair.hpp index 110f9ea0..ee91ff42 100644 --- a/pv/view/cursorpair.hpp +++ b/pv/view/cursorpair.hpp @@ -14,8 +14,7 @@ * 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_VIEWS_TRACEVIEW_CURSORPAIR_HPP @@ -27,6 +26,9 @@ #include +using std::pair; +using std::shared_ptr; + class QPainter; namespace pv { @@ -55,12 +57,12 @@ public: /** * Returns a pointer to the first cursor. */ - std::shared_ptr first() const; + shared_ptr first() const; /** * Returns a pointer to the second cursor. */ - std::shared_ptr second() const; + shared_ptr second() const; /** * Sets the time of the marker. @@ -89,7 +91,7 @@ public: * @param p the QPainter to paint into. * @param pp the painting parameters object to paint with. */ - void paint_back(QPainter &p, const ViewItemPaintParams &pp) override; + void paint_back(QPainter &p, ViewItemPaintParams &pp) override; /** * Constructs the string to display. @@ -98,10 +100,10 @@ public: void compute_text_size(QPainter &p); - std::pair get_cursor_offsets() const; + pair get_cursor_offsets() const; private: - std::shared_ptr first_, second_; + shared_ptr first_, second_; QSizeF text_size_; };