Merge the Qt branch: Part 1#5199
Merge the Qt branch: Part 1#5199refractionpcsx2 merged 16 commits intoPCSX2:masterfrom stenzek:qt-part-1
Conversation
pcsx2/PAD/Host/Config.h
Outdated
| @@ -0,0 +1,131 @@ | |||
| /* PCSX2 - PS2 Emulator for PCs | |||
| * Copyright (C) 2002-2020 PCSX2 Dev Team | |||
There was a problem hiding this comment.
Minor nitpick: Some of these are 2002-2021 and others are 2002-2020.
This comment was marked as spam.
This comment was marked as spam.
|
|
||
| bool INISettingsInterface::GetIntValue(const char* section, const char* key, int* value) const | ||
| { | ||
| const char* str_value = m_ini.GetValue(section, key); |
There was a problem hiding this comment.
Why is for example GetLongValue inappropriate here?
https://github.com/brofield/simpleini/blob/master/SimpleIni.h#L885
Guessing from the documentation, the default value is a problem because we cannot set a "value not found" value that is guaranteed to always work?
| std::vector<std::string> ret; | ||
| ret.reserve(entries.size()); | ||
| std::transform(entries.begin(), entries.end(), std::back_inserter(ret), | ||
| [](const CSimpleIniA::Entry& it) { return std::string(it.pItem); }); |
There was a problem hiding this comment.
Any specific reason why something like below won't work? (just curious, no need to change it as in the end it probably doesn't matter)
for (const CSimpleIniA::Entry& it : entries)
ret.push_back(str::string(it.pItem));
JordanTheToaster
left a comment
There was a problem hiding this comment.
Looks all good to me with my rounds of testing.
RedDevilus
left a comment
There was a problem hiding this comment.
No issues were detected.
|
Everything looks all set for me, tested x64 exe too |
Name clashes with Qt.
Description of Changes
This is the first part of a three-PR series which merges my work-in-progress Qt frontend. The new frontend is semi-usable already, the main missing feature is controller binding. If we can get it in-tree, others can work on it, and it avoids my rebase hell.
The WX interface should not be impacted from any of these changes. Except the second part, where it will use the new presentation system.
Currently, this is based on #5194 (and thus #5198).
The three parts:
What this part has:
gamesettings/CRC.iniis an overlay which gets applied on top of the config at runtime.Rationale behind Changes
The WX UI and the disgusting threading system is years past its overdue date. Everyone hates it.
Suggested Testing Steps
Make sure wx doesn't break.