From a4c05e4a328f2fde261563b75aafc286b936957c Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Fri, 16 Aug 2024 16:38:04 -0700 Subject: [PATCH] pkg/macos: graphics usingns yeet --- pkg/macos/dispatch.zig | 2 +- pkg/macos/dispatch/c.zig | 2 +- pkg/macos/dispatch/data.zig | 2 +- pkg/macos/dispatch/queue.zig | 2 +- pkg/macos/graphics.zig | 28 ++++++++++++++++++------- pkg/macos/graphics/affine_transform.zig | 2 +- pkg/macos/graphics/bitmap_context.zig | 2 +- pkg/macos/graphics/c.zig | 2 +- pkg/macos/graphics/color_space.zig | 2 +- pkg/macos/graphics/context.zig | 2 +- pkg/macos/graphics/font.zig | 2 +- pkg/macos/graphics/geometry.zig | 2 +- pkg/macos/graphics/image.zig | 2 +- 13 files changed, 32 insertions(+), 20 deletions(-) diff --git a/pkg/macos/dispatch.zig b/pkg/macos/dispatch.zig index 9c66b529f..2bc7e8396 100644 --- a/pkg/macos/dispatch.zig +++ b/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; diff --git a/pkg/macos/dispatch/c.zig b/pkg/macos/dispatch/c.zig index 527469765..703bb4de6 100644 --- a/pkg/macos/dispatch/c.zig +++ b/pkg/macos/dispatch/c.zig @@ -1,3 +1,3 @@ -pub usingnamespace @cImport({ +pub const c = @cImport({ @cInclude("dispatch/dispatch.h"); }); diff --git a/pkg/macos/dispatch/data.zig b/pkg/macos/dispatch/data.zig index 223eabeb1..28df24b7b 100644 --- a/pkg/macos/dispatch/data.zig +++ b/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; diff --git a/pkg/macos/dispatch/queue.zig b/pkg/macos/dispatch/queue.zig index 72b6bbaec..cb2ca01c9 100644 --- a/pkg/macos/dispatch/queue.zig +++ b/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 diff --git a/pkg/macos/graphics.zig b/pkg/macos/graphics.zig index 2ea5d7b7f..5195da4a5 100644 --- a/pkg/macos/graphics.zig +++ b/pkg/macos/graphics.zig @@ -1,11 +1,23 @@ -pub const c = @import("graphics/c.zig"); -pub usingnamespace @import("graphics/affine_transform.zig"); -pub usingnamespace @import("graphics/bitmap_context.zig"); -pub usingnamespace @import("graphics/color_space.zig"); -pub usingnamespace @import("graphics/font.zig"); -pub usingnamespace @import("graphics/geometry.zig"); -pub usingnamespace @import("graphics/image.zig"); -pub usingnamespace @import("graphics/path.zig"); +const affine_transform = @import("graphics/affine_transform.zig"); +const bitmap_context = @import("graphics/bitmap_context.zig"); +const color_space = @import("graphics/color_space.zig"); +const font = @import("graphics/font.zig"); +const geometry = @import("graphics/geometry.zig"); +const image = @import("graphics/image.zig"); +const path = @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()); diff --git a/pkg/macos/graphics/affine_transform.zig b/pkg/macos/graphics/affine_transform.zig index dd07f125a..e649e7a18 100644 --- a/pkg/macos/graphics/affine_transform.zig +++ b/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, diff --git a/pkg/macos/graphics/bitmap_context.zig b/pkg/macos/graphics/bitmap_context.zig index 8b633f36e..ac2412631 100644 --- a/pkg/macos/graphics/bitmap_context.zig +++ b/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); diff --git a/pkg/macos/graphics/c.zig b/pkg/macos/graphics/c.zig index fe755e76c..c47b271a2 100644 --- a/pkg/macos/graphics/c.zig +++ b/pkg/macos/graphics/c.zig @@ -1,3 +1,3 @@ -pub usingnamespace @cImport({ +pub const c = @cImport({ @cInclude("CoreGraphics/CoreGraphics.h"); }); diff --git a/pkg/macos/graphics/color_space.zig b/pkg/macos/graphics/color_space.zig index e5735b22e..459f06302 100644 --- a/pkg/macos/graphics/color_space.zig +++ b/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 { diff --git a/pkg/macos/graphics/context.zig b/pkg/macos/graphics/context.zig index 6e1ac5016..6c3c243b7 100644 --- a/pkg/macos/graphics/context.zig +++ b/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. diff --git a/pkg/macos/graphics/font.zig b/pkg/macos/graphics/font.zig index 47089a70b..c310c62a2 100644 --- a/pkg/macos/graphics/font.zig +++ b/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; diff --git a/pkg/macos/graphics/geometry.zig b/pkg/macos/graphics/geometry.zig index 14dee2b42..66937403c 100644 --- a/pkg/macos/graphics/geometry.zig +++ b/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, diff --git a/pkg/macos/graphics/image.zig b/pkg/macos/graphics/image.zig index 0c4954c11..879384b12 100644 --- a/pkg/macos/graphics/image.zig +++ b/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,