No-op: indentation.

[ardour.git] / gtk2_ardour / lineset.cc

diff --git a/gtk2_ardour/lineset.cc b/gtk2_ardour/lineset.cc
index 61e5804ed46817b0e1f587c5a362552651ed4fa5..414f29cc0a1956630e0ea27d6ebe1136d7da1b36 100644 (file)
--- a/gtk2_ardour/lineset.cc
+++ b/gtk2_ardour/lineset.cc
@@ -66,7 +66,7 @@ LineSetClass::init()
 }
 
 void
-LineSetClass::class_init_function(void* g_class, void* class_data)
+LineSetClass::class_init_function(void* /*g_class*/, void* /*class_data*/)
 {
 }
 
@@ -89,10 +89,10 @@ LineSet::LineSet(Group& parent, Orientation o)
 
        item_construct(parent);
 
-       property_x1().signal_changed().connect(mem_fun(*this, &LineSet::bounds_need_update));
-       property_y1().signal_changed().connect(mem_fun(*this, &LineSet::bounds_need_update));
-       property_x2().signal_changed().connect(mem_fun(*this, &LineSet::bounds_need_update));
-       property_y2().signal_changed().connect(mem_fun(*this, &LineSet::bounds_need_update));
+       property_x1().signal_changed().connect(sigc::mem_fun(*this, &LineSet::bounds_need_update));
+       property_y1().signal_changed().connect(sigc::mem_fun(*this, &LineSet::bounds_need_update));
+       property_x2().signal_changed().connect(sigc::mem_fun(*this, &LineSet::bounds_need_update));
+       property_y2().signal_changed().connect(sigc::mem_fun(*this, &LineSet::bounds_need_update));
 }
 
 LineSet::~LineSet()
@@ -179,7 +179,7 @@ LineSet::add_line(double coord, double width, uint32_t color)
        Line l(coord, width, color);
 
        Lines::iterator it = std::lower_bound(lines.begin(), lines.end(), l, line_compare);
-       
+
        /* overlap checking */
        if (it != lines.end()) {
                if (l.coord + l.width > it->coord) {
@@ -195,7 +195,7 @@ LineSet::add_line(double coord, double width, uint32_t color)
                }
                ++it;
        }
-       
+
        lines.insert(it, l);
        region_needs_update(coord, coord + width);
 }
@@ -228,13 +228,13 @@ LineSet::remove_until(double coord)
 {
        if (!lines.empty()) {
                double first = lines.front().coord;
-               
+
                // code
 
                region_needs_update(first, coord);
        }
 }
-       
+
 void
 LineSet::remove_from(double coord)
 {
@@ -253,7 +253,7 @@ LineSet::clear()
        if (!lines.empty()) {
                double coord1 = lines.front().coord;
                double coord2 = lines.back().coord + lines.back().width;
-                       
+
                lines.clear();
                region_needs_update(coord1, coord2);
        }
@@ -269,7 +269,7 @@ LineSet::line_at(double coord)
        if (cached_pos != lines.end()) {
                if (coord < cached_pos->coord) {
                        /* backward search */
-                       while(--cached_pos != lines.end()) {
+                       while (--cached_pos != lines.end()) {
                                if (cached_pos->coord <= coord) {
                                        if (cached_pos->coord + cached_pos->width < coord) {
                                                /* coord is between two lines */
@@ -281,7 +281,7 @@ LineSet::line_at(double coord)
                        }
                } else {
                        /* forward search */
-                       while(cached_pos != lines.end()) {
+                       while (cached_pos != lines.end()) {
                                if (cached_pos->coord > coord) {
                                        /* we searched past the line that we want, so now see
                                           if the previous line includes the coordinate */
@@ -300,10 +300,10 @@ LineSet::line_at(double coord)
                Line dummy(coord);
 
                cached_pos = lower_bound(lines.begin(), lines.end(), dummy, line_compare);
-               
+
                /* The iterator found should point to the element after the one we want. */
                --cached_pos;
-               
+
                if (cached_pos != lines.end()) {
                        if (cached_pos->coord <= coord) {
                                if (cached_pos->coord + cached_pos->width >= coord) {
@@ -356,7 +356,7 @@ LineSet::update_lines(bool need_redraw)
                LineSet::bounds_vfunc(&redraw.x0, &redraw.y0, &redraw.x1, &redraw.y1);
                i2w(redraw.x0, redraw.y0);
                i2w(redraw.x1, redraw.y1);
-               
+
                if (orientation == Vertical) {
                        redraw.x1 = redraw.x0 + update_region2;
                        redraw.x0 += update_region1;
@@ -401,7 +401,7 @@ LineSet::update_bounds()
        item->y1 = new_b.y0;
        item->x2 = new_b.x1;
        item->y2 = new_b.y1;
-       
+
        /* Update bounding box used in rendering function */
        cv.w2c(new_b.x0, new_b.y0, bbox.x0, bbox.y0);
        cv.w2c(new_b.x1, new_b.y1, bbox.x1, bbox.y1);
@@ -428,7 +428,7 @@ LineSet::update_bounds()
                                redraw.y1 = max(old_b.y1, new_b.y1);
                                redraw_request(redraw);
                        }
-                       
+
                        if (new_b.x1 > old_b.x1) {
                                // we have a larger area ==> possibly more lines
                                request_lines(old_b.x1, new_b.x1);
@@ -470,7 +470,7 @@ LineSet::update_bounds()
                                redraw.x1 = max(old_b.x1, new_b.x1);
                                redraw_request(redraw);
                        }
-                       
+
                        if (new_b.y1 > old_b.y1) {
                                // we have a larger area ==> possibly more lines
                                request_lines(old_b.y1, new_b.y1);
@@ -503,7 +503,7 @@ LineSet::update_bounds()
  * N. find out if the item moved. if it moved, the old bbox and the new bbox need to be updated.
  */
 void
-LineSet::update_vfunc(double* affine, ArtSVP* clip_path, int flags)
+LineSet::update_vfunc(double* /*affine*/, ArtSVP* /*clip_path*/, int /*flags*/)
 {
        GnomeCanvasItem* item = GNOME_CANVAS_ITEM(gobj());
        bool lines_need_redraw = true;
@@ -539,7 +539,7 @@ LineSet::update_vfunc(double* affine, ArtSVP* clip_path, int flags)
 }
 
 void
-LineSet::draw_vfunc(const Glib::RefPtr<Gdk::Drawable>& drawable, int x, int y, int width, int height)
+LineSet::draw_vfunc(const Glib::RefPtr<Gdk::Drawable>& /*drawable*/, int /*x*/, int /*y*/, int /*width*/, int /*height*/)
 {
        cerr << "please don't use the GnomeCanvasLineSet item in a non-aa Canvas" << endl;
        abort();
@@ -604,7 +604,7 @@ LineSet::render_vfunc(GnomeCanvasBuf* buf)
 
        /**
         * The first and the last line in this render have to be handled separately from those in between, because those lines
-        * may be cut off at the ends. 
+        * may be cut off at the ends.
         */
 
        if (orientation == Vertical) {
@@ -633,7 +633,7 @@ LineSet::render_vfunc(GnomeCanvasBuf* buf)
                for (; it != end; ++it) {
                        pos0 = ((int) floor(it->coord)) + offset;
                        pos1 = pos0 + ((int) floor(it->width));
-                       
+
                        if (pos1 > rect.x0) {
                                pos0 = max(pos0, rect.x0);
                                paint_vert(buf, *it, pos0, rect.y0, pos1, rect.y1);
@@ -641,7 +641,7 @@ LineSet::render_vfunc(GnomeCanvasBuf* buf)
                                break;
                        }
                }
-               
+
                // render what's between the first and last lines
                for (; it != end; ++it) {
                        pos0 = ((int) floor(it->coord)) + offset;
@@ -675,7 +675,7 @@ LineSet::render_vfunc(GnomeCanvasBuf* buf)
                for (; it != end; ++it) {
                        pos0 = ((int) floor(it->coord)) + offset;
                        pos1 = pos0 + ((int) floor(it->width));
-                       
+
                        if (pos1 > rect.y0) {
                                pos0 = max(pos0, rect.y0);
                                paint_horiz(buf, *it, rect.x0, pos0, rect.x1, pos1);
@@ -683,7 +683,7 @@ LineSet::render_vfunc(GnomeCanvasBuf* buf)
                                break;
                        }
                }
-               
+
                // render what's between the first and last lines
                for (; it != end; ++it) {
                        pos0 = ((int) floor(it->coord)) + offset;
@@ -704,7 +704,7 @@ LineSet::bounds_vfunc(double* _x1, double* _y1, double* _x2, double* _y2)
 
 
 double
-LineSet::point_vfunc(double x, double y, int cx, int cy, GnomeCanvasItem** actual_item)
+LineSet::point_vfunc(double x, double y, int /*cx*/, int /*cy*/, GnomeCanvasItem** actual_item)
 {
        double x1, y1, x2, y2;
        double dx, dy;
@@ -774,8 +774,8 @@ LineSet::region_needs_update(double coord1, double coord2)
  * These have been defined to avoid endless recursion with gnomecanvasmm.
  * Don't know why this happens
  */
-bool LineSet::on_event(GdkEvent* p1)
-{ 
+bool LineSet::on_event(GdkEvent* /*p1*/)
+{
        return false;
 }