diff options
| -rw-r--r-- | core/parse-xml.c | 1 | ||||
| -rw-r--r-- | core/qtserialbluetooth.cpp | 4 | ||||
| -rw-r--r-- | desktop-widgets/tab-widgets/maintab.ui | 2 | ||||
| -rw-r--r-- | profile-widget/tankitem.cpp | 2 | ||||
| -rw-r--r-- | qt-models/cylindermodel.cpp | 5 | ||||
| -rw-r--r-- | qt-models/diveplannermodel.cpp | 2 |
6 files changed, 9 insertions, 7 deletions
diff --git a/core/parse-xml.c b/core/parse-xml.c index a2365c0aa..9b5123ad5 100644 --- a/core/parse-xml.c +++ b/core/parse-xml.c @@ -3359,6 +3359,7 @@ extern int divinglog_profile(void *handle, int columns, char **data, char **colu int ppo2_2 = atoi_n(ptr5 + 3, 3); int ppo2_3 = atoi_n(ptr5 + 6, 3); int otu = atoi_n(ptr5 + 9, 4); + (void) otu; // we seem to not store this? Do we understand its format? int cns = atoi_n(ptr5 + 13, 4); int setpoint = atoi_n(ptr5 + 17, 2); diff --git a/core/qtserialbluetooth.cpp b/core/qtserialbluetooth.cpp index 8e5fac499..a6baae9f7 100644 --- a/core/qtserialbluetooth.cpp +++ b/core/qtserialbluetooth.cpp @@ -181,14 +181,14 @@ static dc_status_t ble_serial_write(dc_custom_io_t *io, const void* data, size_t while (size) { size_t len = sizeof(buffer.out) - transferred; - if (len > io->packet_size) + if ((int)len > io->packet_size) len = io->packet_size; if (len > size) len = size; memcpy(buffer.out + buffer.out_bytes, data, len); buffer.out_bytes += len; - if (buffer.out_bytes <= io->packet_size || buffer.out_bytes == size) { + if ((int)buffer.out_bytes <= io->packet_size || buffer.out_bytes == size) { rc = ble_serial_flush_write(); if (rc != DC_STATUS_SUCCESS) break; diff --git a/desktop-widgets/tab-widgets/maintab.ui b/desktop-widgets/tab-widgets/maintab.ui index ab77740f0..25dcab600 100644 --- a/desktop-widgets/tab-widgets/maintab.ui +++ b/desktop-widgets/tab-widgets/maintab.ui @@ -510,7 +510,7 @@ <property name="widgetResizable"> <bool>true</bool> </property> - <widget class="QWidget" name="scrollAreaWidgetContents"> + <widget class="QWidget" name="scrollAreaWidgetContents2"> <property name="geometry"> <rect> <x>0</x> diff --git a/profile-widget/tankitem.cpp b/profile-widget/tankitem.cpp index c4c1aeeee..24c13aed6 100644 --- a/profile-widget/tankitem.cpp +++ b/profile-widget/tankitem.cpp @@ -110,7 +110,7 @@ void TankItem::modelDataChanged(const QModelIndex &topLeft, const QModelIndex &b // work through all the gas changes and add the rectangle for each gas while it was used struct event *ev = get_next_event(dc->events, "gaschange"); - while (ev && ev->time.seconds < last_entry->sec) { + while (ev && (int)ev->time.seconds < last_entry->sec) { width = hAxis->posAtValue(ev->time.seconds) - hAxis->posAtValue(startTime); left = hAxis->posAtValue(startTime); createBar(left, width, gasmix); diff --git a/qt-models/cylindermodel.cpp b/qt-models/cylindermodel.cpp index d388cd0ef..cda27ebaf 100644 --- a/qt-models/cylindermodel.cpp +++ b/qt-models/cylindermodel.cpp @@ -135,11 +135,10 @@ QVariant CylindersModel::data(const QModelIndex &index, int role) const if (!index.isValid() || index.row() >= MAX_CYLINDERS) return ret; - - int mapping[MAX_CYLINDERS]; + int same_gas = -1; cylinder_t *cyl = &displayed_dive.cylinder[index.row()]; - + switch (role) { case Qt::BackgroundRole: { switch (index.column()) { diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp index 36aee8a42..707cdcfcc 100644 --- a/qt-models/diveplannermodel.cpp +++ b/qt-models/diveplannermodel.cpp @@ -988,6 +988,8 @@ int DivePlannerPointsModel::analyzeVariations(struct decostop *min, struct decos (mid->time + 1)/60, (left + right) / 2, unit, (right - left) / 2, unit); +#else + (void) unit; #endif ++min; ++mid; |