github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename method: scope → scopeContext

Browse Source 
This is to avoid a clash as there is also another method called scope (WebKit / DOM).
This commit is contained in:
Allan Odgaard
2012-09-06 22:41:24 +02:00
parent f9133694f8
commit f57d35362e
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Applications/TextMate/src/AppController.mm
View File

@@ -173,7 +173,7 @@ void OakOpenDocuments (NSArray* paths)
{
self.filterWindowController = [OakFilterWindowController filterWindow];
OakTextView* textView = [NSApp targetForAction:@selector(scope)];
BundleItemChooser* dataSource = [BundleItemChooser bundleItemChooserForScope:textView ? [textView scope] : scope::wildcard];
BundleItemChooser* dataSource = [BundleItemChooser bundleItemChooserForScope:textView ? [textView scopeContext] : scope::wildcard];
dataSource.searchType = search::type(bundleItemSearch.search_type);
dataSource.keyEquivalentSearch = bundleItemSearch.key_equivalent;
dataSource.textViewHasSelection = [textView hasSelection];

2
Frameworks/OakTextView/src/OakTextView.h
View File

@@ -105,7 +105,7 @@ PUBLIC @interface OakTextView : OakView <NSTextInput, NSTextFieldDelegate>
- (GVLineRecord const&)lineFragmentForLine:(NSUInteger)aLine column:(NSUInteger)aColumn;
- (NSPoint)positionForWindowUnderCaret;
- (scope::context_t const&)scope;
- (scope::context_t const&)scopeContext;
- (folding_state_t)foldingStateForLine:(NSUInteger)lineNumber;
- (IBAction)toggleMacroRecording:(id)sender;

2
Frameworks/OakTextView/src/OakTextView.mm
View File

@@ -1839,7 +1839,7 @@ static void update_menu_key_equivalents (NSMenu* menu, action_to_key_t const& ac
}
}
- (scope::context_t const&)scope
- (scope::context_t const&)scopeContext
{
static scope::context_t res;
return res = editor->scope();