This commit is contained in:
Steven Cherry 2016-06-12 21:12:45 -05:00 committed by Anon
parent f6cd1ec450
commit b58452bf9e
3 changed files with 3 additions and 3 deletions

View File

@ -31,7 +31,7 @@ const std::array<QVariant, Settings::NativeInput::NUM_INPUTS> Config::defaults =
Qt::Key_D, Qt::Key_D,
}; };
const std::array<QVariant, Settings::NativeInput::NUM_INPUTS>& Config::getDefaultInput() const std::array<QVariant, Settings::NativeInput::NUM_INPUTS>& Config::GetDefaultInput()
{ {
return defaults; return defaults;
} }

View File

@ -24,5 +24,5 @@ public:
void Reload(); void Reload();
void Save(); void Save();
static const std::array<QVariant, Settings::NativeInput::NUM_INPUTS>& getDefaultInput(); static const std::array<QVariant, Settings::NativeInput::NUM_INPUTS>& GetDefaultInput();
}; };

View File

@ -161,7 +161,7 @@ void ConfigureInput::removeDuplicates(const QString& newValue)
/// Restore all buttons to their default values. /// Restore all buttons to their default values.
void ConfigureInput::restoreDefaults() { void ConfigureInput::restoreDefaults() {
for (int i = 0; i < Settings::NativeInput::NUM_INPUTS - 1; ++i) { for (int i = 0; i < Settings::NativeInput::NUM_INPUTS - 1; ++i) {
QString keyValue = getKeyName(Config::getDefaultInput()[i].toInt()); QString keyValue = getKeyName(Config::GetDefaultInput()[i].toInt());
input_mapping[Settings::NativeInput::Values(i)]->setText(keyValue); input_mapping[Settings::NativeInput::Values(i)]->setText(keyValue);
} }
} }