pkg/macos: graphics usingns yeet

pkg/macos/dispatch.zig

@@ -1,4 +1,4 @@
-pub const c = @import("dispatch/c.zig");
+pub const c = @import("dispatch/c.zig").c;
 pub const data = @import("dispatch/data.zig");
 pub const queue = @import("dispatch/queue.zig");
 pub const Data = data.Data;

pkg/macos/dispatch/c.zig

@@ -1,3 +1,3 @@
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("dispatch/dispatch.h");
 });

pkg/macos/dispatch/data.zig

@@ -1,6 +1,6 @@
 const std = @import("std");
 const foundation = @import("../foundation.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Data = opaque {
     pub const DESTRUCTOR_DEFAULT = c.DISPATCH_DATA_DESTRUCTOR_DEFAULT;

pkg/macos/dispatch/queue.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Queue = *anyopaque; // dispatch_queue_t
 

pkg/macos/graphics.zig

@@ -1,11 +1,23 @@
-pub const c = @import("graphics/c.zig");
+const affine_transform = @import("graphics/affine_transform.zig");
-pub usingnamespace @import("graphics/affine_transform.zig");
+const bitmap_context = @import("graphics/bitmap_context.zig");
-pub usingnamespace @import("graphics/bitmap_context.zig");
+const color_space = @import("graphics/color_space.zig");
-pub usingnamespace @import("graphics/color_space.zig");
+const font = @import("graphics/font.zig");
-pub usingnamespace @import("graphics/font.zig");
+const geometry = @import("graphics/geometry.zig");
-pub usingnamespace @import("graphics/geometry.zig");
+const image = @import("graphics/image.zig");
-pub usingnamespace @import("graphics/image.zig");
+const path = @import("graphics/path.zig");
-pub usingnamespace @import("graphics/path.zig");
+
+pub const c = @import("graphics/c.zig").c;
+pub const AffineTransform = affine_transform.AffineTransform;
+pub const BitmapContext = bitmap_context.BitmapContext;
+pub const ColorSpace = color_space.ColorSpace;
+pub const Glyph = font.Glyph;
+pub const Point = geometry.Point;
+pub const Rect = geometry.Rect;
+pub const Size = geometry.Size;
+pub const ImageAlphaInfo = image.ImageAlphaInfo;
+pub const BitmapInfo = image.BitmapInfo;
+pub const Path = path.Path;
+pub const MutablePath = path.MutablePath;
 
 test {
     @import("std").testing.refAllDecls(@This());

pkg/macos/graphics/affine_transform.zig

@@ -1,6 +1,6 @@
 const std = @import("std");
 const assert = std.debug.assert;
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const AffineTransform = extern struct {
     a: c.CGFloat,

pkg/macos/graphics/bitmap_context.zig

@@ -3,7 +3,7 @@ const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const graphics = @import("../graphics.zig");
 const context = @import("context.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const BitmapContext = opaque {
     pub usingnamespace context.Context(BitmapContext);

pkg/macos/graphics/c.zig

@@ -1,3 +1,3 @@
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("CoreGraphics/CoreGraphics.h");
 });

pkg/macos/graphics/color_space.zig

@@ -1,7 +1,7 @@
 const std = @import("std");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const ColorSpace = opaque {
     pub fn createDeviceGray() Allocator.Error!*ColorSpace {

pkg/macos/graphics/context.zig

@@ -2,7 +2,7 @@ const std = @import("std");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const graphics = @import("../graphics.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 /// Returns a struct that has all the shared context functions for the
 /// given type.

pkg/macos/graphics/font.zig

@@ -1,3 +1,3 @@
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Glyph = c.CGGlyph;

pkg/macos/graphics/geometry.zig

@@ -1,6 +1,6 @@
 const std = @import("std");
 const assert = std.debug.assert;
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Point = extern struct {
     x: c.CGFloat,

pkg/macos/graphics/image.zig

@@ -3,7 +3,7 @@ const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const graphics = @import("../graphics.zig");
 const context = @import("context.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const ImageAlphaInfo = enum(c_uint) {
     none = c.kCGImageAlphaNone,