X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursor.hpp;h=e78920e2c3e8df29572fb1d7cd6e62e5b9033e97;hp=b23bd642b47130446a21b8fcf7b67c812acb7dc5;hb=4c7a19d3d7049bcc9fb3185ce2bc91333a7ca9e1;hpb=096fb584db59a7b95ea57a6accf6c282a43497f6

diff --git a/pv/view/cursor.hpp b/pv/view/cursor.hpp
index b23bd642..e78920e2 100644
--- a/pv/view/cursor.hpp
+++ b/pv/view/cursor.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_CURSOR_H
-#define PULSEVIEW_PV_VIEW_CURSOR_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSOR_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSOR_HPP
 
 #include "timemarker.hpp"
 
@@ -27,10 +26,13 @@
 
 #include <QSizeF>
 
+using std::shared_ptr;
+
 class QPainter;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 class Cursor : public TimeMarker
 {
@@ -63,13 +65,14 @@ public:
 	 * @param rect The rectangle of the ruler client area.
 	 * @return Returns the label rectangle.
 	 */
-	QRectF get_label_rect(const QRect &rect) const;
+	QRectF label_rect(const QRectF &rect) const;
 
 private:
-	std::shared_ptr<Cursor> get_other_cursor() const;
+	shared_ptr<Cursor> get_other_cursor() const;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_CURSOR_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSOR_HPP