Move all core-functionality to subsurface-core

And adapt a new CMakeLists.txt file for it. On the way I've also
found out that we where double-compilling a few files. I've also
set the subsurface-core as a include_path but that was just to
reduce the noise on this commit, since I plan to remove it from
the include path to make it obligatory to specify something like

 include "subsurface-core/dive.h"

for the header files. Since the app is growing quite a bit we ended
up having a few different files with almost same name that did
similar things, I want to kill that (for instance Dive.h, dive.h,
PrintDive.h and such).

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-09-02 20:52:34 -03:00 committed by Dirk Hohndel
parent a079821423
commit 4c0156e3d5
105 changed files with 102 additions and 78 deletions

View file

@ -0,0 +1,68 @@
#ifndef CONFIGUREDIVECOMPUTER_H
#define CONFIGUREDIVECOMPUTER_H
#include <QObject>
#include <QThread>
#include <QVariant>
#include "libdivecomputer.h"
#include "configuredivecomputerthreads.h"
#include <QDateTime>
#include "libxml/xmlreader.h"
class ConfigureDiveComputer : public QObject {
Q_OBJECT
public:
explicit ConfigureDiveComputer();
void readSettings(device_data_t *data);
enum states {
OPEN,
INITIAL,
READING,
WRITING,
RESETTING,
FWUPDATE,
CANCELLING,
CANCELLED,
ERROR,
DONE,
};
QString lastError;
states currentState;
void saveDeviceDetails(DeviceDetails *details, device_data_t *data);
void fetchDeviceDetails();
bool saveXMLBackup(QString fileName, DeviceDetails *details, device_data_t *data);
bool restoreXMLBackup(QString fileName, DeviceDetails *details);
void startFirmwareUpdate(QString fileName, device_data_t *data);
void resetSettings(device_data_t *data);
QString dc_open(device_data_t *data);
public
slots:
void dc_close(device_data_t *data);
signals:
void progress(int percent);
void message(QString msg);
void error(QString err);
void stateChanged(states newState);
void deviceDetailsChanged(DeviceDetails *newDetails);
private:
ReadSettingsThread *readThread;
WriteSettingsThread *writeThread;
ResetSettingsThread *resetThread;
FirmwareUpdateThread *firmwareThread;
void setState(states newState);
private
slots:
void progressEvent(int percent);
void readThreadFinished();
void writeThreadFinished();
void resetThreadFinished();
void firmwareThreadFinished();
void setError(QString err);
};
#endif // CONFIGUREDIVECOMPUTER_H