diff options
Diffstat (limited to 'rbutil/rbutilqt/installbootloader.cpp')
-rw-r--r-- | rbutil/rbutilqt/installbootloader.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/installbootloader.cpp b/rbutil/rbutilqt/installbootloader.cpp index c567dcd418..05b7be4e49 100644 --- a/rbutil/rbutilqt/installbootloader.cpp +++ b/rbutil/rbutilqt/installbootloader.cpp | |||
@@ -320,11 +320,12 @@ void BootloaderInstaller::gigabeatPrepare() | |||
320 | // get the real file. | 320 | // get the real file. |
321 | getter = new HttpGet(this); | 321 | getter = new HttpGet(this); |
322 | getter->setFile(&downloadFile); | 322 | getter->setFile(&downloadFile); |
323 | getter->getFile(QUrl(url)); | ||
324 | // connect signals from HttpGet | 323 | // connect signals from HttpGet |
325 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 324 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
326 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 325 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); |
327 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 326 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
327 | |||
328 | getter->getFile(QUrl(url)); | ||
328 | } | 329 | } |
329 | else //UnInstallation | 330 | else //UnInstallation |
330 | { | 331 | { |
@@ -518,11 +519,12 @@ void BootloaderInstaller::h10Prepare() | |||
518 | // get the real file. | 519 | // get the real file. |
519 | getter = new HttpGet(this); | 520 | getter = new HttpGet(this); |
520 | getter->setFile(&downloadFile); | 521 | getter->setFile(&downloadFile); |
521 | getter->getFile(QUrl(url)); | ||
522 | // connect signals from HttpGet | 522 | // connect signals from HttpGet |
523 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 523 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
524 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 524 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); |
525 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 525 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
526 | |||
527 | getter->getFile(QUrl(url)); | ||
526 | } | 528 | } |
527 | else // Uninstallation | 529 | else // Uninstallation |
528 | { | 530 | { |
@@ -670,11 +672,13 @@ void BootloaderInstaller::mrobe100Prepare() | |||
670 | // get the real file. | 672 | // get the real file. |
671 | getter = new HttpGet(this); | 673 | getter = new HttpGet(this); |
672 | getter->setFile(&downloadFile); | 674 | getter->setFile(&downloadFile); |
673 | getter->getFile(QUrl(url)); | 675 | |
674 | // connect signals from HttpGet | 676 | // connect signals from HttpGet |
675 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 677 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
676 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 678 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); |
677 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 679 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
680 | |||
681 | getter->getFile(QUrl(url)); | ||
678 | } | 682 | } |
679 | else // Uninstallation | 683 | else // Uninstallation |
680 | { | 684 | { |
@@ -835,11 +839,13 @@ void BootloaderInstaller::ipodPrepare() | |||
835 | // get the real file. | 839 | // get the real file. |
836 | getter = new HttpGet(this); | 840 | getter = new HttpGet(this); |
837 | getter->setFile(&downloadFile); | 841 | getter->setFile(&downloadFile); |
838 | getter->getFile(QUrl(url)); | 842 | |
839 | // connect signals from HttpGet | 843 | // connect signals from HttpGet |
840 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 844 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
841 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 845 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); |
842 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 846 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
847 | |||
848 | getter->getFile(QUrl(url)); | ||
843 | } | 849 | } |
844 | else // Uninstallation | 850 | else // Uninstallation |
845 | { | 851 | { |
@@ -1077,11 +1083,13 @@ void BootloaderInstaller::sansaPrepare() | |||
1077 | // get the real file. | 1083 | // get the real file. |
1078 | getter = new HttpGet(this); | 1084 | getter = new HttpGet(this); |
1079 | getter->setFile(&downloadFile); | 1085 | getter->setFile(&downloadFile); |
1080 | getter->getFile(QUrl(url)); | 1086 | |
1081 | // connect signals from HttpGet | 1087 | // connect signals from HttpGet |
1082 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 1088 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
1083 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 1089 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); |
1084 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 1090 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
1091 | |||
1092 | getter->getFile(QUrl(url)); | ||
1085 | } | 1093 | } |
1086 | else // Uninstallation | 1094 | else // Uninstallation |
1087 | { | 1095 | { |
@@ -1265,11 +1273,13 @@ void BootloaderInstaller::iriverPrepare() | |||
1265 | // get the real file. | 1273 | // get the real file. |
1266 | getter = new HttpGet(this); | 1274 | getter = new HttpGet(this); |
1267 | getter->setFile(&downloadFile); | 1275 | getter->setFile(&downloadFile); |
1268 | getter->getFile(QUrl(url)); | 1276 | |
1269 | // connect signals from HttpGet | 1277 | // connect signals from HttpGet |
1270 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 1278 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
1271 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 1279 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); |
1272 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 1280 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
1281 | |||
1282 | getter->getFile(QUrl(url)); | ||
1273 | } | 1283 | } |
1274 | 1284 | ||
1275 | void BootloaderInstaller::iriverFinish() | 1285 | void BootloaderInstaller::iriverFinish() |