flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-03 07:35:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #649, refs #658 fixed includes to new subfolders "db"

Browse Source 
some style changes in same step
This commit is contained in:
Klaus Basan
2016-05-24 00:40:40 +02:00
parent 5789bdd722
commit 54b1234f7f
44 changed files with 130 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackmisc/aviation/aircrafticaocode.cpp
View File

@@ -9,7 +9,7 @@
#include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/comparefunctions.h"
#include "blackmisc/datastoreutility.h"
#include "blackmisc/db/datastoreutility.h"
#include "blackmisc/logcategory.h"
#include "blackmisc/logcategorylist.h"
#include "blackmisc/propertyindex.h"
@@ -26,6 +26,7 @@
#include <QtGlobal>
using namespace BlackMisc;
using namespace BlackMisc::Db;
namespace BlackMisc
{

4
src/blackmisc/aviation/aircrafticaocode.h
View File

@@ -12,8 +12,8 @@
#ifndef BLACKMISC_AVIATION_AIRCRAFTICAOCODE_H
#define BLACKMISC_AVIATION_AIRCRAFTICAOCODE_H
#include "blackmisc/db/datastore.h"
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/datastore.h"
#include "blackmisc/metaclass.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/statusmessagelist.h"
@@ -33,7 +33,7 @@ namespace BlackMisc
//! Value object for ICAO classification
class BLACKMISC_EXPORT CAircraftIcaoCode :
public CValueObject<CAircraftIcaoCode>,
public BlackMisc::IDatastoreObjectWithIntegerKey
public BlackMisc::Db::IDatastoreObjectWithIntegerKey
{
public:
//! Properties by index

4
src/blackmisc/aviation/aircrafticaocodelist.h
View File

@@ -16,7 +16,7 @@
#include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/collection.h"
#include "blackmisc/datastoreobjectlist.h"
#include "blackmisc/db/datastoreobjectlist.h"
#include "blackmisc/sequence.h"
#include "blackmisc/variant.h"
@@ -33,7 +33,7 @@ namespace BlackMisc
//! Value object encapsulating a list of ICAO codes.
class BLACKMISC_EXPORT CAircraftIcaoCodeList :
public CSequence<CAircraftIcaoCode>,
public BlackMisc::IDatastoreObjectList<CAircraftIcaoCode, CAircraftIcaoCodeList, int>,
public BlackMisc::Db::IDatastoreObjectList<CAircraftIcaoCode, CAircraftIcaoCodeList, int>,
public BlackMisc::Mixin::MetaType<CAircraftIcaoCodeList>
{
public:

2
src/blackmisc/aviation/airlineicaocode.cpp
View File

@@ -9,7 +9,7 @@
#include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/comparefunctions.h"
#include "blackmisc/datastoreutility.h"
#include "blackmisc/db/datastoreutility.h"
#include "blackmisc/icons.h"
#include "blackmisc/logcategory.h"
#include "blackmisc/logcategorylist.h"

4
src/blackmisc/aviation/airlineicaocode.h
View File

@@ -14,7 +14,7 @@
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/country.h"
#include "blackmisc/datastore.h"
#include "blackmisc/db/datastore.h"
#include "blackmisc/icon.h"
#include "blackmisc/metaclass.h"
#include "blackmisc/propertyindex.h"
@@ -33,7 +33,7 @@ namespace BlackMisc
//! Value object for ICAO classification
class BLACKMISC_EXPORT CAirlineIcaoCode :
public CValueObject<CAirlineIcaoCode>,
public BlackMisc::IDatastoreObjectWithIntegerKey
public BlackMisc::Db::IDatastoreObjectWithIntegerKey
{
public:
//! Properties by index

4
src/blackmisc/aviation/airlineicaocodelist.h
View File

@@ -16,7 +16,7 @@
#include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/collection.h"
#include "blackmisc/datastoreobjectlist.h"
#include "blackmisc/db/datastoreobjectlist.h"
#include "blackmisc/sequence.h"
#include "blackmisc/variant.h"
@@ -33,7 +33,7 @@ namespace BlackMisc
//! Value object encapsulating a list of ICAO codes.
class BLACKMISC_EXPORT CAirlineIcaoCodeList :
public CSequence<CAirlineIcaoCode>,
public BlackMisc::IDatastoreObjectList<CAirlineIcaoCode, CAirlineIcaoCodeList, int>,
public BlackMisc::Db::IDatastoreObjectList<CAirlineIcaoCode, CAirlineIcaoCodeList, int>,
public BlackMisc::Mixin::MetaType<CAirlineIcaoCodeList>
{

2
src/blackmisc/aviation/livery.cpp
View File

@@ -10,7 +10,7 @@
#include "blackmisc/aviation/livery.h"
#include "blackmisc/compare.h"
#include "blackmisc/comparefunctions.h"
#include "blackmisc/datastoreutility.h"
#include "blackmisc/db/datastoreutility.h"
#include "blackmisc/logcategory.h"
#include "blackmisc/logcategorylist.h"
#include "blackmisc/propertyindex.h"

4
src/blackmisc/aviation/livery.h
View File

@@ -14,7 +14,7 @@
#include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/datastore.h"
#include "blackmisc/db/datastore.h"
#include "blackmisc/metaclass.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/rgbcolor.h"
@@ -33,7 +33,7 @@ namespace BlackMisc
//! Value object encapsulating information about an airpot.
class BLACKMISC_EXPORT CLivery :
public CValueObject<CLivery>,
public BlackMisc::IDatastoreObjectWithIntegerKey
public BlackMisc::Db::IDatastoreObjectWithIntegerKey
{
public:
//! Properties by index

4
src/blackmisc/aviation/liverylist.h
View File

@@ -16,7 +16,7 @@
#include "blackmisc/aviation/livery.h"
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/collection.h"
#include "blackmisc/datastoreobjectlist.h"
#include "blackmisc/db/datastoreobjectlist.h"
#include "blackmisc/sequence.h"
#include "blackmisc/variant.h"
@@ -31,7 +31,7 @@ namespace BlackMisc
//! Value object for a list of airports.
class BLACKMISC_EXPORT CLiveryList :
public CSequence<CLivery>,
public BlackMisc::IDatastoreObjectList<CLivery, CLiveryList, int>,
public BlackMisc::Db::IDatastoreObjectList<CLivery, CLiveryList, int>,
public BlackMisc::Mixin::MetaType<CLiveryList>
{
public:

4
src/blackmisc/country.h
View File

@@ -13,7 +13,7 @@
#define BLACKMISC_COUNTRY_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/datastore.h"
#include "blackmisc/db/datastore.h"
#include "blackmisc/icon.h"
#include "blackmisc/metaclass.h"
#include "blackmisc/propertyindex.h"
@@ -24,6 +24,8 @@
#include <QMetaType>
#include <QString>
using namespace BlackMisc::Db;
namespace BlackMisc
{
/*!

4
src/blackmisc/countrylist.h
View File

@@ -12,10 +12,10 @@
#ifndef BLACKMISC_COUNTRYLIST_H
#define BLACKMISC_COUNTRYLIST_H
#include "blackmisc/db/datastoreobjectlist.h"
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/collection.h"
#include "blackmisc/country.h"
#include "blackmisc/datastoreobjectlist.h"
#include "blackmisc/sequence.h"
#include "blackmisc/variant.h"
@@ -31,7 +31,7 @@ namespace BlackMisc
//! \remark: I do not use CCollection as I want to sort per column
class BLACKMISC_EXPORT CCountryList :
public CSequence<CCountry>,
public BlackMisc::IDatastoreObjectList<CCountry, CCountryList, QString>,
public BlackMisc::Db::IDatastoreObjectList<CCountry, CCountryList, QString>,
public BlackMisc::Mixin::MetaType<CCountryList>
{
public:

4
src/blackmisc/network/authenticateduser.h
View File

@@ -14,7 +14,7 @@
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/country.h"
#include "blackmisc/datastore.h"
#include "blackmisc/db/datastore.h"
#include "blackmisc/icon.h"
#include "blackmisc/metaclass.h"
#include "blackmisc/network/rolelist.h"
@@ -37,7 +37,7 @@ namespace BlackMisc
*/
class BLACKMISC_EXPORT CAuthenticatedUser :
public CValueObject<CAuthenticatedUser>,
public BlackMisc::IDatastoreObjectWithIntegerKey
public BlackMisc::Db::IDatastoreObjectWithIntegerKey
{
public:
//! Properties by index

4
src/blackmisc/network/role.h
View File

@@ -13,7 +13,7 @@
#define BLACKMISC_NETWORK_ROLE_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/datastore.h"
#include "blackmisc/db/datastore.h"
#include "blackmisc/metaclass.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/valueobject.h"
@@ -32,7 +32,7 @@ namespace BlackMisc
*/
class BLACKMISC_EXPORT CRole :
public CValueObject<CRole>,
public IDatastoreObjectWithIntegerKey
public BlackMisc::Db::IDatastoreObjectWithIntegerKey
{
public:
//! Properties by index

2
src/blackmisc/simulation/aircraftmodel.cpp
View File

@@ -9,7 +9,7 @@
#include "blackmisc/compare.h"
#include "blackmisc/comparefunctions.h"
#include "blackmisc/datastoreutility.h"
#include "blackmisc/db/datastoreutility.h"
#include "blackmisc/icon.h"
#include "blackmisc/iconlist.h"
#include "blackmisc/icons.h"

4
src/blackmisc/simulation/aircraftmodel.h
View File

@@ -17,7 +17,7 @@
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/aviation/livery.h"
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/datastore.h"
#include "blackmisc/db/datastore.h"
#include "blackmisc/dictionary.h"
#include "blackmisc/metaclass.h"
#include "blackmisc/metaclassprivate.h"
@@ -52,7 +52,7 @@ namespace BlackMisc
//! \remarks Simulator independent class, supposed to be common denominator
class BLACKMISC_EXPORT CAircraftModel :
public CValueObject<CAircraftModel>,
public BlackMisc::IDatastoreObjectWithIntegerKey,
public BlackMisc::Db::IDatastoreObjectWithIntegerKey,
public BlackMisc::IOrderable
{
public:

4
src/blackmisc/simulation/aircraftmodellist.h
View File

@@ -15,7 +15,7 @@
#include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/collection.h"
#include "blackmisc/datastoreobjectlist.h"
#include "blackmisc/db/datastoreobjectlist.h"
#include "blackmisc/orderablelist.h"
#include "blackmisc/sequence.h"
#include "blackmisc/simulation/aircraftmodel.h"
@@ -46,7 +46,7 @@ namespace BlackMisc
//! Value object encapsulating a list of aircraft models
class BLACKMISC_EXPORT CAircraftModelList :
public BlackMisc::CSequence<CAircraftModel>,
public BlackMisc::IDatastoreObjectList<CAircraftModel, CAircraftModelList, int>,
public BlackMisc::Db::IDatastoreObjectList<CAircraftModel, CAircraftModelList, int>,
public BlackMisc::IOrderableList<CAircraftModel, CAircraftModelList>,
public BlackMisc::Mixin::MetaType<CAircraftModelList>
{

4
src/blackmisc/simulation/distributor.h
View File

@@ -13,7 +13,7 @@
#define BLACKMISC_SIMULATION_DISTRIBUTOR_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/datastore.h"
#include "blackmisc/db/datastore.h"
#include "blackmisc/metaclass.h"
#include "blackmisc/orderable.h"
#include "blackmisc/propertyindex.h"
@@ -33,7 +33,7 @@ namespace BlackMisc
//! Value object encapsulating information of software distributor.
class BLACKMISC_EXPORT CDistributor :
public BlackMisc::CValueObject<CDistributor>,
public BlackMisc::IDatastoreObjectWithStringKey,
public BlackMisc::Db::IDatastoreObjectWithStringKey,
public BlackMisc::IOrderable
{
public:

4
src/blackmisc/simulation/distributorlist.h
View File

@@ -14,7 +14,7 @@
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/collection.h"
#include "blackmisc/datastoreobjectlist.h"
#include "blackmisc/db/datastoreobjectlist.h"
#include "blackmisc/orderablelist.h"
#include "blackmisc/sequence.h"
#include "blackmisc/simulation/distributor.h"
@@ -32,7 +32,7 @@ namespace BlackMisc
//! Value object encapsulating a list of distributors.
class BLACKMISC_EXPORT CDistributorList :
public BlackMisc::CSequence<CDistributor>,
public BlackMisc::IDatastoreObjectList<CDistributor, CDistributorList, QString>,
public BlackMisc::Db::IDatastoreObjectList<CDistributor, CDistributorList, QString>,
public BlackMisc::IOrderableList<CDistributor, CDistributorList>,
public BlackMisc::Mixin::MetaType<CDistributorList>
{

11
src/blackmisc/simulation/simulatorinfo.cpp
View File

@@ -9,7 +9,7 @@
#include "blackconfig/buildconfig.h"
#include "blackmisc/comparefunctions.h"
#include "blackmisc/datastoreutility.h"
#include "blackmisc/db/datastoreutility.h"
#include "blackmisc/simulation/fscommon/fscommonutil.h"
#include "blackmisc/simulation/simulatorinfo.h"
#include <QJsonValue>
@@ -18,6 +18,7 @@
using namespace BlackConfig;
using namespace BlackMisc;
using namespace BlackMisc::Db;
using namespace BlackMisc::Simulation::FsCommon;
namespace BlackMisc
@@ -210,10 +211,10 @@ namespace BlackMisc
CSimulatorInfo CSimulatorInfo::fromDatabaseJson(const QJsonObject &json, const QString prefix)
{
bool fsx = CDatastoreUtility::dbBoolStringToBool(json.value(prefix + "simfsx").toString());
bool fs9 = CDatastoreUtility::dbBoolStringToBool(json.value(prefix + "simfs9").toString());
bool xp = CDatastoreUtility::dbBoolStringToBool(json.value(prefix + "simxplane").toString());
bool p3d = CDatastoreUtility::dbBoolStringToBool(json.value(prefix + "simp3d").toString());
const bool fsx = CDatastoreUtility::dbBoolStringToBool(json.value(prefix + "simfsx").toString());
const bool fs9 = CDatastoreUtility::dbBoolStringToBool(json.value(prefix + "simfs9").toString());
const bool xp = CDatastoreUtility::dbBoolStringToBool(json.value(prefix + "simxplane").toString());
const bool p3d = CDatastoreUtility::dbBoolStringToBool(json.value(prefix + "simp3d").toString());
const CSimulatorInfo simInfo(fsx, fs9, xp, p3d);
return simInfo;