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

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

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
{

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

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:

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"

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

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>
{

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"

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

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: