This commit is contained in:
Klaus Basan
2018-09-22 00:20:28 +02:00
parent bba65326da
commit ff2f653aae
5 changed files with 10 additions and 10 deletions

View File

@@ -48,7 +48,7 @@ namespace BlackCore
bool CInfoDataReader::areAllInfoObjectsRead() const
{
return getInfoObjectCount() > 4;
return this->getInfoObjectCount() > 4;
}
void CInfoDataReader::synchronizeCaches(CEntityFlags::Entity entities)
@@ -152,7 +152,7 @@ namespace BlackCore
if (!url.isEmpty())
{
this->getFromNetworkAndLog(url, { this, &CInfoDataReader::parseInfoObjectsData});
emit dataRead(this->getEntityForMode(), CEntityFlags::StartRead, 0);
emit this->dataRead(this->getEntityForMode(), CEntityFlags::StartRead, 0);
}
else
{

View File

@@ -1227,8 +1227,8 @@ namespace BlackCore
switch (wr)
{
case CWebReaderFlags::IcaoDataReader: return m_icaoDataReader;
case CWebReaderFlags::ModelReader: return m_modelDataReader;
case CWebReaderFlags::AirportReader: return m_airportDataReader;
case CWebReaderFlags::ModelReader: return m_modelDataReader;
case CWebReaderFlags::AirportReader: return m_airportDataReader;
default: break;
}
return nullptr;

View File

@@ -762,7 +762,7 @@ namespace BlackGui
const QPointer<const QWidget> wp(widget);
QTimer::singleShot(0, sGui, [ = ]
{
if (wp.isNull() || !sGui || sGui->isShuttingDown()) { return; }
if (!wp || !sGui || sGui->isShuttingDown()) { return; }
sGui->showHelp(widget);
});
return true;

View File

@@ -27,14 +27,14 @@ namespace BlackMisc
{
//! Information about accessing one URL over the network
class BLACKMISC_EXPORT CUrlLog :
public BlackMisc::CValueObject<CUrlLog>,
public BlackMisc::ITimestampBased
public CValueObject<CUrlLog>,
public ITimestampBased
{
public:
//! Properties by index
enum ColumnIndex
{
IndexId = BlackMisc::CPropertyIndex::GlobalIndexCUrlLog,
IndexId = CPropertyIndex::GlobalIndexCUrlLog,
IndexSuccess,
IndexUrl,
IndexResponseTimestamp,

View File

@@ -27,8 +27,8 @@ namespace BlackMisc
//! Value object encapsulating a list of voice rooms.
class BLACKMISC_EXPORT CUrlLogList :
public CSequence<CUrlLog>,
public BlackMisc::ITimestampObjectList<CUrlLog, CUrlLogList>,
public BlackMisc::Mixin::MetaType<CUrlLogList>
public ITimestampObjectList<CUrlLog, CUrlLogList>,
public Mixin::MetaType<CUrlLogList>
{
public:
BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CUrlLogList)