From: Josh Stone <jistone@redhat.com>
Date: Wed, 5 Aug 2009 03:29:51 +0000 (-0700)
Subject: Fix grapher compilation warnings from rpm build
X-Git-Tag: release-0.9.9~1
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=1545a93985714128927d6eac2c6e43d07fc02eb0;p=systemtap.git

Fix grapher compilation warnings from rpm build

* grapher/Graph.cxx (Graph::Graph): Initialize in declaration order.
* grapher/GraphWidget.cxx (GraphWidget::on_expose_event): Remove several
  unused local variables.
---

diff --git a/grapher/Graph.cxx b/grapher/Graph.cxx
index d36f284f3..ec5e40356 100644
--- a/grapher/Graph.cxx
+++ b/grapher/Graph.cxx
@@ -10,9 +10,9 @@ namespace systemtap
   using namespace std::tr1;
   
   Graph::Graph()
-    : _left(0.0), _right(1.0), _top(5.0), _bottom(0.0), _lineWidth(2),
-      _autoScaling(true), _autoScrolling(true), _zoomFactor(1.0),
-      _playButton(new CairoPlayButton)
+    : _lineWidth(2), _autoScaling(true), _autoScrolling(true),
+      _zoomFactor(1.0), _playButton(new CairoPlayButton),
+      _left(0.0), _right(1.0), _top(5.0), _bottom(0.0)
   {
   }
   
diff --git a/grapher/GraphWidget.cxx b/grapher/GraphWidget.cxx
index 5b0d1b1cd..4a1e09185 100644
--- a/grapher/GraphWidget.cxx
+++ b/grapher/GraphWidget.cxx
@@ -54,13 +54,6 @@ namespace systemtap
     if(!window)
       return true;
 
-    Gtk::Allocation allocation = get_allocation();
-    
-    const int graphWidth = allocation.get_width();
-    const int graphHeight = allocation.get_height();
-    const int width = graphWidth - 20;
-    const int height = graphHeight - 20;
-
     Cairo::RefPtr<Cairo::Context> cr = window->create_cairo_context();
 #if 0
     if(event && !_autoScaling)