From ecfc141677efb8482ab5c20f460519a9782fb628 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Tue, 8 Mar 2016 02:23:37 -0300 Subject: [PATCH 04/21] Clean Profilewidget2 Signed-off-by: Tomaz Canabrava --- profile-widget/profilewidget2.cpp | 4 ++-- 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 38276b2..627e5c4 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 4385233..5e05b14 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; -- 2.5.4 (Apple Git-61)