flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 23:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #568, only one IDatastoreObjectList by making the key type a template parameter

Browse Source
This commit is contained in:
Klaus Basan
2016-01-13 01:05:01 +01:00
parent 6625b83c5e
commit 31c86da50b
9 changed files with 56 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ namespace BlackMisc
//! Value object encapsulating a list of ICAO codes.
class BLACKMISC_EXPORT CAircraftIcaoCodeList :
public CSequence<CAircraftIcaoCode>,
public BlackMisc::IDatastoreObjectListWithIntegerKey<CAircraftIcaoCode, CAircraftIcaoCodeList>,
public BlackMisc::IDatastoreObjectList<CAircraftIcaoCode, CAircraftIcaoCodeList, int>,
public BlackMisc::Mixin::MetaType<CAircraftIcaoCodeList>
{
public:

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

@@ -26,7 +26,7 @@ namespace BlackMisc
//! Value object encapsulating a list of ICAO codes.
class BLACKMISC_EXPORT CAirlineIcaoCodeList :
public CSequence<CAirlineIcaoCode>,
public BlackMisc::IDatastoreObjectListWithIntegerKey<CAirlineIcaoCode, CAirlineIcaoCodeList>,
public BlackMisc::IDatastoreObjectList<CAirlineIcaoCode, CAirlineIcaoCodeList, int>,
public BlackMisc::Mixin::MetaType<CAirlineIcaoCodeList>
{

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

@@ -24,7 +24,7 @@ namespace BlackMisc
//! Value object for a list of airports.
class BLACKMISC_EXPORT CLiveryList :
public CSequence<CLivery>,
public BlackMisc::IDatastoreObjectListWithIntegerKey<CLivery, CLiveryList>,
public BlackMisc::IDatastoreObjectList<CLivery, CLiveryList, int>,
public BlackMisc::Mixin::MetaType<CLiveryList>
{
public:

2
src/blackmisc/countrylist.cpp
View File

@@ -19,7 +19,7 @@ namespace BlackMisc
{
QString iso(isoCode.trimmed().toUpper());
if (!CCountry::isValidIsoCode(iso)) { return CCountry(); }
return IDatastoreObjectListWithStringKey::findByKey(isoCode);
return IDatastoreObjectList::findByKey(isoCode);
}
CCountry CCountryList::findBestMatchByCountryName(const QString &countryName) const

2
src/blackmisc/countrylist.h
View File

@@ -25,7 +25,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::IDatastoreObjectListWithStringKey<CCountry, CCountryList>,
public BlackMisc::IDatastoreObjectList<CCountry, CCountryList, QString>,
public BlackMisc::Mixin::MetaType<CCountryList>
{
public:

116
src/blackmisc/datastoreobjectlist.cpp
View File

@@ -20,36 +20,26 @@
namespace BlackMisc
{
template <class OBJ, class CONTAINER>
IDatastoreObjectListWithIntegerKey<OBJ, CONTAINER>::IDatastoreObjectListWithIntegerKey()
template <class OBJ, class CONTAINER, typename KEYTYPE>
IDatastoreObjectList<OBJ, CONTAINER, KEYTYPE>::IDatastoreObjectList()
{ }
template <class OBJ, class CONTAINER>
IDatastoreObjectListWithStringKey<OBJ, CONTAINER>::IDatastoreObjectListWithStringKey()
{ }
template <class OBJ, class CONTAINER>
OBJ IDatastoreObjectListWithIntegerKey<OBJ, CONTAINER>::findByKey(int key, const OBJ &notFound) const
template <class OBJ, class CONTAINER, typename KEYTYPE>
OBJ IDatastoreObjectList<OBJ, CONTAINER, KEYTYPE>::findByKey(KEYTYPE key, const OBJ &notFound) const
{
return this->container().findFirstByOrDefault(&OBJ::getDbKey, key, notFound);
}
template <class OBJ, class CONTAINER>
OBJ IDatastoreObjectListWithStringKey<OBJ, CONTAINER>::findByKey(const QString &key, const OBJ &notFound) const
{
return this->container().findFirstByOrDefault(&OBJ::getDbKey, key, notFound);
}
template <class OBJ, class CONTAINER>
void IDatastoreObjectListWithIntegerKey<OBJ, CONTAINER>::sortByKey()
template <class OBJ, class CONTAINER, typename KEYTYPE>
void IDatastoreObjectList<OBJ, CONTAINER, KEYTYPE>::sortByKey()
{
this->container().sort(BlackMisc::Predicates::MemberLess(&OBJ::getDbKey));
}
template <class OBJ, class CONTAINER>
QList<int> IDatastoreObjectListWithIntegerKey<OBJ, CONTAINER>::toDbKeyList() const
template <class OBJ, class CONTAINER, typename KEYTYPE>
QList<KEYTYPE> IDatastoreObjectList<OBJ, CONTAINER, KEYTYPE>::toDbKeyList() const
{
QList<int> keys;
QList<KEYTYPE> keys;
for (const OBJ &obj : ITimestampObjectList<OBJ, CONTAINER>::container())
{
if (!obj.hasValidDbKey()) { continue; }
@@ -58,8 +48,8 @@ namespace BlackMisc
return keys;
}
template <class OBJ, class CONTAINER>
int IDatastoreObjectListWithIntegerKey<OBJ, CONTAINER>::removeObjectsWithKeys(const QList<int> &keys)
template <class OBJ, class CONTAINER, typename KEYTYPE>
int IDatastoreObjectList<OBJ, CONTAINER, KEYTYPE>::removeObjectsWithKeys(const QList<KEYTYPE> &keys)
{
if (keys.isEmpty()) { return 0; }
if (this->container().isEmpty()) { return 0; }
@@ -70,46 +60,30 @@ namespace BlackMisc
newValues.push_back(obj);
}
int delta = this->container().size() - newValues.size();
*this = newValues;
this->container() = newValues;
return delta;
}
template <class OBJ, class CONTAINER>
int IDatastoreObjectListWithStringKey<OBJ, CONTAINER>::removeObjectsWithKeys(const QStringList &keys)
template <class OBJ, class CONTAINER, typename KEYTYPE>
int IDatastoreObjectList<OBJ, CONTAINER, KEYTYPE>::replaceOrAddObjectsByKey(const CONTAINER &container)
{
if (keys.isEmpty()) { return 0; }
if (this->container().isEmpty()) { return 0; }
CONTAINER newValues;
for (const OBJ &obj : ITimestampObjectList<OBJ, CONTAINER>::container())
if (container.isEmpty()) { return 0; }
if (this->container().isEmpty())
{
if (keys.contains(obj.getDbKey(), Qt::CaseInsensitive)) { continue; }
newValues.push_back(obj);
this->container() = container;
return this->container().size();
}
int delta = this->container().size() - newValues.size();
*this = newValues;
CONTAINER newValues(this->container());
const QList<KEYTYPE> keys(container.toDbKeyList());
newValues.removeObjectsWithKeys(keys);
newValues.push_back(container);
int delta = newValues.size() - this->container().size();
this->container() = newValues;
return delta;
}
template <class OBJ, class CONTAINER>
void IDatastoreObjectListWithStringKey<OBJ, CONTAINER>::sortByKey()
{
this->container().sort(BlackMisc::Predicates::MemberLess(&OBJ::getDbKey));
}
template <class OBJ, class CONTAINER>
QStringList IDatastoreObjectListWithStringKey<OBJ, CONTAINER>::toDbKeyList() const
{
QStringList keys;
for (const OBJ &obj : ITimestampObjectList<OBJ, CONTAINER>::container())
{
if (!obj.hasValidDbKey()) { continue; }
keys.append(obj.getDbKey());
}
return keys;
}
template <class OBJ, class CONTAINER>
CONTAINER IDatastoreObjectListWithIntegerKey<OBJ, CONTAINER>::fromDatabaseJson(const QJsonArray &array)
template <class OBJ, class CONTAINER, typename KEYTYPE>
CONTAINER IDatastoreObjectList<OBJ, CONTAINER, KEYTYPE>::fromDatabaseJson(const QJsonArray &array)
{
CONTAINER container;
for (const QJsonValue &value : array)
@@ -119,30 +93,8 @@ namespace BlackMisc
return container;
}
template <class OBJ, class CONTAINER>
CONTAINER IDatastoreObjectListWithIntegerKey<OBJ, CONTAINER>::fromDatabaseJson(const QJsonArray &array, const QString &prefix)
{
CONTAINER container;
for (const QJsonValue &value : array)
{
container.push_back(OBJ::fromDatabaseJson(value.toObject(), prefix));
}
return container;
}
template <class OBJ, class CONTAINER>
CONTAINER IDatastoreObjectListWithStringKey<OBJ, CONTAINER>::fromDatabaseJson(const QJsonArray &array)
{
CONTAINER container;
for (const QJsonValue &value : array)
{
container.push_back(OBJ::fromDatabaseJson(value.toObject()));
}
return container;
}
template <class OBJ, class CONTAINER>
CONTAINER IDatastoreObjectListWithStringKey<OBJ, CONTAINER>::fromDatabaseJson(const QJsonArray &array, const QString &prefix)
template <class OBJ, class CONTAINER, typename KEYTYPE>
CONTAINER IDatastoreObjectList<OBJ, CONTAINER, KEYTYPE>::fromDatabaseJson(const QJsonArray &array, const QString &prefix)
{
CONTAINER container;
for (const QJsonValue &value : array)
@@ -154,11 +106,11 @@ namespace BlackMisc
// see here for the reason of thess forward instantiations
// http://www.parashift.com/c++-faq/separate-template-class-defn-from-decl.html
template class IDatastoreObjectListWithIntegerKey<BlackMisc::Aviation::CLivery, BlackMisc::Aviation::CLiveryList>;
template class IDatastoreObjectListWithIntegerKey<BlackMisc::Aviation::CAircraftIcaoCode, BlackMisc::Aviation::CAircraftIcaoCodeList>;
template class IDatastoreObjectListWithIntegerKey<BlackMisc::Aviation::CAirlineIcaoCode, BlackMisc::Aviation::CAirlineIcaoCodeList>;
template class IDatastoreObjectListWithIntegerKey<BlackMisc::Simulation::CAircraftModel, BlackMisc::Simulation::CAircraftModelList>;
template class IDatastoreObjectListWithStringKey<BlackMisc::Simulation::CDistributor, BlackMisc::Simulation::CDistributorList>;
template class IDatastoreObjectListWithStringKey<BlackMisc::CCountry, BlackMisc::CCountryList>;
template class IDatastoreObjectList<BlackMisc::Aviation::CLivery, BlackMisc::Aviation::CLiveryList, int>;
template class IDatastoreObjectList<BlackMisc::Aviation::CAircraftIcaoCode, BlackMisc::Aviation::CAircraftIcaoCodeList, int>;
template class IDatastoreObjectList<BlackMisc::Aviation::CAirlineIcaoCode, BlackMisc::Aviation::CAirlineIcaoCodeList, int>;
template class IDatastoreObjectList<BlackMisc::Simulation::CAircraftModel, BlackMisc::Simulation::CAircraftModelList, int>;
template class IDatastoreObjectList<BlackMisc::Simulation::CDistributor, BlackMisc::Simulation::CDistributorList, QString>;
template class IDatastoreObjectList<BlackMisc::CCountry, BlackMisc::CCountryList, QString>;
} // namespace

55
src/blackmisc/datastoreobjectlist.h
View File

@@ -21,21 +21,24 @@
namespace BlackMisc
{
//! List of objects read from database.
//! Such objects should implement \sa ITimestampBased and \sa IDatastoreObjectWithIntegerKey
template<class OBJ, class CONTAINER> class IDatastoreObjectListWithIntegerKey : public ITimestampObjectList<OBJ, CONTAINER>
//! Such objects should implement \sa ITimestampBased and \sa IDatastoreObjectWithIntegerKey or \sa IDatastoreObjectWithStringKey
template<class OBJ, class CONTAINER, typename KEYTYPE> class IDatastoreObjectList : public ITimestampObjectList<OBJ, CONTAINER>
{
public:
//! Object with key, notFound otherwise
OBJ findByKey(int key, const OBJ &notFound = OBJ()) const;
OBJ findByKey(KEYTYPE key, const OBJ &notFound = OBJ()) const;
//! Sort by timestamp
void sortByKey();
//! All keys as list
QList<int> toDbKeyList() const;
QList<KEYTYPE> toDbKeyList() const;
//! Remove objects with key
int removeObjectsWithKeys(const QList<int> &keys);
int removeObjectsWithKeys(const QList<KEYTYPE> &keys);
//! Update or insert data (based on DB key)
int replaceOrAddObjectsByKey(const CONTAINER &container);
//! From DB JSON with default prefixes
static CONTAINER fromDatabaseJson(const QJsonArray &array);
@@ -45,35 +48,7 @@ namespace BlackMisc
protected:
//! Constructor
IDatastoreObjectListWithIntegerKey();
};
//! List of objects read from database.
//! Such objects should implement \sa ITimestampBased and \sa IDatastoreObjectWithString
template<class OBJ, class CONTAINER> class IDatastoreObjectListWithStringKey : public ITimestampObjectList<OBJ, CONTAINER>
{
public:
//! Object with key, not found otherwise
OBJ findByKey(const QString &key, const OBJ &notFound = OBJ()) const;
//! Sort by timestamp
void sortByKey();
//! All keys as string list
QStringList toDbKeyList() const;
//! Remove objects with key
int removeObjectsWithKeys(const QStringList &keys);
//! From DB JSON with default prefixes
static CONTAINER fromDatabaseJson(const QJsonArray &array);
//! From DB JSON
static CONTAINER fromDatabaseJson(const QJsonArray &array, const QString &prefix);
protected:
//! Constructor
IDatastoreObjectListWithStringKey();
IDatastoreObjectList();
};
//! \cond PRIVATE
@@ -91,12 +66,12 @@ namespace BlackMisc
class CAircraftModelList;
}
extern template class BLACKMISC_EXPORT_TEMPLATE IDatastoreObjectListWithIntegerKey<BlackMisc::Aviation::CLivery, BlackMisc::Aviation::CLiveryList>;
extern template class BLACKMISC_EXPORT_TEMPLATE IDatastoreObjectListWithIntegerKey<BlackMisc::Aviation::CAircraftIcaoCode, BlackMisc::Aviation::CAircraftIcaoCodeList>;
extern template class BLACKMISC_EXPORT_TEMPLATE IDatastoreObjectListWithIntegerKey<BlackMisc::Aviation::CAirlineIcaoCode, BlackMisc::Aviation::CAirlineIcaoCodeList>;
extern template class BLACKMISC_EXPORT_TEMPLATE IDatastoreObjectListWithIntegerKey<BlackMisc::Simulation::CAircraftModel, BlackMisc::Simulation::CAircraftModelList>;
extern template class BLACKMISC_EXPORT_TEMPLATE IDatastoreObjectListWithStringKey<BlackMisc::Simulation::CDistributor, BlackMisc::Simulation::CDistributorList>;
extern template class BLACKMISC_EXPORT_TEMPLATE IDatastoreObjectListWithStringKey<BlackMisc::CCountry, BlackMisc::CCountryList>;
extern template class BLACKMISC_EXPORT_TEMPLATE IDatastoreObjectList<BlackMisc::Aviation::CLivery, BlackMisc::Aviation::CLiveryList, int>;
extern template class BLACKMISC_EXPORT_TEMPLATE IDatastoreObjectList<BlackMisc::Aviation::CAircraftIcaoCode, BlackMisc::Aviation::CAircraftIcaoCodeList, int>;
extern template class BLACKMISC_EXPORT_TEMPLATE IDatastoreObjectList<BlackMisc::Aviation::CAirlineIcaoCode, BlackMisc::Aviation::CAirlineIcaoCodeList, int>;
extern template class BLACKMISC_EXPORT_TEMPLATE IDatastoreObjectList<BlackMisc::Simulation::CAircraftModel, BlackMisc::Simulation::CAircraftModelList, int>;
extern template class BLACKMISC_EXPORT_TEMPLATE IDatastoreObjectList<BlackMisc::Simulation::CDistributor, BlackMisc::Simulation::CDistributorList, QString>;
extern template class BLACKMISC_EXPORT_TEMPLATE IDatastoreObjectList<BlackMisc::CCountry, BlackMisc::CCountryList, QString>;
//! \endcond
} //namespace

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

@@ -25,7 +25,7 @@ namespace BlackMisc
//! Value object encapsulating a list of aircraft models
class BLACKMISC_EXPORT CAircraftModelList :
public CSequence<CAircraftModel>,
public IDatastoreObjectListWithIntegerKey<CAircraftModel, CAircraftModelList>,
public IDatastoreObjectList<CAircraftModel, CAircraftModelList, int>,
public BlackMisc::Mixin::MetaType<CAircraftModelList>
{
public:

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

@@ -28,7 +28,7 @@ namespace BlackMisc
//! Value object encapsulating a list of distributors.
class BLACKMISC_EXPORT CDistributorList :
public BlackMisc::CSequence<CDistributor>,
public BlackMisc::IDatastoreObjectListWithStringKey<CDistributor, CDistributorList>,
public BlackMisc::IDatastoreObjectList<CDistributor, CDistributorList, QString>,
public BlackMisc::Mixin::MetaType<CDistributorList>
{
public: