refs #748 Move CAirportDataReader to the db/ subdirectory

* BlackCore::CAirportDataReader -> BlackCore::Db::CAirportDataReader
* fix typo in CDatabaseReader
This commit is contained in:
Michał Garapich
2016-09-04 22:19:46 +02:00
committed by Mathew Sutcliffe
parent 30e3ce2dbf
commit a4b5b28cc1
16 changed files with 258 additions and 211 deletions

View File

@@ -13,8 +13,8 @@
#include "testreaders.h"
#include "blackcore/application.h"
#include "blackcore/airportdatareader.h"
#include "blackcore/data/globalsetup.h"
#include "blackcore/db/airportdatareader.h"
#include "blackcore/db/icaodatareader.h"
#include "blackcore/db/modeldatareader.h"
#include "blackmisc/aviation/aircrafticaocode.h"
@@ -45,7 +45,7 @@ namespace BlackCoreTest
{
CTestReaders::CTestReaders(QObject *parent) :
QObject(parent),
m_airportReader(new CAirportDataReader(this)),
m_airportReader(new CAirportDataReader(this, CDatabaseReaderConfigList::allDirectDbAccess())),
m_icaoReader(new CIcaoDataReader(this, CDatabaseReaderConfigList::allDirectDbAccess())),
m_modelReader(new CModelDataReader(this, CDatabaseReaderConfigList::allDirectDbAccess()))
{ }

View File

@@ -22,11 +22,10 @@ namespace BlackCore
{
namespace Db
{
class CAirportDataReader;
class CIcaoDataReader;
class CModelDataReader;
}
class CAirportDataReader;
}
namespace BlackCoreTest
@@ -56,9 +55,9 @@ namespace BlackCoreTest
void readAirportData();
private:
BlackCore::CAirportDataReader *m_airportReader = nullptr;
BlackCore::Db::CIcaoDataReader *m_icaoReader = nullptr;
BlackCore::Db::CModelDataReader *m_modelReader = nullptr;
BlackCore::Db::CAirportDataReader *m_airportReader = nullptr;
BlackCore::Db::CIcaoDataReader *m_icaoReader = nullptr;
BlackCore::Db::CModelDataReader *m_modelReader = nullptr;
//! Test if server is available
static bool pingServer(const BlackMisc::Network::CUrl &url);