Commit 71944e87 authored by Philipp Borgers's avatar Philipp Borgers

remove trailing whitespaces in JoystickManager.cc

parent 0627751a
......@@ -106,14 +106,14 @@ void JoystickManager::_setActiveJoystickFromSettings(void)
}
QSettings settings;
settings.beginGroup(_settingsGroup);
QString name = settings.value(_settingsKeyActiveJoystick).toString();
if (name.isEmpty()) {
name = _name2JoystickMap.first()->name();
}
setActiveJoystick(_name2JoystickMap.value(name, _name2JoystickMap.first()));
settings.setValue(_settingsKeyActiveJoystick, _activeJoystick->name());
}
......@@ -139,9 +139,9 @@ void JoystickManager::setActiveJoystick(Joystick* joystick)
if (_activeJoystick) {
_activeJoystick->stopPolling();
}
_activeJoystick = joystick;
if (_activeJoystick != nullptr) {
qCDebug(JoystickManagerLog) << "Set active:" << _activeJoystick->name();
......@@ -156,11 +156,11 @@ void JoystickManager::setActiveJoystick(Joystick* joystick)
QVariantList JoystickManager::joysticks(void)
{
QVariantList list;
for (const QString &name: _name2JoystickMap.keys()) {
list += QVariant::fromValue(_name2JoystickMap[name]);
}
return list;
}
......@@ -180,7 +180,7 @@ void JoystickManager::setActiveJoystickName(const QString& name)
qCWarning(JoystickManagerLog) << "Set active not in map" << name;
return;
}
setActiveJoystick(_name2JoystickMap[name]);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment