citra/citra-nightly
1
0
Fork 0
mirror of https://github.com/citra-emu/citra-nightly.git synced 2024-12-23 08:25:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

configuration/config: Move config loading and saving to functions based off groups (#4855)

Browse source 
Over time our config values have grown quite numerous in size.
Unfortunately it also makes the single functions we have for loading and
saving values more error prone.

For example, we were loading the core settings twice when they only
should have been loaded once. In another section, a variable was
shadowing another variable used to load settings from a completely
different section.

Finally, in one other case, there was an extraneous endGroup() call used
that didn't need to be done. This was essentially dead code and also a
bug waiting to happen.

This separates the section loading code into its own separate functions.
This keeps variables only visible to the code that actually needs it,
and makes it much easier to visually see the end of each individual
configuration group. It also makes it much easier to visually catch bugs
during code review.

While we're at it, this also uses QStringLiteral instead of raw string
literals, which both avoids constructing a lot of QString instances, but
also makes it much easier to disable implicit ASCII to QString and
vice-versa in the future via setting QT_NO_CAST_FROM_ASCII and
QT_NO_CAST_TO_ASCII as compilation flags.
This commit is contained in:
Tobias 2019-11-07 17:33:41 +01:00 committed by GitHub
parent 35690e3ac7
commit ff931590b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 740 additions and 408 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1110
src/citra_qt/configuration/config.cpp
View file

File diff suppressed because it is too large Load diff

38
src/citra_qt/configuration/config.h
View file

@ -25,7 +25,45 @@ public:
private:
void ReadValues();
void ReadAudioValues();
void ReadCameraValues();
void ReadControlValues();
void ReadCoreValues();
void ReadDataStorageValues();
void ReadDebuggingValues();
void ReadLayoutValues();
void ReadMiscellaneousValues();
void ReadMultiplayerValues();
void ReadPathValues();
void ReadRendererValues();
void ReadShortcutValues();
void ReadSystemValues();
void ReadUIValues();
void ReadUIGameListValues();
void ReadUILayoutValues();
void ReadUpdaterValues();
void ReadWebServiceValues();
void SaveValues();
void SaveAudioValues();
void SaveCameraValues();
void SaveControlValues();
void SaveCoreValues();
void SaveDataStorageValues();
void SaveDebuggingValues();
void SaveLayoutValues();
void SaveMiscellaneousValues();
void SaveMultiplayerValues();
void SavePathValues();
void SaveRendererValues();
void SaveShortcutValues();
void SaveSystemValues();
void SaveUIValues();
void SaveUIGameListValues();
void SaveUILayoutValues();
void SaveUpdaterValues();
void SaveWebServiceValues();
QVariant ReadSetting(const QString& name) const;
QVariant ReadSetting(const QString& name, const QVariant& default_value) const;
void WriteSetting(const QString& name, const QVariant& value);