Rename Shapes enum to shape_type_t and fix enum names

We already have a 'shapes' data structure, so to avoid confusion don't
name our shape type enums 'Shapes'.  Instead, name it shape_type_t,
which is more consistent with the code style of other enums in the
codebase.

Also, rename Circle / Triangle / etc. to CB_SHAPE_CIRCLE /
CB_SHAPE_TRIANGLE / etc.  The former could be confused as class names;
the latter are less likely to get confused this way, and follow the
style of other enums in the codebase.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/cairo-tests/fill.cpp b/src/cairo-tests/fill.cpp
index fabdcb3..af57da7 100644
--- a/src/cairo-tests/fill.cpp
+++ b/src/cairo-tests/fill.cpp
@@ -140,7 +140,7 @@ void drawshapes(caskbench_context_t *ctx,kinetics_t *particles)
                         cairo_set_source (cr, pattern);
                     }
                 }
-                cairoShapes[Circle](ctx,&ctx->shape_args);
+                cairoShapes[CB_SHAPE_CIRCLE](ctx,&ctx->shape_args);
 
                 break;
 
@@ -173,7 +173,7 @@ void drawshapes(caskbench_context_t *ctx,kinetics_t *particles)
                         cairo_set_source (cr, pattern);
                     }
                 }
-                cairoShapes[Rectangle](ctx,&ctx->shape_args);
+                cairoShapes[CB_SHAPE_RECTANGLE](ctx,&ctx->shape_args);
 
                 break;
 
@@ -211,7 +211,7 @@ void drawshapes(caskbench_context_t *ctx,kinetics_t *particles)
                     }
 
                 }
-                cairoShapes[Triangle] (ctx,&ctx->shape_args);
+                cairoShapes[CB_SHAPE_TRIANGLE] (ctx,&ctx->shape_args);
                 free (ctx->shape_args.points);
 
                 break;
@@ -249,7 +249,7 @@ void drawshapes(caskbench_context_t *ctx,kinetics_t *particles)
                         cairo_set_source (cr, pattern);
                     }
                 }
-                cairoShapes[Star] (ctx,&ctx->shape_args);
+                cairoShapes[CB_SHAPE_STAR] (ctx,&ctx->shape_args);
 
                 free (ctx->shape_args.points);
                 break;