gnustep/apps-projectcenter
0
0
Fork 0
mirror of https://github.com/gnustep/apps-projectcenter.git synced 2025-03-17 08:01:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

ProjectCenter fixes for compilation on 64-bit hosts.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@35330 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Wolfgang Lux 2012-07-30 21:07:19 +00:00
parent d98014879b
commit f3ac6d9d8a
4 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2012-07-30 Wolfgang Lux <wolfgang.lux@gmail.com>
* Framework/PCProjectBuilder.m (-line:startsWithString:,
-parseErrorLine:):
* Modules/Editors/ProjectCenter/PCEditor.h:
* Modules/Editors/ProjectCenter/PCEditor.m (FindDelimiterInString,
-highlightCharacterAt:inEditor:): Fix for compilation on 64-bit
hosts.
2012-07-09 Serg Stoyan <stoyan255@ukr.net>
* Framework/PCProjectInspector.m: (-removeAuthor): Improve selection

8
Framework/PCProjectBuilder.m
View file

@ -870,8 +870,8 @@
// --- Parsing utilities
- (BOOL)line:(NSString *)lineString startsWithString:(NSString *)substring
{
int position = 0;
NSRange range = NSMakeRange(position,1);
NSInteger position = 0;
NSRange range = NSMakeRange(position,1);
while ([[lineString substringFromRange:range] isEqualToString:@" "])
{
@ -1127,8 +1127,8 @@
}
else if ([components count] > 3)
{
unsigned typeIndex;
NSString *substr;
NSUInteger typeIndex;
NSString *substr;
// file and includedFile
file = [currentBuildPath

2
Modules/Editors/ProjectCenter/PCEditor.h
View file

@ -150,7 +150,7 @@
@interface PCEditor (Parenthesis)
- (void)unhighlightCharacter: (NSTextView *)editorView;
- (void)highlightCharacterAt:(unsigned int)location inEditor: (NSTextView *)editorView;
- (void)highlightCharacterAt:(NSUInteger)location inEditor: (NSTextView *)editorView;
- (void)computeNewParenthesisNesting: (NSTextView *)editorView;
@end

22
Modules/Editors/ProjectCenter/PCEditor.m
View file

@ -1170,19 +1170,19 @@ static inline BOOL CheckDelimiter(unichar character,
* @return The location of the delimiter if it is found, or NSNotFound
* if it isn't.
*/
unsigned int FindDelimiterInString(NSString * string,
unichar delimiter,
unichar oppositeDelimiter,
unsigned int startLocation,
BOOL searchBackwards)
NSUInteger FindDelimiterInString(NSString * string,
unichar delimiter,
unichar oppositeDelimiter,
NSUInteger startLocation,
BOOL searchBackwards)
{
unsigned int i;
unsigned int length;
unichar (*charAtIndex)(id, SEL, unsigned int);
NSUInteger i;
NSUInteger length;
unichar (*charAtIndex)(id, SEL, NSUInteger);
SEL sel = @selector(characterAtIndex:);
int nesting = 1;
charAtIndex = (unichar (*)(id, SEL, unsigned int)) [string
charAtIndex = (unichar (*)(id, SEL, NSUInteger)) [string
methodForSelector: sel];
if (searchBackwards)
@ -1299,7 +1299,7 @@ unsigned int FindDelimiterInString(NSString * string,
[textStorage endEditing];
}
- (void)highlightCharacterAt:(unsigned int)location inEditor: (NSTextView *)editorView
- (void)highlightCharacterAt:(NSUInteger)location inEditor: (NSTextView *)editorView
{
int i;
@ -1384,7 +1384,7 @@ unsigned int FindDelimiterInString(NSString * string,
// we're searching for).
if (CheckDelimiter(c, &oppositeDelimiter, &searchBackwards))
{
unsigned int result;
NSUInteger result;
result = FindDelimiterInString(myString,
oppositeDelimiter,