diff options
| author |  Tomaz Canabrava <tomaz.canabrava@gmail.com> | 2016-03-08 02:23:37 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-03-08 20:58:09 -0800 |
| commit | 98e8a04d01caa90e5384654fb247b2778f6760c9 (patch) | |
| tree | 328174260c99b92121d1ccc788de07f07523e02c | |
| parent | 16320bb580798b1a61813409795f27544861526e (diff) | |
| download | subsurface-98e8a04d01caa90e5384654fb247b2778f6760c9.tar.gz | |
Silence warnings in Profilewidget2
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 4 | ||||
| -rw-r--r-- | profile-widget/profilewidget2.h | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 38276b235..627e5c40a 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -605,9 +605,9 @@ void ProfileWidget2::plotDive(struct dive *d, bool force) currentdc = fake_dc(currentdc, false); } +#ifndef SUBSURFACE_MOBILE bool setpointflag = (currentdc->divemode == CCR) && prefs.pp_graphs.po2 && current_dive; bool sensorflag = setpointflag && prefs.show_ccr_sensors; -#ifndef SUBSURFACE_MOBILE o2SetpointGasItem->setVisible(setpointflag && prefs.show_ccr_setpoint); ccrsensor1GasItem->setVisible(sensorflag); ccrsensor2GasItem->setVisible(sensorflag && (currentdc->no_o2sensors > 1)); @@ -723,8 +723,8 @@ void ProfileWidget2::plotDive(struct dive *d, bool force) event->setVisible(!event->shouldBeHidden()); } QString dcText = get_dc_nickname(currentdc->model, currentdc->deviceid); - int nr; #ifndef SUBSURFACE_MOBILE + int nr; if ((nr = number_of_computers(&displayed_dive)) > 1) dcText += tr(" (#%1 of %2)").arg(dc_number + 1).arg(nr); #endif diff --git a/profile-widget/profilewidget2.h b/profile-widget/profilewidget2.h index 438523340..5e05b14f8 100644 --- a/profile-widget/profilewidget2.h +++ b/profile-widget/profilewidget2.h @@ -141,14 +141,14 @@ slots: // Necessary to call from QAction's signals. protected: virtual ~ProfileWidget2(); - virtual void resizeEvent(QResizeEvent *event); + void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; #ifndef SUBSURFACE_MOBILE - virtual void wheelEvent(QWheelEvent *event); - virtual void mouseMoveEvent(QMouseEvent *event); - virtual void contextMenuEvent(QContextMenuEvent *event); - virtual void mouseDoubleClickEvent(QMouseEvent *event); - virtual void mousePressEvent(QMouseEvent *event); - virtual void mouseReleaseEvent(QMouseEvent *event); + void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE; + void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; + void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; #endif void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE; |