RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

Qt: simplify callbacks.resolve_path

Browse Source
This commit is contained in:
Megamouse 2021-07-28 17:31:35 +02:00
parent 7eee9e7b05
commit 5272dd951b
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rpcs3/headless_application.cpp
View File

@ -9,8 +9,6 @@
#include <clocale>
#include <QFileInfo>
// For now, a trivial constructor/destructor. May add command line usage later.
headless_application::headless_application(int& argc, char** argv) : QCoreApplication(argc, argv)
{
@ -134,11 +132,6 @@ void headless_application::InitializeCallbacks()
callbacks.play_sound = [](const std::string&){};
callbacks.resolve_path = [](std::string_view sv)
{
return QFileInfo(QString::fromUtf8(sv.data(), static_cast<int>(sv.size()))).canonicalFilePath().toStdString();
};
Emu.SetCallbacks(std::move(callbacks));
}

7
rpcs3/main_application.cpp
View File

@ -32,6 +32,8 @@
#include "Emu/Audio/FAudio/FAudioBackend.h"
#endif
#include <QFileInfo> // This shouldn't be outside rpcs3qt...
LOG_CHANNEL(sys_log, "SYS");
/** Emu.Init() wrapper for user management */
@ -134,5 +136,10 @@ EmuCallbacks main_application::CreateCallbacks()
return result;
};
callbacks.resolve_path = [](std::string_view sv)
{
return QFileInfo(QString::fromUtf8(sv.data(), static_cast<int>(sv.size()))).canonicalFilePath().toStdString();
};
return callbacks;
}

5
rpcs3/rpcs3qt/gui_application.cpp
View File

@ -419,11 +419,6 @@ void gui_application::InitializeCallbacks()
});
};
callbacks.resolve_path = [](std::string_view sv)
{
return QFileInfo(QString::fromUtf8(sv.data(), static_cast<int>(sv.size()))).canonicalFilePath().toStdString();
};
Emu.SetCallbacks(std::move(callbacks));
}