diff --git a/ChangeLog b/ChangeLog index 70ef79f0..0f4ed9ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-02-02 22:44 Gregory John Casamento + + * GormDocument.m: -[GormDocument removeConnectionsWithLabel:..] added + break to avoid iterating through all connections when the user has + responded "NO". + * GormFilePrefsManager.m: Update version to 0.9.1 + * GormInfo.plist: Update version to 0.9.1 + * GormObjCHeaderParser/OCIVarDecl.m: Change to correct problem + reading ivars with <...> in them such as id xxx. + 2005-02-01 23:40 Gregory John Casamento * Version 0.9.0 diff --git a/GormDocument.m b/GormDocument.m index c5dac0b9..eaf78dba 100644 --- a/GormDocument.m +++ b/GormDocument.m @@ -3196,6 +3196,7 @@ static NSImage *fileImage = nil; else { removed = NO; + break; } } } diff --git a/GormFilePrefsManager.m b/GormFilePrefsManager.m index 80789ce7..c396d84c 100644 --- a/GormFilePrefsManager.m +++ b/GormFilePrefsManager.m @@ -83,7 +83,7 @@ NSString *formatVersion(int version) + (int) currentVersion { - return appVersion(0,9,0); + return appVersion(0,9,1); } - (void) awakeFromNib diff --git a/GormInfo.plist b/GormInfo.plist index fb44a59e..6c82bcfb 100644 --- a/GormInfo.plist +++ b/GormInfo.plist @@ -14,9 +14,9 @@ ApplicationDescription = "[GNUstep | Graphical] Object Relationship Modeller"; ApplicationIcon = "Gorm.tiff"; ApplicationName = "Gorm"; - ApplicationRelease = "Gorm 0.9.0 (Release)"; + ApplicationRelease = "Gorm 0.9.1 (Alpha)"; Authors = ("Gregory John Casamento ","Richard Frith-Macdonald ","Pierre-Yves Rivaille "); Copyright = "Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 FSF"; CopyrightDescription = "Released under the GNU General Public License 2.0"; - NSBuildVersion = "0.9.0 Feb 2 2005"; + NSBuildVersion = "0.9.1 Feb 2 2005"; } diff --git a/GormObjCHeaderParser/OCIVarDecl.m b/GormObjCHeaderParser/OCIVarDecl.m index 5ecb87df..590c72d4 100644 --- a/GormObjCHeaderParser/OCIVarDecl.m +++ b/GormObjCHeaderParser/OCIVarDecl.m @@ -79,11 +79,20 @@ } // strip protocol qualifiers - stripScanner = [NSScanner scannerWithString: tempString]; - [stripScanner scanUpToString: @"<" intoString: &typeName]; - [stripScanner scanUpToAndIncludingString: @">" intoString: NULL]; - [stripScanner scanUpToCharactersFromSet: wsnl intoString: &varName]; - resultString = [typeName stringByAppendingString: varName]; + if(lookAhead(tempString,@"<")) + { + stripScanner = [NSScanner scannerWithString: tempString]; + [stripScanner scanUpToString: @"<" intoString: &typeName]; + [stripScanner scanUpToAndIncludingString: @">" intoString: NULL]; + [stripScanner scanUpToCharactersFromSet: wsnl intoString: &varName]; + + resultString = [[typeName stringByAppendingString: @" "] + stringByAppendingString: varName]; + } + else + { + resultString = tempString; + } ASSIGN(ivarString, resultString); }