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

fixup! Avoid using objc_ptr

Browse Source
This commit is contained in:
Allan Odgaard
2012-09-21 01:17:21 +02:00
parent a94e89d7be
commit 56ec46e1f9
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Frameworks/OakFileBrowser/src/io/FSDirectoryDataSource.h
View File

@@ -7,7 +7,6 @@
NSUInteger dataSourceOptions;
fs::event_callback_t* callback;
NSMutableDictionary* visible;
scm::callback_t* scmCallback;
std::map<std::string, scm::info_ptr> scmDrivers;

12
Frameworks/OakFileBrowser/src/io/FSDirectoryDataSource.mm
View File

@@ -279,21 +279,21 @@ static void remove_callbacks (scm::callback_t* cb, std::string const& path, std:
- (void)fsEvent:(std::string const&)aPath
{
D(DBF_FileBrowser_DSDirectory, bug("%s\n", aPath.c_str()););
if(FSItem* item = visible[[NSString stringWithCxxString:aPath]])
if(FSItem* item = self.visible[[NSString stringWithCxxString:aPath]])
new scanner_t(self, item, dataSourceOptions, false);
}
- (void)lostItems:(NSArray*)someItems
{
NSMutableArray* toDelete = [NSMutableArray array];
for(NSString* path in visible)
for(NSString* path in self.visible)
{
if([someItems containsObject:visible[path]])
if([someItems containsObject:self.visible[path]])
[toDelete addObject:path];
}
for(NSString* path in toDelete)
[visible removeObjectForKey:path];
[self.visible removeObjectForKey:path];
}
- (id)initWithURL:(NSURL*)anURL options:(NSUInteger)someOptions
@@ -365,7 +365,7 @@ static void remove_callbacks (scm::callback_t* cb, std::string const& path, std:
- (void)internalReloadItem:(FSItem*)anItem requested:(BOOL)flag
{
D(DBF_FileBrowser_DSDirectory, bug("%s %s\n", [[[anItem url] path] UTF8String], BSTR(flag)););
visible[[anItem.url path]] = anItem;
self.visible[[anItem.url path]] = anItem;
new scanner_t(self, anItem, dataSourceOptions, flag);
ensure_callback(scmCallback, [[anItem.url path] fileSystemRepresentation], scmDrivers, scmReferenceCounts);
}
@@ -381,7 +381,7 @@ static void remove_callbacks (scm::callback_t* cb, std::string const& path, std:
{
D(DBF_FileBrowser_DSDirectory, bug("%s\n", [[[anItem url] path] UTF8String]););
remove_callbacks(scmCallback, [[anItem.url path] fileSystemRepresentation], scmDrivers, scmReferenceCounts);
[visible removeObjectForKey:[anItem.url path]];
[self.visible removeObjectForKey:[anItem.url path]];
anItem.children = nil;
return YES;
}