Rename and re-order the cairo_operator_t enum to names that abbreviate less and are easier to understand, (eg. CAIRO_OPERATOR_DEST_OVER instead of CAIRO_OPEERATOR_OVER_REVERSE).

1 files changed, 10 insertions, 7 deletions

diff --git a/src/cairo.h b/src/cairo.h
index f8ce4dd54..de85566a6 100644
--- a/src/cairo.h
+++ b/src/cairo.h
@@ -228,18 +228,21 @@ cairo_pop_group (cairo_t *cr);
 
 /* Modify state */
 
-typedef enum cairo_operator { 
+typedef enum cairo_operator {
     CAIRO_OPERATOR_CLEAR,
-    CAIRO_OPERATOR_SRC,
-    CAIRO_OPERATOR_DST,
+
+    CAIRO_OPERATOR_SOURCE,
     CAIRO_OPERATOR_OVER,
-    CAIRO_OPERATOR_OVER_REVERSE,
     CAIRO_OPERATOR_IN,
-    CAIRO_OPERATOR_IN_REVERSE,
     CAIRO_OPERATOR_OUT,
-    CAIRO_OPERATOR_OUT_REVERSE,
     CAIRO_OPERATOR_ATOP,
-    CAIRO_OPERATOR_ATOP_REVERSE,
+
+    CAIRO_OPERATOR_DEST,
+    CAIRO_OPERATOR_DEST_OVER,
+    CAIRO_OPERATOR_DEST_IN,
+    CAIRO_OPERATOR_DEST_OUT,
+    CAIRO_OPERATOR_DEST_ATOP,
+
     CAIRO_OPERATOR_XOR,
     CAIRO_OPERATOR_ADD,
     CAIRO_OPERATOR_SATURATE