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/SPTableContent.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/SPTableContent.m')
| -rw-r--r-- | Source/SPTableContent.m | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index 7549a1f1..11e19588 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -278,11 +278,7 @@ } // Post a notification that a query will be performed -#ifndef SP_REFACTOR [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:@"SMySQLQueryWillBePerformed" object:tableDocumentInstance]; -#else - [[NSNotificationCenter defaultCenter] sequelProPostNotificationOnMainThreadWithName:@"SMySQLQueryWillBePerformed" object:tableDocumentInstance]; -#endif // Set up the table details for the new table, and trigger an interface update NSDictionary *tableDetails = [NSDictionary dictionaryWithObjectsAndKeys: @@ -322,11 +318,7 @@ [[tableContentView onMainThread] setNeedsDisplay:YES]; // Post the notification that the query is finished -#ifndef SP_REFACTOR [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:@"SMySQLQueryHasBeenPerformed" object:tableDocumentInstance]; -#else - [[NSNotificationCenter defaultCenter] sequelProPostNotificationOnMainThreadWithName:@"SMySQLQueryHasBeenPerformed" object:tableDocumentInstance]; -#endif // Clear any details to restore now that they have been restored [self clearDetailsToRestore]; @@ -755,11 +747,7 @@ #endif // Notify any listeners that a query has started -#ifndef SP_REFACTOR [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:@"SMySQLQueryWillBePerformed" object:tableDocumentInstance]; -#else - [[NSNotificationCenter defaultCenter] sequelProPostNotificationOnMainThreadWithName:@"SMySQLQueryWillBePerformed" object:tableDocumentInstance]; -#endif // Start construction of the query string queryString = [NSMutableString stringWithFormat:@"SELECT %@%@ FROM %@", @@ -875,11 +863,7 @@ // Notify listenters that the query has finished -#ifndef SP_REFACTOR [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:@"SMySQLQueryHasBeenPerformed" object:tableDocumentInstance]; -#else - [[NSNotificationCenter defaultCenter] sequelProPostNotificationOnMainThreadWithName:@"SMySQLQueryHasBeenPerformed" object:tableDocumentInstance]; -#endif if ([mySQLConnection queryErrored] && ![mySQLConnection lastQueryWasCancelled]) { #ifndef SP_REFACTOR @@ -2724,11 +2708,8 @@ [rowValuesToSave addObject:fieldValue]; } -#ifndef SP_REFACTOR [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:@"SMySQLQueryWillBePerformed" object:tableDocumentInstance]; -#else - [[NSNotificationCenter defaultCenter] sequelProPostNotificationOnMainThreadWithName:@"SMySQLQueryWillBePerformed" object:tableDocumentInstance]; -#endif + NSMutableString *queryString; // Use INSERT syntax when creating new rows @@ -2754,11 +2735,7 @@ // Run the query [mySQLConnection queryString:queryString]; -#ifndef SP_REFACTOR [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:@"SMySQLQueryHasBeenPerformed" object:tableDocumentInstance]; -#else - [[NSNotificationCenter defaultCenter] sequelProPostNotificationOnMainThreadWithName:@"SMySQLQueryHasBeenPerformed" object:tableDocumentInstance]; -#endif // If no rows have been changed, show error if appropriate. if ( ![mySQLConnection rowsAffectedByLastQuery] && ![mySQLConnection queryErrored] ) { |