Mercurial > hg > svgui

changeset 909:251dd0abc7b7 cxx11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More type fixes. We now build with -Wconversion, on this platform (64-bit Linux) at least.
author Chris Cannam
date Tue, 10 Mar 2015 17:23:45 +0000
parents 4a578a360011
children b48db6f1a7d2
files layer/Layer.h layer/RegionLayer.cpp layer/RegionLayer.h layer/TimeInstantLayer.cpp layer/TimeInstantLayer.h layer/TimeValueLayer.cpp layer/TimeValueLayer.h
diffstat 7 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/layer/Layer.h	Tue Mar 10 13:22:10 2015 +0000
+++ b/layer/Layer.h	Tue Mar 10 17:23:45 2015 +0000
@@ -150,7 +150,7 @@
 	return "";
     }
 
-    virtual QString getLabelPreceding(int /* frame */) const {
+    virtual QString getLabelPreceding(sv_frame_t /* frame */) const {
         return "";
     }
 
--- a/layer/RegionLayer.cpp	Tue Mar 10 13:22:10 2015 +0000
+++ b/layer/RegionLayer.cpp	Tue Mar 10 17:23:45 2015 +0000
@@ -371,7 +371,7 @@
 }
 
 QString
-RegionLayer::getLabelPreceding(int frame) const
+RegionLayer::getLabelPreceding(sv_frame_t frame) const
 {
     if (!m_model) return "";
     RegionModel::PointList points = m_model->getPreviousPoints(frame);
--- a/layer/RegionLayer.h	Tue Mar 10 13:22:10 2015 +0000
+++ b/layer/RegionLayer.h	Tue Mar 10 17:23:45 2015 +0000
@@ -45,7 +45,7 @@
     virtual void paintVerticalScale(View *v, bool, QPainter &paint, QRect rect) const;
 
     virtual QString getFeatureDescription(View *v, QPoint &) const;
-    virtual QString getLabelPreceding(int) const;
+    virtual QString getLabelPreceding(sv_frame_t) const;
 
     virtual bool snapToFeatureFrame(View *v, sv_frame_t &frame,
 				    int &resolution,
--- a/layer/TimeInstantLayer.cpp	Tue Mar 10 13:22:10 2015 +0000
+++ b/layer/TimeInstantLayer.cpp	Tue Mar 10 17:23:45 2015 +0000
@@ -201,7 +201,7 @@
 }
 
 QString
-TimeInstantLayer::getLabelPreceding(int frame) const
+TimeInstantLayer::getLabelPreceding(sv_frame_t frame) const
 {
     if (!m_model) return "";
     SparseOneDimensionalModel::PointList points = m_model->getPreviousPoints(frame);
--- a/layer/TimeInstantLayer.h	Tue Mar 10 13:22:10 2015 +0000
+++ b/layer/TimeInstantLayer.h	Tue Mar 10 17:23:45 2015 +0000
@@ -35,7 +35,7 @@
 
     virtual void paint(View *v, QPainter &paint, QRect rect) const;
 
-    virtual QString getLabelPreceding(int) const;
+    virtual QString getLabelPreceding(sv_frame_t) const;
     virtual QString getFeatureDescription(View *v, QPoint &) const;
 
     virtual bool snapToFeatureFrame(View *v, sv_frame_t &frame,
--- a/layer/TimeValueLayer.cpp	Tue Mar 10 13:22:10 2015 +0000
+++ b/layer/TimeValueLayer.cpp	Tue Mar 10 17:23:45 2015 +0000
@@ -574,7 +574,7 @@
 }
 
 QString
-TimeValueLayer::getLabelPreceding(int frame) const
+TimeValueLayer::getLabelPreceding(sv_frame_t frame) const
 {
     if (!m_model) return "";
     SparseTimeValueModel::PointList points = m_model->getPreviousPoints(frame);
--- a/layer/TimeValueLayer.h	Tue Mar 10 13:22:10 2015 +0000
+++ b/layer/TimeValueLayer.h	Tue Mar 10 17:23:45 2015 +0000
@@ -43,7 +43,7 @@
     virtual void paintVerticalScale(View *v, bool, QPainter &paint, QRect rect) const;
 
     virtual QString getFeatureDescription(View *v, QPoint &) const;
-    virtual QString getLabelPreceding(int) const;
+    virtual QString getLabelPreceding(sv_frame_t) const;
 
     virtual bool snapToFeatureFrame(View *v, sv_frame_t &frame,
 				    int &resolution,