comparison view/Pane.cpp @ 248:28c8e8e3c537

* Fix many compile warnings, remove some debug output

                 drawVisibleText(paint, x, y, text, OutlinedText);
             }
             
             QString text = QString("%1").arg(m_centreFrame);
             
-            int tw = paint.fontMetrics().width(text);
             int x = width()/2 + 4;
             
             drawVisibleText(paint, x, y, text, OutlinedText);
         }
 

 	}
     }
 
     if (m_manager &&
         m_manager->shouldShowLayerNames() &&
-        r.y() + r.height() >= height() - m_layers.size() * fontHeight - 6) {
+        r.y() + r.height() >= height() - int(m_layers.size()) * fontHeight - 6) {
 
 	std::vector<QString> texts;
 	int maxTextWidth = 0;
 
 	for (LayerList::iterator i = m_layers.begin(); i != m_layers.end(); ++i) {

             llx -= 36;
         }
 
 	if (r.x() + r.width() >= llx) {
 	    
-	    for (int i = 0; i < texts.size(); ++i) {
-
-		if (i == texts.size() - 1) {
+	    for (size_t i = 0; i < texts.size(); ++i) {
+
+		if (i + 1 == texts.size()) {
 		    paint.setPen(Qt::black);
 		}
 		
 		drawVisibleText(paint, llx,
 				lly - fontHeight + fontAscent,

         float vmin = 0.f, vmax = 0.f;
         float dmin = 0.f, dmax = 0.f;
 
         if (getTopLayerDisplayExtents(vmin, vmax, dmin, dmax)) {
 
-            std::cerr << "ydiff = " << ydiff << std::endl;
+//            std::cerr << "ydiff = " << ydiff << std::endl;
 
             float perpix = (dmax - dmin) / height();
             float valdiff = ydiff * perpix;
-            std::cerr << "valdiff = " << valdiff << std::endl;
+//            std::cerr << "valdiff = " << valdiff << std::endl;
 
             float newmin = m_dragStartMinValue + valdiff;
             float newmax = m_dragStartMinValue + (dmax - dmin) + valdiff;
             if (newmin < vmin) {
                 newmax += vmin - newmin;

             }
             if (newmax > vmax) {
                 newmin -= newmax - vmax;
                 newmax -= newmax - vmax;
             }
-            std::cerr << "(" << dmin << ", " << dmax << ") -> ("
-                      << newmin << ", " << newmax << ") (drag start " << m_dragStartMinValue << ")" << std::endl;
+//            std::cerr << "(" << dmin << ", " << dmax << ") -> ("
+//                      << newmin << ", " << newmax << ") (drag start " << m_dragStartMinValue << ")" << std::endl;
 
             setTopLayerDisplayExtents(newmin, newmax);
             updateVerticalPanner();
         }
     }

     if (snapFrameLeft < 0) snapFrameLeft = 0;
     if (snapFrameRight < 0) snapFrameRight = 0;
 	
     size_t min, max;
 	
-    if (m_selectionStartFrame > snapFrameLeft) {
+    if (m_selectionStartFrame > size_t(snapFrameLeft)) {
         min = snapFrameLeft;
         max = m_selectionStartFrame;
-    } else if (snapFrameRight > m_selectionStartFrame) {
+    } else if (size_t(snapFrameRight) > m_selectionStartFrame) {
         min = m_selectionStartFrame;
         max = snapFrameRight;
     } else {
         min = snapFrameLeft;
         max = snapFrameRight;

         if (offset >= available * 0.95) {
             int move = int(offset - available * 0.95) + 1;
             setCentreFrame(m_centreFrame + move);
         } else if (offset <= available * 0.10) {
             int move = int(available * 0.10 - offset) + 1;
-            if (m_centreFrame > move) {
+            if (move < 0) {
+                setCentreFrame(m_centreFrame + (-move));
+            } else if (m_centreFrame > move) {
                 setCentreFrame(m_centreFrame - move);
             } else {
                 setCentreFrame(0);
             }
         }

     update();
     return true;
 }
 
 bool
-Pane::editSelectionEnd(QMouseEvent *e)
+Pane::editSelectionEnd(QMouseEvent *)
 {
     if (m_editingSelection.isEmpty()) return false;
 
     int offset = m_mousePos.x() - m_clickPos.x();
     Layer *layer = getSelectedLayer();