nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-14 16:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Boost Dependency - Devices

Browse Source 
All devices no longer need boost (use signals and slots instead), other
than SRM.
This commit is contained in:
Andy Bryson
2012-12-28 11:05:48 +00:00
committed by Mark Liversedge
parent 9039fca136
commit 356a80a448
11 changed files with 81 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/DownloadRideDialog.cpp
View File

@@ -25,7 +25,6 @@
#include <assert.h>
#include <errno.h>
#include <QtGui>
#include <boost/bind.hpp>
DownloadRideDialog::DownloadRideDialog(MainWindow *mainWindow,
const QDir &home) :
@@ -283,8 +282,11 @@ DownloadRideDialog::downloadClicked()
QList<DeviceDownloadFile> files;
DevicesPtr devtype = Devices::getType(deviceCombo->currentText());
DevicePtr device = devtype->newDevice( dev,
boost::bind(&DownloadRideDialog::updateStatus, this, _1) );
DevicePtr device = devtype->newDevice( dev );
connect( device.data(), SIGNAL(updateStatus(QString)), this, SLOT(updateStatus(QString)));
connect( this, SIGNAL(cancel()), device.data(), SLOT(cancelled()) );
connect( device.data(), SIGNAL(updateProgress(QString)), this, SLOT(updateProgress(QString)));
updateStatus(tr("getting summary ..."));
if( ! device->preview( err ) ){
@@ -303,10 +305,7 @@ DownloadRideDialog::downloadClicked()
}
updateStatus(tr("getting data ..."));
if (!device->download( home, files,
boost::bind(&DownloadRideDialog::isCancelled, this),
boost::bind(&DownloadRideDialog::updateProgress, this, _1),
err))
if (!device->download( home, files, err))
{
if (cancelled) {
QMessageBox::information(this, tr("Download canceled"),
@@ -415,8 +414,7 @@ DownloadRideDialog::eraseClicked()
}
assert(dev);
DevicesPtr devtype = Devices::getType(deviceCombo->currentText());
DevicePtr device = devtype->newDevice( dev,
boost::bind(&DownloadRideDialog::updateStatus, this, _1) );
DevicePtr device = devtype->newDevice( dev );
QString err;
if( device->cleanup( err) )
@@ -438,6 +436,7 @@ DownloadRideDialog::cancelClicked()
default:
cancelled = true;
emit cancel();
break;
}
}