summaryrefslogtreecommitdiff
path: root/src/citra_qt/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/citra_qt/main.cpp')
-rw-r--r--src/citra_qt/main.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index a81c6db3f..23eb28259 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>
@@ -32,7 +33,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"
@@ -302,7 +302,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();
@@ -392,7 +392,7 @@ void GMainWindow::UpdateRecentFiles() {
}
void GMainWindow::OnGameListLoadFile(QString game_path) {
- BootGame(game_path.toLocal8Bit().data());
+ BootGame(game_path.toStdString());
}
void GMainWindow::OnMenuLoadFile() {
@@ -400,7 +400,7 @@ void GMainWindow::OnMenuLoadFile() {
if (!filename.isEmpty()) {
UISettings::values.roms_path = QFileInfo(filename).path();
- BootGame(filename.toLocal8Bit().data());
+ BootGame(filename.toStdString());
}
}
@@ -409,7 +409,7 @@ void GMainWindow::OnMenuLoadSymbolMap() {
if (!filename.isEmpty()) {
UISettings::values.symbols_path = QFileInfo(filename).path();
- LoadSymbolMap(filename.toLocal8Bit().data());
+ LoadSymbolMap(filename.toStdString());
}
}
@@ -428,7 +428,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));