[gjs: 7/7] Merge branch 'simplify-private-pointers' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit d7253f3fa08aaa01233d1091eb059ce2e939ee4f
Merge: 2f781e30 9303ffa4
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun May 31 01:31:02 2020 +0000

    Merge branch 'simplify-private-pointers' into 'master'
    
    Simplify private pointers
    
    See merge request GNOME/gjs!434

 gi/param.cpp                      |  47 ++++--------
 modules/cairo-context.cpp         | 149 ++++++++++++++++++++------------------
 modules/cairo-image-surface.cpp   |   6 +-
 modules/cairo-linear-gradient.cpp |   4 +-
 modules/cairo-path.cpp            |  32 +++-----
 modules/cairo-pattern.cpp         |  40 ++--------
 modules/cairo-pdf-surface.cpp     |   4 +-
 modules/cairo-private.h           |   8 +-
 modules/cairo-ps-surface.cpp      |   4 +-
 modules/cairo-radial-gradient.cpp |   4 +-
 modules/cairo-region.cpp          |  51 ++++---------
 modules/cairo-solid-pattern.cpp   |   2 +-
 modules/cairo-surface-pattern.cpp |   4 +-
 modules/cairo-surface.cpp         |  42 +++--------
 modules/cairo-svg-surface.cpp     |   4 +-
 15 files changed, 153 insertions(+), 248 deletions(-)
---
diff --cc modules/cairo-path.cpp
index 5bb5582a,41db292f..2d95318f
--- a/modules/cairo-path.cpp
+++ b/modules/cairo-path.cpp
@@@ -34,11 -34,8 +34,7 @@@
  #include "gjs/jsapi-class.h"
  #include "gjs/jsapi-util.h"
  #include "gjs/macros.h"
 -#include "modules/cairo-private.h"  // IWYU pragma: keep
  
- typedef struct {
-     cairo_path_t    *path;
- } GjsCairoPath;
- 
  GJS_USE
  static JSObject *gjs_cairo_path_get_proto(JSContext *);