diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2015-11-06 10:20:18 -0800 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-11-06 10:20:18 -0800 |
commit | bb566f7798f1bc7fe8e4d40813823dca0f6ea9a3 (patch) | |
tree | 36d4e50e9e1db4942c1021c7393f9ea1b4bf1980 | |
parent | 7e5b66d2c47538b3fcda806600e246b6cfb1d19d (diff) | |
download | subsurface-bb566f7798f1bc7fe8e4d40813823dca0f6ea9a3.tar.gz |
Don't connect to the PreferencesDialog in Subsurface-mobile
Just more untangling from the desktop UI.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r-- | profile-widget/divecartesianaxis.cpp | 6 | ||||
-rw-r--r-- | profile-widget/divepixmapitem.cpp | 5 | ||||
-rw-r--r-- | profile-widget/diveprofileitem.cpp | 4 | ||||
-rw-r--r-- | profile-widget/ruleritem.cpp | 4 |
4 files changed, 19 insertions, 0 deletions
diff --git a/profile-widget/divecartesianaxis.cpp b/profile-widget/divecartesianaxis.cpp index 3941911de..41d6bc3e4 100644 --- a/profile-widget/divecartesianaxis.cpp +++ b/profile-widget/divecartesianaxis.cpp @@ -1,7 +1,9 @@ #include "divecartesianaxis.h" #include "divetextitem.h" #include "helpers.h" +#ifndef SUBSURFACE_MOBILE #include "preferences/preferencesdialog.h" +#endif #include "diveplotdatamodel.h" #include "animationfunctions.h" #include "divelineitem.h" @@ -376,7 +378,9 @@ QColor DepthAxis::colorForValue(double value) DepthAxis::DepthAxis(ProfileWidget2 *widget) : DiveCartesianAxis(widget) { +#ifndef SUBSURFACE_MOBILE connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged())); +#endif changed = true; settingsChanged(); } @@ -432,7 +436,9 @@ PartialGasPressureAxis::PartialGasPressureAxis(ProfileWidget2 *widget) : DiveCartesianAxis(widget), model(NULL) { +#ifndef SUBSURFACE_MOBILE connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged())); +#endif } void PartialGasPressureAxis::setModel(DivePlotDataModel *m) diff --git a/profile-widget/divepixmapitem.cpp b/profile-widget/divepixmapitem.cpp index 7d95b79c2..7b0d4993e 100644 --- a/profile-widget/divepixmapitem.cpp +++ b/profile-widget/divepixmapitem.cpp @@ -1,7 +1,10 @@ #include "divepixmapitem.h" #include "animationfunctions.h" #include "divepicturemodel.h" +#include "pref.h" +#ifndef SUBSURFACE_MOBILE #include "preferences/preferencesdialog.h" +#endif #include <QDesktopServices> #include <QGraphicsView> @@ -47,7 +50,9 @@ DivePictureItem::DivePictureItem(QObject *parent): DivePixmapItem(parent), setFlag(ItemIgnoresTransformations); setAcceptHoverEvents(true); setScale(0.2); +#ifndef SUBSURFACE_MOBILE connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged())); +#endif setVisible(prefs.show_pictures_in_profile); canvas->setPen(Qt::NoPen); diff --git a/profile-widget/diveprofileitem.cpp b/profile-widget/diveprofileitem.cpp index b4e33fe1b..ca87f4ed0 100644 --- a/profile-widget/diveprofileitem.cpp +++ b/profile-widget/diveprofileitem.cpp @@ -5,7 +5,9 @@ #include "animationfunctions.h" #include "dive.h" #include "profile.h" +#ifndef SUBSURFACE_MOBILE #include "preferences/preferencesdialog.h" +#endif #include "diveplannermodel.h" #include "helpers.h" #include "libdivecomputer/parser.h" @@ -16,7 +18,9 @@ AbstractProfilePolygonItem::AbstractProfilePolygonItem() : QObject(), QGraphicsPolygonItem(), hAxis(NULL), vAxis(NULL), dataModel(NULL), hDataColumn(-1), vDataColumn(-1) { setCacheMode(DeviceCoordinateCache); +#ifndef SUBSURFACE_MOBILE connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged())); +#endif } void AbstractProfilePolygonItem::settingsChanged() diff --git a/profile-widget/ruleritem.cpp b/profile-widget/ruleritem.cpp index 9c6a8527a..1b9c0e929 100644 --- a/profile-widget/ruleritem.cpp +++ b/profile-widget/ruleritem.cpp @@ -1,5 +1,7 @@ #include "ruleritem.h" +#ifndef SUBSURFACE_MOBILE #include "preferences/preferencesdialog.h" +#endif #include "profilewidget2.h" #include "display.h" @@ -78,7 +80,9 @@ RulerItem2::RulerItem2() : source(new RulerNodeItem2()), textItemBack->setPen(QColor(Qt::white)); textItemBack->setFlag(QGraphicsItem::ItemIgnoresTransformations); setPen(QPen(QColor(Qt::black), 0.0)); +#ifndef SUBSURFACE_MOBILE connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged())); +#endif } void RulerItem2::settingsChanged() |