ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Mark widget binder functions as inline 

Should also fix the unused warning without using [[maybe_unused]];
This commit is contained in:
Stenzek 2023-01-30 20:40:47 +10:00 committed by lightningterror
parent 79daed63ee
commit 43572a1560
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pcsx2-qt/SettingWidgetBinder.h
View File

@ -595,7 +595,7 @@ namespace SettingWidgetBinder
/// Binds a widget's value to a setting, updating it when the value changes. /// Binds a widget's value to a setting, updating it when the value changes.
template <typename WidgetType> template <typename WidgetType>
static void BindWidgetToBoolSetting( static inline void BindWidgetToBoolSetting(
SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, bool default_value) SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, bool default_value)
{ {
using Accessor = SettingAccessor<WidgetType>; using Accessor = SettingAccessor<WidgetType>;
@ -636,7 +636,7 @@ namespace SettingWidgetBinder
} }
template <typename WidgetType> template <typename WidgetType>
static void BindWidgetToIntSetting( static inline void BindWidgetToIntSetting(
SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, int default_value, int option_offset = 0) SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, int default_value, int option_offset = 0)
{ {
using Accessor = SettingAccessor<WidgetType>; using Accessor = SettingAccessor<WidgetType>;
@ -677,7 +677,7 @@ namespace SettingWidgetBinder
} }
template <typename WidgetType> template <typename WidgetType>
static void BindWidgetToFloatSetting( static inline void BindWidgetToFloatSetting(
SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, float default_value) SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, float default_value)
{ {
using Accessor = SettingAccessor<WidgetType>; using Accessor = SettingAccessor<WidgetType>;
@ -718,7 +718,7 @@ namespace SettingWidgetBinder
} }
template <typename WidgetType> template <typename WidgetType>
static void BindWidgetToNormalizedSetting( static inline void BindWidgetToNormalizedSetting(
SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, float range, float default_value) SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, float range, float default_value)
{ {
using Accessor = SettingAccessor<WidgetType>; using Accessor = SettingAccessor<WidgetType>;
@ -759,7 +759,7 @@ namespace SettingWidgetBinder
} }
template <typename WidgetType> template <typename WidgetType>
static void BindWidgetToStringSetting( static inline void BindWidgetToStringSetting(
SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, std::string default_value = std::string()) SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, std::string default_value = std::string())
{ {
using Accessor = SettingAccessor<WidgetType>; using Accessor = SettingAccessor<WidgetType>;
@ -804,7 +804,7 @@ namespace SettingWidgetBinder
} }
template <typename WidgetType, typename DataType> template <typename WidgetType, typename DataType>
static void BindWidgetToEnumSetting(SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, static inline void BindWidgetToEnumSetting(SettingsInterface* sif, WidgetType* widget, std::string section, std::string key,
std::optional<DataType> (*from_string_function)(const char* str), const char* (*to_string_function)(DataType value), std::optional<DataType> (*from_string_function)(const char* str), const char* (*to_string_function)(DataType value),
DataType default_value) DataType default_value)
{ {
@ -866,7 +866,7 @@ namespace SettingWidgetBinder
} }
template <typename WidgetType, typename DataType> template <typename WidgetType, typename DataType>
static void BindWidgetToEnumSetting( static inline void BindWidgetToEnumSetting(
SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, const char** enum_names, DataType default_value) SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, const char** enum_names, DataType default_value)
{ {
using Accessor = SettingAccessor<WidgetType>; using Accessor = SettingAccessor<WidgetType>;
@ -928,7 +928,7 @@ namespace SettingWidgetBinder
} }
template <typename WidgetType> template <typename WidgetType>
static void BindWidgetToEnumSetting(SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, static inline void BindWidgetToEnumSetting(SettingsInterface* sif, WidgetType* widget, std::string section, std::string key,
const char** enum_names, const char** enum_values, const char* default_value) const char** enum_names, const char** enum_values, const char* default_value)
{ {
using Accessor = SettingAccessor<WidgetType>; using Accessor = SettingAccessor<WidgetType>;
@ -992,7 +992,7 @@ namespace SettingWidgetBinder
} }
template <typename WidgetType> template <typename WidgetType>
static void BindWidgetToFolderSetting(SettingsInterface* sif, WidgetType* widget, QAbstractButton* browse_button, static inline void BindWidgetToFolderSetting(SettingsInterface* sif, WidgetType* widget, QAbstractButton* browse_button,
QAbstractButton* open_button, QAbstractButton* reset_button, std::string section, std::string key, std::string default_value, QAbstractButton* open_button, QAbstractButton* reset_button, std::string section, std::string key, std::string default_value,
bool use_relative = true) bool use_relative = true)
{ {
@ -1068,7 +1068,7 @@ namespace SettingWidgetBinder
} }
} }
[[maybe_unused]] static void BindSliderToIntSetting(SettingsInterface* sif, QSlider* slider, QLabel* label, const QString& label_suffix, static inline void BindSliderToIntSetting(SettingsInterface* sif, QSlider* slider, QLabel* label, const QString& label_suffix,
std::string section, std::string key, s32 default_value) std::string section, std::string key, s32 default_value)
{ {
const s32 global_value = Host::GetBaseIntSettingValue(section.c_str(), key.c_str(), default_value); const s32 global_value = Host::GetBaseIntSettingValue(section.c_str(), key.c_str(), default_value);
@ -1109,8 +1109,8 @@ namespace SettingWidgetBinder
}); });
slider->connect(slider, &QSlider::valueChanged, slider, slider->connect(slider, &QSlider::valueChanged, slider,
[sif, label, label_suffix, section = std::move(section), key = std::move(key), [sif, label, label_suffix, section = std::move(section), key = std::move(key), orig_font = std::move(orig_font),
orig_font = std::move(orig_font), bold_font = std::move(bold_font)](int value) { bold_font = std::move(bold_font)](int value) {
label->setText(QStringLiteral("%1%2").arg(value).arg(label_suffix)); label->setText(QStringLiteral("%1%2").arg(value).arg(label_suffix));
if (label->font() != bold_font) if (label->font() != bold_font)

11
pcsx2-qt/Settings/ControllerSettingWidgetBinder.h
View File

@ -38,7 +38,7 @@ namespace ControllerSettingWidgetBinder
{ {
/// Interface specific method of BindWidgetToBoolSetting(). /// Interface specific method of BindWidgetToBoolSetting().
template <typename WidgetType> template <typename WidgetType>
static void BindWidgetToInputProfileBool( static inline void BindWidgetToInputProfileBool(
SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, bool default_value) SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, bool default_value)
{ {
using Accessor = SettingWidgetBinder::SettingAccessor<WidgetType>; using Accessor = SettingWidgetBinder::SettingAccessor<WidgetType>;
@ -71,7 +71,7 @@ namespace ControllerSettingWidgetBinder
/// Interface specific method of BindWidgetToIntSetting(). /// Interface specific method of BindWidgetToIntSetting().
template <typename WidgetType> template <typename WidgetType>
static void BindWidgetToInputProfileInt( static inline void BindWidgetToInputProfileInt(
SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, s32 default_value, s32 option_offset = 0) SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, s32 default_value, s32 option_offset = 0)
{ {
using Accessor = SettingWidgetBinder::SettingAccessor<WidgetType>; using Accessor = SettingWidgetBinder::SettingAccessor<WidgetType>;
@ -104,7 +104,7 @@ namespace ControllerSettingWidgetBinder
/// Interface specific method of BindWidgetToFloatSetting(). /// Interface specific method of BindWidgetToFloatSetting().
template <typename WidgetType> template <typename WidgetType>
static void BindWidgetToInputProfileFloat( static inline void BindWidgetToInputProfileFloat(
SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, float default_value, float multiplier = 1.0f) SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, float default_value, float multiplier = 1.0f)
{ {
using Accessor = SettingWidgetBinder::SettingAccessor<WidgetType>; using Accessor = SettingWidgetBinder::SettingAccessor<WidgetType>;
@ -137,12 +137,11 @@ namespace ControllerSettingWidgetBinder
/// Interface specific method of BindWidgetToNormalizedSetting(). /// Interface specific method of BindWidgetToNormalizedSetting().
template <typename WidgetType> template <typename WidgetType>
static void BindWidgetToInputProfileNormalized( static inline void BindWidgetToInputProfileNormalized(
SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, float range, float default_value) SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, float range, float default_value)
{ {
using Accessor = SettingWidgetBinder::SettingAccessor<WidgetType>; using Accessor = SettingWidgetBinder::SettingAccessor<WidgetType>;
if (sif) if (sif)
{ {
const float value = sif->GetFloatValue(section.c_str(), key.c_str(), default_value); const float value = sif->GetFloatValue(section.c_str(), key.c_str(), default_value);
@ -171,7 +170,7 @@ namespace ControllerSettingWidgetBinder
/// Interface specific method of BindWidgetToStringSetting(). /// Interface specific method of BindWidgetToStringSetting().
template <typename WidgetType> template <typename WidgetType>
static void BindWidgetToInputProfileString( static inline void BindWidgetToInputProfileString(
SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, std::string default_value = std::string()) SettingsInterface* sif, WidgetType* widget, std::string section, std::string key, std::string default_value = std::string())
{ {
using Accessor = SettingWidgetBinder::SettingAccessor<WidgetType>; using Accessor = SettingWidgetBinder::SettingAccessor<WidgetType>;