Mercurial > hg > svgui
comparison layer/TextLayer.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 | 4806715f7a19 |
children | 0c993091a4c9 |
comparison
equal
deleted
inserted
replaced
782:ddae586bc47b | 805:1d526ba11a24 |
---|---|
219 | 219 |
220 //!!! too much overlap with TimeValueLayer/TimeInstantLayer | 220 //!!! too much overlap with TimeValueLayer/TimeInstantLayer |
221 | 221 |
222 bool | 222 bool |
223 TextLayer::snapToFeatureFrame(View *v, int &frame, | 223 TextLayer::snapToFeatureFrame(View *v, int &frame, |
224 size_t &resolution, | 224 int &resolution, |
225 SnapType snap) const | 225 SnapType snap) const |
226 { | 226 { |
227 if (!m_model) { | 227 if (!m_model) { |
228 return Layer::snapToFeatureFrame(v, frame, resolution, snap); | 228 return Layer::snapToFeatureFrame(v, frame, resolution, snap); |
229 } | 229 } |
493 | 493 |
494 m_editing = true; | 494 m_editing = true; |
495 } | 495 } |
496 | 496 |
497 void | 497 void |
498 TextLayer::eraseDrag(View *v, QMouseEvent *e) | 498 TextLayer::eraseDrag(View *, QMouseEvent *) |
499 { | 499 { |
500 } | 500 } |
501 | 501 |
502 void | 502 void |
503 TextLayer::eraseEnd(View *v, QMouseEvent *e) | 503 TextLayer::eraseEnd(View *v, QMouseEvent *e) |
619 | 619 |
620 return true; | 620 return true; |
621 } | 621 } |
622 | 622 |
623 void | 623 void |
624 TextLayer::moveSelection(Selection s, size_t newStartFrame) | 624 TextLayer::moveSelection(Selection s, int newStartFrame) |
625 { | 625 { |
626 if (!m_model) return; | 626 if (!m_model) return; |
627 | 627 |
628 TextModel::EditCommand *command = | 628 TextModel::EditCommand *command = |
629 new TextModel::EditCommand(m_model, tr("Drag Selection")); | 629 new TextModel::EditCommand(m_model, tr("Drag Selection")); |
715 } | 715 } |
716 } | 716 } |
717 } | 717 } |
718 | 718 |
719 bool | 719 bool |
720 TextLayer::paste(View *v, const Clipboard &from, int frameOffset, bool /* interactive */) | 720 TextLayer::paste(View *v, const Clipboard &from, int /* frameOffset */, bool /* interactive */) |
721 { | 721 { |
722 if (!m_model) return false; | 722 if (!m_model) return false; |
723 | 723 |
724 const Clipboard::PointList &points = from.getPoints(); | 724 const Clipboard::PointList &points = from.getPoints(); |
725 | 725 |
757 | 757 |
758 for (Clipboard::PointList::const_iterator i = points.begin(); | 758 for (Clipboard::PointList::const_iterator i = points.begin(); |
759 i != points.end(); ++i) { | 759 i != points.end(); ++i) { |
760 | 760 |
761 if (!i->haveFrame()) continue; | 761 if (!i->haveFrame()) continue; |
762 size_t frame = 0; | 762 int frame = 0; |
763 | 763 |
764 if (!realign) { | 764 if (!realign) { |
765 | 765 |
766 frame = i->getFrame(); | 766 frame = i->getFrame(); |
767 | 767 |