diff options
Diffstat (limited to 'rbutil/rbutilqt/base/bootloaderinstalls5l.cpp')
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstalls5l.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp b/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp index 013abb2f5e..e8852d6df5 100644 --- a/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp | |||
@@ -66,7 +66,7 @@ bool BootloaderInstallS5l::installStage1(void) | |||
66 | if (doInstall) { | 66 | if (doInstall) { |
67 | // download firmware from server | 67 | // download firmware from server |
68 | emit logItem(tr("Downloading bootloader file..."), LOGINFO); | 68 | emit logItem(tr("Downloading bootloader file..."), LOGINFO); |
69 | connect(this, SIGNAL(downloadDone()), this, SLOT(installStageMkdfu())); | 69 | connect(this, &BootloaderInstallBase::downloadDone, this, &BootloaderInstallS5l::installStageMkdfu); |
70 | downloadBlStart(m_blurl); | 70 | downloadBlStart(m_blurl); |
71 | } | 71 | } |
72 | else { | 72 | else { |
@@ -87,8 +87,8 @@ void BootloaderInstallS5l::installStageMkdfu(void) | |||
87 | 87 | ||
88 | setProgress(0); | 88 | setProgress(0); |
89 | aborted = false; | 89 | aborted = false; |
90 | connect(this, SIGNAL(installAborted()), this, SLOT(abortInstall())); | 90 | connect(this, &BootloaderInstallBase::installAborted, this, &BootloaderInstallS5l::abortInstall); |
91 | connect(this, SIGNAL(done(bool)), this, SLOT(installDone(bool))); | 91 | connect(this, &BootloaderInstallBase::done, this, &BootloaderInstallS5l::installDone); |
92 | 92 | ||
93 | if (doInstall) { | 93 | if (doInstall) { |
94 | dfu_type = DFU_INST; | 94 | dfu_type = DFU_INST; |
@@ -142,7 +142,7 @@ void BootloaderInstallS5l::installStageWaitForEject(void) | |||
142 | LOGWARNING); | 142 | LOGWARNING); |
143 | actionShown = true; | 143 | actionShown = true; |
144 | } | 144 | } |
145 | QTimer::singleShot(250, this, SLOT(installStageWaitForEject())); | 145 | QTimer::singleShot(250, this, &BootloaderInstallS5l::installStageWaitForEject); |
146 | return; | 146 | return; |
147 | } | 147 | } |
148 | emit logItem(tr("Device successfully ejected."), LOGINFO); | 148 | emit logItem(tr("Device successfully ejected."), LOGINFO); |
@@ -169,7 +169,7 @@ void BootloaderInstallS5l::installStageWaitForProcs(void) | |||
169 | " Quit iTunes application."), LOGWARNING); | 169 | " Quit iTunes application."), LOGWARNING); |
170 | actionShown = true; | 170 | actionShown = true; |
171 | } | 171 | } |
172 | QTimer::singleShot(250, this, SLOT(installStageWaitForProcs())); | 172 | QTimer::singleShot(250, this, &BootloaderInstallS5l::installStageWaitForProcs); |
173 | return; | 173 | return; |
174 | } | 174 | } |
175 | if (actionShown) { | 175 | if (actionShown) { |
@@ -206,7 +206,7 @@ void BootloaderInstallS5l::installStageWaitForSpindown(void) | |||
206 | return; /* aborted */ | 206 | return; /* aborted */ |
207 | 207 | ||
208 | if (progressTimer.elapsed() < progressTimeout) { | 208 | if (progressTimer.elapsed() < progressTimeout) { |
209 | QTimer::singleShot(250, this, SLOT(installStageWaitForSpindown())); | 209 | QTimer::singleShot(250, this, &BootloaderInstallS5l::installStageWaitForSpindown); |
210 | return; | 210 | return; |
211 | } | 211 | } |
212 | 212 | ||
@@ -232,7 +232,7 @@ void BootloaderInstallS5l::installStageWaitForDfu(void) | |||
232 | scanTimer.start(); | 232 | scanTimer.start(); |
233 | } | 233 | } |
234 | if (!scanSuccess) { | 234 | if (!scanSuccess) { |
235 | QTimer::singleShot(250, this, SLOT(installStageWaitForDfu())); | 235 | QTimer::singleShot(250, this, &BootloaderInstallS5l::installStageWaitForDfu); |
236 | return; | 236 | return; |
237 | } | 237 | } |
238 | emit logItem(tr("DFU mode detected."), LOGINFO); | 238 | emit logItem(tr("DFU mode detected."), LOGINFO); |
@@ -256,7 +256,7 @@ void BootloaderInstallS5l::installStageSendDfu(void) | |||
256 | return; /* aborted */ | 256 | return; /* aborted */ |
257 | 257 | ||
258 | if (progressTimer.elapsed() < progressTimeout) { | 258 | if (progressTimer.elapsed() < progressTimeout) { |
259 | QTimer::singleShot(250, this, SLOT(installStageSendDfu())); | 259 | QTimer::singleShot(250, this, &BootloaderInstallS5l::installStageSendDfu); |
260 | return; | 260 | return; |
261 | } | 261 | } |
262 | 262 | ||
@@ -324,7 +324,7 @@ void BootloaderInstallS5l::installStageWaitForRemount(void) | |||
324 | LOGWARNING); | 324 | LOGWARNING); |
325 | actionShown = true; | 325 | actionShown = true; |
326 | } | 326 | } |
327 | QTimer::singleShot(250, this, SLOT(installStageWaitForRemount())); | 327 | QTimer::singleShot(250, this, &BootloaderInstallS5l::installStageWaitForRemount); |
328 | return; | 328 | return; |
329 | } | 329 | } |
330 | emit logItem(tr("Device remounted."), LOGINFO); | 330 | emit logItem(tr("Device remounted."), LOGINFO); |
@@ -350,7 +350,7 @@ void BootloaderInstallS5l::abortInstall(void) | |||
350 | { | 350 | { |
351 | LOG_INFO() << "abortInstall"; | 351 | LOG_INFO() << "abortInstall"; |
352 | aborted = true; | 352 | aborted = true; |
353 | disconnect(this, SIGNAL(installAborted()), this, SLOT(abortInstall())); | 353 | disconnect(this, &BootloaderInstallBase::installAborted, this, &BootloaderInstallS5l::abortInstall); |
354 | } | 354 | } |
355 | 355 | ||
356 | 356 | ||