1 files changed, 7 insertions, 33 deletions

diff --git a/qt-ui/configuredivecomputer.h b/qt-ui/configuredivecomputer.h
index 08c4e190f..65ceaa780 100644
--- a/qt-ui/configuredivecomputer.h
+++ b/qt-ui/configuredivecomputer.h
@@ -5,41 +5,15 @@
 #include <QThread>
 #include <QVariant>
 #include "libdivecomputer.h"
+#include "configuredivecomputerthreads.h"
 #include <QDateTime>
-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);
-private:
-	device_data_t *data;
-};
-
-class WriteSettingsThread : public QThread {
-	Q_OBJECT
-public:
-	WriteSettingsThread(QObject *parent, device_data_t *data, QString settingName, QVariant settingValue);
-	virtual void run();
-	QString result;
-	QString lastError;
-signals:
-	void error(QString err);
-private:
-	device_data_t *data;
-	QString m_settingName;
-	QVariant m_settingValue;
-};
 
 class ConfigureDiveComputer : public QObject
 {
 	Q_OBJECT
 public:
 	explicit ConfigureDiveComputer(QObject *parent = 0);
-	void readSettings(device_data_t *data);
+	void readSettings(DeviceDetails *deviceDetails, device_data_t *data);
 
 	enum states {
 			INITIAL,
@@ -53,23 +27,23 @@ public:
 
 	QString lastError;
 	states currentState;
+	DeviceDetails *m_deviceDetails;
+	device_data_t *m_data;
+	void saveDeviceDetails();
+	void fetchDeviceDetails();
 
-	void setDeviceName(device_data_t *data, QString newName);
-	void setDeviceDateAndTime(device_data_t *data, QDateTime dateAndTime);
-	void setDeviceBrightness(device_data_t *data, int brighnessLevel);
 signals:
-	void deviceSettings(QString settings);
 	void message(QString msg);
 	void error(QString err);
 	void readFinished();
 	void writeFinished();
 	void stateChanged(states newState);
+
 private:
 	ReadSettingsThread *readThread;
 	WriteSettingsThread *writeThread;
 	void setState(states newState);
 
-	void writeSettingToDevice(device_data_t *data, QString settingName, QVariant settingValue);
 private slots:
 	void readThreadFinished();
 	void writeThreadFinished();