Merge branch 'joshua-gsoc' of git://github.com/thiagomacieira/subsurface into josh

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

Conflicts:
	subsurface.pro

1 files changed, 58 insertions, 0 deletions

diff --git a/configuredivecomputerthreads.h b/configuredivecomputerthreads.h
new file mode 100644
index 000000000..66df7a93b
--- /dev/null
+++ b/configuredivecomputerthreads.h
@@ -0,0 +1,58 @@
+#ifndef CONFIGUREDIVECOMPUTERTHREADS_H
+#define CONFIGUREDIVECOMPUTERTHREADS_H
+
+#include <QObject>
+#include <QThread>
+#include <QVariant>
+#include "libdivecomputer.h"
+#include <QDateTime>
+#include "devicedetails.h"
+
+class ReadSettingsThread : public QThread
+{
+	Q_OBJECT
+public:
+	ReadSettingsThread(QObject *parent, device_data_t *data);
+	virtual void run();
+	QString result;
+	QString lastError;
+signals:
+	void error(QString err);
+	void devicedetails(DeviceDetails *newDeviceDetails);
+private:
+	device_data_t *m_data;
+};
+
+class WriteSettingsThread : public QThread
+{
+	Q_OBJECT
+public:
+	WriteSettingsThread(QObject *parent, device_data_t *data);
+	void setDeviceDetails(DeviceDetails *details);
+	virtual void run();
+	QString result;
+	QString lastError;
+signals:
+	void error(QString err);
+private:
+	device_data_t *m_data;
+	DeviceDetails *m_deviceDetails;
+};
+
+class FirmwareUpdateThread : public QThread
+{
+	Q_OBJECT
+public:
+	FirmwareUpdateThread(QObject *parent, device_data_t *data, QString fileName);
+	virtual void run();
+	QString lastError;
+signals:
+	void progress(int percent);
+	void message(QString msg);
+	void error(QString err);
+private:
+	device_data_t *m_data;
+	QString m_fileName;
+};
+
+#endif // CONFIGUREDIVECOMPUTERTHREADS_H