diff options
| author | bunnei <bunneidev@gmail.com> | 2018-10-24 18:11:03 -0400 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 18:11:03 -0400 | 
| commit | 9aa5c1894e7e09dccb358824b0d9a3a40ce714be (patch) | |
| tree | d977bbc52731b3b8a6a35cb9560086c2d15c95e0 /src/yuzu/configuration | |
| parent | 3a6e76e9b56db63f3f444c13e97d62124b94f31d (diff) | |
| parent | 4a31f99a0214ac7ee04d61c8934823e284db5e63 (diff) | |
Merge pull request #1570 from lioncash/optional
profile_manager: Use std::optional instead of boost::optional
Diffstat (limited to 'src/yuzu/configuration')
| -rw-r--r-- | src/yuzu/configuration/configure_system.cpp | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp index 83cc49dfc..0bc307e99 100644 --- a/src/yuzu/configuration/configure_system.cpp +++ b/src/yuzu/configuration/configure_system.cpp @@ -153,7 +153,7 @@ void ConfigureSystem::UpdateCurrentUser() {      ui->pm_add->setEnabled(profile_manager->GetUserCount() < Service::Account::MAX_USERS);      const auto& current_user = profile_manager->GetUser(Settings::values.current_user); -    ASSERT(current_user != boost::none); +    ASSERT(current_user != std::nullopt);      const auto username = GetAccountUsername(*current_user);      scene->clear(); @@ -252,7 +252,7 @@ void ConfigureSystem::AddUser() {  void ConfigureSystem::RenameUser() {      const auto user = tree_view->currentIndex().row();      const auto uuid = profile_manager->GetUser(user); -    ASSERT(uuid != boost::none); +    ASSERT(uuid != std::nullopt);      const auto username = GetAccountUsername(*uuid);      Service::Account::ProfileBase profile; @@ -292,7 +292,7 @@ void ConfigureSystem::RenameUser() {  void ConfigureSystem::DeleteUser() {      const auto index = tree_view->currentIndex().row();      const auto uuid = profile_manager->GetUser(index); -    ASSERT(uuid != boost::none); +    ASSERT(uuid != std::nullopt);      const auto username = GetAccountUsername(*uuid);      const auto confirm = @@ -320,7 +320,7 @@ void ConfigureSystem::DeleteUser() {  void ConfigureSystem::SetUserImage() {      const auto index = tree_view->currentIndex().row();      const auto uuid = profile_manager->GetUser(index); -    ASSERT(uuid != boost::none); +    ASSERT(uuid != std::nullopt);      const auto username = GetAccountUsername(*uuid);      const auto file = QFileDialog::getOpenFileName(this, tr("Select User Image"), QString(), | 
