gnustep/apps-projectcenter
0
0
Fork 0
mirror of https://github.com/gnustep/apps-projectcenter.git synced 2025-02-14 07:31:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge

Browse source
This commit is contained in:
Riccardo Mottola 2023-01-16 21:31:01 +01:00
commit de5e8f63c5
6 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -3,6 +3,12 @@
* Framework/PCProjectWindow.m * Framework/PCProjectWindow.m
nil the delegates of the split-view, avoid a crash on close window. nil the delegates of the split-view, avoid a crash on close window.
2022-01-13 Riccardo Mottola <rm@gnu.org>
* Framework/PCProjectInspector.m
Don't assign nil, it is useless, just destroy it: retaining nil is
useless.
2022-01-12 Riccardo Mottola <rm@gnu.org> 2022-01-12 Riccardo Mottola <rm@gnu.org>
* Modules/Editors/ProjectCenter/PCEditor.h * Modules/Editors/ProjectCenter/PCEditor.h

4
Framework/PCProjectInspector.m
View file

@ -1,7 +1,7 @@
/* /*
GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html
Copyright (C) 2000-2021 Free Software Foundation Copyright (C) 2000-2023 Free Software Foundation
Authors: Philippe C.D. Robert Authors: Philippe C.D. Robert
Serg Stoyan Serg Stoyan
@ -429,7 +429,7 @@
} }
else else
{ {
ASSIGN(searchItems,nil); DESTROY(searchItems);
} }
[searchOrderList reloadData]; [searchOrderList reloadData];

2
Modules/Editors/ProjectCenter/SyntaxDefinition.m
View file

@ -339,7 +339,7 @@ static NSMutableDictionary * syntaxDefinitions = nil;
NSLog(_(@"Missing keyword pattern declaration " NSLog(_(@"Missing keyword pattern declaration "
@"in context %i keyword %i. Ignoring all the " @"in context %i keyword %i. Ignoring all the "
@"remaining of the keywords in this context."), @"remaining of the keywords in this context."),
i, j); (int)i, (int)j);
break; break;
} }
pattern = CompileTextPattern(keywordString); pattern = CompileTextPattern(keywordString);

12
Modules/Editors/ProjectCenter/TextPattern.m
View file

@ -67,7 +67,7 @@ ParseTextPatternItem (NSString *string, unsigned int *index)
{ {
NSLog(_(@"Text pattern item parse error in text " NSLog(_(@"Text pattern item parse error in text "
@"pattern \"%@\" at index %i: unexpected end of " @"pattern \"%@\" at index %i: unexpected end of "
@"pattern. Escape sequence expected."), string); @"pattern. Escape sequence expected."), string, i);
free (buf); free (buf);
free (newItem); free (newItem);
@ -126,7 +126,7 @@ ParseTextPatternItem (NSString *string, unsigned int *index)
{ {
NSLog(_(@"Text pattern item parse error in text pattern " NSLog(_(@"Text pattern item parse error in text pattern "
@"\"%@\" at index %i: unexpected end of pattern. Escape " @"\"%@\" at index %i: unexpected end of pattern. Escape "
@"sequence expected."), string); @"sequence expected."), string, i);
free (newItem); free (newItem);
return NULL; return NULL;
@ -172,8 +172,8 @@ ParseTextPatternItem (NSString *string, unsigned int *index)
if (![scanner scanInt: &value]) if (![scanner scanInt: &value])
{ {
NSLog(_(@"Text pattern item parse error in text pattern " NSLog(_(@"Text pattern item parse error in text pattern "
@"\"%@\" at index %i: integer expected."), string, @"\"%@\" at index %li: integer expected."), string,
[scanner scanLocation]); (long int)[scanner scanLocation]);
FreeTextPatternItem(newItem); FreeTextPatternItem(newItem);
@ -198,8 +198,8 @@ ParseTextPatternItem (NSString *string, unsigned int *index)
if (![scanner scanInt: &value]) if (![scanner scanInt: &value])
{ {
NSLog(_(@"Text pattern item parser error in text " NSLog(_(@"Text pattern item parser error in text "
@"pattern \"%@\" at index %i: integer expected."), @"pattern \"%@\" at index %li: integer expected."),
string, [scanner scanLocation]); string, (long int)[scanner scanLocation]);
FreeTextPatternItem(newItem); FreeTextPatternItem(newItem);

8
Modules/Projects/Framework/PCFrameworkProject.m
View file

@ -1,7 +1,7 @@
/* /*
GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html
Copyright (C) 2005-2018 Free Software Foundation Copyright (C) 2005-2023 Free Software Foundation
Authors: Serg Stoyan Authors: Serg Stoyan
Riccardo Mottola Riccardo Mottola
@ -319,11 +319,11 @@
[mff appendString:@"\n#\n# AutoGSDoc\n#\n"]; [mff appendString:@"\n#\n# AutoGSDoc\n#\n"];
[mff appendString: [NSString stringWithFormat:@"DOCUMENT_NAME = %@\n\n", projectName]]; [mff appendString: [NSString stringWithFormat:@"DOCUMENT_NAME = %@\n\n", projectName]];
[mff appendString: [NSString stringWithFormat:@"%@_AGSDOC_FILES = %@.gsdoc \\\n", [mff appendString: [NSString stringWithFormat:@"%@_AGSDOC_FILES = %@.gsdoc \\\n",
projectName, projectName]]; projectName, projectName]];
[mff appendString: [NSString stringWithFormat:@"\t$(%@_HEADER_FILES) \\\n", [mff appendString: [NSString stringWithFormat:@"\t$(%@_HEADER_FILES) \\\n",
projectName, projectName]]; projectName]];
[mff appendString: [NSString stringWithFormat:@"\t$(%@_OBJC_FILES) \\\n", [mff appendString: [NSString stringWithFormat:@"\t$(%@_OBJC_FILES) \\\n",
projectName, projectName]]; projectName]];
[mff appendString: [NSString stringWithFormat:@"\n\n%@_AGSDOC_FLAGS += -MakeFrames YES\n", projectName]]; [mff appendString: [NSString stringWithFormat:@"\n\n%@_AGSDOC_FLAGS += -MakeFrames YES\n", projectName]];
} }

2
Resources/Info-gnustep.plist
View file

@ -72,6 +72,6 @@
} }
); );
URL = "See http://www.gnustep.org/"; URL = "See http://www.gnustep.org/";
Copyright = "Copyright (C) 1999 - 2022 Free Software Foundation"; Copyright = "Copyright (C) 1999 - 2023 Free Software Foundation";
CopyrightDescription = "Released under the GNU General Public License 3.0 or later"; CopyrightDescription = "Released under the GNU General Public License 3.0 or later";
} }