N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Qt: Remove unnecessary std::string usage

Browse source
This commit is contained in:
Yuri Kunde Schlesner 2017-02-16 22:32:22 -08:00
parent c7c1f56ce6
commit 5f00fe905c
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/citra_qt/main.cpp
View file

@ -75,7 +75,7 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
QStringList args = QApplication::arguments(); QStringList args = QApplication::arguments();
if (args.length() >= 2) { if (args.length() >= 2) {
BootGame(args[1].toStdString()); BootGame(args[1]);
} }
} }
@ -272,7 +272,7 @@ void GMainWindow::OnDisplayTitleBars(bool show) {
} }
} }
bool GMainWindow::LoadROM(const std::string& filename) { bool GMainWindow::LoadROM(const QString& filename) {
// Shutdown previous session if the emu thread is still active... // Shutdown previous session if the emu thread is still active...
if (emu_thread != nullptr) if (emu_thread != nullptr)
ShutdownGame(); ShutdownGame();
@ -290,12 +290,13 @@ bool GMainWindow::LoadROM(const std::string& filename) {
Core::System& system{Core::System::GetInstance()}; Core::System& system{Core::System::GetInstance()};
const Core::System::ResultStatus result{system.Load(render_window, filename)}; const Core::System::ResultStatus result{system.Load(render_window, filename.toStdString())};
if (result != Core::System::ResultStatus::Success) { if (result != Core::System::ResultStatus::Success) {
switch (result) { switch (result) {
case Core::System::ResultStatus::ErrorGetLoader: case Core::System::ResultStatus::ErrorGetLoader:
LOG_CRITICAL(Frontend, "Failed to obtain loader for %s!", filename.c_str()); LOG_CRITICAL(Frontend, "Failed to obtain loader for %s!",
filename.toStdString().c_str());
QMessageBox::critical(this, tr("Error while loading ROM!"), QMessageBox::critical(this, tr("Error while loading ROM!"),
tr("The ROM format is not supported.")); tr("The ROM format is not supported."));
break; break;
@ -335,7 +336,7 @@ bool GMainWindow::LoadROM(const std::string& filename) {
return true; return true;
} }
void GMainWindow::BootGame(const std::string& filename) { void GMainWindow::BootGame(const QString& filename) {
LOG_INFO(Frontend, "Citra starting..."); LOG_INFO(Frontend, "Citra starting...");
StoreRecentFile(filename); // Put the filename on top of the list StoreRecentFile(filename); // Put the filename on top of the list
@ -411,8 +412,8 @@ void GMainWindow::ShutdownGame() {
emulation_running = false; emulation_running = false;
} }
void GMainWindow::StoreRecentFile(const std::string& filename) { void GMainWindow::StoreRecentFile(const QString& filename) {
UISettings::values.recent_files.prepend(QString::fromStdString(filename)); UISettings::values.recent_files.prepend(filename);
UISettings::values.recent_files.removeDuplicates(); UISettings::values.recent_files.removeDuplicates();
while (UISettings::values.recent_files.size() > max_recent_files_item) { while (UISettings::values.recent_files.size() > max_recent_files_item) {
UISettings::values.recent_files.removeLast(); UISettings::values.recent_files.removeLast();
@ -447,7 +448,7 @@ void GMainWindow::UpdateRecentFiles() {
} }
void GMainWindow::OnGameListLoadFile(QString game_path) { void GMainWindow::OnGameListLoadFile(QString game_path) {
BootGame(game_path.toStdString()); BootGame(game_path);
} }
void GMainWindow::OnGameListOpenSaveFolder(u64 program_id) { void GMainWindow::OnGameListOpenSaveFolder(u64 program_id) {
@ -477,7 +478,7 @@ void GMainWindow::OnMenuLoadFile() {
if (!filename.isEmpty()) { if (!filename.isEmpty()) {
UISettings::values.roms_path = QFileInfo(filename).path(); UISettings::values.roms_path = QFileInfo(filename).path();
BootGame(filename.toStdString()); BootGame(filename);
} }
} }
@ -506,7 +507,7 @@ void GMainWindow::OnMenuRecentFile() {
QString filename = action->data().toString(); QString filename = action->data().toString();
QFileInfo file_info(filename); QFileInfo file_info(filename);
if (file_info.exists()) { if (file_info.exists()) {
BootGame(filename.toStdString()); BootGame(filename);
} else { } else {
// Display an error message and remove the file from the list. // Display an error message and remove the file from the list.
QMessageBox::information(this, tr("File not found"), QMessageBox::information(this, tr("File not found"),
@ -634,7 +635,7 @@ void GMainWindow::dropEvent(QDropEvent* event) {
if (IsSingleFileDropEvent(event) && ConfirmChangeGame()) { if (IsSingleFileDropEvent(event) && ConfirmChangeGame()) {
const QMimeData* mimeData = event->mimeData(); const QMimeData* mimeData = event->mimeData();
QString filename = mimeData->urls().at(0).toLocalFile(); QString filename = mimeData->urls().at(0).toLocalFile();
BootGame(filename.toStdString()); BootGame(filename);
} }
} }

6
src/citra_qt/main.h
View file

@ -79,8 +79,8 @@ private:
* @returns Whether the system was properly initialized. * @returns Whether the system was properly initialized.
*/ */
bool InitializeSystem(u32 system_mode); bool InitializeSystem(u32 system_mode);
bool LoadROM(const std::string& filename); bool LoadROM(const QString& filename);
void BootGame(const std::string& filename); void BootGame(const QString& filename);
void ShutdownGame(); void ShutdownGame();
/** /**
@ -94,7 +94,7 @@ private:
* *
* @param filename the filename to store * @param filename the filename to store
*/ */
void StoreRecentFile(const std::string& filename); void StoreRecentFile(const QString& filename);
/** /**
* Updates the recent files menu. * Updates the recent files menu.