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

Move subsurface-core to core and qt-mobile to mobile-widgets

Browse source 
Having subsurface-core as a directory name really messes with
autocomplete and is obviously redundant. Simmilarly, qt-mobile caused an
autocomplete conflict and also was inconsistent with the desktop-widget
name for the directory containing the "other" UI.

And while cleaning up the resulting change in the path name for include
files, I decided to clean up those even more to make them consistent
overall.

This could have been handled in more commits, but since this requires a
make clean before the build, it seemed more sensible to do it all in one.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-04-04 22:02:03 -07:00
parent 2d760a7bff
commit 7be962bfc2
254 changed files with 572 additions and 582 deletions
Download patch file Download diff file Expand all files Collapse all files

68
core/configuredivecomputer.h Normal file
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