diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-04-15 04:44:12 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-04-15 13:22:08 -0700 |
| commit | 6985c123d412d3223618247e2fcc733cd99bb842 (patch) | |
| tree | 0c51bf7303f928b2e7a68b5dc2a356ef5c052606 | |
| parent | 9e787a2476e49bb4793cdaeae4c097019d29e9dd (diff) | |
| download | subsurface-6985c123d412d3223618247e2fcc733cd99bb842.tar.gz | |
QML UI: stop using "--" for empty strings
I can't remember why we started doing this, but at this point I find it
just weird.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.cpp | 2 | ||||
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 18 |
2 files changed, 1 insertions, 19 deletions
diff --git a/core/subsurface-qt/DiveObjectHelper.cpp b/core/subsurface-qt/DiveObjectHelper.cpp index 9a3f2386d..dc22e59a2 100644 --- a/core/subsurface-qt/DiveObjectHelper.cpp +++ b/core/subsurface-qt/DiveObjectHelper.cpp @@ -6,7 +6,7 @@ #include "../qthelper.h" #include "../helpers.h" -static QString EMPTY_DIVE_STRING = QStringLiteral("--"); +static QString EMPTY_DIVE_STRING = QStringLiteral(""); enum returnPressureSelector {START_PRESSURE, END_PRESSURE}; static QString getFormattedWeight(struct dive *dive, unsigned int idx) diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index a10115981..4fa32bdd9 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -440,24 +440,6 @@ void QMLManager::commitChanges(QString diveId, QString date, QString location, Q QString airtemp, QString watertemp, QString suit, QString buddy, QString diveMaster, QString weight, QString notes, QString startpressure, QString endpressure, QString gasmix) { -#define DROP_EMPTY_PLACEHOLDER(_s) if ((_s) == QLatin1Literal("--")) (_s).clear() - - DROP_EMPTY_PLACEHOLDER(location); - DROP_EMPTY_PLACEHOLDER(duration); - DROP_EMPTY_PLACEHOLDER(depth); - DROP_EMPTY_PLACEHOLDER(airtemp); - DROP_EMPTY_PLACEHOLDER(watertemp); - DROP_EMPTY_PLACEHOLDER(suit); - DROP_EMPTY_PLACEHOLDER(buddy); - DROP_EMPTY_PLACEHOLDER(diveMaster); - DROP_EMPTY_PLACEHOLDER(weight); - DROP_EMPTY_PLACEHOLDER(gasmix); - DROP_EMPTY_PLACEHOLDER(startpressure); - DROP_EMPTY_PLACEHOLDER(endpressure); - DROP_EMPTY_PLACEHOLDER(notes); - -#undef DROP_EMPTY_PLACEHOLDER - struct dive *d = get_dive_by_uniq_id(diveId.toInt()); // notes comes back as rich text - let's convert this into plain text QTextDocument doc; |