gen: Remove _As* pattern to clean up generated code (#129)

* gen: remove _As* constrcutor pattern * gen: fix up As calls * gen: drop As* for Init methods * gen: include typed Init_As
progrium · Jul 9, 2023 · 8d32f63 · 8d32f63
1 parent a8ace7c
commit 8d32f63
Show file tree

Hide file tree

Showing 30 changed files with 591 additions and 154 deletions.
diff --git a/cocoa/NSApplication.go b/cocoa/NSApplication.go
@@ -24,15 +24,15 @@ func init() {
 		return TerminateAfterWindowsClose
 	})
 	objc.RegisterClass(DefaultDelegateClass)
-	DefaultDelegate = objc.Get("DefaultDelegate").Alloc().Init()
+	DefaultDelegate = objc.Get("DefaultDelegate").Alloc().InitObject()
 }
 
 type NSApplication struct {
 	gen_NSApplication
 }
 
 func NSApplication_New() NSApplication {
-	return NSApplication_Alloc().Init_AsNSApplication()
+	return NSApplication_Alloc().Init()
 }
 
 func NSApp() NSApplication {

diff --git a/cocoa/NSControl.go b/cocoa/NSControl.go
@@ -9,5 +9,5 @@ type NSControl struct {
 }
 
 func NSControl_Init(frame core.NSRect) NSControl {
-	return NSControl_Alloc().InitWithFrame_AsNSControl(frame)
+	return NSControl_Alloc().InitWithFrame(frame)
 }
diff --git a/cocoa/NSImage.go b/cocoa/NSImage.go
@@ -9,11 +9,11 @@ type NSImage struct {
 }
 
 func NSImage_InitWithData(data core.NSDataRef) NSImage {
-	return NSImage_Alloc().InitWithData_AsNSImage(data)
+	return NSImage_Alloc().InitWithData(data)
 }
 
 func NSImage_InitWithURL(url core.NSURL) NSImage {
-	return NSImage_Alloc().InitWithContentsOfURL_AsNSImage(url)
+	return NSImage_Alloc().InitWithContentsOfURL(url)
 }
 
 func NSImage_ImageNamed(name string) NSImage {

diff --git a/cocoa/NSImageView.go b/cocoa/NSImageView.go
@@ -5,5 +5,5 @@ type NSImageView struct {
 }
 
 func NSImageView_New() NSImageView {
-	return NSImageView_Alloc().Init_AsNSImageView()
+	return NSImageView_Alloc().Init()
 }
diff --git a/cocoa/NSImage_test.go b/cocoa/NSImage_test.go
@@ -8,7 +8,7 @@ import (
 )
 
 func TestNSImageSize(t *testing.T) {
-	img := NSImage_Alloc().InitWithSize_AsNSImage(core.Size(100, 200))
+	img := NSImage_Alloc().InitWithSize(core.Size(100, 200))
 	size := img.Size()
 	assert.EqualValues(t, 100, size.Width)
 	assert.EqualValues(t, 200, size.Height)

diff --git a/cocoa/NSMenu.go b/cocoa/NSMenu.go
@@ -9,11 +9,11 @@ type NSMenu struct {
 }
 
 func NSMenu_New() NSMenu {
-	return NSMenu_Alloc().Init_AsNSMenu()
+	return NSMenu_Alloc().Init()
 }
 
 func NSMenu_Init(title string) NSMenu {
-	return NSMenu_Alloc().InitWithTitle_AsNSMenu(core.String(title))
+	return NSMenu_Alloc().InitWithTitle(core.String(title))
 }
 
 func (menu NSMenu) Title() string {

diff --git a/cocoa/NSMenuItem.go b/cocoa/NSMenuItem.go
@@ -14,13 +14,13 @@ type NSMenuItem struct {
 // NSMenuItem_Init returns an initialized instance of NSMenuItem.
 // https://developer.apple.com/documentation/appkit/nsmenuitem/1514858-initwithtitle?language=objc
 func NSMenuItem_Init(itemName string, action objc.Selector, keyEquivalent string) NSMenuItem {
-	return NSMenuItem_Alloc().InitWithTitleActionKeyEquivalent_AsNSMenuItem(
+	return NSMenuItem_Alloc().InitWithTitleActionKeyEquivalent(
 		core.String(itemName), action, core.String(keyEquivalent))
 }
 
 // NSMenuItem_New returns an initialized instance of NSMenuItem.
 func NSMenuItem_New() NSMenuItem {
-	return NSMenuItem_Alloc().Init_AsNSMenuItem()
+	return NSMenuItem_Alloc().Init()
 }
 
 // NSMenuItem_Separator returns a menu item that is used to separate logical groups of menu commands.

diff --git a/cocoa/NSNib.go b/cocoa/NSNib.go
@@ -16,7 +16,7 @@ func NSNib_InitWithNibNamed_Bundle(name string, bundle NSBundle) NSNib {
 }
 
 func NSNib_InitWithNibData_Bundle(data core.NSDataRef, bundle NSBundleRef) NSNib {
-	return NSNib_Alloc().InitWithNibDataBundle_AsNSNib(data, bundle)
+	return NSNib_Alloc().InitWithNibDataBundle(data, bundle)
 }
 
 func (nib NSNib) InstantiateWithOwner_TopLevelObjects(owner objc.Object) (core.NSArray, bool) {

diff --git a/cocoa/NSPopover.go b/cocoa/NSPopover.go
@@ -14,7 +14,7 @@ const (
 )
 
 func NSPopover_Init() NSPopover {
-	return NSPopover_Alloc().Init_AsNSPopover()
+	return NSPopover_Alloc().Init()
 }
 
 func (p NSPopover) SetContentSize(s core.NSSize) {

diff --git a/cocoa/NSSound.go b/cocoa/NSSound.go
@@ -9,17 +9,5 @@ type NSSound struct {
 }
 
 func NSSound_InitWithData(data core.NSDataRef) NSSound {
-	return NSSound_Alloc().InitWithData_AsNSSound(data)
-}
-
-func (sound NSSound) Play() {
-	sound.Play()
-}
-
-func (sound NSSound) Pause() {
-	sound.Pause()
-}
-
-func (sound NSSound) Resume() {
-	sound.Resume()
+	return NSSound_Alloc().InitWithData(data)
 }
diff --git a/cocoa/NSTextView.go b/cocoa/NSTextView.go
@@ -19,7 +19,7 @@ type NSTextView struct {
 }
 
 func NSTextView_Init(frame core.NSRect) NSTextView {
-	return NSTextView_Alloc().InitWithFrame_AsNSTextView(frame)
+	return NSTextView_Alloc().InitWithFrame(frame)
 }
 
 func (v NSTextView) String() string {

diff --git a/cocoa/NSView.go b/cocoa/NSView.go
@@ -10,7 +10,7 @@ type NSView struct {
 }
 
 func NSView_Init(frame core.NSRect) NSView {
-	return NSView_Alloc().InitWithFrame_AsNSView(frame)
+	return NSView_Alloc().InitWithFrame(frame)
 }
 
 func (v NSView) AddSubviewPositionedRelativeTo(subview NSViewRef, positioned int, relativeTo NSViewRef) {

diff --git a/cocoa/NSViewController.go b/cocoa/NSViewController.go
@@ -3,7 +3,7 @@ package cocoa
 type NSViewController struct{ gen_NSViewController }
 
 func NSViewController_New() NSViewController {
-	return NSViewController_Alloc().Init_AsNSViewController()
+	return NSViewController_Alloc().Init()
 }
 
 func (c NSViewController) SetView(v NSView) {

diff --git a/cocoa/NSVisualEffectView.go b/cocoa/NSVisualEffectView.go
@@ -10,7 +10,7 @@ type NSVisualEffectView struct {
 }
 
 func NSVisualEffectView_New() NSVisualEffectView {
-	return NSVisualEffectView_Alloc().Init_AsNSVisualEffectView()
+	return NSVisualEffectView_Alloc().Init()
 }
 
 // effect.Set("translatesAutoresizingMaskIntoConstraints:", false)

diff --git a/cocoa/NSWindow.go b/cocoa/NSWindow.go
@@ -12,15 +12,15 @@ type NSWindow struct {
 var nsWindow = objc.Get("NSWindow")
 
 func NSWindow_New() NSWindow {
-	return NSWindow_Alloc().Init_AsNSWindow()
+	return NSWindow_Alloc().Init()
 }
 
 func NSWindow_WithContentViewController(controller NSViewControllerRef) NSWindow {
 	return NSWindow_WindowWithContentViewController(controller)
 }
 
 func NSWindow_Init(rect core.NSRect, windowStyle core.NSUInteger, bufferingType NSBackingStoreType, deferCreation bool) NSWindow {
-	return NSWindow_Alloc().InitWithContentRectStyleMaskBackingDefer_AsNSWindow(
+	return NSWindow_Alloc().InitWithContentRectStyleMaskBackingDefer(
 		rect, core.NSUInteger(windowStyle), core.NSUInteger(bufferingType), deferCreation,
 	)
 }
@@ -65,10 +65,6 @@ func (w NSWindow) MovableByWindowBackground() bool {
 	return w.IsMovableByWindowBackground()
 }
 
-func (w NSWindow) SetFrameDisplay(frame core.NSRect, display bool) {
-	w.SetFrameDisplay(frame, display)
-}
-
 func (w NSWindow) CollectionBehavior() uint {
 	return uint(w.gen_NSWindow.CollectionBehavior())
 }