gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-01-12 13:15:18 -08:00
Code Issues Packages Projects Releases Wiki Activity

Address /W4 compiler warnings for Windows (#4910)

Browse Source
This commit is contained in:
Zach H
2023-10-15 20:31:13 -04:00
committed by GitHub
parent cb90a8356b
commit 186f4289e9
50 changed files with 279 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
oracle/src/oraclewizard.cpp
View File

@@ -438,7 +438,7 @@ void LoadSetsPage::actDownloadFinishedSetsFile()
reply->deleteLater();
}
void LoadSetsPage::readSetsFromByteArray(QByteArray data)
void LoadSetsPage::readSetsFromByteArray(QByteArray _data)
{
// show an infinite progressbar
progressBar->setMaximum(0);
@@ -450,16 +450,16 @@ void LoadSetsPage::readSetsFromByteArray(QByteArray data)
wizard()->downloadedPlainXml = false;
wizard()->xmlData.clear();
readSetsFromByteArrayRef(data);
readSetsFromByteArrayRef(_data);
}
void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &data)
void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &_data)
{
// unzip the file if needed
if (data.startsWith(XZ_SIGNATURE)) {
if (_data.startsWith(XZ_SIGNATURE)) {
#ifdef HAS_LZMA
// zipped file
auto *inBuffer = new QBuffer(&data);
auto *inBuffer = new QBuffer(&_data);
auto newData = QByteArray();
auto *outBuffer = new QBuffer(&newData);
inBuffer->open(QBuffer::ReadOnly);
@@ -469,7 +469,7 @@ void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &data)
zipDownloadFailed(tr("Xz extraction failed."));
return;
}
data.clear();
_data.clear();
readSetsFromByteArrayRef(newData);
return;
#else
@@ -481,10 +481,10 @@ void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &data)
progressBar->hide();
return;
#endif
} else if (data.startsWith(ZIP_SIGNATURE)) {
} else if (_data.startsWith(ZIP_SIGNATURE)) {
#ifdef HAS_ZLIB
// zipped file
auto *inBuffer = new QBuffer(&data);
auto *inBuffer = new QBuffer(&_data);
auto newData = QByteArray();
auto *outBuffer = new QBuffer(&newData);
QString fileName;
@@ -510,7 +510,7 @@ void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &data)
uz.closeArchive();
return;
}
data.clear();
_data.clear();
readSetsFromByteArrayRef(newData);
return;
#else
@@ -522,15 +522,15 @@ void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &data)
progressBar->hide();
return;
#endif
} else if (data.startsWith("{")) {
} else if (_data.startsWith("{")) {
// Start the computation.
jsonData = std::move(data);
jsonData = std::move(_data);
future = QtConcurrent::run([this] { return wizard()->importer->readSetsFromByteArray(std::move(jsonData)); });
watcher.setFuture(future);
} else if (data.startsWith("<")) {
} else if (_data.startsWith("<")) {
// save xml file and don't do any processing
wizard()->downloadedPlainXml = true;
wizard()->xmlData = std::move(data);
wizard()->xmlData = std::move(_data);
importFinished();
} else {
wizard()->enableButtons();