mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Random whitespace cleanup
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
3c1a111404
commit
19e95efd6f
5 changed files with 92 additions and 97 deletions
|
@ -38,8 +38,7 @@ extern "C" int gitProgressCB(int percent)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
QMLManager::QMLManager() :
|
QMLManager::QMLManager() : m_locationServiceEnabled(false),
|
||||||
m_locationServiceEnabled(false),
|
|
||||||
m_verboseEnabled(false),
|
m_verboseEnabled(false),
|
||||||
m_loadFromCloud(false),
|
m_loadFromCloud(false),
|
||||||
reply(0),
|
reply(0),
|
||||||
|
@ -323,7 +322,6 @@ void QMLManager::refreshDiveList()
|
||||||
for_each_dive (i, d) {
|
for_each_dive (i, d) {
|
||||||
DiveListModel::instance()->addDive(d);
|
DiveListModel::instance()->addDive(d);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// update the dive and return the notes field, stripped of the HTML junk
|
// update the dive and return the notes field, stripped of the HTML junk
|
||||||
|
@ -532,7 +530,6 @@ void QMLManager::downloadGpsData()
|
||||||
{
|
{
|
||||||
locationProvider->downloadFromServer();
|
locationProvider->downloadFromServer();
|
||||||
populateGpsData();
|
populateGpsData();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void QMLManager::populateGpsData()
|
void QMLManager::populateGpsData()
|
||||||
|
@ -678,7 +675,8 @@ void QMLManager::showMap(QString location)
|
||||||
{
|
{
|
||||||
if (!location.isEmpty()) {
|
if (!location.isEmpty()) {
|
||||||
QString link = QString("https://www.google.com/maps/place/%1/@%2,5000m/data=!3m1!1e3!4m2!3m1!1s0x0:0x0")
|
QString link = QString("https://www.google.com/maps/place/%1/@%2,5000m/data=!3m1!1e3!4m2!3m1!1s0x0:0x0")
|
||||||
.arg(location).arg(location);
|
.arg(location)
|
||||||
|
.arg(location);
|
||||||
QDesktopServices::openUrl(link);
|
QDesktopServices::openUrl(link);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,8 +7,7 @@
|
||||||
|
|
||||||
#include "gpslocation.h"
|
#include "gpslocation.h"
|
||||||
|
|
||||||
class QMLManager : public QObject
|
class QMLManager : public QObject {
|
||||||
{
|
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY(QString cloudUserName READ cloudUserName WRITE setCloudUserName NOTIFY cloudUserNameChanged)
|
Q_PROPERTY(QString cloudUserName READ cloudUserName WRITE setCloudUserName NOTIFY cloudUserNameChanged)
|
||||||
Q_PROPERTY(QString cloudPassword READ cloudPassword WRITE setCloudPassword NOTIFY cloudPasswordChanged)
|
Q_PROPERTY(QString cloudPassword READ cloudPassword WRITE setCloudPassword NOTIFY cloudPasswordChanged)
|
||||||
|
|
|
@ -18,8 +18,7 @@ struct gpsTracker {
|
||||||
int idx;
|
int idx;
|
||||||
};
|
};
|
||||||
|
|
||||||
class GpsLocation : QObject
|
class GpsLocation : QObject {
|
||||||
{
|
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
GpsLocation(void (*showMsgCB)(const char *msg), QObject *parent);
|
GpsLocation(void (*showMsgCB)(const char *msg), QObject *parent);
|
||||||
|
|
|
@ -33,8 +33,7 @@ static QString getFormattedCylinder(struct dive *dive, unsigned int idx)
|
||||||
return fmt;
|
return fmt;
|
||||||
}
|
}
|
||||||
|
|
||||||
DiveObjectHelper::DiveObjectHelper(struct dive *d) :
|
DiveObjectHelper::DiveObjectHelper(struct dive *d) : m_number(d->number),
|
||||||
m_number(d->number),
|
|
||||||
m_id(d->id),
|
m_id(d->id),
|
||||||
m_rating(d->rating),
|
m_rating(d->rating),
|
||||||
m_timestamp(d->when),
|
m_timestamp(d->when),
|
||||||
|
|
|
@ -60,6 +60,7 @@ public:
|
||||||
QString trip() const;
|
QString trip() const;
|
||||||
QString maxcns() const;
|
QString maxcns() const;
|
||||||
QString otu() const;
|
QString otu() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int m_number;
|
int m_number;
|
||||||
int m_id;
|
int m_id;
|
||||||
|
@ -86,7 +87,6 @@ private:
|
||||||
QString m_maxcns;
|
QString m_maxcns;
|
||||||
QString m_otu;
|
QString m_otu;
|
||||||
struct dive *m_dive;
|
struct dive *m_dive;
|
||||||
|
|
||||||
};
|
};
|
||||||
Q_DECLARE_METATYPE(DiveObjectHelper *)
|
Q_DECLARE_METATYPE(DiveObjectHelper *)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue