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

core: remove qml properties from downloadfromcthread

Browse source 
Remove Q_OBJECT and qml properties from DCDeviceData class
Remove DCDeviceData register from mobile-helper.cpp
Change DCDeviceData constructor to be without parameters

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-06-09 16:59:02 +02:00 • committed by Dirk Hohndel
parent 807571a588
commit 470c218b79
4 changed files with 5 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/downloadfromdcthread.cpp
View file

@ -205,7 +205,7 @@ void show_computer_list()
}
DCDeviceData *DCDeviceData::m_instance = NULL;
DCDeviceData::DCDeviceData(QObject *parent) : QObject(parent)
DCDeviceData::DCDeviceData()
{
memset(&data, 0, sizeof(data));
data.trip = nullptr;
@ -227,7 +227,7 @@ DCDeviceData::DCDeviceData(QObject *parent) : QObject(parent)
DCDeviceData *DCDeviceData::instance()
{
if (!m_instance)
m_instance = new DCDeviceData();
m_instance = new DCDeviceData;
return m_instance;
}
@ -282,19 +282,16 @@ QString DCDeviceData::devBluetoothName() const
return m_devBluetoothName;
}
#ifdef SUBSURFACE_MOBILE
QString DCDeviceData::descriptor() const
{
return "";
}
#endif // SUBSURFACE_MOBILE
bool DCDeviceData::bluetoothMode() const
{
return data.bluetooth_mode;
}
#ifdef SUBSURFACE_MOBILE
bool DCDeviceData::forceDownload() const
{
return data.force_download;
@ -314,7 +311,6 @@ int DCDeviceData::diveId() const
{
return data.diveid;
}
#endif // SUBSURFACE_MOBILE
void DCDeviceData::setVendor(const QString& vendor)
{
@ -367,7 +363,6 @@ void DCDeviceData::setCreateNewTrip(bool create)
data.create_new_trip = create;
}
#ifdef SUBSURFACE_MOBILE
void DCDeviceData::setDeviceId(int deviceId)
{
data.deviceid = deviceId;
@ -377,7 +372,6 @@ void DCDeviceData::setDiveId(int diveId)
{
data.diveid = diveId;
}
#endif // SUBSURFACE_MOBILE
void DCDeviceData::setSaveDump(bool save)
{
@ -394,12 +388,10 @@ void DCDeviceData::setSaveLog(bool saveLog)
data.libdc_log = saveLog;
}
#ifdef SUBSURFACE_MOBILE
bool DCDeviceData::saveLog() const
{
return data.libdc_log;
}
#endif // SUBSURFACE_MOBILE
device_data_t* DCDeviceData::internalData()