Add all empty classes make them compile.

This commit is contained in:
Gregory John Casamento 2020-06-18 05:42:11 -04:00
parent 178a2cabf5
commit 9e80fbebbe
3 changed files with 37 additions and 32 deletions

View file

@ -284,6 +284,9 @@ GSDisplayServer.m \
GSHelpManagerPanel.m \
GSInfoPanel.m \
GSMemoryPanel.m \
GSStoryboardDocument.m \
GSStoryboardScene.m \
GSStoryboardSegue.m \
GSSlideView.m \
GSTextStorage.m \
GSTrackingRect.m \

View file

@ -44,15 +44,15 @@
#import "GNUstepGUI/GSXibLoading.h"
#import "GNUstepGUI/GSXibKeyedUnarchiver.h"
@interface NSApplication (NibCompatibility)
@interface NSApplication (StoryboardCompatibility)
- (void) _setMainMenu: (NSMenu*)aMenu;
@end
@interface NSMenu (XibCompatibility)
@interface NSMenu (StoryboardCompatibility)
- (BOOL) _isMainMenu;
@end
@implementation NSMenu (XibCompatibility)
@implementation NSMenu (StoryboardCompatibility)
- (BOOL) _isMainMenu
{
@ -63,19 +63,6 @@
@end
@interface GSXibKeyedUnarchiver (DebugMethods)
- (NSDictionary *) objects;
@end
@implementation GSXibKeyedUnarchiver (DebugMethods)
- (NSDictionary *) objects
{
return objects;
}
@end
@interface GSStoryboardLoader: GSModelLoader
{
}
@ -90,7 +77,7 @@
+ (float) priority
{
return 5.0;
return 6.0;
}
- (void) awake: (NSArray *)rootObjects
@ -104,7 +91,7 @@
if ([rootObjects count] == 0)
{
NSWarnMLog(@"No root objects in XIB!");
NSWarnMLog(@"No root objects in storyboard!");
return;
}

View file

@ -156,12 +156,7 @@ static NSString *ApplicationClass = nil;
@end
@interface NSPathCell (Private)
+ (NSArray *) _generateCellsForURL: (NSURL *)url;
@end
@implementation GSXib5KeyedUnarchiver
// Declare all static vars...
static NSDictionary *XmlTagToObjectClassMap = nil;
static NSArray *XmlTagsNotStacked = nil;
static NSArray *XmlTagsToSkip = nil;
@ -174,6 +169,24 @@ static NSArray *XmlReferenceAttributes = nil;
static NSArray *XmlConnectionRecordTags = nil;
static NSArray *XmlBoolDefaultYes = nil;
@interface NSString (XibExtension)
- (BOOL) hasPrefixedClassName;
@end
@implementation NSString (XibExtension)
- (BOOL) hasPrefixedClassName
{
NSString *prefix = [self substringWithRange: NSMakeRange(0,2)];
return [ClassNamePrefixes containsObject: prefix];
}
@end
@implementation GSXib5KeyedUnarchiver
+ (void) initialize
{
if (self == [GSXib5KeyedUnarchiver class])
@ -212,6 +225,8 @@ static NSArray *XmlBoolDefaultYes = nil;
@"NSWindowTemplate", @"window",
@"NSView", @"tableCellView",
@"IBUserDefinedRuntimeAttribute5", @"userDefinedRuntimeAttribute",
@"GSStoryboardScene", @"scene",
@"GSStoryboardDocument", @"document",
@"NSURL", @"url",
nil];
RETAIN(XmlTagToObjectClassMap);
@ -222,7 +237,7 @@ static NSArray *XmlBoolDefaultYes = nil;
XmlTagsToSkip = [NSArray arrayWithObject: @"dependencies"];
RETAIN(XmlTagsToSkip);
ClassNamePrefixes = [NSArray arrayWithObjects: @"NS", @"GS", @"IB", nil];
ClassNamePrefixes = [NSArray arrayWithObjects: @"NS", @"IB", @"GS", nil];
RETAIN(ClassNamePrefixes);
XmlReferenceAttributes = [NSArray arrayWithObjects: @"headerView", @"initialItem",
@ -3005,7 +3020,7 @@ didStartElement: (NSString*)elementName
// This would allow to do system dependent path separator decoding...
object = @"/";
}
else if ([key hasPrefix: @"NS"])
else if ([key hasPrefixedClassName])
{
// Try a key minus a (potential) NS prefix...
NSString *newKey = [self alternateName: key];
@ -3048,7 +3063,7 @@ didStartElement: (NSString*)elementName
SEL selector = NSSelectorFromString([XmlKeyToDecoderSelectorMap objectForKey: key]);
flag = [[self performSelector: selector withObject: currentElement] boolValue];
}
else if ([key hasPrefix:@"NS"])
else if ([key hasPrefixedClassName])
{
NSString *newKey = [self alternateName: key];
flag = [self decodeBoolForKey: newKey];
@ -3080,7 +3095,7 @@ didStartElement: (NSString*)elementName
{
point = [self decodePointForKey: [XmlKeyMapTable objectForKey: key]];
}
else if ([key hasPrefix: @"NS"])
else if ([key hasPrefixedClassName])
{
NSString *newKey = [self alternateName: key];
point = [self decodePointForKey: newKey];
@ -3116,7 +3131,7 @@ didStartElement: (NSString*)elementName
size.width = [[currentElement attributeForKey: @"width"] doubleValue];
size.height = [[currentElement attributeForKey: @"height"] doubleValue];
}
else if ([key hasPrefix: @"NS"])
else if ([key hasPrefixedClassName])
{
NSString *newKey = [self alternateName: key];
size = [self decodeSizeForKey: newKey];
@ -3143,7 +3158,7 @@ didStartElement: (NSString*)elementName
{
frame = [self decodeRectForKey: [XmlKeyMapTable objectForKey: key]];
}
else if ([key hasPrefix: @"NS"])
else if ([key hasPrefixedClassName])
{
NSString *newKey = [self alternateName: key];
frame = [self decodeRectForKey: newKey];
@ -3171,7 +3186,7 @@ didStartElement: (NSString*)elementName
{
range = [self decodeRangeForKey: [XmlKeyMapTable objectForKey: key]];
}
else if ([key hasPrefix: @"NS"])
else if ([key hasPrefixedClassName])
{
NSString *newKey = [self alternateName: key];
range = [self decodeRangeForKey: newKey];
@ -3246,7 +3261,7 @@ didStartElement: (NSString*)elementName
// Missing values mean YES
hasValue = YES;
}
else if ([key hasPrefix: @"NS"])
else if ([key hasPrefixedClassName])
{
// Try a key minus a (potential) NS prefix...
NSString *newKey = [self alternateName: key];