X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.hpp;h=1efd8737c9c938fb568bdf0948a8b9f5c0bc62d8;hp=c8cb0e5f66fc364e7ab1f1acd8bd58b623fc0d9b;hb=c063290ac7189bdd15221450f598504f43286b43;hpb=efdec55aec1a137460fa362a381ed1904182bfed

diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index c8cb0e5f..1efd8737 100644
--- a/pv/view/ruler.hpp
+++ b/pv/view/ruler.hpp
@@ -28,6 +28,11 @@
 #include "marginwidget.hpp"
 #include <pv/util.hpp>
 
+using std::function;
+using std::pair;
+using std::shared_ptr;
+using std::vector;
+
 namespace RulerTest {
 struct tick_position_test_0;
 struct tick_position_test_1;
@@ -50,7 +55,6 @@ class Ruler : public MarginWidget
 	friend struct RulerTest::tick_position_test_2;
 
 private:
-
 	/// Height of the ruler in multipes of the text height
 	static const float RulerHeight;
 
@@ -109,7 +113,7 @@ private:
 	/**
 	 * Gets the time items.
 	 */
-	std::vector< std::shared_ptr<ViewItem> > items() override;
+	vector< shared_ptr<ViewItem> > items() override;
 
 	/**
 	 * Gets the first view item which has a label that contains @c pt .
@@ -117,8 +121,7 @@ private:
 	 * @return the view item that has been found, or and empty
 	 *   @c shared_ptr if no item was found.
 	 */
-	std::shared_ptr<ViewItem> get_mouse_over_item(
-		const QPoint &pt) override;
+	shared_ptr<ViewItem> get_mouse_over_item(const QPoint &pt) override;
 
 	void paintEvent(QPaintEvent *event) override;
 
@@ -135,8 +138,8 @@ private:
 
 	struct TickPositions
 	{
-		std::vector<std::pair<double, QString>> major;
-		std::vector<double> minor;
+		vector<pair<double, QString>> major;
+		vector<double> minor;
 	};
 
 	/**
@@ -162,7 +165,7 @@ private:
 		const pv::util::Timestamp& offset,
 		const double scale,
 		const int width,
-		std::function<QString(const pv::util::Timestamp&)> format_function);
+		function<QString(const pv::util::Timestamp&)> format_function);
 
 protected:
 	void resizeEvent(QResizeEvent*) override;