Mercurial > hg > svgui

diff layer/TextLayer.cpp @ 810:b68af2be4545 tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:42:25 +0100
parents 1d526ba11a24
children 0c993091a4c9
line wrap: on
line diff
--- a/layer/TextLayer.cpp	Mon Jun 16 12:50:27 2014 +0100
+++ b/layer/TextLayer.cpp	Wed Jun 18 13:42:25 2014 +0100
@@ -221,7 +221,7 @@
 
 bool
 TextLayer::snapToFeatureFrame(View *v, int &frame,
-			      size_t &resolution,
+			      int &resolution,
 			      SnapType snap) const
 {
     if (!m_model) {
@@ -495,7 +495,7 @@
 }
 
 void
-TextLayer::eraseDrag(View *v, QMouseEvent *e)
+TextLayer::eraseDrag(View *, QMouseEvent *)
 {
 }
 
@@ -621,7 +621,7 @@
 }    
 
 void
-TextLayer::moveSelection(Selection s, size_t newStartFrame)
+TextLayer::moveSelection(Selection s, int newStartFrame)
 {
     if (!m_model) return;
 
@@ -717,7 +717,7 @@
 }
 
 bool
-TextLayer::paste(View *v, const Clipboard &from, int frameOffset, bool /* interactive */)
+TextLayer::paste(View *v, const Clipboard &from, int /* frameOffset */, bool /* interactive */)
 {
     if (!m_model) return false;
 
@@ -759,7 +759,7 @@
          i != points.end(); ++i) {
         
         if (!i->haveFrame()) continue;
-        size_t frame = 0;
+        int frame = 0;
         
         if (!realign) {