Skip to content

Commit 9609ade

Browse files
author
josh.aas
committed
Replace deprecated API usage, upgrade Xcode project file to version 3.2.
1 parent f482a65 commit 9609ade

File tree

2 files changed

+23
-11
lines changed

2 files changed

+23
-11
lines changed

LineBreak.xcodeproj/project.pbxproj

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 42;
6+
objectVersion = 46;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -201,9 +201,16 @@
201201
/* Begin PBXProject section */
202202
29B97313FDCFA39411CA2CEA /* Project object */ = {
203203
isa = PBXProject;
204+
attributes = {
205+
LastUpgradeCheck = 0420;
206+
};
204207
buildConfigurationList = 036BFF5A09D4864F003A7A3E /* Build configuration list for PBXProject "LineBreak" */;
205-
compatibilityVersion = "Xcode 2.4";
208+
compatibilityVersion = "Xcode 3.2";
209+
developmentRegion = English;
206210
hasScannedForEncodings = 1;
211+
knownRegions = (
212+
en,
213+
);
207214
mainGroup = 29B97314FDCFA39411CA2CEA /* LineBreak */;
208215
projectDirPath = "";
209216
projectRoot = "";
@@ -278,10 +285,10 @@
278285
036BFF5309D4864D003A7A3E /* Development */ = {
279286
isa = XCBuildConfiguration;
280287
buildSettings = {
288+
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
281289
COPY_PHASE_STRIP = NO;
282290
FRAMEWORK_SEARCH_PATHS = "";
283291
GCC_DYNAMIC_NO_PIC = NO;
284-
GCC_ENABLE_FIX_AND_CONTINUE = YES;
285292
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
286293
GCC_OPTIMIZATION_LEVEL = 0;
287294
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
@@ -291,6 +298,7 @@
291298
LIBRARY_SEARCH_PATHS = "";
292299
OTHER_LDFLAGS = "";
293300
PRODUCT_NAME = LineBreak;
301+
SDKROOT = macosx;
294302
SECTORDER_FLAGS = "";
295303
WARNING_CFLAGS = (
296304
"-Wmost",
@@ -305,9 +313,9 @@
305313
036BFF5409D4864D003A7A3E /* Deployment */ = {
306314
isa = XCBuildConfiguration;
307315
buildSettings = {
316+
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
308317
COPY_PHASE_STRIP = YES;
309318
FRAMEWORK_SEARCH_PATHS = "";
310-
GCC_ENABLE_FIX_AND_CONTINUE = NO;
311319
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
312320
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
313321
HEADER_SEARCH_PATHS = "";
@@ -316,6 +324,7 @@
316324
LIBRARY_SEARCH_PATHS = "";
317325
OTHER_LDFLAGS = "";
318326
PRODUCT_NAME = LineBreak;
327+
SDKROOT = macosx;
319328
SECTORDER_FLAGS = "";
320329
WARNING_CFLAGS = (
321330
"-Wmost",
@@ -330,6 +339,7 @@
330339
036BFF5509D4864D003A7A3E /* Default */ = {
331340
isa = XCBuildConfiguration;
332341
buildSettings = {
342+
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
333343
FRAMEWORK_SEARCH_PATHS = "";
334344
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
335345
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
@@ -339,6 +349,7 @@
339349
LIBRARY_SEARCH_PATHS = "";
340350
OTHER_LDFLAGS = "";
341351
PRODUCT_NAME = LineBreak;
352+
SDKROOT = macosx;
342353
SECTORDER_FLAGS = "";
343354
WARNING_CFLAGS = (
344355
"-Wmost",
@@ -357,7 +368,7 @@
357368
i386,
358369
);
359370
MACOSX_DEPLOYMENT_TARGET = 10.4;
360-
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
371+
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
361372
};
362373
name = Development;
363374
};
@@ -369,7 +380,7 @@
369380
i386,
370381
);
371382
MACOSX_DEPLOYMENT_TARGET = 10.4;
372-
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
383+
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
373384
};
374385
name = Deployment;
375386
};
@@ -381,7 +392,7 @@
381392
i386,
382393
);
383394
MACOSX_DEPLOYMENT_TARGET = 10.4;
384-
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
395+
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
385396
};
386397
name = Default;
387398
};

ProtectionPanel.m

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,17 +107,18 @@ -(IBAction)addExtension:(id)sender {
107107
}
108108

109109
-(IBAction)removeSelection:(id)sender {
110-
int i;
111110
NSMutableArray *currentFileExtensions;
112-
NSArray *selections = [[mExtensionsTable selectedRowEnumerator] allObjects];
111+
NSIndexSet *selections = [mExtensionsTable selectedRowIndexes];
113112
if ([self isExcludeSelected]) {
114113
currentFileExtensions = [NSMutableArray arrayWithArray:[preferences arrayForKey:NonTextFileExtensionsKey]];
115114
}
116115
else {
117116
currentFileExtensions = [NSMutableArray arrayWithArray:[preferences arrayForKey:TextFileExtensionsKey]];
118117
}
119-
for (i = ([selections count] - 1); i >= 0; i--) {
120-
[currentFileExtensions removeObjectAtIndex:[[selections objectAtIndex:i] intValue]];
118+
NSUInteger i = [selections lastIndex];
119+
while (i != NSNotFound) {
120+
[currentFileExtensions removeObjectAtIndex:i];
121+
i = [selections indexLessThanIndex:i];
121122
}
122123
if ([self isExcludeSelected]) {
123124
[preferences setObject:[NSArray arrayWithArray:currentFileExtensions] forKey:NonTextFileExtensionsKey];

0 commit comments

Comments
 (0)