(Qt) Get rid of menu_setting_find references
This commit is contained in:
parent
68ddb0e3b2
commit
a7977c5f38
|
@ -289,11 +289,6 @@ CheckBox::CheckBox(rarch_setting_t *setting, QWidget *parent) :
|
||||||
add_sublabel_and_whats_this(this, m_setting);
|
add_sublabel_and_whats_this(this, m_setting);
|
||||||
}
|
}
|
||||||
|
|
||||||
CheckBox::CheckBox(const char *setting, QWidget *parent) :
|
|
||||||
CheckBox(menu_setting_find(setting), parent)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
CheckBox::CheckBox(msg_hash_enums enum_idx, QWidget *parent) :
|
CheckBox::CheckBox(msg_hash_enums enum_idx, QWidget *parent) :
|
||||||
CheckBox(menu_setting_find_enum(enum_idx), parent)
|
CheckBox(menu_setting_find_enum(enum_idx), parent)
|
||||||
{
|
{
|
||||||
|
@ -339,11 +334,6 @@ CheckableSettingsGroup::CheckableSettingsGroup(rarch_setting_t *setting, QWidget
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CheckableSettingsGroup::CheckableSettingsGroup(const char *setting, QWidget *parent) :
|
|
||||||
CheckableSettingsGroup(menu_setting_find(setting), parent)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
CheckableSettingsGroup::CheckableSettingsGroup(msg_hash_enums enum_idx, QWidget *parent) :
|
CheckableSettingsGroup::CheckableSettingsGroup(msg_hash_enums enum_idx, QWidget *parent) :
|
||||||
CheckableSettingsGroup(menu_setting_find_enum(enum_idx), parent)
|
CheckableSettingsGroup(menu_setting_find_enum(enum_idx), parent)
|
||||||
{
|
{
|
||||||
|
@ -370,11 +360,6 @@ void CheckableSettingsGroup::paintEvent(QPaintEvent *event)
|
||||||
QGroupBox::paintEvent(event);
|
QGroupBox::paintEvent(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
CheckableIcon::CheckableIcon(const char *setting, const QIcon &icon, QWidget *parent) :
|
|
||||||
CheckableIcon(menu_setting_find(setting), icon, parent)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
CheckableIcon::CheckableIcon(msg_hash_enums enum_idx, const QIcon &icon, QWidget *parent) :
|
CheckableIcon::CheckableIcon(msg_hash_enums enum_idx, const QIcon &icon, QWidget *parent) :
|
||||||
CheckableIcon(menu_setting_find_enum(enum_idx), icon, parent)
|
CheckableIcon(menu_setting_find_enum(enum_idx), icon, parent)
|
||||||
{
|
{
|
||||||
|
@ -428,11 +413,6 @@ StringLineEdit::StringLineEdit(rarch_setting_t *setting, QWidget *parent) :
|
||||||
add_sublabel_and_whats_this(this, m_setting);
|
add_sublabel_and_whats_this(this, m_setting);
|
||||||
}
|
}
|
||||||
|
|
||||||
StringLineEdit::StringLineEdit(const char *setting, QWidget *parent) :
|
|
||||||
StringLineEdit(menu_setting_find(setting), parent)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void StringLineEdit::onEditingFinished()
|
void StringLineEdit::onEditingFinished()
|
||||||
{
|
{
|
||||||
strlcpy(m_value, text().toUtf8().data(), m_setting->size);
|
strlcpy(m_value, text().toUtf8().data(), m_setting->size);
|
||||||
|
@ -471,11 +451,6 @@ StringComboBox::StringComboBox(rarch_setting_t *setting, QWidget *parent) :
|
||||||
add_sublabel_and_whats_this(this, m_setting);
|
add_sublabel_and_whats_this(this, m_setting);
|
||||||
}
|
}
|
||||||
|
|
||||||
StringComboBox::StringComboBox(const char *setting, QWidget *parent) :
|
|
||||||
StringComboBox(menu_setting_find(setting), parent)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void StringComboBox::onCurrentTextChanged(const QString &text)
|
void StringComboBox::onCurrentTextChanged(const QString &text)
|
||||||
{
|
{
|
||||||
strlcpy(m_value, text.toUtf8().data(), sizeof(m_value));
|
strlcpy(m_value, text.toUtf8().data(), sizeof(m_value));
|
||||||
|
@ -561,11 +536,6 @@ UIntComboBox::UIntComboBox(msg_hash_enums enum_idx, double min, double max, QWid
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
UIntComboBox::UIntComboBox(const char *setting, QWidget *parent) :
|
|
||||||
UIntComboBox(menu_setting_find(setting), parent)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void UIntComboBox::onCurrentIndexChanged(int index)
|
void UIntComboBox::onCurrentIndexChanged(int index)
|
||||||
{
|
{
|
||||||
Q_UNUSED(index);
|
Q_UNUSED(index);
|
||||||
|
@ -756,11 +726,6 @@ UIntRadioButtons::UIntRadioButtons(rarch_setting_t *setting, QWidget *parent) :
|
||||||
connect(m_buttonGroup, SIGNAL(buttonClicked(int)), this, SLOT(onButtonClicked(int)));
|
connect(m_buttonGroup, SIGNAL(buttonClicked(int)), this, SLOT(onButtonClicked(int)));
|
||||||
}
|
}
|
||||||
|
|
||||||
UIntRadioButtons::UIntRadioButtons(const char *setting, QWidget *parent) :
|
|
||||||
UIntRadioButtons(menu_setting_find(setting), parent)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
UIntRadioButtons::UIntRadioButtons(msg_hash_enums enum_idx, QWidget *parent) :
|
UIntRadioButtons::UIntRadioButtons(msg_hash_enums enum_idx, QWidget *parent) :
|
||||||
UIntRadioButtons(menu_setting_find_enum(enum_idx), parent)
|
UIntRadioButtons(menu_setting_find_enum(enum_idx), parent)
|
||||||
{
|
{
|
||||||
|
@ -806,11 +771,6 @@ void IntSpinBox::paintEvent(QPaintEvent *event)
|
||||||
QSpinBox::paintEvent(event);
|
QSpinBox::paintEvent(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
FloatSpinBox::FloatSpinBox(const char *setting, QWidget *parent) :
|
|
||||||
FloatSpinBox(menu_setting_find(setting), parent)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
FloatSpinBox::FloatSpinBox(msg_hash_enums enum_idx, QWidget *parent) :
|
FloatSpinBox::FloatSpinBox(msg_hash_enums enum_idx, QWidget *parent) :
|
||||||
FloatSpinBox(menu_setting_find_enum(enum_idx), parent)
|
FloatSpinBox(menu_setting_find_enum(enum_idx), parent)
|
||||||
{
|
{
|
||||||
|
@ -874,11 +834,6 @@ PathButton::PathButton(rarch_setting_t *setting, QWidget *parent) :
|
||||||
add_sublabel_and_whats_this(this, m_setting);
|
add_sublabel_and_whats_this(this, m_setting);
|
||||||
}
|
}
|
||||||
|
|
||||||
PathButton::PathButton(const char *setting, QWidget *parent) :
|
|
||||||
PathButton(menu_setting_find(setting), parent)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
QString PathButton::currentPath()
|
QString PathButton::currentPath()
|
||||||
{
|
{
|
||||||
QString current(m_setting->value.target.string);
|
QString current(m_setting->value.target.string);
|
||||||
|
@ -933,11 +888,6 @@ DirectorySelector::DirectorySelector(rarch_setting_t *setting, QWidget *parent)
|
||||||
connect(m_button, SIGNAL(changed()), m_lineEdit, SLOT(update()));
|
connect(m_button, SIGNAL(changed()), m_lineEdit, SLOT(update()));
|
||||||
}
|
}
|
||||||
|
|
||||||
FileSelector::FileSelector(const char *setting, QWidget *parent) :
|
|
||||||
FileSelector(menu_setting_find(setting), parent)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
FileSelector::FileSelector(rarch_setting_t *setting, QWidget *parent) :
|
FileSelector::FileSelector(rarch_setting_t *setting, QWidget *parent) :
|
||||||
QHBoxLayout(parent)
|
QHBoxLayout(parent)
|
||||||
,m_lineEdit(new StringLineEdit(setting))
|
,m_lineEdit(new StringLineEdit(setting))
|
||||||
|
@ -950,11 +900,6 @@ FileSelector::FileSelector(rarch_setting_t *setting, QWidget *parent) :
|
||||||
connect(m_button, SIGNAL(changed()), m_lineEdit, SLOT(update()));
|
connect(m_button, SIGNAL(changed()), m_lineEdit, SLOT(update()));
|
||||||
}
|
}
|
||||||
|
|
||||||
FloatSlider::FloatSlider(const char *setting, QWidget *parent) :
|
|
||||||
FloatSlider(menu_setting_find(setting), parent)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
FloatSlider::FloatSlider(rarch_setting_t *setting, QWidget *parent) :
|
FloatSlider::FloatSlider(rarch_setting_t *setting, QWidget *parent) :
|
||||||
QSlider(Qt::Horizontal, parent)
|
QSlider(Qt::Horizontal, parent)
|
||||||
,m_setting(setting)
|
,m_setting(setting)
|
||||||
|
@ -1003,11 +948,6 @@ void FloatSlider::paintEvent(QPaintEvent *event)
|
||||||
QSlider::paintEvent(event);
|
QSlider::paintEvent(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
FloatSliderAndSpinBox::FloatSliderAndSpinBox(const char *setting, QWidget *parent) :
|
|
||||||
FloatSliderAndSpinBox(menu_setting_find(setting), parent)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
FloatSliderAndSpinBox::FloatSliderAndSpinBox(msg_hash_enums enum_idx, QWidget *parent) :
|
FloatSliderAndSpinBox::FloatSliderAndSpinBox(msg_hash_enums enum_idx, QWidget *parent) :
|
||||||
FloatSliderAndSpinBox(menu_setting_find_enum(enum_idx), parent)
|
FloatSliderAndSpinBox(menu_setting_find_enum(enum_idx), parent)
|
||||||
{
|
{
|
||||||
|
|
|
@ -222,7 +222,6 @@ class CheckableSettingsGroup : public SettingsGroup
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
CheckableSettingsGroup(rarch_setting_t *setting, QWidget *parent = 0);
|
CheckableSettingsGroup(rarch_setting_t *setting, QWidget *parent = 0);
|
||||||
CheckableSettingsGroup(const char *setting, QWidget *parent = 0);
|
|
||||||
CheckableSettingsGroup(msg_hash_enums enum_idx, QWidget *parent = 0);
|
CheckableSettingsGroup(msg_hash_enums enum_idx, QWidget *parent = 0);
|
||||||
private slots:
|
private slots:
|
||||||
void onClicked(bool clicked);
|
void onClicked(bool clicked);
|
||||||
|
@ -237,7 +236,6 @@ class CheckBox : public QCheckBox
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
CheckBox(rarch_setting_t *setting, QWidget *parent = 0);
|
CheckBox(rarch_setting_t *setting, QWidget *parent = 0);
|
||||||
CheckBox(const char *setting, QWidget *parent = 0);
|
|
||||||
CheckBox(msg_hash_enums enum_idx, QWidget *parent = 0);
|
CheckBox(msg_hash_enums enum_idx, QWidget *parent = 0);
|
||||||
private slots:
|
private slots:
|
||||||
void onClicked(bool checked);
|
void onClicked(bool checked);
|
||||||
|
@ -252,7 +250,6 @@ class CheckableIcon : public QToolButton
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
CheckableIcon(rarch_setting_t *setting, const QIcon &icon, QWidget *parent = 0);
|
CheckableIcon(rarch_setting_t *setting, const QIcon &icon, QWidget *parent = 0);
|
||||||
CheckableIcon(const char *setting, const QIcon &icon, QWidget *parent = 0);
|
|
||||||
CheckableIcon(msg_hash_enums enum_idx, const QIcon &icon, QWidget *parent = 0);
|
CheckableIcon(msg_hash_enums enum_idx, const QIcon &icon, QWidget *parent = 0);
|
||||||
private slots:
|
private slots:
|
||||||
void onToggled(bool checked);
|
void onToggled(bool checked);
|
||||||
|
@ -267,7 +264,6 @@ class StringLineEdit : public QLineEdit
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
StringLineEdit(rarch_setting_t *setting, QWidget *parent = 0);
|
StringLineEdit(rarch_setting_t *setting, QWidget *parent = 0);
|
||||||
StringLineEdit(const char *setting, QWidget *parent = 0);
|
|
||||||
private slots:
|
private slots:
|
||||||
void onEditingFinished();
|
void onEditingFinished();
|
||||||
void paintEvent(QPaintEvent *event);
|
void paintEvent(QPaintEvent *event);
|
||||||
|
@ -288,7 +284,6 @@ class StringComboBox : public QComboBox
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
StringComboBox(rarch_setting_t *setting, QWidget *parent = 0);
|
StringComboBox(rarch_setting_t *setting, QWidget *parent = 0);
|
||||||
StringComboBox(const char *setting, QWidget *parent = 0);
|
|
||||||
private slots:
|
private slots:
|
||||||
void onCurrentTextChanged(const QString &text);
|
void onCurrentTextChanged(const QString &text);
|
||||||
void paintEvent(QPaintEvent *event);
|
void paintEvent(QPaintEvent *event);
|
||||||
|
@ -305,7 +300,6 @@ public:
|
||||||
UIntComboBox(rarch_setting_t *setting, double min, double max, QWidget *parent = 0);
|
UIntComboBox(rarch_setting_t *setting, double min, double max, QWidget *parent = 0);
|
||||||
UIntComboBox(msg_hash_enums enum_idx, QWidget *parent = 0);
|
UIntComboBox(msg_hash_enums enum_idx, QWidget *parent = 0);
|
||||||
UIntComboBox(msg_hash_enums enum_idx, double min, double max, QWidget *parent = 0);
|
UIntComboBox(msg_hash_enums enum_idx, double min, double max, QWidget *parent = 0);
|
||||||
UIntComboBox(const char *setting, QWidget *parent = 0);
|
|
||||||
private slots:
|
private slots:
|
||||||
void onCurrentIndexChanged(int index);
|
void onCurrentIndexChanged(int index);
|
||||||
void paintEvent(QPaintEvent *event);
|
void paintEvent(QPaintEvent *event);
|
||||||
|
@ -336,7 +330,6 @@ class UIntRadioButtons : public QGroupBox
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
UIntRadioButtons(rarch_setting_t *setting, QWidget *parent = 0);
|
UIntRadioButtons(rarch_setting_t *setting, QWidget *parent = 0);
|
||||||
UIntRadioButtons(const char *setting, QWidget *parent = 0);
|
|
||||||
UIntRadioButtons(msg_hash_enums enum_idx, QWidget *parent = 0);
|
UIntRadioButtons(msg_hash_enums enum_idx, QWidget *parent = 0);
|
||||||
signals:
|
signals:
|
||||||
void currentUIntChanged(unsigned value);
|
void currentUIntChanged(unsigned value);
|
||||||
|
@ -395,7 +388,6 @@ class FloatSpinBox : public QDoubleSpinBox
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
FloatSpinBox(rarch_setting_t *setting, QWidget *parent = 0);
|
FloatSpinBox(rarch_setting_t *setting, QWidget *parent = 0);
|
||||||
FloatSpinBox(const char *setting, QWidget *parent = 0);
|
|
||||||
FloatSpinBox(msg_hash_enums enum_idx, QWidget *parent = 0);
|
FloatSpinBox(msg_hash_enums enum_idx, QWidget *parent = 0);
|
||||||
private slots:
|
private slots:
|
||||||
void onValueChanged(double value);
|
void onValueChanged(double value);
|
||||||
|
@ -411,7 +403,6 @@ class PathButton : public QPushButton
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
PathButton(rarch_setting_t *setting, QWidget *parent = 0);
|
PathButton(rarch_setting_t *setting, QWidget *parent = 0);
|
||||||
PathButton(const char *setting, QWidget *parent = 0);
|
|
||||||
signals:
|
signals:
|
||||||
void changed();
|
void changed();
|
||||||
protected slots:
|
protected slots:
|
||||||
|
@ -459,7 +450,6 @@ class FileSelector : public QHBoxLayout
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
FileSelector(rarch_setting_t *setting, QWidget *parent = 0);
|
FileSelector(rarch_setting_t *setting, QWidget *parent = 0);
|
||||||
FileSelector(const char *setting, QWidget *parent = 0);
|
|
||||||
private:
|
private:
|
||||||
StringLineEdit *m_lineEdit;
|
StringLineEdit *m_lineEdit;
|
||||||
FileButton *m_button;
|
FileButton *m_button;
|
||||||
|
@ -470,7 +460,6 @@ class FloatSlider : public QSlider
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
FloatSlider(rarch_setting_t *setting, QWidget *parent = 0);
|
FloatSlider(rarch_setting_t *setting, QWidget *parent = 0);
|
||||||
FloatSlider(const char *setting, QWidget *parent = 0);
|
|
||||||
private slots:
|
private slots:
|
||||||
void onValueChanged(int value);
|
void onValueChanged(int value);
|
||||||
void paintEvent(QPaintEvent *event);
|
void paintEvent(QPaintEvent *event);
|
||||||
|
@ -486,7 +475,6 @@ class FloatSliderAndSpinBox : public QHBoxLayout
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
FloatSliderAndSpinBox(rarch_setting_t *setting, QWidget *parent = 0);
|
FloatSliderAndSpinBox(rarch_setting_t *setting, QWidget *parent = 0);
|
||||||
FloatSliderAndSpinBox(const char *setting, QWidget *parent = 0);
|
|
||||||
FloatSliderAndSpinBox(msg_hash_enums enum_idx, QWidget *parent = 0);
|
FloatSliderAndSpinBox(msg_hash_enums enum_idx, QWidget *parent = 0);
|
||||||
private slots:
|
private slots:
|
||||||
void onSliderValueChanged(int value);
|
void onSliderValueChanged(int value);
|
||||||
|
|
Loading…
Reference in New Issue