mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix broken windows build with latest MXE

Browse source 
Replaces some enums with names that do not clash with windows #defines.
Specifically:
ERROR -> ERRORED, PASCAL->PASCALS, IGNORE->IGNORED,FLOAT->FLOATVAL

Signed-off-by: Paul Buxton <paulbuxton.mail@googlemail.com>
This commit is contained in:
Paul Buxton 2019-08-28 10:21:24 +01:00 • committed by Dirk Hohndel
parent 193c456f06
commit 3c4fd5d599
9 changed files with 38 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

8
desktop-widgets/downloadfromdivecomputer.cpp
View file

@ -244,7 +244,7 @@ void DownloadFromDCWidget::updateState(states state)
// user pressed cancel but the application isn't doing anything.
// means close the window
else if ((currentState == INITIAL || currentState == DONE || currentState == ERROR) && state == CANCELLING) {
else if ((currentState == INITIAL || currentState == DONE || currentState == ERRORED) && state == CANCELLING) {
timer->stop();
reject();
}
@ -294,7 +294,7 @@ void DownloadFromDCWidget::updateState(states state)
}
// got an error
else if (state == ERROR) {
else if (state == ERRORED) {
timer->stop();
QMessageBox::critical(this, TITLE_OR_TEXT(tr("Error"), thread.error), QMessageBox::Ok);
@ -503,7 +503,7 @@ void DownloadFromDCWidget::onDownloadThreadFinished()
if (thread.error.isEmpty())
updateState(DONE);
else
updateState(ERROR);
updateState(ERRORED);
} else if (currentState == CANCELLING) {
updateState(DONE);
}
@ -524,7 +524,7 @@ void DownloadFromDCWidget::on_cancel_clicked()
void DownloadFromDCWidget::on_ok_clicked()
{
if (currentState != DONE && currentState != ERROR)
if (currentState != DONE && currentState != ERRORED)
return;
struct dive_table *table = thread.table();
struct dive_site_table *sites = thread.sites();