diff options
| author | rowanbeentje <rowan@beent.je> | 2012-03-17 17:56:04 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2012-03-17 17:56:04 +0000 |
| commit | e26e22d9d6a6641cfc0a35e8ae31c12aee8bea5b (patch) | |
| tree | bb9bcc0ff8ba2e685fcb0fac775b616d9fde2baf /Source/SPDatabaseDocument.m | |
| parent | ac8ebfe4bba6d7da6edad87c75b174156d919621 (diff) | |
| download | sequelpro-e26e22d9d6a6641cfc0a35e8ae31c12aee8bea5b.tar.gz sequelpro-e26e22d9d6a6641cfc0a35e8ae31c12aee8bea5b.tar.bz2 sequelpro-e26e22d9d6a6641cfc0a35e8ae31c12aee8bea5b.zip | |
- Remove the GPL-licensed Colloquy-sourced NSNotificationAdditions category from the project, and replace with an MIT-licensed TCMPortMapper sources NSNotificationCenterThreadingAdditions category. This should fix method clashes in the SP_REFACTOR project, so remove behavioural/namespacing switches.
Diffstat (limited to 'Source/SPDatabaseDocument.m')
| -rw-r--r-- | Source/SPDatabaseDocument.m | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m index 4e2d5954..da2dbaf7 100644 --- a/Source/SPDatabaseDocument.m +++ b/Source/SPDatabaseDocument.m @@ -969,11 +969,7 @@ static NSString *SPCreateSyntx = @"SPCreateSyntax"; NSString *dbName = nil; // Notify listeners that a query has started -#ifndef SP_REFACTOR [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:@"SMySQLQueryWillBePerformed" object:self]; -#else - [[NSNotificationCenter defaultCenter] sequelProPostNotificationOnMainThreadWithName:@"SMySQLQueryWillBePerformed" object:self]; -#endif SPMySQLResult *theResult = [mySQLConnection queryString:@"SELECT DATABASE()"]; [theResult setDefaultRowReturnType:SPMySQLResultRowAsArray]; @@ -1000,11 +996,7 @@ static NSString *SPCreateSyntx = @"SPCreateSyntax"; } //query finished -#ifndef SP_REFACTOR [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:@"SMySQLQueryHasBeenPerformed" object:self]; -#else - [[NSNotificationCenter defaultCenter] sequelProPostNotificationOnMainThreadWithName:@"SMySQLQueryHasBeenPerformed" object:self]; -#endif } #ifndef SP_REFACTOR /* navigatorSchemaPathExistsForDatabase: */ @@ -5325,11 +5317,7 @@ static NSString *SPCreateSyntx = @"SPCreateSyntax"; - (void)registerActivity:(NSDictionary*)commandDict { [runningActivitiesArray addObject:commandDict]; -#ifndef SP_REFACTOR - [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:SPActivitiesUpdateNotification object:nil]; -#else - [[NSNotificationCenter defaultCenter] sequelProPostNotificationOnMainThreadWithName:SPActivitiesUpdateNotification object:self]; -#endif + [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:SPActivitiesUpdateNotification object:self]; if([runningActivitiesArray count] || [[[NSApp delegate] runningActivities] count]) [self performSelector:@selector(setActivityPaneHidden:) withObject:[NSNumber numberWithInteger:0] afterDelay:1.0]; @@ -5361,12 +5349,7 @@ static NSString *SPCreateSyntx = @"SPCreateSyntax"; [self setActivityPaneHidden:[NSNumber numberWithInteger:1]]; } -#ifndef SP_REFACTOR - [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:SPActivitiesUpdateNotification object:nil]; -#else - [[NSNotificationCenter defaultCenter] sequelProPostNotificationOnMainThreadWithName:SPActivitiesUpdateNotification object:self]; -#endif - + [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:SPActivitiesUpdateNotification object:self]; } - (void)setActivityPaneHidden:(NSNumber*)hide |