diff options
| author | sqlprodev <sqlprodev@northofthree.com> | 2011-04-14 19:57:45 +0000 |
|---|---|---|
| committer | sqlprodev <sqlprodev@northofthree.com> | 2011-04-14 19:57:45 +0000 |
| commit | 8c2e3126426c0c4c9e5bc2392879a850d3373641 (patch) | |
| tree | 8a6963b5efd578e8586bd808d5f204a81a85c6dc /Source/SPTextViewAdditions.m | |
| parent | ad7328e56541556d23f527303deddaefd4253ef2 (diff) | |
| download | sequelpro-8c2e3126426c0c4c9e5bc2392879a850d3373641.tar.gz sequelpro-8c2e3126426c0c4c9e5bc2392879a850d3373641.tar.bz2 sequelpro-8c2e3126426c0c4c9e5bc2392879a850d3373641.zip | |
SP_REFACTOR: Workaround for naming conflict with postNotificationOnMainThread: which also exists in TCMPortMapper.framework; NSUserDefaults access now permitted in SP_REFACTOR blocks for a few prefs keys
Diffstat (limited to 'Source/SPTextViewAdditions.m')
| -rw-r--r-- | Source/SPTextViewAdditions.m | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/Source/SPTextViewAdditions.m b/Source/SPTextViewAdditions.m index 74c60987..c23bd14e 100644 --- a/Source/SPTextViewAdditions.m +++ b/Source/SPTextViewAdditions.m @@ -4,7 +4,7 @@ // SPTextViewAdditions.m // sequel-pro // -// Created by Hans-Jörg Bibiko on April 05, 2009 +// Created by Hans-Jrg Bibiko on April 05, 2009 // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -389,17 +389,12 @@ */ - (IBAction)insertNULLvalue:(id)sender { -#ifndef SP_REFACTOR - id prefs = [NSUserDefaults standardUserDefaults]; -#endif if([self respondsToSelector:@selector(insertText:)]) { -#ifndef SP_REFACTOR if([prefs objectForKey:SPNullValue] && [(NSString*)[prefs objectForKey:SPNullValue] length]) [self insertText:[prefs objectForKey:SPNullValue]]; else -#endif [self insertText:@"NULL"]; } } @@ -529,7 +524,7 @@ mutabilityOption:NSPropertyListImmutable format:&format errorDescription:&convError] retain]; if(!cmdData || readError != nil || [convError length] || !(format == NSPropertyListXMLFormat_v1_0 || format == NSPropertyListBinaryFormat_v1_0)) { - NSLog(@"“%@” file couldn't be read.", infoPath); + NSLog(@"%@ file couldn't be read.", infoPath); NSBeep(); if (cmdData) [cmdData release]; return; @@ -648,7 +643,7 @@ if(inputFileError != nil) { NSString *errorMessage = [inputFileError localizedDescription]; SPBeginAlertSheet(NSLocalizedString(@"Bundle Error", @"bundle error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [self window], self, nil, nil, - [NSString stringWithFormat:@"%@ “%@”:\n%@", NSLocalizedString(@"Error for", @"error for message"), [cmdData objectForKey:@"name"], errorMessage]); + [NSString stringWithFormat:@"%@ %@:\n%@", NSLocalizedString(@"Error for", @"error for message"), [cmdData objectForKey:@"name"], errorMessage]); if (cmdData) [cmdData release]; return; } @@ -768,7 +763,7 @@ } else if([err code] != 9) { // Suppress an error message if command was killed NSString *errorMessage = [err localizedDescription]; SPBeginAlertSheet(NSLocalizedString(@"BASH Error", @"bash error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [self window], self, nil, nil, - [NSString stringWithFormat:@"%@ “%@”:\n%@", NSLocalizedString(@"Error for", @"error for message"), [cmdData objectForKey:@"name"], errorMessage]); + [NSString stringWithFormat:@"%@ %@:\n%@", NSLocalizedString(@"Error for", @"error for message"), [cmdData objectForKey:@"name"], errorMessage]); } } |