Skip to content

Commit 51a0a9a

Browse files
committed
Objective-C API naming...
1 parent 0f7c3cd commit 51a0a9a

File tree

4 files changed

+27
-14
lines changed

4 files changed

+27
-14
lines changed

ColorSetKit-Test/Test.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ class Test: XCTestCase
136136

137137
func testNSColor()
138138
{
139-
if let c = NSColor.colorFrom( colorSet: "NoVariant" )
139+
if let c = NSColor.from( colorSet: "NoVariant" )
140140
{
141141
XCTAssertEqual( c.redComponent * 255, 50.0 )
142142
XCTAssertEqual( c.greenComponent * 255, 100.0 )

ColorSetKit/ColorSet.swift

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,17 +122,20 @@ import Cocoa
122122
}
123123
}
124124

125-
@objc public func add( color: NSColor, forName name: String )
125+
@objc( addColor:forName: )
126+
public func add( color: NSColor, forName name: String )
126127
{
127128
self.add( color: color, variant: nil, forName: name )
128129
}
129130

130-
@objc public func set( color: NSColor, forName name: String )
131+
@objc( setColor:forName: )
132+
public func set( color: NSColor, forName name: String )
131133
{
132134
self.set( color: color, variant: nil, forName: name )
133135
}
134136

135-
@objc public func add( color: NSColor, variant: NSColor?, forName name: String )
137+
@objc( addColor:variant:forName: )
138+
public func add( color: NSColor, variant: NSColor?, forName name: String )
136139
{
137140
self.synchronized
138141
{
@@ -143,7 +146,8 @@ import Cocoa
143146
}
144147
}
145148

146-
@objc public func set( color: NSColor, variant: NSColor?, forName name: String )
149+
@objc( setColor:variant:forName: )
150+
public func set( color: NSColor, variant: NSColor?, forName name: String )
147151
{
148152
self.synchronized
149153
{
@@ -181,7 +185,7 @@ import Cocoa
181185
}
182186
}
183187

184-
@objc public func write( to url: URL ) throws
188+
@objc public func writeTo( url: URL ) throws
185189
{
186190
do
187191
{

ColorSetKit/ColorSetStream.swift

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ import Cocoa
4040
self.data = data ?? Data()
4141
}
4242

43-
@objc public func append( string: String )
43+
@objc( appendString: )
44+
public func append( string: String )
4445
{
4546
self.synchronized
4647
{
@@ -55,7 +56,8 @@ import Cocoa
5556
}
5657
}
5758

58-
@objc public func append( color: NSColor )
59+
@objc( appendColor: )
60+
public func append( color: NSColor )
5961
{
6062
self.synchronized
6163
{
@@ -78,7 +80,8 @@ import Cocoa
7880
}
7981
}
8082

81-
@objc public func append( uInt8: UInt8 )
83+
@objc( appendUInt8: )
84+
public func append( uInt8: UInt8 )
8285
{
8386
self.synchronized
8487
{
@@ -88,7 +91,8 @@ import Cocoa
8891
}
8992
}
9093

91-
@objc public func append( uInt16: UInt16 )
94+
@objc( appendUInt16: )
95+
public func append( uInt16: UInt16 )
9296
{
9397
self.synchronized
9498
{
@@ -98,7 +102,8 @@ import Cocoa
98102
}
99103
}
100104

101-
@objc public func append( uInt32: UInt32 )
105+
@objc( appendUInt32: )
106+
public func append( uInt32: UInt32 )
102107
{
103108
self.synchronized
104109
{
@@ -108,7 +113,8 @@ import Cocoa
108113
}
109114
}
110115

111-
@objc public func append( uInt64: UInt64 )
116+
@objc( appendUInt64: )
117+
public func append( uInt64: UInt64 )
112118
{
113119
self.synchronized
114120
{
@@ -118,7 +124,8 @@ import Cocoa
118124
}
119125
}
120126

121-
@objc public func append( float: Float )
127+
@objc( appendFloat: )
128+
public func append( float: Float )
122129
{
123130
self.synchronized
124131
{
@@ -128,6 +135,7 @@ import Cocoa
128135
}
129136
}
130137

138+
@objc( appendDouble: )
131139
public func append( double: Double )
132140
{
133141
self.synchronized
@@ -138,6 +146,7 @@ import Cocoa
138146
}
139147
}
140148

149+
@objc( appendBool: )
141150
public func append( bool: Bool )
142151
{
143152
self.synchronized

ColorSetKit/NSColor+ColorSetKit.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import Cocoa
2626

2727
@objc public extension NSColor
2828
{
29-
@objc class func colorFrom( colorSet name: String ) -> NSColor?
29+
@objc class func from( colorSet name: String ) -> NSColor?
3030
{
3131
if name.hasPrefix( "NS" )
3232
{

0 commit comments

Comments
 (0)