mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 13:10:19 +00:00
a70597b903
ostcFirmwareCheck in DownloadFromDCWidget was neither freed in the destructor, not freed if a new object was allocated. Simply make it a unique_ptr<> to do all the work for us. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
96 lines
2.2 KiB
C++
96 lines
2.2 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#ifndef DOWNLOADFROMDIVECOMPUTER_H
|
|
#define DOWNLOADFROMDIVECOMPUTER_H
|
|
|
|
#include <QDialog>
|
|
#include <QThread>
|
|
#include <QHash>
|
|
#include <QMap>
|
|
#include <QAbstractTableModel>
|
|
#include <memory>
|
|
|
|
#include "core/libdivecomputer.h"
|
|
#include "desktop-widgets/configuredivecomputerdialog.h"
|
|
#include "core/downloadfromdcthread.h"
|
|
|
|
#include "ui_downloadfromdivecomputer.h"
|
|
|
|
#if defined(BT_SUPPORT)
|
|
#include "btdeviceselectiondialog.h"
|
|
#endif
|
|
|
|
class QStringListModel;
|
|
class DiveImportedModel;
|
|
|
|
class DownloadFromDCWidget : public QDialog {
|
|
Q_OBJECT
|
|
public:
|
|
explicit DownloadFromDCWidget(QWidget *parent = 0, Qt::WindowFlags f = 0);
|
|
void reject();
|
|
|
|
enum states {
|
|
INITIAL,
|
|
DOWNLOADING,
|
|
CANCELLING,
|
|
ERROR,
|
|
DONE,
|
|
};
|
|
|
|
public
|
|
slots:
|
|
void on_downloadCancelRetryButton_clicked();
|
|
void on_ok_clicked();
|
|
void on_cancel_clicked();
|
|
void on_search_clicked();
|
|
void on_vendor_currentIndexChanged(const QString &vendor);
|
|
void on_product_currentIndexChanged(const QString &product);
|
|
void on_device_currentTextChanged(const QString &device);
|
|
|
|
void onDownloadThreadFinished();
|
|
void updateProgressBar();
|
|
void checkLogFile(int state);
|
|
void checkDumpFile(int state);
|
|
void pickDumpFile();
|
|
void pickLogFile();
|
|
void DC1Clicked();
|
|
void DC2Clicked();
|
|
void DC3Clicked();
|
|
void DC4Clicked();
|
|
int deviceIndex(QString deviceText);
|
|
|
|
#if defined(BT_SUPPORT)
|
|
void enableBluetoothMode(int state);
|
|
void selectRemoteBluetoothDevice();
|
|
void bluetoothSelectionDialogIsFinished(int result);
|
|
#endif
|
|
private:
|
|
void markChildrenAsDisabled();
|
|
void markChildrenAsEnabled();
|
|
void updateDeviceEnabled();
|
|
void showRememberedDCs();
|
|
|
|
QStringListModel vendorModel;
|
|
QStringListModel productModel;
|
|
Ui::DownloadFromDiveComputer ui;
|
|
DownloadThread thread;
|
|
bool downloading;
|
|
|
|
int previousLast;
|
|
|
|
void fill_device_list(unsigned int transport);
|
|
QTimer *timer;
|
|
bool dumpWarningShown;
|
|
std::unique_ptr<OstcFirmwareCheck> ostcFirmwareCheck;
|
|
DiveImportedModel *diveImportedModel;
|
|
#if defined(BT_SUPPORT)
|
|
BtDeviceSelectionDialog *btDeviceSelectionDialog;
|
|
BTDiscovery *btd;
|
|
#endif
|
|
|
|
public:
|
|
bool preferDownloaded();
|
|
void updateState(states state);
|
|
states currentState;
|
|
};
|
|
|
|
#endif // DOWNLOADFROMDIVECOMPUTER_H
|