dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: pass std::string references to OpenBrowser

Browse Source
This commit is contained in:
rubidium42
2023-11-28 20:17:05 -04:00
committed by rubidium42
parent 8437b20fed
commit 27082f9efa
10 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/os/macosx/macos.mm
View File

@@ -143,9 +143,9 @@ void ShowOSErrorBox(const char *buf, bool system)
}
}
void OSOpenBrowser(const char *url)
void OSOpenBrowser(const std::string &url)
{
[ [ NSWorkspace sharedWorkspace ] openURL:[ NSURL URLWithString:[ NSString stringWithUTF8String:url ] ] ];
[ [ NSWorkspace sharedWorkspace ] openURL:[ NSURL URLWithString:[ NSString stringWithUTF8String:url.c_str() ] ] ];
}
/**

8
src/os/unix/unix.cpp
View File

@@ -230,20 +230,20 @@ std::optional<std::string> GetClipboardContents()
#if defined(__EMSCRIPTEN__)
void OSOpenBrowser(const char *url)
void OSOpenBrowser(const std::string &url)
{
/* Implementation in pre.js */
EM_ASM({ if(window["openttd_open_url"]) window.openttd_open_url($0, $1) }, url, strlen(url));
EM_ASM({ if (window["openttd_open_url"]) window.openttd_open_url($0, $1) }, url.c_str(), url.size());
}
#elif !defined( __APPLE__)
void OSOpenBrowser(const char *url)
void OSOpenBrowser(const std::string &url)
{
pid_t child_pid = fork();
if (child_pid != 0) return;
const char *args[3];
args[0] = "xdg-open";
args[1] = url;
args[1] = url.c_str();
args[2] = nullptr;
execvp(args[0], const_cast<char * const *>(args));
Debug(misc, 0, "Failed to open url: {}", url);

2
src/os/windows/win32.cpp
View File

@@ -52,7 +52,7 @@ void ShowOSErrorBox(const char *buf, bool)
MessageBox(GetActiveWindow(), OTTD2FS(buf).c_str(), L"Error!", MB_ICONSTOP | MB_TASKMODAL);
}
void OSOpenBrowser(const char *url)
void OSOpenBrowser(const std::string &url)
{
ShellExecute(GetActiveWindow(), L"open", OTTD2FS(url).c_str(), nullptr, nullptr, SW_SHOWNORMAL);
}