diff --git a/Framework/src/MetaEdits.m b/Framework/src/MetaEdits.m index 26e54720..6500a975 100644 --- a/Framework/src/MetaEdits.m +++ b/Framework/src/MetaEdits.m @@ -49,24 +49,6 @@ - (id)initWithProvider:(id)aProvider { return self; } -/* -- (id)retain -{ - NSLog(@"Retaining %d", [self retainCount]); - if([self retainCount]<=8) - NSLog(@"NOB"); - return [super retain]; -} - -- (oneway void)release -{ - NSLog(@"Releasin %d", [self retainCount]); - if([self retainCount]<=8) - NSLog(@"NOB"); - [super release]; -} -*/ - - (void)dealloc { [[NSNotificationCenter defaultCenter] @@ -155,9 +137,7 @@ -(void)setterChanged:(BOOL)aValue forKey:(NSString *)aKey id oldValue = [changes objectForKey:aKey]; if(!aValue && oldValue!=nil) { - // Shitty fucking crap code [[[self undoManager] prepareWithInvocationTarget:self] setterValue:oldValue forKey:aKey]; - //[[self undoManager] registerUndoWithTarget:self selector:[MZMethodData setterSelectorForKey:aKey] object:oldValue]; MZTag* tag = [MZTag tagForIdentifier:aKey]; NSString* actionKey = [tag localizedName]; if(!actionKey) @@ -176,27 +156,6 @@ -(void)setterChanged:(BOOL)aValue forKey:(NSString *)aKey NSLocalizedString(@"Reverted %@", @"Undo reverted action"), actionKey]]; } - /* - if(multiUndoManager) - { - if([multiUndoManager isUndoing]) - { - [[multiUndoManager prepareWithInvocationTarget:[self undoManager]] redo]; - [multiUndoManager setActionName: - [NSString stringWithFormat: - NSLocalizedString(@"Set %@", @"Undo set action"), - actionKey]]; - } - else - { - [[multiUndoManager prepareWithInvocationTarget:[self undoManager]] undo]; - [multiUndoManager setActionName: - [NSString stringWithFormat: - NSLocalizedString(@"Reverted %@", @"Undo reverted action"), - actionKey]]; - } - } - */ if([changes count] == 1) [self willChangeValueForKey:@"changed"]; @@ -223,19 +182,6 @@ -(void)setterChanged:(BOOL)aValue forKey:(NSString *)aKey [NSString stringWithFormat: NSLocalizedString(@"Set %@", @"Undo set action"), actionKey]]; - /* - if(multiUndoManager) - { - if([multiUndoManager isUndoing]) - [[multiUndoManager prepareWithInvocationTarget:[self undoManager]] redo]; - else - [[multiUndoManager prepareWithInvocationTarget:[self undoManager]] undo]; - [multiUndoManager setActionName: - [NSString stringWithFormat: - NSLocalizedString(@"Set %@", @"Undo set action"), - actionKey]]; - } - */ if([changes count] == 0) [self willChangeValueForKey:@"changed"]; @@ -356,39 +302,6 @@ -(void)handleDataForKey:(NSString *)aKey ofType:(NSUInteger)aType forInvocation: return; } } -/* -- (id)valueForUndefinedKey:(NSString *)key -{ - if([self respondsToSelector:NSSelectorFromString(key)]) - { - if([key hasSuffix:@"Changed"]) - { - NSString* valueKey = [key substringToIndex:[key length]-7]; - BOOL ret = [self getterChangedForKey:valueKey]; - return [NSNumber numberWithBool:ret]; - } - return [self getterValueForKey:key]; - } - return [super valueForUndefinedKey:key]; -} - -- (void)setValue:(id)value forUndefinedKey:(NSString *)key -{ - if([self respondsToSelector:NSSelectorFromString(key)]) - { - if([key hasSuffix:@"Changed"]) - { - NSString* valueKey = [key substringToIndex:[key length]-7]; - BOOL newChanged = [value boolValue]; - [self setterChanged:newChanged forKey:valueKey]; - return; - } - [self setterValue:value forKey:key]; - return; - } - [super setValue:value forUndefinedKey:key]; -} -*/ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context { @@ -404,7 +317,6 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N [self didChangeValueForKey:keyPath]; } } - //[super observeValueForKeyPath:keyPath ofObject:object change:change context:context]; } - (BOOL)isEqual:(id)other diff --git a/MetaZ.xcodeproj/project.pbxproj b/MetaZ.xcodeproj/project.pbxproj index d2871f80..69cfcc4e 100644 --- a/MetaZ.xcodeproj/project.pbxproj +++ b/MetaZ.xcodeproj/project.pbxproj @@ -1655,7 +1655,7 @@ HEADER_SEARCH_PATHS = "$(TARGET_BUILD_DIR)/include"; INFOPLIST_FILE = Plugins/Amazon/Info.plist; INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-C"; - INFOPLIST_PREFIX_HEADER = "$(TARGET_BUILD_DIR)/include/PlistMacros.h"; + INFOPLIST_PREFIX_HEADER = "$(CONFIGURATION_TEMP_DIR)/Plist Marcos.build/PlistMacros.h"; INFOPLIST_PREPROCESS = YES; INSTALL_PATH = "$(HOME)/Library/Application Support/MetaZ/Plugins"; OTHER_LDFLAGS = ( @@ -1682,7 +1682,7 @@ HEADER_SEARCH_PATHS = "$(TARGET_BUILD_DIR)/include"; INFOPLIST_FILE = Plugins/Amazon/Info.plist; INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-C"; - INFOPLIST_PREFIX_HEADER = "$(TARGET_BUILD_DIR)/include/PlistMacros.h"; + INFOPLIST_PREFIX_HEADER = "$(CONFIGURATION_TEMP_DIR)/Plist Marcos.build/PlistMacros.h"; INFOPLIST_PREPROCESS = YES; INSTALL_PATH = "$(HOME)/Library/Application Support/MetaZ/Plugins"; OTHER_LDFLAGS = ( @@ -1713,6 +1713,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; INFOPLIST_FILE = "Framework/Test-Info.plist"; + INFOPLIST_PREFIX_HEADER = "$(CONFIGURATION_TEMP_DIR)/Plist Marcos.build/PlistMacros.h"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; OTHER_LDFLAGS = ( "-framework", @@ -1739,6 +1740,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; INFOPLIST_FILE = "Framework/Test-Info.plist"; + INFOPLIST_PREFIX_HEADER = "$(CONFIGURATION_TEMP_DIR)/Plist Marcos.build/PlistMacros.h"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; OTHER_LDFLAGS = ( "-framework", @@ -1766,7 +1768,7 @@ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INFOPLIST_FILE = Plugins/TagChimp/Info.plist; INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-C"; - INFOPLIST_PREFIX_HEADER = "$(TARGET_BUILD_DIR)/include/PlistMacros.h"; + INFOPLIST_PREFIX_HEADER = "$(CONFIGURATION_TEMP_DIR)/Plist Marcos.build/PlistMacros.h"; INFOPLIST_PREPROCESS = YES; INSTALL_PATH = "$(HOME)/Library/Application Support/MetaZ/Plugins"; OTHER_LDFLAGS = ( @@ -1793,7 +1795,7 @@ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INFOPLIST_FILE = Plugins/TagChimp/Info.plist; INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-C"; - INFOPLIST_PREFIX_HEADER = "$(TARGET_BUILD_DIR)/include/PlistMacros.h"; + INFOPLIST_PREFIX_HEADER = "$(CONFIGURATION_TEMP_DIR)/Plist Marcos.build/PlistMacros.h"; INFOPLIST_PREPROCESS = YES; INSTALL_PATH = "$(HOME)/Library/Application Support/MetaZ/Plugins"; OTHER_LDFLAGS = ( @@ -2000,6 +2002,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; INFOPLIST_FILE = "Framework/Test-Info.plist"; + INFOPLIST_PREFIX_HEADER = "$(CONFIGURATION_TEMP_DIR)/Plist Marcos.build/PlistMacros.h"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; OTHER_LDFLAGS = ( "-framework", @@ -2039,7 +2042,7 @@ GCC_PREFIX_HEADER = Framework/MetaZKit_Prefix.pch; INFOPLIST_FILE = Framework/Info.plist; INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-C"; - INFOPLIST_PREFIX_HEADER = "$(TARGET_BUILD_DIR)/include/PlistMacros.h"; + INFOPLIST_PREFIX_HEADER = "$(CONFIGURATION_TEMP_DIR)/Plist Marcos.build/PlistMacros.h"; INFOPLIST_PREPROCESS = YES; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_LDFLAGS = ( @@ -2069,7 +2072,7 @@ GCC_PREFIX_HEADER = Framework/MetaZKit_Prefix.pch; INFOPLIST_FILE = Framework/Info.plist; INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-C"; - INFOPLIST_PREFIX_HEADER = "$(TARGET_BUILD_DIR)/include/PlistMacros.h"; + INFOPLIST_PREFIX_HEADER = "$(CONFIGURATION_TEMP_DIR)/Plist Marcos.build/PlistMacros.h"; INFOPLIST_PREPROCESS = YES; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_LDFLAGS = ( @@ -2098,7 +2101,7 @@ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INFOPLIST_FILE = Plugins/AtomicParsley/Info.plist; INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-C"; - INFOPLIST_PREFIX_HEADER = "$(TARGET_BUILD_DIR)/include/PlistMacros.h"; + INFOPLIST_PREFIX_HEADER = "$(CONFIGURATION_TEMP_DIR)/Plist Marcos.build/PlistMacros.h"; INFOPLIST_PREPROCESS = YES; INSTALL_PATH = "$(HOME)/Library/Application Support/MetaZ/Plugins"; OTHER_LDFLAGS = ( @@ -2128,7 +2131,7 @@ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INFOPLIST_FILE = Plugins/AtomicParsley/Info.plist; INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-C"; - INFOPLIST_PREFIX_HEADER = "$(TARGET_BUILD_DIR)/include/PlistMacros.h"; + INFOPLIST_PREFIX_HEADER = "$(CONFIGURATION_TEMP_DIR)/Plist Marcos.build/PlistMacros.h"; INFOPLIST_PREPROCESS = YES; INSTALL_PATH = "$(HOME)/Library/Application Support/MetaZ/Plugins"; OTHER_LDFLAGS = ( @@ -2165,7 +2168,7 @@ IBC_OTHER_FLAGS = "--plugin /System/Library/Frameworks/Quartz.framework/Versions/A/Frameworks/ImageKit.framework/Resources/ImageKitIBPlugin.ibplugin"; INFOPLIST_FILE = App/Info.plist; INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-C"; - INFOPLIST_PREFIX_HEADER = "$(TARGET_BUILD_DIR)/include/PlistMacros.h"; + INFOPLIST_PREFIX_HEADER = "$(CONFIGURATION_TEMP_DIR)/Plist Marcos.build/PlistMacros.h"; INFOPLIST_PREPROCESS = YES; INSTALL_PATH = "$(HOME)/Applications"; PRODUCT_NAME = MetaZ; @@ -2188,7 +2191,7 @@ IBC_OTHER_FLAGS = "--plugin /System/Library/Frameworks/Quartz.framework/Versions/A/Frameworks/ImageKit.framework/Resources/ImageKitIBPlugin.ibplugin"; INFOPLIST_FILE = App/Info.plist; INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-C"; - INFOPLIST_PREFIX_HEADER = "$(TARGET_BUILD_DIR)/include/PlistMacros.h"; + INFOPLIST_PREFIX_HEADER = "$(CONFIGURATION_TEMP_DIR)/Plist Marcos.build/PlistMacros.h"; INFOPLIST_PREPROCESS = YES; INSTALL_PATH = "$(HOME)/Applications"; PRODUCT_NAME = MetaZ;