From 8896f5e59d181f17f23829c10d50775579825f0c Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Mon, 2 May 2016 20:10:21 -0500 Subject: [PATCH] Fix __mobile__ tags --- src/Joystick/Joystick.cc | 2 +- src/QGCToolbox.cc | 8 ++++---- src/comm/UDPLink.cc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Joystick/Joystick.cc b/src/Joystick/Joystick.cc index 37d6140f2..8aea5b9d4 100644 --- a/src/Joystick/Joystick.cc +++ b/src/Joystick/Joystick.cc @@ -90,7 +90,7 @@ Joystick::Joystick(const QString& name, int axisCount, int buttonCount, int sdlI } _loadSettings(); -#endif // __mobile __ +#endif // __mobile__ } Joystick::~Joystick() diff --git a/src/QGCToolbox.cc b/src/QGCToolbox.cc index 3d32df13c..56dc6f7d2 100644 --- a/src/QGCToolbox.cc +++ b/src/QGCToolbox.cc @@ -28,7 +28,7 @@ #include "GAudioOutput.h" #ifndef __mobile__ #include "GPSManager.h" -#endif /* __mobile */ +#endif #include "HomePositionManager.h" #include "JoystickManager.h" #include "LinkManager.h" @@ -47,7 +47,7 @@ QGCToolbox::QGCToolbox(QGCApplication* app) , _factSystem(NULL) , _firmwarePluginManager(NULL) , _flightMapSettings(NULL) -#ifndef __mobile +#ifndef __mobile__ , _gpsManager(NULL) #endif , _homePositionManager(NULL) @@ -69,7 +69,7 @@ QGCToolbox::QGCToolbox(QGCApplication* app) _flightMapSettings = new FlightMapSettings(app); #ifndef __mobile__ _gpsManager = new GPSManager(app); -#endif /* __mobile */ +#endif _homePositionManager = new HomePositionManager(app); _imageProvider = new QGCImageProvider(app); _joystickManager = new JoystickManager(app); @@ -89,7 +89,7 @@ QGCToolbox::QGCToolbox(QGCApplication* app) _flightMapSettings->setToolbox(this); #ifndef __mobile__ _gpsManager->setToolbox(this); -#endif /* __mobile */ +#endif _homePositionManager->setToolbox(this); _imageProvider->setToolbox(this); _joystickManager->setToolbox(this); diff --git a/src/comm/UDPLink.cc b/src/comm/UDPLink.cc index 7f24c3872..44a7cb10a 100644 --- a/src/comm/UDPLink.cc +++ b/src/comm/UDPLink.cc @@ -264,7 +264,7 @@ bool UDPLink::_hardwareConnect() _connectState = _socket->bind(host, _config->localPort(), QAbstractSocket::ReuseAddressHint | QUdpSocket::ShareAddress); if (_connectState) { //-- Make sure we have a large enough IO buffers -#ifdef __mobile +#ifdef __mobile__ _socket->setSocketOption(QAbstractSocket::SendBufferSizeSocketOption, 64 * 1024); _socket->setSocketOption(QAbstractSocket::ReceiveBufferSizeSocketOption, 128 * 1024); #else -- 2.22.0