X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fruler.hpp;h=1efd8737c9c938fb568bdf0948a8b9f5c0bc62d8;hb=a9627352f283dd4f83906dc1710a1d9d327fbe57;hp=f6ce99dc833985b2175a13a55078128e6d2f96ff;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;p=pulseview.git
diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index f6ce99d..1efd873 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 .
*/
#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP
@@ -29,6 +28,11 @@
#include "marginwidget.hpp"
#include
+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;
@@ -51,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;
@@ -110,7 +113,7 @@ private:
/**
* Gets the time items.
*/
- std::vector< std::shared_ptr > items() override;
+ vector< shared_ptr > items() override;
/**
* Gets the first view item which has a label that contains @c pt .
@@ -118,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 get_mouse_over_item(
- const QPoint &pt) override;
+ shared_ptr get_mouse_over_item(const QPoint &pt) override;
void paintEvent(QPaintEvent *event) override;
@@ -136,8 +138,8 @@ private:
struct TickPositions
{
- std::vector> major;
- std::vector minor;
+ vector> major;
+ vector minor;
};
/**
@@ -163,7 +165,7 @@ private:
const pv::util::Timestamp& offset,
const double scale,
const int width,
- std::function format_function);
+ function format_function);
protected:
void resizeEvent(QResizeEvent*) override;