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

Silence random warnings

Browse source 
None of these seem to point to actual issues, so let's quiet them.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-10-20 17:25:18 -04:00
parent 12dac214aa
commit 27c49fe3ad
6 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/parse-xml.c
View file

@ -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_2 = atoi_n(ptr5 + 3, 3);
int ppo2_3 = atoi_n(ptr5 + 6, 3); int ppo2_3 = atoi_n(ptr5 + 6, 3);
int otu = atoi_n(ptr5 + 9, 4); 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 cns = atoi_n(ptr5 + 13, 4);
int setpoint = atoi_n(ptr5 + 17, 2); int setpoint = atoi_n(ptr5 + 17, 2);

4
core/qtserialbluetooth.cpp
View file

@ -181,14 +181,14 @@ static dc_status_t ble_serial_write(dc_custom_io_t *io, const void* data, size_t
while (size) { while (size) {
size_t len = sizeof(buffer.out) - transferred; size_t len = sizeof(buffer.out) - transferred;
if (len > io->packet_size) if ((int)len > io->packet_size)
len = io->packet_size; len = io->packet_size;
if (len > size) if (len > size)
len = size; len = size;
memcpy(buffer.out + buffer.out_bytes, data, len); memcpy(buffer.out + buffer.out_bytes, data, len);
buffer.out_bytes += 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(); rc = ble_serial_flush_write();
if (rc != DC_STATUS_SUCCESS) if (rc != DC_STATUS_SUCCESS)
break; break;

2
desktop-widgets/tab-widgets/maintab.ui
View file

@ -510,7 +510,7 @@
<property name="widgetResizable"> <property name="widgetResizable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<widget class="QWidget" name="scrollAreaWidgetContents"> <widget class="QWidget" name="scrollAreaWidgetContents2">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>

2
profile-widget/tankitem.cpp
View file

@ -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 // 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"); 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); width = hAxis->posAtValue(ev->time.seconds) - hAxis->posAtValue(startTime);
left = hAxis->posAtValue(startTime); left = hAxis->posAtValue(startTime);
createBar(left, width, gasmix); createBar(left, width, gasmix);

1
qt-models/cylindermodel.cpp
View file

@ -136,7 +136,6 @@ QVariant CylindersModel::data(const QModelIndex &index, int role) const
if (!index.isValid() || index.row() >= MAX_CYLINDERS) if (!index.isValid() || index.row() >= MAX_CYLINDERS)
return ret; return ret;
int mapping[MAX_CYLINDERS];
int same_gas = -1; int same_gas = -1;
cylinder_t *cyl = &displayed_dive.cylinder[index.row()]; cylinder_t *cyl = &displayed_dive.cylinder[index.row()];

2
qt-models/diveplannermodel.cpp
View file

@ -988,6 +988,8 @@ int DivePlannerPointsModel::analyzeVariations(struct decostop *min, struct decos
(mid->time + 1)/60, (mid->time + 1)/60,
(left + right) / 2, unit, (left + right) / 2, unit,
(right - left) / 2, unit); (right - left) / 2, unit);
#else
(void) unit;
#endif #endif
++min; ++min;
++mid; ++mid;