Add code to use old calls with old Qt versions

This commit is contained in:
Phil Olynyk 2020-01-21 15:53:08 -05:00
parent 0dba31e58b
commit 04c085f924

View File

@ -895,7 +895,7 @@ void PRS1Loader::ScanFiles(const QStringList & paths, int sessionid_base, Machin
qint64 ignoreBefore = p_profile->session->ignoreOlderSessionsDate().toMSecsSinceEpoch()/1000; qint64 ignoreBefore = p_profile->session->ignoreOlderSessionsDate().toMSecsSinceEpoch()/1000;
#else #else
qint64 ignoreBefore = p_profile->session->ignoreOlderSessionsDate().toSecsSinceEpoch(); qint64 ignoreBefore = p_profile->session->ignoreOlderSessionsDate().toSecsSinceEpoch();
#end #endif
bool ignoreOldSessions = p_profile->session->ignoreOlderSessions(); bool ignoreOldSessions = p_profile->session->ignoreOlderSessions();
QSet<SessionID> skipped; QSet<SessionID> skipped;
@ -1026,7 +1026,7 @@ void PRS1Loader::ScanFiles(const QStringList & paths, int sessionid_base, Machin
qDebug().noquote() << relativePath(path) << "skipping session" << chunk_sid << ":" qDebug().noquote() << relativePath(path) << "skipping session" << chunk_sid << ":"
<< QDateTime::fromSecsSinceEpoch(chunk->timestamp).toString() << "older than" << QDateTime::fromSecsSinceEpoch(chunk->timestamp).toString() << "older than"
<< QDateTime::fromSecsSinceEpoch(ignoreBefore).toString(); << QDateTime::fromSecsSinceEpoch(ignoreBefore).toString();
#end #endif
skipped += chunk_sid; skipped += chunk_sid;
delete chunk; delete chunk;
continue; continue;
@ -7697,7 +7697,7 @@ QList<PRS1DataChunk *> PRS1Import::CoalesceWaveformChunks(QList<PRS1DataChunk *>
qint64 ignoreBefore = p_profile->session->ignoreOlderSessionsDate().toMSecsSinceEpoch()/1000; qint64 ignoreBefore = p_profile->session->ignoreOlderSessionsDate().toMSecsSinceEpoch()/1000;
#else #else
qint64 ignoreBefore = p_profile->session->ignoreOlderSessionsDate().toSecsSinceEpoch(); qint64 ignoreBefore = p_profile->session->ignoreOlderSessionsDate().toSecsSinceEpoch();
#end #endif
bool ignoreOldSessions = p_profile->session->ignoreOlderSessions(); bool ignoreOldSessions = p_profile->session->ignoreOlderSessions();
for (auto & chunk : coalesced) { for (auto & chunk : coalesced) {
@ -7710,7 +7710,7 @@ QList<PRS1DataChunk *> PRS1Import::CoalesceWaveformChunks(QList<PRS1DataChunk *>
qWarning().noquote() << relativePath(chunk->m_path) << "skipping session" << chunk->sessionid << ":" qWarning().noquote() << relativePath(chunk->m_path) << "skipping session" << chunk->sessionid << ":"
<< QDateTime::fromSecsSinceEpoch(chunk->timestamp).toString() << "older than" << QDateTime::fromSecsSinceEpoch(chunk->timestamp).toString() << "older than"
<< QDateTime::fromSecsSinceEpoch(ignoreBefore).toString(); << QDateTime::fromSecsSinceEpoch(ignoreBefore).toString();
#end #endif
continue; continue;
} }
coalescedAndFiltered.append(chunk); coalescedAndFiltered.append(chunk);