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

Mobile: use value semantics for DiveObjectHelper in qmlmanager.cpp

Browse source 
Instead of creating a pointer-to-DiveObjectHelper in commitChanges,
use a normal object. Thus, we don't have to think about ownership
issues with respect to this object.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-08-13 09:35:18 +02:00 • committed by bstoeger
parent 0026aa3955
commit feb11f6f5f
2 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
mobile-widgets/qmlmanager.cpp
View file

@ -845,9 +845,9 @@ void QMLManager::setupDivesite(struct dive *d, struct dive_site *ds, double lat,
} }
} }
bool QMLManager::checkDate(DiveObjectHelper *myDive, struct dive * d, QString date) bool QMLManager::checkDate(const DiveObjectHelper &myDive, struct dive * d, QString date)
{ {
QString oldDate = myDive->date() + " " + myDive->time(); QString oldDate = myDive.date() + " " + myDive.time();
if (date != oldDate) { if (date != oldDate) {
QDateTime newDate; QDateTime newDate;
// what a pain - Qt will not parse dates if the day of the week is incorrect // what a pain - Qt will not parse dates if the day of the week is incorrect
@ -950,12 +950,12 @@ parsed:
return false; return false;
} }
bool QMLManager::checkLocation(DiveObjectHelper *myDive, struct dive *d, QString location, QString gps) bool QMLManager::checkLocation(const DiveObjectHelper &myDive, struct dive *d, QString location, QString gps)
{ {
bool diveChanged = false; bool diveChanged = false;
struct dive_site *ds = get_dive_site_for_dive(d); struct dive_site *ds = get_dive_site_for_dive(d);
qDebug() << "checkLocation" << location << "gps" << gps << "dive had" << myDive->location() << "gps" << myDive->gas(); qDebug() << "checkLocation" << location << "gps" << gps << "dive had" << myDive.location() << "gps" << myDive.gas();
if (myDive->location() != location) { if (myDive.location() != location) {
diveChanged = true; diveChanged = true;
ds = get_dive_site_by_name(qPrintable(location), &dive_site_table); ds = get_dive_site_by_name(qPrintable(location), &dive_site_table);
if (!ds && !location.isEmpty()) if (!ds && !location.isEmpty())
@ -968,12 +968,12 @@ bool QMLManager::checkLocation(DiveObjectHelper *myDive, struct dive *d, QString
// now make sure that the GPS coordinates match - if the user changed the name but not // now make sure that the GPS coordinates match - if the user changed the name but not
// the GPS coordinates, this still does the right thing as the now new dive site will // the GPS coordinates, this still does the right thing as the now new dive site will
// have no coordinates, so the coordinates from the edit screen will get added // have no coordinates, so the coordinates from the edit screen will get added
if (myDive->gps() != gps) { if (myDive.gps() != gps) {
double lat, lon; double lat, lon;
if (parseGpsText(gps, &lat, &lon)) { if (parseGpsText(gps, &lat, &lon)) {
qDebug() << "parsed GPS, using it"; qDebug() << "parsed GPS, using it";
// there are valid GPS coordinates - just use them // there are valid GPS coordinates - just use them
setupDivesite(d, ds, lat, lon, qPrintable(myDive->location())); setupDivesite(d, ds, lat, lon, qPrintable(myDive.location()));
diveChanged = true; diveChanged = true;
} else if (gps == GPS_CURRENT_POS) { } else if (gps == GPS_CURRENT_POS) {
qDebug() << "gps was our default text for no GPS"; qDebug() << "gps was our default text for no GPS";
@ -982,7 +982,7 @@ bool QMLManager::checkLocation(DiveObjectHelper *myDive, struct dive *d, QString
if (gpsString != GPS_CURRENT_POS) { if (gpsString != GPS_CURRENT_POS) {
qDebug() << "but now I got a valid location" << gpsString; qDebug() << "but now I got a valid location" << gpsString;
if (parseGpsText(qPrintable(gpsString), &lat, &lon)) { if (parseGpsText(qPrintable(gpsString), &lat, &lon)) {
setupDivesite(d, ds, lat, lon, qPrintable(myDive->location())); setupDivesite(d, ds, lat, lon, qPrintable(myDive.location()));
diveChanged = true; diveChanged = true;
} }
} else { } else {
@ -996,9 +996,9 @@ bool QMLManager::checkLocation(DiveObjectHelper *myDive, struct dive *d, QString
return diveChanged; return diveChanged;
} }
bool QMLManager::checkDuration(DiveObjectHelper *myDive, struct dive *d, QString duration) bool QMLManager::checkDuration(const DiveObjectHelper &myDive, struct dive *d, QString duration)
{ {
if (myDive->duration() != duration) { if (myDive.duration() != duration) {
int h = 0, m = 0, s = 0; int h = 0, m = 0, s = 0;
QRegExp r1(QStringLiteral("(\\d*)\\s*%1[\\s,:]*(\\d*)\\s*%2[\\s,:]*(\\d*)\\s*%3").arg(tr("h")).arg(tr("min")).arg(tr("sec")), Qt::CaseInsensitive); QRegExp r1(QStringLiteral("(\\d*)\\s*%1[\\s,:]*(\\d*)\\s*%2[\\s,:]*(\\d*)\\s*%3").arg(tr("h")).arg(tr("min")).arg(tr("sec")), Qt::CaseInsensitive);
QRegExp r2(QStringLiteral("(\\d*)\\s*%1[\\s,:]*(\\d*)\\s*%2").arg(tr("h")).arg(tr("min")), Qt::CaseInsensitive); QRegExp r2(QStringLiteral("(\\d*)\\s*%1[\\s,:]*(\\d*)\\s*%2").arg(tr("h")).arg(tr("min")), Qt::CaseInsensitive);
@ -1035,9 +1035,9 @@ bool QMLManager::checkDuration(DiveObjectHelper *myDive, struct dive *d, QString
return false; return false;
} }
bool QMLManager::checkDepth(DiveObjectHelper *myDive, dive *d, QString depth) bool QMLManager::checkDepth(const DiveObjectHelper &myDive, dive *d, QString depth)
{ {
if (myDive->depth() != depth) { if (myDive.depth() != depth) {
int depthValue = parseLengthToMm(depth); int depthValue = parseLengthToMm(depth);
// the QML code should stop negative depth, but massively huge depth can make // the QML code should stop negative depth, but massively huge depth can make
// the profile extremely slow or even run out of memory and crash, so keep // the profile extremely slow or even run out of memory and crash, so keep
@ -1066,7 +1066,7 @@ void QMLManager::commitChanges(QString diveId, QString date, QString location, Q
return; return;
} }
DiveObjectHelper *myDive = new DiveObjectHelper(d); DiveObjectHelper myDive(d);
// notes comes back as rich text - let's convert this into plain text // notes comes back as rich text - let's convert this into plain text
QTextDocument doc; QTextDocument doc;
@ -1084,15 +1084,15 @@ void QMLManager::commitChanges(QString diveId, QString date, QString location, Q
diveChanged |= checkDepth(myDive, d, depth); diveChanged |= checkDepth(myDive, d, depth);
if (myDive->airTemp() != airtemp) { if (myDive.airTemp() != airtemp) {
diveChanged = true; diveChanged = true;
d->airtemp.mkelvin = parseTemperatureToMkelvin(airtemp); d->airtemp.mkelvin = parseTemperatureToMkelvin(airtemp);
} }
if (myDive->waterTemp() != watertemp) { if (myDive.waterTemp() != watertemp) {
diveChanged = true; diveChanged = true;
d->watertemp.mkelvin = parseTemperatureToMkelvin(watertemp); d->watertemp.mkelvin = parseTemperatureToMkelvin(watertemp);
} }
if (myDive->sumWeight() != weight) { if (myDive.sumWeight() != weight) {
diveChanged = true; diveChanged = true;
// not sure what we'd do if there was more than one weight system // not sure what we'd do if there was more than one weight system
// defined - for now just ignore that case // defined - for now just ignore that case
@ -1104,7 +1104,7 @@ void QMLManager::commitChanges(QString diveId, QString date, QString location, Q
} }
} }
// start and end pressures for first cylinder only // start and end pressures for first cylinder only
if (myDive->startPressure() != startpressure || myDive->endPressure() != endpressure) { if (myDive.startPressure() != startpressure || myDive.endPressure() != endpressure) {
diveChanged = true; diveChanged = true;
for ( int i = 0, j = 0 ; j < startpressure.length() && j < endpressure.length() ; i++ ) { for ( int i = 0, j = 0 ; j < startpressure.length() && j < endpressure.length() ; i++ ) {
if (state != "add" && !is_cylinder_used(d, i)) if (state != "add" && !is_cylinder_used(d, i))
@ -1119,7 +1119,7 @@ void QMLManager::commitChanges(QString diveId, QString date, QString location, Q
} }
} }
// gasmix for first cylinder // gasmix for first cylinder
if (myDive->firstGas() != gasmix) { if (myDive.firstGas() != gasmix) {
for ( int i = 0, j = 0 ; j < gasmix.length() ; i++ ) { for ( int i = 0, j = 0 ; j < gasmix.length() ; i++ ) {
if (state != "add" && !is_cylinder_used(d, i)) if (state != "add" && !is_cylinder_used(d, i))
continue; continue;
@ -1138,7 +1138,7 @@ void QMLManager::commitChanges(QString diveId, QString date, QString location, Q
} }
} }
// info for first cylinder // info for first cylinder
if (myDive->getCylinder() != usedCylinder) { if (myDive.getCylinder() != usedCylinder) {
diveChanged = true; diveChanged = true;
unsigned long i; unsigned long i;
int size = 0, wp = 0, j = 0, k = 0; int size = 0, wp = 0, j = 0, k = 0;
@ -1164,12 +1164,12 @@ void QMLManager::commitChanges(QString diveId, QString date, QString location, Q
k++; k++;
} }
} }
if (myDive->suit() != suit) { if (myDive.suit() != suit) {
diveChanged = true; diveChanged = true;
free(d->suit); free(d->suit);
d->suit = copy_qstring(suit); d->suit = copy_qstring(suit);
} }
if (myDive->buddy() != buddy) { if (myDive.buddy() != buddy) {
if (buddy.contains(",")){ if (buddy.contains(",")){
buddy = buddy.replace(QRegExp("\\s*,\\s*"), ", "); buddy = buddy.replace(QRegExp("\\s*,\\s*"), ", ");
} }
@ -1177,7 +1177,7 @@ void QMLManager::commitChanges(QString diveId, QString date, QString location, Q
free(d->buddy); free(d->buddy);
d->buddy = copy_qstring(buddy); d->buddy = copy_qstring(buddy);
} }
if (myDive->divemaster() != diveMaster) { if (myDive.divemaster() != diveMaster) {
if (diveMaster.contains(",")){ if (diveMaster.contains(",")){
diveMaster = diveMaster.replace(QRegExp("\\s*,\\s*"), ", "); diveMaster = diveMaster.replace(QRegExp("\\s*,\\s*"), ", ");
} }
@ -1185,15 +1185,15 @@ void QMLManager::commitChanges(QString diveId, QString date, QString location, Q
free(d->divemaster); free(d->divemaster);
d->divemaster = copy_qstring(diveMaster); d->divemaster = copy_qstring(diveMaster);
} }
if (myDive->rating() != rating) { if (myDive.rating() != rating) {
diveChanged = true; diveChanged = true;
d->rating = rating; d->rating = rating;
} }
if (myDive->visibility() != visibility) { if (myDive.visibility() != visibility) {
diveChanged = true; diveChanged = true;
d->visibility = visibility; d->visibility = visibility;
} }
if (myDive->notes() != notes) { if (myDive.notes() != notes) {
diveChanged = true; diveChanged = true;
free(d->notes); free(d->notes);
d->notes = copy_qstring(notes); d->notes = copy_qstring(notes);
@ -1212,7 +1212,7 @@ void QMLManager::commitChanges(QString diveId, QString date, QString location, Q
if (newIdx != oldIdx) { if (newIdx != oldIdx) {
DiveListModel::instance()->removeDive(modelIdx); DiveListModel::instance()->removeDive(modelIdx);
modelIdx += (newIdx - oldIdx); modelIdx += (newIdx - oldIdx);
DiveListModel::instance()->insertDive(modelIdx, myDive); DiveListModel::instance()->insertDive(modelIdx, &myDive);
diveChanged = true; // because we already modified things diveChanged = true; // because we already modified things
} }
} }

8
mobile-widgets/qmlmanager.h
View file

@ -228,10 +228,10 @@ private:
qreal m_lastDevicePixelRatio; qreal m_lastDevicePixelRatio;
QElapsedTimer timer; QElapsedTimer timer;
bool alreadySaving; bool alreadySaving;
bool checkDate(DiveObjectHelper *myDive, struct dive * d, QString date); bool checkDate(const DiveObjectHelper &myDive, struct dive *d, QString date);
bool checkLocation(DiveObjectHelper *myDive, struct dive *d, QString location, QString gps); bool checkLocation(const DiveObjectHelper &myDive, struct dive *d, QString location, QString gps);
bool checkDuration(DiveObjectHelper *myDive, struct dive *d, QString duration); bool checkDuration(const DiveObjectHelper &myDive, struct dive *d, QString duration);
bool checkDepth(DiveObjectHelper *myDive, struct dive *d, QString depth); bool checkDepth(const DiveObjectHelper &myDive, struct dive *d, QString depth);
bool currentGitLocalOnly; bool currentGitLocalOnly;
Q_INVOKABLE DCDeviceData *m_device_data; Q_INVOKABLE DCDeviceData *m_device_data;
QString m_progressMessage; QString m_progressMessage;