Skip to content

Q
qgroundcontrol
Commit a18ca238 authored by Gregory Dymarek's avatar Gregory Dymarek
Browse files
Options

Comments

parent 4a49c702
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
src/Joystick/JoystickManager.cc
View file @ a18ca238
...@@ -52,8 +52,7 @@ void JoystickManager::setToolbox(QGCToolbox *toolbox) ...@@ -52,8 +52,7 @@ void JoystickManager::setToolbox(QGCToolbox *toolbox)
QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership); QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
} }
void JoystickManager::init() void JoystickManager::init() {
{
#ifdef __sdljoystick__ #ifdef __sdljoystick__
if (JoystickSDL::init()) { if (JoystickSDL::init()) {
_setActiveJoystickFromSettings(); _setActiveJoystickFromSettings();
...@@ -181,6 +180,9 @@ void JoystickManager::setActiveJoystickName(const QString& name) ...@@ -181,6 +180,9 @@ void JoystickManager::setActiveJoystickName(const QString& name)
setActiveJoystick(_name2JoystickMap[name]); setActiveJoystick(_name2JoystickMap[name]);
} }
/*
* TODO: move this to the right place: JoystickSDL.cc and JoystickAndroid.cc respectively and call through Joystick.cc
*/
void JoystickManager::_updateAvailableJoysticks(void) void JoystickManager::_updateAvailableJoysticks(void)
{ {
#ifdef __sdljoystick__ #ifdef __sdljoystick__
......
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