diff options
Diffstat (limited to 'src/citra_qt')
| -rw-r--r-- | src/citra_qt/game_list.cpp | 2 | ||||
| -rw-r--r-- | src/citra_qt/main.cpp | 12 | 
2 files changed, 7 insertions, 7 deletions
| diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp index 1f8d69a03..ffcab1f03 100644 --- a/src/citra_qt/game_list.cpp +++ b/src/citra_qt/game_list.cpp @@ -66,7 +66,7 @@ void GameList::ValidateEntry(const QModelIndex& item)      if (file_path.isEmpty())          return; -    std::string std_file_path = file_path.toStdString(); +    std::string std_file_path(file_path.toStdString());      if (!FileUtil::Exists(std_file_path) || FileUtil::IsDirectory(std_file_path))          return;      emit GameChosen(file_path); diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 32cceaf7e..ca0ae6f7b 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -3,6 +3,7 @@  // Refer to the license.txt file included.  #include <clocale> +#include <memory>  #include <thread>  #include <QDesktopWidget> @@ -30,7 +31,6 @@  #include "citra_qt/debugger/ramview.h"  #include "citra_qt/debugger/registers.h" -#include "common/make_unique.h"  #include "common/microprofile.h"  #include "common/platform.h"  #include "common/scm_rev.h" @@ -319,7 +319,7 @@ void GMainWindow::BootGame(const std::string& filename) {          return;      // Create and start the emulation thread -    emu_thread = Common::make_unique<EmuThread>(render_window); +    emu_thread = std::make_unique<EmuThread>(render_window);      emit EmulationStarting(emu_thread.get());      render_window->moveContext();      emu_thread->start(); @@ -417,7 +417,7 @@ void GMainWindow::UpdateRecentFiles() {  }  void GMainWindow::OnGameListLoadFile(QString game_path) { -    BootGame(game_path.toLocal8Bit().data()); +    BootGame(game_path.toStdString());  }  void GMainWindow::OnMenuLoadFile() { @@ -428,7 +428,7 @@ void GMainWindow::OnMenuLoadFile() {      if (!filename.isEmpty()) {          settings.setValue("romsPath", QFileInfo(filename).path()); -        BootGame(filename.toLocal8Bit().data()); +        BootGame(filename.toStdString());      }  } @@ -440,7 +440,7 @@ void GMainWindow::OnMenuLoadSymbolMap() {      if (!filename.isEmpty()) {          settings.setValue("symbolsPath", QFileInfo(filename).path()); -        LoadSymbolMap(filename.toLocal8Bit().data()); +        LoadSymbolMap(filename.toStdString());      }  } @@ -461,7 +461,7 @@ void GMainWindow::OnMenuRecentFile() {      QString filename = action->data().toString();      QFileInfo file_info(filename);      if (file_info.exists()) { -        BootGame(filename.toLocal8Bit().data()); +        BootGame(filename.toStdString());      } else {          // Display an error message and remove the file from the list.          QMessageBox::information(this, tr("File not found"), tr("File \"%1\" not found").arg(filename)); | 
