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

Rework slot to quiet down Qt5 warning

Browse source 
Qt5 got confused about this slot. This does the same as previously but
gets Qt5 happy.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2014-05-26 00:06:56 +02:00 • committed by Dirk Hohndel
parent f0f60e1f84
commit d14a531510
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
qt-ui/downloadfromdivecomputer.cpp
View file

@ -72,7 +72,6 @@ DownloadFromDCWidget::DownloadFromDCWidget(QWidget *parent, Qt::WindowFlags f) :
if (default_dive_computer_product) if (default_dive_computer_product)
ui.product->setCurrentIndex(ui.product->findText(default_dive_computer_product)); ui.product->setCurrentIndex(ui.product->findText(default_dive_computer_product));
} }
connect(ui.product, SIGNAL(currentIndexChanged(int)), this, SLOT(on_product_currentIndexChanged()), Qt::UniqueConnection);
if (default_dive_computer_device) if (default_dive_computer_device)
ui.device->setEditText(default_dive_computer_device); ui.device->setEditText(default_dive_computer_device);
@ -190,11 +189,11 @@ void DownloadFromDCWidget::on_vendor_currentIndexChanged(const QString &vendor)
//currentModel->deleteLater(); //currentModel->deleteLater();
} }
void DownloadFromDCWidget::on_product_currentIndexChanged() void DownloadFromDCWidget::on_product_currentIndexChanged(const QString &product)
{ {
// Set up the DC descriptor // Set up the DC descriptor
dc_descriptor_t *descriptor = NULL; dc_descriptor_t *descriptor = NULL;
descriptor = descriptorLookup[ui.vendor->currentText() + ui.product->currentText()]; descriptor = descriptorLookup[ui.vendor->currentText() + product];
// call dc_descriptor_get_transport to see if the dc_transport_t is DC_TRANSPORT_SERIAL // call dc_descriptor_get_transport to see if the dc_transport_t is DC_TRANSPORT_SERIAL
if (dc_descriptor_get_transport(descriptor) == DC_TRANSPORT_SERIAL) { if (dc_descriptor_get_transport(descriptor) == DC_TRANSPORT_SERIAL) {

2
qt-ui/downloadfromdivecomputer.h
View file

@ -42,7 +42,7 @@ slots:
void on_cancel_clicked(); void on_cancel_clicked();
void on_search_clicked(); void on_search_clicked();
void on_vendor_currentIndexChanged(const QString &vendor); void on_vendor_currentIndexChanged(const QString &vendor);
void on_product_currentIndexChanged(); void on_product_currentIndexChanged(const QString &product);
void onDownloadThreadFinished(); void onDownloadThreadFinished();
void updateProgressBar(); void updateProgressBar();