chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile errors on Centos 7

Browse Source
This commit is contained in:
kappa44 2021-05-16 13:57:44 +10:00
parent 505264a200
commit 497cf8e5c4
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oscar/SleepLib/loader_plugins/intellipap_loader.cpp
View File

@ -2426,7 +2426,7 @@ bool backup6 (const QString & path) {
QStringList fileNames = hpath.entryList(); // Get list of files
if (! fileNames.isEmpty()) {
QString lastFile = fileNames.first();
qDebug() << "last settings file is" << lastFile << "new file is" << settingsFile;
qDebug() << "last settings file is" << lastFile << "new file is" << settingsFile.fileName();
QByteArray newMD5 = fileChecksum(settingsFile.fileName(), QCryptographicHash::Md5);
QByteArray oldMD5 = fileChecksum(hpath.absolutePath()+"/"+lastFile, QCryptographicHash::Md5);
if (newMD5 == oldMD5)

3
oscar/miniz.c
View File

@ -5329,7 +5329,8 @@ mz_bool mz_zip_validate_file(mz_zip_archive *pZip, mz_uint file_index, mz_uint f
goto handle_failure;
}
has_id = (MZ_READ_LE32(descriptor_buf) == MZ_ZIP_DATA_DESCRIPTOR_ID);
pSrc = descriptor_buf; // avoid g++ warning/error
has_id = (MZ_READ_LE32(pSrc) == MZ_ZIP_DATA_DESCRIPTOR_ID);
pSrc = has_id ? (descriptor_buf + sizeof(mz_uint32)) : descriptor_buf;
file_crc32 = MZ_READ_LE32(pSrc);

2
oscar/statistics.h
View File

@ -128,7 +128,7 @@ public:
dates = copy.dates;
highlight = copy.highlight;
}
RXItem& operator=(const RXItem& other) = default;
RXItem& operator=(const RXItem&) = default;
inline quint64 count(ChannelID id) const {
QHash<ChannelID, quint64>::const_iterator it = s_count.find(id);
if (it == s_count.end()) return 0;