comparison src/Analyser.cpp @ 359:f0b210403369

Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:48:33 +0100
parents 56109ef020b4
children f76adae8fe5e
comparison
equal deleted inserted replaced
357:d511868c1ffe 359:f0b210403369
771 771
772 myLayer->paste(m_pane, clip, 0, false); 772 myLayer->paste(m_pane, clip, 0, false);
773 } 773 }
774 774
775 void 775 void
776 Analyser::getEnclosingSelectionScope(size_t f, size_t &f0, size_t &f1) 776 Analyser::getEnclosingSelectionScope(int f, int &f0, int &f1)
777 { 777 {
778 FlexiNoteLayer *flexiNoteLayer = 778 FlexiNoteLayer *flexiNoteLayer =
779 qobject_cast<FlexiNoteLayer *>(m_layers[Notes]); 779 qobject_cast<FlexiNoteLayer *>(m_layers[Notes]);
780 780
781 int f0i = f, f1i = f; 781 int f0i = f, f1i = f;
782 size_t res = 1; 782 int res = 1;
783 783
784 if (!flexiNoteLayer) { 784 if (!flexiNoteLayer) {
785 f0 = f1 = f; 785 f0 = f1 = f;
786 return; 786 return;
787 } 787 }