diff --git a/GormCore/GNUmakefile b/GormCore/GNUmakefile index ea4b072e..7607dfeb 100644 --- a/GormCore/GNUmakefile +++ b/GormCore/GNUmakefile @@ -190,10 +190,6 @@ GormCore_OBJC_FILES = \ GormXLIFFDocument.m \ GormCore_RESOURCE_FILES = \ - Plugins/Gorm/Gorm.plugin \ - Plugins/Nib/Nib.plugin \ - Plugins/Xib/Xib.plugin \ - Plugins/GModel/GModel.plugin \ Images/GormActionSelected.tiff \ Images/GormAction.tiff \ Images/GormClass.tiff \ diff --git a/GormCore/GormClassEditor.m b/GormCore/GormClassEditor.m index 69752873..254acff7 100644 --- a/GormCore/GormClassEditor.m +++ b/GormCore/GormClassEditor.m @@ -73,7 +73,7 @@ NSImage *browserImage = nil; { NSBundle *bundle = [NSBundle bundleForClass: [self class]]; - if([bundle loadNibNamed: @"GormClassEditor" owner: self topLevelObjects: nil]) + if([bundle loadNibNamed: @"GormClassEditor" owner: self topLevelObjects: NULL]) { NSNotificationCenter *nc = [NSNotificationCenter defaultCenter]; NSRect scrollRect = [classesView frame]; // = {{0, 0}, {340, 188}}; diff --git a/GormCore/GormClassInspector.m b/GormCore/GormClassInspector.m index 3ac6420e..2d36c52a 100644 --- a/GormCore/GormClassInspector.m +++ b/GormCore/GormClassInspector.m @@ -274,7 +274,7 @@ objectValueForTableColumn: (NSTableColumn *)tc // load the gui... if (![bundle loadNibNamed: @"GormClassInspector" owner: self - topLevelObjects: nil]) + topLevelObjects: NULL]) { NSLog(@"Could not open gorm GormClassInspector"); return nil; diff --git a/GormCore/GormClassManager.m b/GormCore/GormClassManager.m index 8cbec825..ac9fb119 100644 --- a/GormCore/GormClassManager.m +++ b/GormCore/GormClassManager.m @@ -2264,6 +2264,8 @@ return result; } +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpointer-to-int-cast" - (NSString *) description { return [NSString stringWithFormat: @"<%s: %lx> = %@", @@ -2271,6 +2273,7 @@ (unsigned long)self, _customClassMap]; } +#pragma GCC diagnostic pop /** Helpful for debugging */ - (NSString *) dumpClassInformation diff --git a/GormCore/GormClassPanelController.m b/GormCore/GormClassPanelController.m index 10eef40d..acd1a452 100644 --- a/GormCore/GormClassPanelController.m +++ b/GormCore/GormClassPanelController.m @@ -38,7 +38,7 @@ { NSBundle *bundle = [NSBundle bundleForClass: [self class]]; - if ( ![bundle loadNibNamed:@"GormClassPanel" owner:self topLevelObjects: nil] ) + if ( ![bundle loadNibNamed:@"GormClassPanel" owner:self topLevelObjects: NULL] ) { NSLog(@"Can not load bundle GormClassPanel"); return nil; diff --git a/GormCore/GormConnectionInspector.m b/GormCore/GormConnectionInspector.m index a2dd005a..978de645 100644 --- a/GormCore/GormConnectionInspector.m +++ b/GormCore/GormConnectionInspector.m @@ -92,7 +92,7 @@ { NSBundle *bundle = [NSBundle bundleForClass: [self class]]; - if([bundle loadNibNamed: @"GormConnectionInspector" owner: self topLevelObjects: nil] == NO) + if([bundle loadNibNamed: @"GormConnectionInspector" owner: self topLevelObjects: NULL] == NO) { NSLog(@"Couldn't load GormConnectionInsector"); return nil; diff --git a/GormCore/GormCustomClassInspector.m b/GormCore/GormCustomClassInspector.m index 193e63df..51d24d8a 100644 --- a/GormCore/GormCustomClassInspector.m +++ b/GormCore/GormCustomClassInspector.m @@ -58,7 +58,7 @@ // load the gui... if (![bundle loadNibNamed: @"GormCustomClassInspector" owner: self - topLevelObjects: nil]) + topLevelObjects: NULL]) { NSLog(@"Could not open gorm GormCustomClassInspector"); return nil; diff --git a/GormCore/GormDocument.m b/GormCore/GormDocument.m index 3cca48de..dda2494e 100644 --- a/GormCore/GormDocument.m +++ b/GormCore/GormDocument.m @@ -1436,7 +1436,7 @@ static NSImage *fileImage = nil; /** * Detach every object in anArray from the document. Optionally closing editors. */ -- (void) detachObjects: (NSArray*)anArray closeEditors: (BOOL)close_editors +- (void) detachObjects: (/* NSArray* */ id)anArray closeEditors: (BOOL)close_editors { NSEnumerator *enumerator = [anArray objectEnumerator]; NSObject *obj; @@ -2924,6 +2924,8 @@ static void _real_close(GormDocument *self, /** * Return a text description of the document. */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpointer-to-int-cast" - (NSString *) description { return [NSString stringWithFormat: @"<%s: %lx> = <>", @@ -2931,6 +2933,7 @@ static void _real_close(GormDocument *self, (unsigned long)self, nameTable, connections]; } +#pragma GCC diagnostic pop /** * Returns YES, if obj is a top level object. @@ -3670,6 +3673,7 @@ static void _real_close(GormDocument *self, } } + /* NSLog(@"Checking connections..."); // %@", connections); en = [connections objectEnumerator]; o = nil; @@ -3677,7 +3681,7 @@ static void _real_close(GormDocument *self, { id src = [o source]; id dst = [o destination]; - NSString *lable = [o label]; + NSString *label = [o label]; if ([o isKindOfClass: [NSNibControlConnector class]]) { @@ -3686,7 +3690,7 @@ static void _real_close(GormDocument *self, { } } - + */ return results; } diff --git a/GormCore/GormFontViewController.m b/GormCore/GormFontViewController.m index 976489f0..32bc83d3 100644 --- a/GormCore/GormFontViewController.m +++ b/GormCore/GormFontViewController.m @@ -27,7 +27,7 @@ static GormFontViewController *gorm_font_cont = nil; // load the gui... if (![bundle loadNibNamed: @"GormFontView" owner: self - topLevelObjects: nil]) + topLevelObjects: NULL]) { NSLog(@"Could not open gorm GormFontView"); return nil; diff --git a/GormCore/GormHelpInspector.m b/GormCore/GormHelpInspector.m index 22740e04..e0316cb9 100644 --- a/GormCore/GormHelpInspector.m +++ b/GormCore/GormHelpInspector.m @@ -16,7 +16,7 @@ return nil; } - if ([bundle loadNibNamed: @"GormHelpInspector" owner: self topLevelObjects: nil] == NO) + if ([bundle loadNibNamed: @"GormHelpInspector" owner: self topLevelObjects: NULL] == NO) { NSLog(@"Could not gorm GormHelpInspector"); return nil; diff --git a/GormCore/GormImageInspector.m b/GormCore/GormImageInspector.m index 928f1fa9..6f17111e 100644 --- a/GormCore/GormImageInspector.m +++ b/GormCore/GormImageInspector.m @@ -24,7 +24,7 @@ // load the gui... if (![bundle loadNibNamed: @"GormImageInspector" owner: self - topLevelObjects: nil]) + topLevelObjects: NULL]) { NSLog(@"Could not open gorm GormImageInspector"); return nil; diff --git a/GormCore/GormInspectorsManager.m b/GormCore/GormInspectorsManager.m index ac880536..b018fba7 100644 --- a/GormCore/GormInspectorsManager.m +++ b/GormCore/GormInspectorsManager.m @@ -50,7 +50,7 @@ { NSBundle *bundle = [NSBundle bundleForClass: [self class]]; - if([bundle loadNibNamed: @"GormDummyInspector" owner: self topLevelObjects: nil]) + if([bundle loadNibNamed: @"GormDummyInspector" owner: self topLevelObjects: NULL]) { [button setStringValue: [self title]]; } diff --git a/GormCore/GormNSSplitViewInspector.m b/GormCore/GormNSSplitViewInspector.m index e9b129b6..01fb15c3 100644 --- a/GormCore/GormNSSplitViewInspector.m +++ b/GormCore/GormNSSplitViewInspector.m @@ -27,7 +27,7 @@ if ([bundle loadNibNamed: @"GormNSSplitViewInspector" owner: self - topLevelObjects: nil] == NO) + topLevelObjects: NULL] == NO) { NSLog(@"Could not open gorm GormNSSplitViewInspector"); NSLog(@"self %@", self); diff --git a/GormCore/GormObjectInspector.h b/GormCore/GormObjectInspector.h index 67325604..6e36ae55 100644 --- a/GormCore/GormObjectInspector.h +++ b/GormCore/GormObjectInspector.h @@ -27,6 +27,8 @@ #include "GormPrivate.h" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-variable" static NSString *typeId = @"Object"; static NSString *typeChar = @"Character or Boolean"; static NSString *typeUChar = @"Unsigned character/bool"; @@ -34,7 +36,7 @@ static NSString *typeInt = @"Integer"; static NSString *typeUInt = @"Unsigned integer"; static NSString *typeFloat = @"Float"; static NSString *typeDouble = @"Double"; - +#pragma GCC diagnostic pop @interface GormObjectInspector : IBInspector { diff --git a/GormCore/GormObjectInspector.m b/GormCore/GormObjectInspector.m index bcfe5a0c..76614e9a 100644 --- a/GormCore/GormObjectInspector.m +++ b/GormCore/GormObjectInspector.m @@ -33,7 +33,7 @@ { NSBundle *bundle = [NSBundle bundleForClass: [self class]]; - if([bundle loadNibNamed: @"GormObjectInspector" owner: self topLevelObjects: nil] == NO) + if([bundle loadNibNamed: @"GormObjectInspector" owner: self topLevelObjects: NULL] == NO) { NSLog(@"Couldn't load GormObjectInsector"); return nil; diff --git a/GormCore/GormPrivate.h b/GormCore/GormPrivate.h index 651996ba..f8a08bd4 100644 --- a/GormCore/GormPrivate.h +++ b/GormCore/GormPrivate.h @@ -39,6 +39,8 @@ #include #include +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wattributes" extern NSString *GormLinkPboardType; extern NSString *GormToggleGuidelineNotification; extern NSString *GormDidModifyClassNotification; @@ -47,6 +49,7 @@ extern NSString *GormDidDeleteClassNotification; extern NSString *GormWillDetachObjectFromDocumentNotification; extern NSString *GormDidDetachObjectFromDocumentNotification; extern NSString *GormResizeCellNotification; +#pragma GCC diagnostic pop @class GormDocument; @class GormInspectorsManager; diff --git a/GormCore/GormScrollViewAttributesInspector.m b/GormCore/GormScrollViewAttributesInspector.m index c6934c4e..cb647357 100644 --- a/GormCore/GormScrollViewAttributesInspector.m +++ b/GormCore/GormScrollViewAttributesInspector.m @@ -40,7 +40,7 @@ if ([bundle loadNibNamed: @"GormScrollViewAttributesInspector" owner: self - topLevelObjects: nil] == NO) + topLevelObjects: NULL] == NO) { NSLog(@"Could not open gorm GormScrollViewAttributesInspector"); NSLog(@"self %@", self); diff --git a/GormCore/GormSetNameController.m b/GormCore/GormSetNameController.m index 0ca280ce..58b87e51 100644 --- a/GormCore/GormSetNameController.m +++ b/GormCore/GormSetNameController.m @@ -14,7 +14,7 @@ { NSBundle *bundle = [NSBundle bundleForClass: [self class]]; - if (![bundle loadNibNamed: @"GormSetName" owner: self topLevelObjects: nil]) + if (![bundle loadNibNamed: @"GormSetName" owner: self topLevelObjects: NULL]) { return NSAlertAlternateReturn; } diff --git a/GormCore/GormSoundInspector.m b/GormCore/GormSoundInspector.m index e64ef1ff..4aa9df47 100644 --- a/GormCore/GormSoundInspector.m +++ b/GormCore/GormSoundInspector.m @@ -55,7 +55,7 @@ // load the gui... if (![bundle loadNibNamed: @"GormSoundInspector" owner: self - topLevelObjects: nil]) + topLevelObjects: NULL]) { NSLog(@"Could not open gorm GormSoundInspector"); return nil; diff --git a/GormCore/GormViewSizeInspector.m b/GormCore/GormViewSizeInspector.m index 9da27958..a91e4fe1 100644 --- a/GormCore/GormViewSizeInspector.m +++ b/GormCore/GormViewSizeInspector.m @@ -81,7 +81,7 @@ NSImage *mVLine = nil; NSBundle *bundle = [NSBundle bundleForClass: [self class]]; if ([bundle loadNibNamed: @"GormViewSizeInspector" owner: self - topLevelObjects: nil] == NO) + topLevelObjects: NULL] == NO) { NSLog(@"Could not open gorm GormViewSizeInspector"); NSLog(@"self %@", self);