Rework signaling mechanism for trace repainting

[pulseview.git] / pv / view / cursorpair.hpp

diff --git a/pv/view/cursorpair.hpp b/pv/view/cursorpair.hpp
index 7cbd4f05f53aa440c1f35820ef4a2bc65bf17f9c..ee91ff427ee11dfae8737f9f28dde0bc4d870b4d 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
- * 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_VIEWS_TRACEVIEW_CURSORPAIR_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
 
 #include "cursor.hpp"
 
@@ -27,10 +26,14 @@
 
 #include <QPainter>
 
+using std::pair;
+using std::shared_ptr;
+
 class QPainter;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 class CursorPair : public TimeItem
 {
@@ -54,12 +57,12 @@ public:
        /**
         * Returns a pointer to the first cursor.
         */
-       std::shared_ptr<Cursor> first() const;
+       shared_ptr<Cursor> first() const;
 
        /**
         * Returns a pointer to the second cursor.
         */
-       std::shared_ptr<Cursor> second() const;
+       shared_ptr<Cursor> second() const;
 
        /**
         * Sets the time of the marker.
@@ -88,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.
@@ -97,15 +100,16 @@ public:
 
        void compute_text_size(QPainter &p);
 
-       std::pair<float, float> get_cursor_offsets() const;
+       pair<float, float> get_cursor_offsets() const;
 
 private:
-       std::shared_ptr<Cursor> first_, second_;
+       shared_ptr<Cursor> first_, second_;
 
        QSizeF text_size_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_CURSORPAIR_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP