diff options
| author | 2019-01-19 12:57:09 -0500 | |
|---|---|---|
| committer | 2019-01-19 12:57:09 -0500 | |
| commit | 83f8d1aa2ebaf47323b31ff1c5af6f0ced37bedc (patch) | |
| tree | 65215c941489aaeb4df24bc913545c7e4a03b50c /src/core/core.cpp | |
| parent | Merge pull request #2033 from ReinUsesLisp/fixup-clip-warning (diff) | |
| parent | core/frontend/applets/web_browser: Include missing headers (diff) | |
| download | yuzu-83f8d1aa2ebaf47323b31ff1c5af6f0ced37bedc.tar.gz yuzu-83f8d1aa2ebaf47323b31ff1c5af6f0ced37bedc.tar.xz yuzu-83f8d1aa2ebaf47323b31ff1c5af6f0ced37bedc.zip | |
Merge pull request #2031 from lioncash/priv
yuzu/web_browser: Minor cleanup
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 31c590866..572814e4b 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -443,27 +443,31 @@ std::shared_ptr<FileSys::VfsFilesystem> System::GetFilesystem() const { | |||
| 443 | return impl->virtual_filesystem; | 443 | return impl->virtual_filesystem; |
| 444 | } | 444 | } |
| 445 | 445 | ||
| 446 | void System::SetProfileSelector(std::unique_ptr<Core::Frontend::ProfileSelectApplet> applet) { | 446 | void System::SetProfileSelector(std::unique_ptr<Frontend::ProfileSelectApplet> applet) { |
| 447 | impl->profile_selector = std::move(applet); | 447 | impl->profile_selector = std::move(applet); |
| 448 | } | 448 | } |
| 449 | 449 | ||
| 450 | const Core::Frontend::ProfileSelectApplet& System::GetProfileSelector() const { | 450 | const Frontend::ProfileSelectApplet& System::GetProfileSelector() const { |
| 451 | return *impl->profile_selector; | 451 | return *impl->profile_selector; |
| 452 | } | 452 | } |
| 453 | 453 | ||
| 454 | void System::SetSoftwareKeyboard(std::unique_ptr<Core::Frontend::SoftwareKeyboardApplet> applet) { | 454 | void System::SetSoftwareKeyboard(std::unique_ptr<Frontend::SoftwareKeyboardApplet> applet) { |
| 455 | impl->software_keyboard = std::move(applet); | 455 | impl->software_keyboard = std::move(applet); |
| 456 | } | 456 | } |
| 457 | 457 | ||
| 458 | const Core::Frontend::SoftwareKeyboardApplet& System::GetSoftwareKeyboard() const { | 458 | const Frontend::SoftwareKeyboardApplet& System::GetSoftwareKeyboard() const { |
| 459 | return *impl->software_keyboard; | 459 | return *impl->software_keyboard; |
| 460 | } | 460 | } |
| 461 | 461 | ||
| 462 | void System::SetWebBrowser(std::unique_ptr<Core::Frontend::WebBrowserApplet> applet) { | 462 | void System::SetWebBrowser(std::unique_ptr<Frontend::WebBrowserApplet> applet) { |
| 463 | impl->web_browser = std::move(applet); | 463 | impl->web_browser = std::move(applet); |
| 464 | } | 464 | } |
| 465 | 465 | ||
| 466 | const Core::Frontend::WebBrowserApplet& System::GetWebBrowser() const { | 466 | Frontend::WebBrowserApplet& System::GetWebBrowser() { |
| 467 | return *impl->web_browser; | ||
| 468 | } | ||
| 469 | |||
| 470 | const Frontend::WebBrowserApplet& System::GetWebBrowser() const { | ||
| 467 | return *impl->web_browser; | 471 | return *impl->web_browser; |
| 468 | } | 472 | } |
| 469 | 473 | ||