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/SPDatabaseViewController.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/SPDatabaseViewController.m')
| -rw-r--r-- | Source/SPDatabaseViewController.m | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Source/SPDatabaseViewController.m b/Source/SPDatabaseViewController.m index 7affec1d..171ff8f6 100644 --- a/Source/SPDatabaseViewController.m +++ b/Source/SPDatabaseViewController.m @@ -320,7 +320,11 @@ #endif // Notify listeners of the table change +#ifndef SP_REFACTOR [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:SPTableChangedNotification object:self]; +#else + [[NSNotificationCenter defaultCenter] sequelProPostNotificationOnMainThreadWithName:SPTableChangedNotification object:self]; +#endif return; } @@ -463,7 +467,11 @@ if (changeEncoding) [mySQLConnection restoreStoredEncoding]; // Notify listeners of the table change now that the state is fully set up. - [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:SPTableChangedNotification object:self]; +#ifndef SP_REFACTOR + [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:SPTableChangedNotification object:self]; +#else + [[NSNotificationCenter defaultCenter] sequelProPostNotificationOnMainThreadWithName:SPTableChangedNotification object:self]; +#endif #ifndef SP_REFACTOR /* [spHistoryControllerInstance restoreViewStates] */ // Restore view states as appropriate @@ -473,7 +481,7 @@ // Load the currently selected view if looking at a table or view if (tableEncoding && (selectedTableType == SPTableTypeView || selectedTableType == SPTableTypeTable)) { -#ifndef SP_REFACTOR /* load everything in Coda */ +#ifndef SP_REFACTOR /* load everything */ NSInteger selectedTabViewIndex = [tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]]; switch (selectedTabViewIndex) { @@ -481,13 +489,13 @@ #endif [tableSourceInstance loadTable:selectedTableName]; structureLoaded = YES; -#ifndef SP_REFACTOR /* load everything in Coda */ +#ifndef SP_REFACTOR /* load everything */ break; case SPTableViewContent: #endif [tableContentInstance loadTable:selectedTableName]; contentLoaded = YES; -#ifndef SP_REFACTOR /* load everything in Coda */ +#ifndef SP_REFACTOR /* load everything */ break; case SPTableViewStatus: [[extendedTableInfoInstance onMainThread] loadTable:selectedTableName]; |