DataHearth/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configuration: Clean up includes a bit

Browse Source
This commit is contained in:
lat9nq 2023-05-18 23:05:21 -04:00
parent 3337250746
commit 217fa04080
14 changed files with 26 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/yuzu/configuration/configuration_shared.cpp
View File

@ -2,29 +2,8 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#include <memory>
#include <QBoxLayout>
#include <QCheckBox>
#include <QHBoxLayout>
#include <QLabel>
#include <QLineEdit>
#include <QObject>
#include <QPushButton>
#include <QString>
#include <QStyle>
#include <QWidget>
#include <qabstractbutton.h>
#include <qabstractslider.h>
#include <qboxlayout.h>
#include <qcheckbox.h>
#include <qcombobox.h>
#include <qnamespace.h>
#include <qsize.h>
#include <qsizepolicy.h>
#include <qsurfaceformat.h>
#include "common/settings.h"
#include <type_traits>
#include "yuzu/configuration/configuration_shared.h"
#include "yuzu/configuration/configure_per_game.h"
#include "yuzu/configuration/shared_translation.h"
namespace ConfigurationShared {

20
src/yuzu/configuration/configuration_shared.h
View File

@ -4,14 +4,12 @@
#pragma once
#include <forward_list>
#include <iterator>
#include <memory>
#include <QCheckBox>
#include <QComboBox>
#include <QString>
#include <QWidget>
#include <qobjectdefs.h>
#include "common/settings.h"
#include "yuzu/configuration/shared_translation.h"
class QObject;
namespace ConfigurationShared {
@ -29,16 +27,4 @@ private:
std::shared_ptr<std::forward_list<Tab*>> group;
};
constexpr int USE_GLOBAL_INDEX = 0;
constexpr int USE_GLOBAL_SEPARATOR_INDEX = 1;
constexpr int USE_GLOBAL_OFFSET = 2;
// CheckBoxes require a tracker for their state since we emulate a tristate CheckBox
enum class CheckState {
Off, // Checkbox overrides to off/false
On, // Checkbox overrides to on/true
Global, // Checkbox defers to the global state
Count, // Simply the number of states, not a valid checkbox state
};
} // namespace ConfigurationShared

1
src/yuzu/configuration/configure_audio.cpp
View File

@ -3,6 +3,7 @@
#include <forward_list>
#include <memory>
#include <QComboBox>
#include "audio_core/sink/sink.h"
#include "audio_core/sink/sink_details.h"

2
src/yuzu/configuration/configure_audio.h
View File

@ -10,7 +10,7 @@
#include "yuzu/configuration/configuration_shared.h"
#include "yuzu/configuration/shared_translation.h"
class QPushButton;
class QComboBox;
namespace Core {
class System;

1
src/yuzu/configuration/configure_cpu.cpp
View File

@ -3,6 +3,7 @@
#include <forward_list>
#include <memory>
#include <QComboBox>
#include "common/common_types.h"
#include "common/settings.h"
#include "configuration/shared_widget.h"

10
src/yuzu/configuration/configure_cpu.h
View File

@ -6,6 +6,9 @@
#include <memory>
#include <QWidget>
#include "yuzu/configuration/configuration_shared.h"
#include "yuzu/configuration/shared_translation.h"
class QComboBox;
namespace Core {
class System;
@ -37,13 +40,6 @@ private:
std::unique_ptr<Ui::ConfigureCpu> ui;
ConfigurationShared::CheckState cpuopt_unsafe_unfuse_fma;
ConfigurationShared::CheckState cpuopt_unsafe_reduce_fp_error;
ConfigurationShared::CheckState cpuopt_unsafe_ignore_standard_fpcr;
ConfigurationShared::CheckState cpuopt_unsafe_inaccurate_nan;
ConfigurationShared::CheckState cpuopt_unsafe_fastmem_check;
ConfigurationShared::CheckState cpuopt_unsafe_ignore_global_monitor;
const Core::System& system;
const ConfigurationShared::TranslationMap& translations;

3
src/yuzu/configuration/configure_dialog.h
View File

@ -7,7 +7,8 @@
#include <memory>
#include <vector>
#include <QDialog>
#include "configuration/configuration_shared.h"
#include "yuzu/configuration/configuration_shared.h"
#include "yuzu/configuration/shared_translation.h"
#include "yuzu/vk_device_info.h"
namespace Core {

2
src/yuzu/configuration/configure_graphics.h
View File

@ -5,6 +5,7 @@
#include <functional>
#include <memory>
#include <type_traits>
#include <vector>
#include <QColor>
#include <QString>
@ -14,6 +15,7 @@
#include "common/common_types.h"
#include "vk_device_info.h"
#include "yuzu/configuration/configuration_shared.h"
#include "yuzu/configuration/shared_translation.h"
class QPushButton;
class QEvent;

1
src/yuzu/configuration/configure_graphics_advanced.cpp
View File

@ -8,6 +8,7 @@
#include "ui_configure_graphics_advanced.h"
#include "yuzu/configuration/configuration_shared.h"
#include "yuzu/configuration/configure_graphics_advanced.h"
#include "yuzu/configuration/shared_translation.h"
#include "yuzu/configuration/shared_widget.h"
ConfigureGraphicsAdvanced::ConfigureGraphicsAdvanced(

1
src/yuzu/configuration/configure_graphics_advanced.h
View File

@ -6,6 +6,7 @@
#include <memory>
#include <QWidget>
#include "yuzu/configuration/configuration_shared.h"
#include "yuzu/configuration/shared_translation.h"
namespace Core {
class System;

1
src/yuzu/configuration/configure_per_game.h
View File

@ -15,6 +15,7 @@
#include "vk_device_info.h"
#include "yuzu/configuration/config.h"
#include "yuzu/configuration/configuration_shared.h"
#include "yuzu/configuration/shared_translation.h"
namespace Core {
class System;

2
src/yuzu/configuration/configure_system.cpp
View File

@ -5,6 +5,8 @@
#include <forward_list>
#include <optional>
#include <QCheckBox>
#include <QComboBox>
#include <QDateTimeEdit>
#include <QFileDialog>
#include <QGraphicsItem>

7
src/yuzu/configuration/configure_system.h
View File

@ -9,7 +9,11 @@
#include <QWidget>
#include "yuzu/configuration/configuration_shared.h"
#include "yuzu/configuration/shared_translation.h"
class QCheckBox;
class QLineEdit;
class QComboBox;
class QDateTimeEdit;
namespace Core {
@ -43,9 +47,6 @@ private:
std::unique_ptr<Ui::ConfigureSystem> ui;
bool enabled = false;
ConfigurationShared::CheckState use_rng_seed;
ConfigurationShared::CheckState use_unsafe_extended_memory_layout;
Core::System& system;
const ConfigurationShared::TranslationMap& translations;
const ConfigurationShared::ComboboxTranslationMap& combobox_translations;

3
src/yuzu/configuration/shared_widget.cpp
View File

@ -1,6 +1,7 @@
#include <functional>
#include <limits>
#include <QCheckBox>
#include <QComboBox>
#include <QDateTimeEdit>
#include <QHBoxLayout>
#include <QIcon>
@ -8,7 +9,9 @@
#include <QLineEdit>
#include <QPushButton>
#include <QSizePolicy>
#include <QSlider>
#include <QSpinBox>
#include <QStyle>
#include <QWidget>
#include <qabstractbutton.h>
#include <qabstractspinbox.h>