Cleanup several global values (fixes #1044).

robovm · Jun 29, 2015 · 2036bea · 2036bea
1 parent e6fa767
commit 2036bea
Show file tree

Hide file tree

Showing 17 changed files with 3,250 additions and 1,286 deletions.
diff --git a/cocoatouch/src/main/bro-gen/avfoundation.yaml b/cocoatouch/src/main/bro-gen/avfoundation.yaml
@@ -2383,37 +2383,37 @@ values:
         name: '#{g[0]}'
         type: NSString
         extends: AVMetadataKey
-    AVMetadataKey3GPUserData(.*):
+    AVMetadata3GPUserDataKey(.*):
         enum: AVMetadataKey3GPUserData
         name: '#{g[0]}'
         type: NSString
         extends: AVMetadataKey
-    AVMetadataKeyIcyMetadata(.*):
+    AVMetadataIcyMetadataKey(.*):
         enum: AVMetadataKeyIcyMetadata
         name: '#{g[0]}'
         type: NSString
         extends: AVMetadataKey
-    AVMetadataKeyID3Metadata(.*):
+    AVMetadataID3MetadataKey(.*):
         enum: AVMetadataKeyID3Metadata
         name: '#{g[0]}'
         type: NSString
         extends: AVMetadataKey
-    AVMetadataKeyISOUserData(.*):
+    AVMetadataISOUserDataKey(.*):
         enum: AVMetadataKeyISOUserData
         name: '#{g[0]}'
         type: NSString
         extends: AVMetadataKey
-    AVMetadataKeyiTunesMetadata(.*):
+    AVMetadataiTunesMetadataKey(.*):
         enum: AVMetadataKeyiTunesMetadata
         name: '#{g[0]}'
         type: NSString
         extends: AVMetadataKey
-    AVMetadataKeyQuickTimeMetadata(.*):
+    AVMetadataQuickTimeMetadataKey(.*):
         enum: AVMetadataKeyQuickTimeMetadata
         name: '#{g[0]}'
         type: NSString
         extends: AVMetadataKey
-    AVMetadataKeyQuickTimeUserData(.*):
+    AVMetadataQuickTimeUserDataKey(.*):
         enum: AVMetadataKeyQuickTimeUserData
         name: '#{g[0]}'
         type: NSString

diff --git a/cocoatouch/src/main/bro-gen/uikit.yaml b/cocoatouch/src/main/bro-gen/uikit.yaml
@@ -4554,6 +4554,15 @@ values:
         name: '#{g[0]}'
 
     # UIFont
+    UIFontFeature(.*Identifier)Key:
+        dictionary: UIFontFeatureSetting
+        name: '#{g[0]}'
+        type: NSString
+        methods:
+            TypeIdentifier:
+                type: long
+            SelectorIdentifier:
+                type: long
     UIFontDescriptor(.*)Attribute:
         dictionary: UIFontDescriptorAttributes
         enum: UIFontDescriptorAttribute
@@ -4582,14 +4591,8 @@ values:
                 type: double
             TextStyle:
                 type: UIFontTextStyle
-            #FeatureSettings:
-                #type:
-#    UIFontFeature(.*Identifier)Key: TODO
-   #     class: UIFontDescriptorAttributes
-   #     name: '#{g[0]}'
-   #     type: NSString
-   #     visibility: protected
-
+            FeatureSettings:
+                type: List<UIFontFeatureSetting>
 
     UIFontTextStyle(.*):
         enum: UIFontTextStyle

diff --git a/cocoatouch/src/main/bro-gen/watchkit.yaml b/cocoatouch/src/main/bro-gen/watchkit.yaml
@@ -13,10 +13,10 @@ enums:
     WKMenuItemIcon: {}
     WKTextInputMode: {}
     WKInterfaceMapPinColor: {}
-    WatchKitErrorCode: {}
+    WKErrorCode: {first: WatchKitUnknownError, suffix: Error}
 
 classes:
-    WatchKitError:
+    WKError:
         extends: NSError
         annotations: ['@StronglyLinked']
 
@@ -168,7 +168,7 @@ functions:
 
 values:
     WatchKitErrorDomain:
-        class: WatchKitError
+        class: WKError
         name: getClassDomain
 
     # Make sure we don't miss any values if new ones are introduced in a later version