Mercurial > hg > svgui

diff layer/LogColourScale.cpp @ 811:c4ef666721bf

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:51:27 +0100
parents 1d526ba11a24
children 3ca3b8fbbcee
line wrap: on
line diff
--- a/layer/LogColourScale.cpp	Tue Jun 03 11:10:52 2014 +0100
+++ b/layer/LogColourScale.cpp	Wed Jun 18 13:51:27 2014 +0100
@@ -25,7 +25,7 @@
 #include "view/View.h"
 
 int
-LogColourScale::getWidth(View *v,
+LogColourScale::getWidth(View *,
 			    QPainter &paint)
 {
     return paint.fontMetrics().width("-000.00") + 15;
@@ -35,7 +35,7 @@
 LogColourScale::paintVertical(View *v,
 			      const ColourScaleLayer *layer,
 			      QPainter &paint,
-			      int x0,
+			      int /* x0 */,
 			      float minlog,
 			      float maxlog)
 {
@@ -48,8 +48,6 @@
 
     char buffer[40];
 
-    int w = getWidth(v, paint) + x0;
-
     int boxx = 5, boxy = 5;
     if (layer->getScaleUnits() != "") {
         boxy += paint.fontMetrics().height();