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 warnings in Profilewidget2

Browse source 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2016-03-08 02:23:37 -03:00 • committed by Dirk Hohndel
parent 16320bb580
commit 98e8a04d01
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
profile-widget/profilewidget2.cpp
View file

@ -605,9 +605,9 @@ void ProfileWidget2::plotDive(struct dive *d, bool force)
currentdc = fake_dc(currentdc, false); currentdc = fake_dc(currentdc, false);
} }
#ifndef SUBSURFACE_MOBILE
bool setpointflag = (currentdc->divemode == CCR) && prefs.pp_graphs.po2 && current_dive; bool setpointflag = (currentdc->divemode == CCR) && prefs.pp_graphs.po2 && current_dive;
bool sensorflag = setpointflag && prefs.show_ccr_sensors; bool sensorflag = setpointflag && prefs.show_ccr_sensors;
#ifndef SUBSURFACE_MOBILE
o2SetpointGasItem->setVisible(setpointflag && prefs.show_ccr_setpoint); o2SetpointGasItem->setVisible(setpointflag && prefs.show_ccr_setpoint);
ccrsensor1GasItem->setVisible(sensorflag); ccrsensor1GasItem->setVisible(sensorflag);
ccrsensor2GasItem->setVisible(sensorflag && (currentdc->no_o2sensors > 1)); ccrsensor2GasItem->setVisible(sensorflag && (currentdc->no_o2sensors > 1));
@ -723,8 +723,8 @@ void ProfileWidget2::plotDive(struct dive *d, bool force)
event->setVisible(!event->shouldBeHidden()); event->setVisible(!event->shouldBeHidden());
} }
QString dcText = get_dc_nickname(currentdc->model, currentdc->deviceid); QString dcText = get_dc_nickname(currentdc->model, currentdc->deviceid);
int nr;
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
int nr;
if ((nr = number_of_computers(&displayed_dive)) > 1) if ((nr = number_of_computers(&displayed_dive)) > 1)
dcText += tr(" (#%1 of %2)").arg(dc_number + 1).arg(nr); dcText += tr(" (#%1 of %2)").arg(dc_number + 1).arg(nr);
#endif #endif

14
profile-widget/profilewidget2.h
View file

@ -141,14 +141,14 @@ slots: // Necessary to call from QAction's signals.
protected: protected:
virtual ~ProfileWidget2(); virtual ~ProfileWidget2();
virtual void resizeEvent(QResizeEvent *event); void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE;
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
virtual void wheelEvent(QWheelEvent *event); void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE;
virtual void mouseMoveEvent(QMouseEvent *event); void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
virtual void contextMenuEvent(QContextMenuEvent *event); void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE;
virtual void mouseDoubleClickEvent(QMouseEvent *event); void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
virtual void mousePressEvent(QMouseEvent *event); void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
virtual void mouseReleaseEvent(QMouseEvent *event); void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
#endif #endif
void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE;
void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE; void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE;