projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
org.sigrok.PulseView.appdata.xml: Add <mimetype> tag.
[pulseview.git]
/
pv
/
view
/
cursorpair.hpp
diff --git
a/pv/view/cursorpair.hpp
b/pv/view/cursorpair.hpp
index 110f9ea087c046fc6afd4c859f715e979cdbbd2c..ee91ff427ee11dfae8737f9f28dde0bc4d870b4d 100644
(file)
--- 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
* 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_VIEWS_TRACEVIEW_CURSORPAIR_HPP
*/
#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
@@
-27,6
+26,9
@@
#include <QPainter>
#include <QPainter>
+using std::pair;
+using std::shared_ptr;
+
class QPainter;
namespace pv {
class QPainter;
namespace pv {
@@
-55,12
+57,12
@@
public:
/**
* 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.
/**
* 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.
*/
* @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.
/**
* Constructs the string to display.
@@
-98,10
+100,10
@@
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_;
};