Merge pull request #1542 from skurfer/warnings

Warnings
quicksilver · Jul 30, 2013 · 554495f · 554495f
2 parents a4ccb5c + 5f2f620
commit 554495f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/Quicksilver/Code-QuickStepCore/QSObject.h b/Quicksilver/Code-QuickStepCore/QSObject.h
@@ -135,6 +135,8 @@ typedef struct _QSObjectFlags {
 - (void)setCache:(NSMutableDictionary *)aCache;
 - (BOOL)isProxyObject;
 - (QSObject *)resolvedObject;
+// This private method is required for QSProxyObject.m
+- (id)_safeObjectForType:(id)aKey;
 
 @end
 
@@ -175,7 +177,6 @@ typedef struct _QSObjectFlags {
 - (void)setIdentifier:(NSString *)newIdentifier;
 - (NSString *)name;
 - (void)setName:(NSString *)newName;
-- (QSObject *)parent;
 - (NSArray *)children;
 - (void)setChildren:(NSArray *)newChildren;
 - (NSArray *)altChildren;
@@ -198,10 +199,6 @@ typedef struct _QSObjectFlags {
 - (NSTimeInterval)childrenLoadedDate;
 - (void)setChildrenLoadedDate:(NSTimeInterval)newChildrenLoadedDate;
 
-
-// This private method is required for QSProxyObject.m
-- (id)_safeObjectForType:(id)aKey;
-
 @end
 
 

diff --git a/Quicksilver/Code-QuickStepCore/QSObject.m b/Quicksilver/Code-QuickStepCore/QSObject.m
@@ -576,6 +576,18 @@ - (QSObject *)resolvedObject
 
 @implementation QSObject (Hierarchy)
 
+- (QSObject *)parent {
+    QSObject * parent = nil;
+
+	id handler = nil;
+	if (handler = [self handlerForSelector:@selector(parentOfObject:)])
+		parent = [handler parentOfObject:self];
+
+	if (!parent)
+		parent = [objectDictionary objectForKey:[meta objectForKey:kQSObjectParentID]];
+	return parent;
+}
+
 - (void)setParentID:(NSString *)parentID {
     [self setObject:parentID forMeta:kQSObjectParentID];
 }
@@ -709,18 +721,6 @@ - (void)setName:(NSString *)newName {
     }
 }
 
-- (QSObject *)parent {
-    QSObject * parent = nil;
-
-	id handler = nil;
-	if (handler = [self handlerForSelector:@selector(parentOfObject:)])
-		parent = [handler parentOfObject:self];
-
-	if (!parent)
-		parent = [objectDictionary objectForKey:[meta objectForKey:kQSObjectParentID]];
-	return parent;
-}
-
 - (NSArray *)children {
 	if (!flags.childrenLoaded || ![self childrenValid])
 		[self loadChildren];

diff --git a/Quicksilver/Code-QuickStepCore/QSRegistry.m b/Quicksilver/Code-QuickStepCore/QSRegistry.m
@@ -175,7 +175,10 @@ - (id)getClassInstance:(NSString *)className {
 
 - (NSMutableDictionary *)identifierBundles { return identifierBundles;  }
 
-+ (void)setObject:(id)object forKey:(NSString *)inTable:(NSString *)table {[[self sharedInstance] setObject:(id)object forKey:(NSString *)inTable:(NSString *)table];} ;
++ (void)setObject:(id)object forKey:(NSString *)key inTable:(NSString *)table {
+    [[self sharedInstance] setObject:object forKey:key inTable:table];
+}
+
 - (void)setObject:(id)object forKey:(NSString *)key inTable:(NSString *)table {
 	[[self tableNamed:table] setObject:object forKey:key];
 }

diff --git a/Quicksilver/SharedSupport/CHANGELOG b/Quicksilver/SharedSupport/CHANGELOG
@@ -26,7 +26,7 @@ This release requires 10.7+ and is 64-bit.
   * Improved recognition of URLs and e-mail addresses (#1462, #1509, #1512, #1508, #1514)
   * Fix the appearance of some hi-res images (#1518)
   * Prevent duplicates in Recent Commands/command history (#1532)
-  * Internal improvements and bug fixes (#1468, #1475, #1479, #1505)
+  * Internal improvements and bug fixes (#1468, #1475, #1479, #1505, #1542)
 
 ### Changed ###