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

Make internal functions private again

Browse Source
This commit is contained in:
Allan Odgaard
2013-02-14 11:31:21 +01:00
parent 967f08c9c0
commit 60a4b9520a
3 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Frameworks/OakFileBrowser/src/OakFSUtilities.h
View File

@@ -6,6 +6,4 @@ PUBLIC extern NSURL* kURLLocationDesktop;
PUBLIC extern NSURL* kURLLocationFavorites;
PUBLIC extern NSURL* kURLLocationBundles;
PUBLIC NSString* DisplayName (NSURL* url, size_t numberOfParents = 0);
PUBLIC NSImage* IconImage (NSURL* url, NSSize size = (NSSize){16, 16});
PUBLIC NSURL* ParentForURL (NSURL* url);

28
Frameworks/OakFileBrowser/src/OakFSUtilities.mm
View File

@@ -22,34 +22,6 @@ static void initializeConstants ()
}
}
NSString* DisplayName (NSURL* url, size_t numberOfParents)
{
NSString* res = nil;
if([[url scheme] isEqualToString:[kURLLocationComputer scheme]])
res = CFBridgingRelease(SCDynamicStoreCopyComputerName(NULL, NULL));
else if([[url scheme] isEqualToString:[kURLLocationBundles scheme]])
res = @"Bundles";
else // if([url isFileURL])
res = [NSString stringWithCxxString:path::display_name([[url path] fileSystemRepresentation], numberOfParents)];
return res ?: [url absoluteString] ?: @"«nil»";
}
NSImage* IconImage (NSURL* url, NSSize size)
{
NSImage* iconImage = nil;
if([[url scheme] isEqualToString:[kURLLocationComputer scheme]])
iconImage = [NSImage imageNamed:NSImageNameComputer];
else if([[url scheme] isEqualToString:[kURLLocationBundles scheme]])
iconImage = [NSImage imageNamed:NSImageNameFolderSmart];
else if([[url scheme] isEqualToString:@"scm"])
iconImage = [NSImage imageNamed:NSImageNameFolderSmart];
else // if([url isFileURL])
iconImage = [OakFileIconImage fileIconImageWithPath:[url path] size:size];
[iconImage setSize:size];
return iconImage;
}
NSURL* ParentForURL (NSURL* url)
{
struct statfs buf;

28
Frameworks/OakFileBrowser/src/OakFileBrowser.mm
View File

@@ -32,6 +32,34 @@
OAK_DEBUG_VAR(FileBrowser_Controller);
static NSString* DisplayName (NSURL* url, size_t numberOfParents = 0)
{
NSString* res = nil;
if([[url scheme] isEqualToString:[kURLLocationComputer scheme]])
res = CFBridgingRelease(SCDynamicStoreCopyComputerName(NULL, NULL));
else if([[url scheme] isEqualToString:[kURLLocationBundles scheme]])
res = @"Bundles";
else // if([url isFileURL])
res = [NSString stringWithCxxString:path::display_name([[url path] fileSystemRepresentation], numberOfParents)];
return res ?: [url absoluteString] ?: @"«nil»";
}
static NSImage* IconImage (NSURL* url, NSSize size = NSMakeSize(16, 16))
{
NSImage* iconImage = nil;
if([[url scheme] isEqualToString:[kURLLocationComputer scheme]])
iconImage = [NSImage imageNamed:NSImageNameComputer];
else if([[url scheme] isEqualToString:[kURLLocationBundles scheme]])
iconImage = [NSImage imageNamed:NSImageNameFolderSmart];
else if([[url scheme] isEqualToString:@"scm"])
iconImage = [NSImage imageNamed:NSImageNameFolderSmart];
else // if([url isFileURL])
iconImage = [OakFileIconImage fileIconImageWithPath:[url path] size:size];
[iconImage setSize:size];
return iconImage;
}
@interface OakFileBrowser () <OFBOutlineViewMenuDelegate, NSMenuDelegate>
{
OBJC_WATCH_LEAKS(OakFileBrowser);