archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 13:31:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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
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 <clocale>
#include <QFileInfo>
// For now, a trivial constructor/destructor. May add command line usage later. // For now, a trivial constructor/destructor. May add command line usage later.
headless_application::headless_application(int& argc, char** argv) : QCoreApplication(argc, argv) 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.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)); Emu.SetCallbacks(std::move(callbacks));
} }

7
rpcs3/main_application.cpp
View file

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