Mercurial > hg > svgui
diff layer/TimeValueLayer.cpp @ 805:1d526ba11a24 warnfix_no_size_t
Remove size_t's and fix warnings in layer/
author | Chris Cannam |
---|---|
date | Tue, 17 Jun 2014 15:18:06 +0100 |
parents | b6dc57688c72 |
children | cf23656a8ca6 |
line wrap: on
line diff
--- a/layer/TimeValueLayer.cpp Tue Jun 03 11:10:52 2014 +0100 +++ b/layer/TimeValueLayer.cpp Tue Jun 17 15:18:06 2014 +0100 @@ -574,7 +574,7 @@ } QString -TimeValueLayer::getLabelPreceding(size_t frame) const +TimeValueLayer::getLabelPreceding(int frame) const { if (!m_model) return ""; SparseTimeValueModel::PointList points = m_model->getPreviousPoints(frame); @@ -630,7 +630,7 @@ bool TimeValueLayer::snapToFeatureFrame(View *v, int &frame, - size_t &resolution, + int &resolution, SnapType snap) const { if (!m_model) { @@ -702,7 +702,7 @@ bool TimeValueLayer::snapToSimilarFeature(View *v, int &frame, - size_t &resolution, + int &resolution, SnapType snap) const { if (!m_model) { @@ -1435,7 +1435,7 @@ } void -TimeValueLayer::eraseDrag(View *v, QMouseEvent *e) +TimeValueLayer::eraseDrag(View *, QMouseEvent *) { } @@ -1580,7 +1580,7 @@ } void -TimeValueLayer::moveSelection(Selection s, size_t newStartFrame) +TimeValueLayer::moveSelection(Selection s, int newStartFrame) { if (!m_model) return; @@ -1682,7 +1682,7 @@ } bool -TimeValueLayer::paste(View *v, const Clipboard &from, int frameOffset, +TimeValueLayer::paste(View *v, const Clipboard &from, int /* frameOffset */, bool interactive) { if (!m_model) return false; @@ -1721,7 +1721,6 @@ Labeller::ValueType generation = Labeller::ValueNone; bool haveUsableLabels = false; - bool haveExistingItems = !(m_model->isEmpty()); Labeller labeller; labeller.setSampleRate(m_model->getSampleRate()); @@ -1823,7 +1822,7 @@ if (!i->haveFrame()) continue; - size_t frame = 0; + int frame = 0; if (!realign) {