Remove debugging, minor cleanup

gnustep · Aug 17, 2024 · 030148b · 030148b
1 parent 9152753
commit 030148b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 67 deletions.
diff --git a/XCode/NSObject+KeyExtraction.m b/XCode/NSObject+KeyExtraction.m
@@ -129,8 +129,8 @@ - (NSDictionary *) recursiveKeysAndValuesForObject: (id)object
 		    }
 		  else
 		    {
-		      [keysAndValues setObject: [NSNull null]
-					forKey: key];
+		      // [keysAndValues setObject: [NSNull null]
+		      //      forKey: key];
 		    }
 		}
 	    }

diff --git a/XCode/PBXCoder.h b/XCode/PBXCoder.h
@@ -73,6 +73,4 @@
 
 - (id) archive;
 
-- (id) archiveWithRootObject: (id)rootObject;
-
 @end
diff --git a/XCode/PBXCoder.m b/XCode/PBXCoder.m
@@ -250,9 +250,10 @@ - (NSDictionary *) objects
 }
 
 // Archiving methods...
-+ (instancetype) archiveWithRootObject: (id)root
++ (id) archiveWithRootObject: (id)root
 {
-  return AUTORELEASE([[self alloc] initWithRootObject: root]);
+  PBXCoder *coder = [[self alloc] initWithRootObject: root];
+  return [coder archive];
 }
 
 - (instancetype) initWithRootObject: (id)root
@@ -266,69 +267,8 @@ - (instancetype) initWithRootObject: (id)root
 }
 
 - (id) archive
-{
-  return [self archiveWithRootObject: _rootObject];
-}
-
-- (id) archiveWithRootObject: (id)rootObject
 {
   return [_rootObject allKeysAndValues];
 }
 
-- (NSArray *) _propertiesFromMethods: (NSArray *)methods
-			   forObject: (id)obj
-{
-  NSEnumerator *en = [methods objectEnumerator];
-  NSString *name = nil;
-  NSMutableArray *result = [NSMutableArray array];
-
-  while ((name = [en nextObject]) != nil)
-    {
-      if ([name isEqualToString: @"set"] == NO) // this is the [NSFont set] method... skip...
-	{
-	  NSString *substring = [name substringToIndex: 3];
-	  if ([substring isEqualToString: @"set"])
-	    {
-	      NSString *os = [[name substringFromIndex: 3]
-			       stringByReplacingOccurrencesOfString: @":"
-							 withString: @""];
-	      NSString *s = [os lowercaseFirstCharacter];
-	      NSString *iss = [NSString stringWithFormat: @"is%@", os];
-
-	      if ([methods containsObject: s])
-		{
-		  SEL sel = NSSelectorFromString(s);
-		  if (sel != NULL)
-		    {
-		      NSDebugLog(@"selector = %@",s);
-		      // NSMethodSignature *sig = [obj methodSignatureForSelector: sel];
-
-		      // NSLog(@"methodSignatureForSelector %@ -> %s", s, [sig methodReturnType]);
-		      if ([obj respondsToSelector: sel]) // if it has a normal getting, fine...
-			{
-			  [result addObject: s];
-			}
-		    }
-		}
-	      else if ([methods containsObject: iss])
-		{
-		  NSDebugLog(@"***** retrying with getter name: %@", iss);
-		  SEL sel = NSSelectorFromString(iss);
-		  if (sel != nil)
-		    {
-		      if ([obj respondsToSelector: sel])
-			{
-			  NSDebugLog(@"Added... %@", iss);
-			  [result addObject: iss];
-			}
-		    }
-		}
-	    }
-	}
-    }
-
-  return result;
-}
-
-
 @end