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

cleanup: use safe connect() in ConfigureDiveComputerDialog

Browse source 
The pointer-to-member-function version is compile-time checked
and therefore less risky with respect to refactoring.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-10-04 21:44:41 +02:00 • committed by Dirk Hohndel
parent 8af40025b0
commit 6e6705fb6e
2 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

37
desktop-widgets/configuredivecomputerdialog.cpp
View file

@ -111,21 +111,20 @@ ConfigureDiveComputerDialog::ConfigureDiveComputerDialog(QWidget *parent) : QDia
deviceDetails = new DeviceDetails(this); deviceDetails = new DeviceDetails(this);
config = new ConfigureDiveComputer(); config = new ConfigureDiveComputer();
connect(config, SIGNAL(progress(int)), ui.progressBar, SLOT(setValue(int))); connect(config, &ConfigureDiveComputer::progress, ui.progressBar, &QProgressBar::setValue);
connect(config, SIGNAL(error(QString)), this, SLOT(configError(QString))); connect(config, &ConfigureDiveComputer::error, this, &ConfigureDiveComputerDialog::configError);
connect(config, SIGNAL(message(QString)), this, SLOT(configMessage(QString))); connect(config, &ConfigureDiveComputer::message, this, &ConfigureDiveComputerDialog::configMessage);
connect(config, SIGNAL(deviceDetailsChanged(DeviceDetails *)), connect(config, &ConfigureDiveComputer::deviceDetailsChanged, this, &ConfigureDiveComputerDialog::deviceDetailsReceived);
this, SLOT(deviceDetailsReceived(DeviceDetails *))); connect(ui.retrieveDetails, &QPushButton::clicked, this, &ConfigureDiveComputerDialog::readSettings);
connect(ui.retrieveDetails, SIGNAL(clicked()), this, SLOT(readSettings())); connect(ui.resetButton, &QPushButton::clicked, this, &ConfigureDiveComputerDialog::resetSettings);
connect(ui.resetButton, SIGNAL(clicked()), this, SLOT(resetSettings())); connect(ui.resetButton_4, &QPushButton::clicked, this, &ConfigureDiveComputerDialog::resetSettings);
connect(ui.resetButton_4, SIGNAL(clicked()), this, SLOT(resetSettings()));
ui.chooseLogFile->setEnabled(ui.logToFile->isChecked()); ui.chooseLogFile->setEnabled(ui.logToFile->isChecked());
connect(ui.chooseLogFile, SIGNAL(clicked()), this, SLOT(pickLogFile())); connect(ui.chooseLogFile, &QToolButton::clicked, this, &ConfigureDiveComputerDialog::pickLogFile);
connect(ui.logToFile, SIGNAL(stateChanged(int)), this, SLOT(checkLogFile(int))); connect(ui.logToFile, &QCheckBox::stateChanged, this, &ConfigureDiveComputerDialog::checkLogFile);
connect(ui.connectButton, SIGNAL(clicked()), this, SLOT(dc_open())); connect(ui.connectButton, &QPushButton::clicked, this, &ConfigureDiveComputerDialog::dc_open);
connect(ui.disconnectButton, SIGNAL(clicked()), this, SLOT(dc_close())); connect(ui.disconnectButton, &QPushButton::clicked, this, &ConfigureDiveComputerDialog::dc_close);
#ifdef BT_SUPPORT #ifdef BT_SUPPORT
connect(ui.bluetoothMode, SIGNAL(clicked(bool)), this, SLOT(selectRemoteBluetoothDevice())); connect(ui.bluetoothMode, &QPushButton::clicked, this, &ConfigureDiveComputerDialog::selectRemoteBluetoothDevice);
#else #else
ui.bluetoothMode->setVisible(false); ui.bluetoothMode->setVisible(false);
#endif #endif
@ -248,7 +247,7 @@ OstcFirmwareCheck::OstcFirmwareCheck(QString product) : parent(0)
} else { // not one of the known dive computers } else { // not one of the known dive computers
return; return;
} }
connect(&manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(parseOstcFwVersion(QNetworkReply *))); connect(&manager, &QNetworkAccessManager::finished, this, &OstcFirmwareCheck::parseOstcFwVersion);
QNetworkRequest download(url); QNetworkRequest download(url);
manager.get(download); manager.get(download);
} }
@ -259,7 +258,7 @@ void OstcFirmwareCheck::parseOstcFwVersion(QNetworkReply *reply)
int firstOpenBracket = parse.indexOf('['); int firstOpenBracket = parse.indexOf('[');
int firstCloseBracket = parse.indexOf(']'); int firstCloseBracket = parse.indexOf(']');
latestFirmwareAvailable = parse.mid(firstOpenBracket + 1, firstCloseBracket - firstOpenBracket - 1); latestFirmwareAvailable = parse.mid(firstOpenBracket + 1, firstCloseBracket - firstOpenBracket - 1);
disconnect(&manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(parseOstcFwVersion(QNetworkReply *))); disconnect(&manager, &QNetworkAccessManager::finished, this, &OstcFirmwareCheck::parseOstcFwVersion);
} }
void OstcFirmwareCheck::checkLatest(QWidget *_parent, device_data_t *data) void OstcFirmwareCheck::checkLatest(QWidget *_parent, device_data_t *data)
@ -325,7 +324,7 @@ void OstcFirmwareCheck::upgradeFirmware()
if (storeFirmware.isEmpty()) if (storeFirmware.isEmpty())
return; return;
connect(&manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(saveOstcFirmware(QNetworkReply *))); connect(&manager, &QNetworkAccessManager::finished, this, &OstcFirmwareCheck::saveOstcFirmware);
QNetworkRequest download(latestFirmwareHexFile); QNetworkRequest download(latestFirmwareHexFile);
manager.get(download); manager.get(download);
} }
@ -344,9 +343,9 @@ void OstcFirmwareCheck::saveOstcFirmware(QNetworkReply *reply)
dialog->setCancelButton(0); dialog->setCancelButton(0);
dialog->setAutoClose(true); dialog->setAutoClose(true);
ConfigureDiveComputer *config = new ConfigureDiveComputer(); ConfigureDiveComputer *config = new ConfigureDiveComputer();
connect(config, SIGNAL(message(QString)), dialog, SLOT(setLabelText(QString))); connect(config, &ConfigureDiveComputer::message, dialog, &QProgressDialog::setLabelText);
connect(config, SIGNAL(error(QString)), dialog, SLOT(setLabelText(QString))); connect(config, &ConfigureDiveComputer::error, dialog, &QProgressDialog::setLabelText);
connect(config, SIGNAL(progress(int)), dialog, SLOT(setValue(int))); connect(config, &ConfigureDiveComputer::progress, dialog, &QProgressDialog::setValue);
config->dc_open(&devData); config->dc_open(&devData);
config->startFirmwareUpdate(storeFirmware, &devData); config->startFirmwareUpdate(storeFirmware, &devData);
} }

2
desktop-widgets/configuredivecomputerdialog.h
View file

@ -124,7 +124,7 @@ private:
#endif #endif
}; };
class OstcFirmwareCheck : QObject { class OstcFirmwareCheck : public QObject {
Q_OBJECT Q_OBJECT
public: public:
explicit OstcFirmwareCheck(QString product); explicit OstcFirmwareCheck(QString product);