[FSD] Style

This commit is contained in:
Mat Sutcliffe
2019-10-03 19:10:14 +01:00
parent 2dbc347bd7
commit 077476c138
5 changed files with 12 additions and 11 deletions

View File

@@ -6,10 +6,10 @@
* or distributed except according to the terms contained in the LICENSE file. * or distributed except according to the terms contained in the LICENSE file.
*/ */
#include "blackcore/airspacemonitor.h"
#include "blackcore/vatsim/vatsimbookingreader.h" #include "blackcore/vatsim/vatsimbookingreader.h"
#include "blackcore/vatsim/vatsimdatafilereader.h" #include "blackcore/vatsim/vatsimdatafilereader.h"
#include "blackcore/airspaceanalyzer.h" #include "blackcore/airspaceanalyzer.h"
#include "blackcore/airspacemonitor.h"
#include "blackcore/aircraftmatcher.h" #include "blackcore/aircraftmatcher.h"
#include "blackcore/application.h" #include "blackcore/application.h"
#include "blackcore/webdataservices.h" #include "blackcore/webdataservices.h"

View File

@@ -47,9 +47,8 @@ SOURCES += $$PWD/afv/crypto/*.cpp
SOURCES += $$PWD/afv/connection/*.cpp SOURCES += $$PWD/afv/connection/*.cpp
SOURCES += $$PWD/afv/model/*.cpp SOURCES += $$PWD/afv/model/*.cpp
LIBS *= \ LIBS *= -lvatsimauth
-lvatsimauth \ LIBS *= -lsodium
-lsodium \
DESTDIR = $$DestRoot/lib DESTDIR = $$DestRoot/lib
DLLDESTDIR = $$DestRoot/bin DLLDESTDIR = $$DestRoot/bin

View File

@@ -32,17 +32,17 @@ namespace BlackCore
}; };
}; };
constexpr double pitchMultiplier () constexpr double pitchMultiplier()
{ {
return 256.0 / 90.0; return 256.0 / 90.0;
} }
constexpr double bankMultiplier () constexpr double bankMultiplier()
{ {
return 512.0 / 180.0; return 512.0 / 180.0;
} }
constexpr double headingMultiplier () constexpr double headingMultiplier()
{ {
return 1024.0 / 360.0; return 1024.0 / 360.0;
} }
@@ -78,7 +78,7 @@ namespace BlackCore
bank = iBank; bank = iBank;
heading = pbhstrct.hdg / headingMultiplier(); heading = pbhstrct.hdg / headingMultiplier();
onGround = pbhstrct.onground == 1 ? true : false; onGround = pbhstrct.onground == 1;
} }
} }
} }

View File

@@ -158,7 +158,7 @@ namespace BlackMisc
private: private:
CUser m_user; CUser m_user;
int m_capabilities; int m_capabilities = static_cast<int>(None);
bool m_swift = false; // another swift client bool m_swift = false; // another swift client
QString m_modelString; QString m_modelString;
QString m_server; QString m_server;

View File

@@ -739,8 +739,10 @@ namespace BlackFsdTest
void CTestFSDClient::testAuth() void CTestFSDClient::testAuth()
{ {
quint16 m_clientId = 0xb9ba; quint16 clientId = 0xb9ba;
QString m_privateKey("727d1efd5cb9f8d2c28372469d922bb4"); QString privateKey("727d1efd5cb9f8d2c28372469d922bb4");
Q_UNUSED(clientId)
Q_UNUSED(privateKey)
// TODO fix with the test key // TODO fix with the test key
// QString initialChallenge("a054064f45cb6d6a6f1345"); // QString initialChallenge("a054064f45cb6d6a6f1345");