Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

1 files changed, 42 insertions, 42 deletions

diff --git a/grapher/CairoWidget.hxx b/grapher/CairoWidget.hxx
index bcabafb2..32d92cce 100644
--- a/grapher/CairoWidget.hxx
+++ b/grapher/CairoWidget.hxx
@@ -12,51 +12,51 @@
 #include <cairomm/context.h>
 namespace systemtap
 {
-  class CairoWidget
+class CairoWidget
+{
+public:
+  CairoWidget(bool visible = false)
+    : _visible(visible)
+  {}
+  bool isVisible() const { return _visible; }
+  void setVisible(bool visible) { _visible = visible; }
+  void getOrigin(double &x, double &y) const
   {
-  public:
-    CairoWidget(bool visible = false)
-      : _visible(visible)
-    {}
-    bool isVisible() const { return _visible; }
-    void setVisible(bool visible) { _visible = visible; }
-    void getOrigin(double &x, double &y) const
-    {
-      x = _x0;
-      y = _y0;
-    }
-    void setOrigin(double x, double y)
-    {
-      _x0 = x;
-      _y0 = y;
-    }
-    virtual void draw(Cairo::RefPtr<Cairo::Context> cr) = 0;
-    virtual bool containsPoint(double x, double y) { return false; }
-  protected:
-    bool _visible;
-    double _x0;
-    double _y0;
-  };
-
-  class CairoPlayButton : public CairoWidget
+    x = _x0;
+    y = _y0;
+  }
+  void setOrigin(double x, double y)
   {
-  public:
-    CairoPlayButton(bool visible = false)
-      : CairoWidget(visible), _size(50.0), _radius(5)
-    {
-    }
-    virtual void draw(Cairo::RefPtr<Cairo::Context> cr);
-    virtual bool containsPoint(double x, double y);
-  protected:
-    double _size;
-    double _radius;
-  };
+    _x0 = x;
+    _y0 = y;
+  }
+  virtual void draw(Cairo::RefPtr<Cairo::Context> cr) = 0;
+  virtual bool containsPoint(double x, double y) { return false; }
+protected:
+  bool _visible;
+  double _x0;
+  double _y0;
+};
 
-  class CairoTextBox : public CairoWidget
+class CairoPlayButton : public CairoWidget
+{
+public:
+  CairoPlayButton(bool visible = false)
+    : CairoWidget(visible), _size(50.0), _radius(5)
   {
-  public:
-    void draw(Cairo::RefPtr<Cairo::Context> cr);
-    std::string contents;
-  };
+  }
+  virtual void draw(Cairo::RefPtr<Cairo::Context> cr);
+  virtual bool containsPoint(double x, double y);
+protected:
+  double _size;
+  double _radius;
+};
+
+class CairoTextBox : public CairoWidget
+{
+public:
+  void draw(Cairo::RefPtr<Cairo::Context> cr);
+  std::string contents;
+};
 }
 #endif