mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Using string from the std

Browse source
This commit is contained in:
Pierre Laurac 2016-10-12 17:25:31 -07:00 • committed by Kevin Sawicki
parent 526debb5ab
commit 9673cee4d7
6 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
atom/browser/native_window_mac.mm
View file

@ -956,14 +956,11 @@ void NativeWindowMac::SetAspectRatio(double aspect_ratio,
[window_ setResizeIncrements:NSMakeSize(1.0, 1.0)];
}
void NativeWindowMac::PreviewFile(const base::string16& filepath, const base::string16& filename) {
std::string pathStr = base::UTF16ToUTF8(filepath);
std::string nameStr = base::UTF16ToUTF8(filename);
NSString *path = [NSString stringWithCString:pathStr.c_str()
void NativeWindowMac::PreviewFile(const std::string& filepath, const std::string& filename) {
NSString *path = [NSString stringWithCString:filepath.c_str()
encoding:[NSString defaultCStringEncoding]];
NSString *name = [NSString stringWithCString:nameStr.c_str()
NSString *name = [NSString stringWithCString:filename.c_str()
encoding:[NSString defaultCStringEncoding]];
[window_ previewFileAtPath:path withName:name];