X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.hpp;h=192de791fcb79ad86c9a37eb09b3f48128eeec89;hp=f6ce99dc833985b2175a13a55078128e6d2f96ff;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede

diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index f6ce99d..192de79 100644
--- a/pv/view/ruler.hpp
+++ b/pv/view/ruler.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 <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP
@@ -29,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;
@@ -110,7 +114,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 .
@@ -118,8 +122,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;
 
@@ -136,8 +139,8 @@ private:
 
 	struct TickPositions
 	{
-		std::vector<std::pair<double, QString>> major;
-		std::vector<double> minor;
+		vector<pair<double, QString>> major;
+		vector<double> minor;
 	};
 
 	/**
@@ -163,7 +166,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;