Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ARC Conversion #42

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

ARC Conversion #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f47f7d5
Updating project files using Xcode 5.
Jan 27, 2014
6ff7253
Switching to automatic developer ID.
Jan 27, 2014
ea3549a
Preparing for conversion to ARC.
Jan 27, 2014
f32bc3d
Preparing for conversion to ARC, 2.
Jan 27, 2014
2585c26
Preparing for conversion to ARC, 3.
Jan 27, 2014
1d28300
Preparing for conversion to ARC, 4.
Jan 27, 2014
dd40de5
Adding warning.
Jan 27, 2014
38240fa
Preparing for conversion to ARC, 5.
Jan 27, 2014
6b72e11
Converting to ARC.
Jan 27, 2014
ce5277e
Declaring some __unsafe_unretained variables as __weak.
Jan 27, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions GTQuickLookItem.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,11 @@ - (id)initWithPath:(NSString *)path
{
self = [super init];

pathItem = [path retain];
pathItem = path;

return self;
}

- (void)dealloc
{
[pathItem release];
[super dealloc];
}

- (NSURL *)previewItemURL
{
Expand Down
18 changes: 13 additions & 5 deletions frameworks/gdkit/gdkit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0460;
LastUpgradeCheck = 0500;
};
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "gdkit" */;
compatibilityVersion = "Xcode 3.2";
Expand Down Expand Up @@ -905,7 +905,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
Expand Down Expand Up @@ -940,7 +940,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 1;
Expand Down Expand Up @@ -996,16 +996,20 @@
1DEB91B208733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = /Users/aaronsmith/dev/xcode/scr/10.5;
ONLY_ACTIVE_ARCH = YES;
Expand All @@ -1017,15 +1021,19 @@
1DEB91B308733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = /Users/aaronsmith/dev/xcode/scr/10.5;
OTHER_LDFLAGS = "";
Expand Down
1 change: 0 additions & 1 deletion frameworks/gdkit/source/GDASLLog.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ - (void) close {

- (void) dealloc {
[self close];
[super dealloc];
}

@end
2 changes: 1 addition & 1 deletion frameworks/gdkit/source/GDASLLogManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
/**
* Singleton instance.
*/
+ (GDASLLogManager *) sharedInstance;
+ (instancetype) sharedInstance;

/**
* Set a log object for key.
Expand Down
27 changes: 6 additions & 21 deletions frameworks/gdkit/source/GDASLLogManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ @implementation GDASLLogManager

@synthesize enabled;

+ (GDASLLogManager *) sharedInstance {
@synchronized(self) {
if(!inst) {
inst = [[self alloc] init];
}
}
+ (instancetype) sharedInstance {
static dispatch_once_t pred;
static id inst = nil;
dispatch_once(&pred, ^{
inst = [[self alloc] init];
});
return inst;
}

Expand Down Expand Up @@ -53,19 +53,4 @@ - (id)copyWithZone:(NSZone *) zone {
return self;
}

- (id) retain {
return self;
}

- (NSUInteger) retainCount {
return UINT_MAX;
}

- (id) autorelease {
return self;
}

- (oneway void) release{
}

@end
2 changes: 1 addition & 1 deletion frameworks/gdkit/source/GDAccessibilityManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ typedef enum {
/**
* Singleton instance.
*/
+ (GDAccessibilityManager *) sharedInstance;
+ (instancetype) sharedInstance;

/**
* Whether or not the accessibility API is on.
Expand Down
Loading