Debug compiling

Quicksilver/Code-App/QSAdvancedPrefPane.m

@@ -67,8 +67,9 @@ - (NSCell *)tableView:(NSTableView *)aTableView dataCellForTableColumn:(NSTableC
        thisInfo = [[prefSetsController arrangedObjects] objectAtIndex:rowIndex];
     }
     @catch (NSException * e) {
-        if (DEBUG)
-            NSLog(@"*** Unhandled Exception:%@ with reason: %@, in %@", [e name], [e reason], NSStringFromSelector(_cmd));
+#ifdef DEBUG
+		NSLog(@"*** Unhandled Exception:%@ with reason: %@, in %@", [e name], [e reason], NSStringFromSelector(_cmd));
+#endif
     }
 	NSCell *cell;
 

Quicksilver/Code-App/QSApp.m

@@ -22,9 +22,9 @@ - (void)_sendFinishLaunchingNotification;
 
 @implementation QSApp
 +(void)load {
-	if (DEBUG)
+#ifdef DEBUG
 		setenv("verbose", "1", YES);
-	else if (mOptionKeyIsDown) {
+	 if(mOptionKeyIsDown) {
 		NSLog(@"Setting Verbose");
 		setenv("verbose", "1", YES);
 		setenv("QSDebugPlugIns", "1", YES);
@@ -33,12 +33,17 @@ +(void)load {
 	} else {
 		unsetenv("verbose");
 	}
+#endif
 }
 
 + (void)initialize {
     static BOOL done = NO;
     if(!done) {
+
+#ifdef DEBUG
         if (DEBUG_STARTUP) NSLog(@"App Initialize");
+#endif
+
         [[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithContentsOfFile:[[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:@"Contents/QSDefaults.plist"]]];
         done = YES;
     }
@@ -139,8 +144,10 @@ - (void)sendEvent:(NSEvent *)theEvent {
 		  break;
 	  case NSOtherMouseDown:
 			[theEvent retain];
+#ifdef DEBUG
 			if (VERBOSE)
 				NSLog(@"OtherMouse %@ %@", theEvent, [theEvent window]);
+#endif
 			[[NSClassFromString(@"QSMouseTriggerManager") sharedInstance] handleMouseTriggerEvent:theEvent type:nil forView:nil];
 			break;
 	  case NSScrollWheel: {

Quicksilver/Code-App/QSCatalogPrefPane.m

@@ -335,11 +335,16 @@ - (IBAction)selectContentsItem:(id)sender {
 }
 
 - (BOOL)selectedCatalogEntryIsEditable {
+
+#ifdef DEBUG
+	return YES;
+#endif
+
 	id source = [currentItem source];
 	if ([source respondsToSelector:@selector(usesGlobalSettings)] && [source performSelector:@selector(usesGlobalSettings)])
 		return YES;
 	else
-		return (![currentItem isPreset] || DEBUG);
+		return (![currentItem isPreset]);
 }
 
 - (void)updateEntrySelection {
@@ -521,7 +526,12 @@ - (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id <NS
 }
 
 - (void)populateCatalogEntryFields {
-	[itemIconField setEnabled:(currentItem && ![currentItem isPreset]) || DEBUG];
+
+#ifdef DEBUG
+	[itemIconField setEnabled:YES];
+#endif
+
+	[itemIconField setEnabled:(currentItem && ![currentItem isPreset])];
 	[itemIconField setImage:[currentItem icon]];
 }
 

Quicksilver/Code-App/QSController.h

@@ -35,7 +35,9 @@
 - (void)openURL:(NSURL *)url;
 - (void)showSplash:sender;
 
+#ifdef DEBUG
 - (void)activateDebugMenu;
+#endif
 
 - (NSMenu *)statusMenuWithQuit;
 - (void)activateInterface:(id)sender;

Quicksilver/Code-App/QSController.m

@@ -33,12 +33,18 @@ + (id)sharedInstance {
 }
 
 + (void)initialize {
+
+#ifdef DEBUG
 	if (DEBUG_STARTUP) NSLog(@"Controller Initialize");
+#endif
+
 	static BOOL initialized = NO;
 	if (initialized) return;
 	initialized = YES;
 
+#ifdef DEBUG
 	if (QSGetLocalizationStatus() && DEBUG_STARTUP) NSLog(@"Enabling Localization");
+#endif
 
 	[NSApp registerServicesMenuSendTypes:[NSArray arrayWithObjects:NSStringPboardType, NSRTFPboardType, nil] returnTypes:[NSArray arrayWithObjects:NSStringPboardType, NSRTFPboardType, nil]];
 
@@ -52,8 +58,10 @@ + (void)initialize {
 	[defaultActionImage setCacheMode:NSImageCacheNever];
 #endif
 
+#ifdef DEBUG
 	if (defaultBool(@"verbose") )
 		setenv("verbose", "1", YES);
+#endif
 
 	// Pre instantiate to avoid bug
 //	[NSColor controlShadowColor];
@@ -92,7 +100,10 @@ - (NSString *)applicationSupportFolder {
 
 - (id)init {
 	if (self = [super init]) {
+
+#ifdef DEBUG
 		if (DEBUG_STARTUP) NSLog(@"Controller Init");
+#endif
 
 		// Enforce Expiration Date
 		//Check if a devopment version has expired
@@ -156,6 +167,7 @@ - (void)setShowMenuIcon:(NSNumber *)mode {
 	[statusItem setHighlightMode:YES];
 }
 
+#ifdef DEBUG
 - (void)activateDebugMenu {
 	NSLog(@"debug menu");
 	NSMenu *debugMenu = [[[NSMenu alloc] initWithTitle:@"Debug"] autorelease];
@@ -195,7 +207,7 @@ - (void)activateDebugMenu {
 	[debugMenuItem setSubmenu:debugMenu];
 
 }
-
+#endif
 - (void)raiseException {
 	[NSException raise:@"Test Exception" format:@"This is a test. It is only a test. In the event of a real exception, it would have been followed by some witty commentary."];
 }
@@ -482,11 +494,15 @@ - (void)handlePasteboardDrop:(NSPasteboard *)pb commandPath:(NSString *)path {
 
 - (void)executeCommandAtPath:(NSString *)path { [[QSCommand commandWithFile:path] execute];  }
 - (void)performService:(NSPasteboard *)pboard userData:(NSString *)userData error:(NSString **)error {
+#ifdef DEBUG
 	if (VERBOSE) NSLog(@"Perform Service: %@ %d", userData, [userData characterAtIndex:0]);
+#endif
 	[self receiveObject:[[[QSObject alloc] initWithPasteboard:pboard] autorelease]];
 }
 - (void)getSelection:(NSPasteboard *)pboard userData:(NSString *)userData error:(NSString **)error {
+#ifdef DEBUG
 	if (VERBOSE) NSLog(@"GetSel Service: %@ %d", userData, [userData characterAtIndex:0]);
+#endif
 	[self receiveObject:[[[QSObject alloc] initWithPasteboard:pboard] autorelease]];
 }
 
@@ -582,7 +598,11 @@ - (IBAction)forceRescanItems:sender { [QSLib startThreadedAndForcedScan];  }
 
 - (void)delayedStartup {
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+#ifdef DEBUG
 	if (DEBUG_STARTUP) NSLog(@"Delayed Startup");
+#endif
+
 	[NSThread setThreadPriority:0.0];
 	QSTask *task = [QSTask taskWithIdentifier:@"QSDelayedStartup"];
 	[task setStatus:@"Updating Catalog"];
@@ -611,12 +631,16 @@ - (void)checkForFirstRun {
 				if (selection)
 					[NSApp relaunchAtPath:lastLocation movedFromPath:bundlePath];
 			}
-			if ([defaults boolForKey:kShowReleaseNotesOnUpgrade] && (!DEBUG) ) {
+
+#ifndef DEBUG
+			if ([defaults boolForKey:kShowReleaseNotesOnUpgrade]) {
 				[NSApp activateIgnoringOtherApps:YES];
 				int selection = NSRunInformationalAlertPanel([NSString stringWithFormat:@"Quicksilver has been updated", nil] , @"You are using a new version of Quicksilver. Would you like to see the Release Notes?", @"Show Release Notes", @"Ignore", nil);
 				if (selection == 1)
 					[self showReleaseNotes:self];
 			}
+#endif
+
 			[[NSWorkspace sharedWorkspace] setComment:@"Quicksilver" forFile:[[NSBundle mainBundle] bundlePath]];
 			if (lastVersion < [@"2000" hexIntValue]) {
 				NSFileManager *fm = [NSFileManager defaultManager];
@@ -722,9 +746,9 @@ - (void)applicationWillTerminate:(NSNotification *)aNotification {
 
 - (void)applicationWillFinishLaunching:(NSNotification *)aNotification {
     QSGetLocalizationStatus();
-	if (DEBUG) {
-		[self registerForErrors];
-	}
+#ifdef DEBUG
+	[self registerForErrors];
+#endif
 }
 
 - (void)setupSplash {
@@ -750,25 +774,34 @@ - (void)startQuicksilver:(id)sender {
 	if (!atLogin)
 		[self setupSplash];
 
+#ifdef DEBUG
 	if (DEBUG_STARTUP)
 		NSLog(@"Instantiate Classes");
-
+#endif
+
 	[QSRegistry sharedInstance];
-
+
+#ifdef DEBUG
 	if (DEBUG_STARTUP)
 		NSLog(@"Registry loaded");
+#endif
 
 	[QSMnemonics sharedInstance];
 	[QSLibrarian sharedInstance];
 	[QSExecutor sharedInstance];
 	[QSTaskController sharedInstance];
-
+
+#ifdef DEBUG
 	if (DEBUG_STARTUP)
 		NSLog(@"Library loaded");
+#endif
 
 	[[QSPlugInManager sharedInstance] loadPlugInsAtLaunch];
+
+#ifdef DEBUG
 	if (DEBUG_STARTUP)
 		NSLog(@"PlugIns loaded");
+#endif
 
 	[[QSLibrarian sharedInstance] initCatalog];
 
@@ -779,13 +812,16 @@ - (void)startQuicksilver:(id)sender {
 
 	[[QSLibrarian sharedInstance] reloadIDDictionary:nil];
 	[[QSLibrarian sharedInstance] enableEntries];
-
+
+#ifdef DEBUG
 	if (DEBUG_STARTUP)
 		NSLog(@"Catalog loaded");
+#endif
 
 	[QSObject purgeIdentifiers];
 
-	if (newVersion && (!DEBUG) ) {
+#ifndef DEBUG
+	if (newVersion) {
 		if (!runningSetupAssistant) {
 			NSLog(@"New Version: Purging all Identifiers and Forcing Rescan");
 			[QSLibrarian removeIndexes];
@@ -794,7 +830,12 @@ - (void)startQuicksilver:(id)sender {
 	} else {
 		[[QSLibrarian sharedInstance] loadCatalogArrays];
 	}
-
+#endif
+
+#ifdef DEBUG
+	[[QSLibrarian sharedInstance] loadCatalogArrays];
+#endif
+
 	[[QSLibrarian sharedInstance] reloadEntrySources:nil];
 
 	if (atLogin)
@@ -841,22 +882,31 @@ - (void)startQuicksilver:(id)sender {
 	int rescanInterval = [defaults integerForKey:@"QSCatalogRescanFrequency"];
 
 	if (rescanInterval>0) {
+
+#ifdef DEBUG
 		if (DEBUG_STARTUP) NSLog(@"Rescanning every %d minutes", rescanInterval);
+#endif
+
 		[NSTimer scheduledTimerWithTimeInterval:rescanInterval*60 target:self selector:@selector(rescanItems:) userInfo:nil repeats:YES];
 	}
 
+#ifdef DEBUG
 	if (DEBUG_STARTUP) NSLog(@"Register for Notifications");
+#endif
+
 	NSWorkspace *ws = [NSWorkspace sharedWorkspace];
 	[[ws notificationCenter] addObserver:self selector:@selector(appLaunched:) name:NSWorkspaceDidLaunchApplicationNotification object:nil];
 	[[ws notificationCenter] addObserver:self selector:@selector(appWillLaunch:) name:NSWorkspaceWillLaunchApplicationNotification object:nil];
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(appChanged:) name:QSActiveApplicationChanged object:nil];
 
 	[[[NSApp mainMenu] itemAtIndex:0] setTitle:@"Quicksilver"];
-
+
+#ifdef DEBUG
 	if (DEBUG_STARTUP) NSLog(@"Will Finish Launching");
 
-	if (DEBUG || PRERELEASEVERSION)
+	if (PRERELEASEVERSION)
 		[self activateDebugMenu];
+#endif
 
 	if (runningSetupAssistant) {
 		[self hideSplash:nil];
@@ -868,8 +918,10 @@ - (void)startQuicksilver:(id)sender {
 
 	[QSResourceManager sharedInstance];
 	[[QSTriggerCenter sharedInstance] activateTriggers];
-
+
+#ifdef DEBUG
 	if (DEBUG_STARTUP) NSLog(@"Did Finish Launching\n ");
+#endif
 
 	[self bind:@"showMenuIcon" toObject:[NSUserDefaultsController sharedUserDefaultsController] withKeyPath:@"values.QSShowMenuIcon" options:nil];
 
@@ -879,8 +931,10 @@ - (void)startQuicksilver:(id)sender {
 	if ( ! (runningSetupAssistant || newVersion) )
 		[self rescanItems:self];
 
-	if (newVersion && !DEBUG)
+#ifndef DEBUG
+	if (newVersion)
 		[[QSUpdateController sharedInstance] forceStartupCheck];
+#endif
 
 	[[QSUpdateController sharedInstance] setUpdateTimer];
 

Quicksilver/Code-App/QSHelpersPrefPane.m

@@ -48,10 +48,12 @@ - (NSMenu *)menuForTable:(NSString *)table includeDefault:(BOOL)includeDefault {
 	NSDictionary *mediators = [QSReg tableNamed:table];
 	NSMenu *menu = [[NSMenu alloc] initWithTitle:@"popUp"];
 	if (![mediators count]) {
-		if (!DEBUG) {
+
+#ifndef DEBUG
             [menu release];
             return nil;
-        }
+#endif
+
 		[menu addItemWithTitle:@"None Available" action:nil keyEquivalent:@""];
 		return [menu autorelease];
 	}

Quicksilver/Code-App/QSTriggersPrefPane.m

@@ -481,7 +481,9 @@ - (id)windowWillReturnFieldEditor:(NSWindow *)sender toObject:(id)anObject {
 
 - (IBAction)outlineClicked:(id)sender {
     if( [triggerTable clickedColumn] == -1 ) {
-        if (DEBUG) NSLog(@"%@ with column == -1", NSStringFromSelector(_cmd));
+#ifdef DEBUG
+		NSLog(@"%@ with column == -1", NSStringFromSelector(_cmd));
+#endif
         return;
     }
 	NSTableColumn *col = [[triggerTable tableColumns] objectAtIndex:[triggerTable clickedColumn]];