Remove OpaquePointerProvider

Sources/Cairo/Context.swift

@@ -9,14 +9,12 @@
 import CCairo
 
 /// Cairo Context
-public final class Context: OpaquePointerOwner {
+public final class Context {
 
     // MARK: - Properties
 
     public let surface: Surface
-
-    // MARK: - Internal Properties
-
+
     internal let internalPointer: OpaquePointer
 
     // MARK: - Initialization
@@ -41,6 +39,10 @@ public final class Context: OpaquePointerOwner {
 
     // MARK: - Methods
 
+    public func withUnsafePointer<R, E>(_ body: (OpaquePointer) throws(E) -> R) throws(E) -> R where E: Error {
+        try body(internalPointer)
+    }
+
     /// Makes a copy of the current state of the context and saves it on an internal stack of saved states.
     /// When `restore()` is called, the context will be restored to the saved state.
     /// Multiple calls to `save()` and `restore()` can be nested; 

Sources/Cairo/Font.swift

@@ -10,7 +10,7 @@ import CCairo
 import CFontConfig
 import CFreeType
 
-public final class ScaledFont: OpaquePointerOwner {
+public final class ScaledFont {
 
     // MARK: - Properties
 
@@ -206,6 +206,10 @@ public final class ScaledFont: OpaquePointerOwner {
 
     // MARK: - Methods
 
+    public func withUnsafePointer<R, E>(_ body: (OpaquePointer) throws(E) -> R) throws(E) -> R where E: Error {
+        try body(internalPointer)
+    }
+
     public func advances(for glyphs: [FontIndex]) -> [Int] {
 
         return self.lockFontFace { (fontFace) in
@@ -253,7 +257,7 @@ public typealias FontIndex = UInt16
 /// The font's face.
 ///
 /// - Note: Only compatible with FreeType and FontConfig.
-public final class FontFace: OpaquePointerOwner {
+public final class FontFace {
 
     // MARK: - Properties
 
@@ -282,9 +286,15 @@ public final class FontFace: OpaquePointerOwner {
     public var type: cairo_font_type_t {
         cairo_font_face_get_type(internalPointer) // Never changes
     }
+
+    // MARK: - Methods
+
+    public func withUnsafePointer<R, E>(_ body: (OpaquePointer) throws(E) -> R) throws(E) -> R where E: Error {
+        try body(internalPointer)
+    }
 }
 
-public final class FontOptions: OpaquePointerOwner {
+public final class FontOptions {
 
     // MARK: - Properties
 
@@ -310,6 +320,10 @@ public final class FontOptions: OpaquePointerOwner {
 
     // MARK: - Methods
 
+    public func withUnsafePointer<R, E>(_ body: (OpaquePointer) throws(E) -> R) throws(E) -> R where E: Error {
+        try body(internalPointer)
+    }
+
     public func merge(_ other: FontOptions) {
 
         cairo_font_options_merge(internalPointer, other.internalPointer)

Sources/Cairo/Pattern.swift

@@ -11,9 +11,9 @@ import CCairo
 /// Represents a source when drawing onto a surface. 
 ///
 /// There are different subtypes of patterns, for different types of sources.
-public final class Pattern: OpaquePointerOwner {
+public final class Pattern {
 
-    // MARK: - Internal Properties
+    // MARK: - Properties
 
     internal var internalPointer: OpaquePointer
 
@@ -105,6 +105,10 @@ public final class Pattern: OpaquePointerOwner {
 
     // MARK: - Methods
 
+    public func withUnsafePointer<R, E>(_ body: (OpaquePointer) throws(E) -> R) throws(E) -> R where E: Error {
+        try body(internalPointer)
+    }
+
     /// Adds an opaque color stop to a gradient pattern.
     public func addColorStop(_ offset: Double, red: Double, green: Double, blue: Double) {
 

Sources/Cairo/Surface.swift

@@ -8,7 +8,7 @@
 
 import CCairo
 
-public class Surface: OpaquePointerOwner {
+public class Surface {
 
     // MARK: - Internal Properties
 
@@ -39,6 +39,10 @@ public class Surface: OpaquePointerOwner {
 
     // MARK: - Methods
 
+    public func withUnsafePointer<R, E>(_ body: (OpaquePointer) throws(E) -> R) throws(E) -> R where E: Error {
+        try body(internalPointer)
+    }
+
     /// Do any pending drawing for the surface and also restore any temporary
     /// modifications cairo has made to the surface's state. 
     /// This function must be called before switching from drawing on the surface