diff options
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallams.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallbase.cpp | 6 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallbspatch.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallchinachip.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallfile.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallhex.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallimx.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallipod.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallmi4.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallmpio.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstalls5l.cpp | 20 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallsansa.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstalltcc.cpp | 2 |
13 files changed, 26 insertions, 26 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstallams.cpp b/rbutil/rbutilqt/base/bootloaderinstallams.cpp index 524ce99e98..be43ed52db 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallams.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallams.cpp | |||
@@ -57,7 +57,7 @@ bool BootloaderInstallAms::install(void) | |||
57 | // download firmware from server | 57 | // download firmware from server |
58 | emit logItem(tr("Downloading bootloader file"), LOGINFO); | 58 | emit logItem(tr("Downloading bootloader file"), LOGINFO); |
59 | 59 | ||
60 | connect(this, SIGNAL(downloadDone()), this, SLOT(installStage2())); | 60 | connect(this, &BootloaderInstallBase::downloadDone, this, &BootloaderInstallAms::installStage2); |
61 | downloadBlStart(m_blurl); | 61 | downloadBlStart(m_blurl); |
62 | 62 | ||
63 | return true; | 63 | return true; |
diff --git a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp b/rbutil/rbutilqt/base/bootloaderinstallbase.cpp index efc61f7529..096c601b91 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallbase.cpp | |||
@@ -48,11 +48,11 @@ void BootloaderInstallBase::downloadBlStart(QUrl source) | |||
48 | { | 48 | { |
49 | m_http.setFile(&m_tempfile); | 49 | m_http.setFile(&m_tempfile); |
50 | m_http.setCache(true); | 50 | m_http.setCache(true); |
51 | connect(&m_http, SIGNAL(done(bool)), this, SLOT(downloadBlFinish(bool))); | 51 | connect(&m_http, &HttpGet::done, this, &BootloaderInstallBase::downloadBlFinish); |
52 | // connect the http read signal to our logProgess *signal* | 52 | // connect the http read signal to our logProgess *signal* |
53 | // to immediately emit it without any helper function. | 53 | // to immediately emit it without any helper function. |
54 | connect(&m_http, SIGNAL(dataReadProgress(int, int)), | 54 | connect(&m_http, &HttpGet::dataReadProgress, |
55 | this, SIGNAL(logProgress(int, int))); | 55 | this, &BootloaderInstallBase::logProgress); |
56 | m_http.getFile(source); | 56 | m_http.getFile(source); |
57 | } | 57 | } |
58 | 58 | ||
diff --git a/rbutil/rbutilqt/base/bootloaderinstallbspatch.cpp b/rbutil/rbutilqt/base/bootloaderinstallbspatch.cpp index f8eab408fd..02291b0151 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallbspatch.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallbspatch.cpp | |||
@@ -88,7 +88,7 @@ bool BootloaderInstallBSPatch::install(void) | |||
88 | LOG_INFO() << "downloading bootloader"; | 88 | LOG_INFO() << "downloading bootloader"; |
89 | // download bootloader from server | 89 | // download bootloader from server |
90 | emit logItem(tr("Downloading bootloader file"), LOGINFO); | 90 | emit logItem(tr("Downloading bootloader file"), LOGINFO); |
91 | connect(this, SIGNAL(downloadDone()), this, SLOT(installStage2())); | 91 | connect(this, &BootloaderInstallBase::downloadDone, this, &BootloaderInstallBSPatch::installStage2); |
92 | downloadBlStart(m_blurl); | 92 | downloadBlStart(m_blurl); |
93 | return true; | 93 | return true; |
94 | } | 94 | } |
@@ -109,7 +109,7 @@ void BootloaderInstallBSPatch::installStage2(void) | |||
109 | m_thread->setOutputFile(m_patchedFile.fileName()); | 109 | m_thread->setOutputFile(m_patchedFile.fileName()); |
110 | m_tempfile.close(); | 110 | m_tempfile.close(); |
111 | m_patchedFile.close(); | 111 | m_patchedFile.close(); |
112 | connect(m_thread, SIGNAL(finished()), this, SLOT(installStage3())); | 112 | connect(m_thread, &QThread::finished, this, &BootloaderInstallBSPatch::installStage3); |
113 | m_thread->start(); | 113 | m_thread->start(); |
114 | } | 114 | } |
115 | 115 | ||
diff --git a/rbutil/rbutilqt/base/bootloaderinstallchinachip.cpp b/rbutil/rbutilqt/base/bootloaderinstallchinachip.cpp index 32cc3c4cf1..f6af952b9a 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallchinachip.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallchinachip.cpp | |||
@@ -49,7 +49,7 @@ bool BootloaderInstallChinaChip::install() | |||
49 | 49 | ||
50 | emit logItem(tr("Downloading bootloader file"), LOGINFO); | 50 | emit logItem(tr("Downloading bootloader file"), LOGINFO); |
51 | 51 | ||
52 | connect(this, SIGNAL(downloadDone()), this, SLOT(installStage2())); | 52 | connect(this, &BootloaderInstallBase::downloadDone, this, &BootloaderInstallChinaChip::installStage2); |
53 | downloadBlStart(m_blurl); | 53 | downloadBlStart(m_blurl); |
54 | 54 | ||
55 | return true; | 55 | return true; |
diff --git a/rbutil/rbutilqt/base/bootloaderinstallfile.cpp b/rbutil/rbutilqt/base/bootloaderinstallfile.cpp index 209e56b4f3..bf3d5e449d 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallfile.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallfile.cpp | |||
@@ -34,7 +34,7 @@ bool BootloaderInstallFile::install(void) | |||
34 | emit logItem(tr("Downloading bootloader"), LOGINFO); | 34 | emit logItem(tr("Downloading bootloader"), LOGINFO); |
35 | LOG_INFO() << "installing bootloader"; | 35 | LOG_INFO() << "installing bootloader"; |
36 | downloadBlStart(m_blurl); | 36 | downloadBlStart(m_blurl); |
37 | connect(this, SIGNAL(downloadDone()), this, SLOT(installStage2())); | 37 | connect(this, &BootloaderInstallBase::downloadDone, this, &BootloaderInstallFile::installStage2); |
38 | return true; | 38 | return true; |
39 | } | 39 | } |
40 | 40 | ||
diff --git a/rbutil/rbutilqt/base/bootloaderinstallhex.cpp b/rbutil/rbutilqt/base/bootloaderinstallhex.cpp index 931c7dfa2e..b3dde0bbfa 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallhex.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallhex.cpp | |||
@@ -122,7 +122,7 @@ bool BootloaderInstallHex::install(void) | |||
122 | 122 | ||
123 | // download firmware from server | 123 | // download firmware from server |
124 | emit logItem(tr("Downloading bootloader file"), LOGINFO); | 124 | emit logItem(tr("Downloading bootloader file"), LOGINFO); |
125 | connect(this, SIGNAL(downloadDone()), this, SLOT(installStage2())); | 125 | connect(this, &BootloaderInstallBase::downloadDone, this, &BootloaderInstallHex::installStage2); |
126 | 126 | ||
127 | downloadBlStart(m_blurl); | 127 | downloadBlStart(m_blurl); |
128 | return true; | 128 | return true; |
diff --git a/rbutil/rbutilqt/base/bootloaderinstallimx.cpp b/rbutil/rbutilqt/base/bootloaderinstallimx.cpp index 581d70270c..7428cf10c8 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallimx.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallimx.cpp | |||
@@ -98,7 +98,7 @@ bool BootloaderInstallImx::install(void) | |||
98 | LOG_INFO() << "downloading bootloader"; | 98 | LOG_INFO() << "downloading bootloader"; |
99 | // download bootloader from server | 99 | // download bootloader from server |
100 | emit logItem(tr("Downloading bootloader file"), LOGINFO); | 100 | emit logItem(tr("Downloading bootloader file"), LOGINFO); |
101 | connect(this, SIGNAL(downloadDone()), this, SLOT(installStage2())); | 101 | connect(this, &BootloaderInstallBase::downloadDone, this, &BootloaderInstallImx::installStage2); |
102 | downloadBlStart(m_blurl); | 102 | downloadBlStart(m_blurl); |
103 | return true; | 103 | return true; |
104 | } | 104 | } |
@@ -120,7 +120,7 @@ void BootloaderInstallImx::installStage2(void) | |||
120 | m_thread->setOutputFile(m_patchedFile.fileName()); | 120 | m_thread->setOutputFile(m_patchedFile.fileName()); |
121 | m_tempfile.close(); | 121 | m_tempfile.close(); |
122 | m_patchedFile.close(); | 122 | m_patchedFile.close(); |
123 | connect(m_thread, SIGNAL(finished()), this, SLOT(installStage3())); | 123 | connect(m_thread, &QThread::finished, this, &BootloaderInstallImx::installStage3); |
124 | connect(m_thread, SIGNAL(terminated()), this, SLOT(installStage3())); | 124 | connect(m_thread, SIGNAL(terminated()), this, SLOT(installStage3())); |
125 | m_thread->start(); | 125 | m_thread->start(); |
126 | } | 126 | } |
diff --git a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp index 3535f9c69c..807c6e870b 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp | |||
@@ -80,7 +80,7 @@ bool BootloaderInstallIpod::install(void) | |||
80 | emit logItem(tr("Downloading bootloader file"), LOGINFO); | 80 | emit logItem(tr("Downloading bootloader file"), LOGINFO); |
81 | 81 | ||
82 | downloadBlStart(m_blurl); | 82 | downloadBlStart(m_blurl); |
83 | connect(this, SIGNAL(downloadDone()), this, SLOT(installStage2())); | 83 | connect(this, &BootloaderInstallBase::downloadDone, this, &BootloaderInstallIpod::installStage2); |
84 | return true; | 84 | return true; |
85 | } | 85 | } |
86 | 86 | ||
diff --git a/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp b/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp index 597c3ac37b..2657347b87 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp | |||
@@ -34,7 +34,7 @@ bool BootloaderInstallMi4::install(void) | |||
34 | emit logItem(tr("Downloading bootloader"), LOGINFO); | 34 | emit logItem(tr("Downloading bootloader"), LOGINFO); |
35 | LOG_INFO() << "installing bootloader"; | 35 | LOG_INFO() << "installing bootloader"; |
36 | downloadBlStart(m_blurl); | 36 | downloadBlStart(m_blurl); |
37 | connect(this, SIGNAL(downloadDone()), this, SLOT(installStage2())); | 37 | connect(this, &BootloaderInstallBase::downloadDone, this, &BootloaderInstallMi4::installStage2); |
38 | return true; | 38 | return true; |
39 | } | 39 | } |
40 | 40 | ||
diff --git a/rbutil/rbutilqt/base/bootloaderinstallmpio.cpp b/rbutil/rbutilqt/base/bootloaderinstallmpio.cpp index 9984366139..863418e591 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallmpio.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallmpio.cpp | |||
@@ -52,7 +52,7 @@ bool BootloaderInstallMpio::install(void) | |||
52 | // download firmware from server | 52 | // download firmware from server |
53 | emit logItem(tr("Downloading bootloader file"), LOGINFO); | 53 | emit logItem(tr("Downloading bootloader file"), LOGINFO); |
54 | 54 | ||
55 | connect(this, SIGNAL(downloadDone()), this, SLOT(installStage2())); | 55 | connect(this, &BootloaderInstallBase::downloadDone, this, &BootloaderInstallMpio::installStage2); |
56 | downloadBlStart(m_blurl); | 56 | downloadBlStart(m_blurl); |
57 | 57 | ||
58 | return true; | 58 | return true; |
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 | ||
diff --git a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp b/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp index e4fd3766cb..b1f0167e42 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp | |||
@@ -79,7 +79,7 @@ bool BootloaderInstallSansa::install(void) | |||
79 | emit logItem(tr("Downloading bootloader file"), LOGINFO); | 79 | emit logItem(tr("Downloading bootloader file"), LOGINFO); |
80 | 80 | ||
81 | downloadBlStart(m_blurl); | 81 | downloadBlStart(m_blurl); |
82 | connect(this, SIGNAL(downloadDone()), this, SLOT(installStage2())); | 82 | connect(this, &BootloaderInstallBase::downloadDone, this, &BootloaderInstallSansa::installStage2); |
83 | return true; | 83 | return true; |
84 | } | 84 | } |
85 | 85 | ||
diff --git a/rbutil/rbutilqt/base/bootloaderinstalltcc.cpp b/rbutil/rbutilqt/base/bootloaderinstalltcc.cpp index 1551d7c45d..ffc8555733 100644 --- a/rbutil/rbutilqt/base/bootloaderinstalltcc.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstalltcc.cpp | |||
@@ -49,7 +49,7 @@ bool BootloaderInstallTcc::install(void) | |||
49 | // Download firmware from server | 49 | // Download firmware from server |
50 | emit logItem(tr("Downloading bootloader file"), LOGINFO); | 50 | emit logItem(tr("Downloading bootloader file"), LOGINFO); |
51 | 51 | ||
52 | connect(this, SIGNAL(downloadDone()), this, SLOT(installStage2())); | 52 | connect(this, &BootloaderInstallBase::downloadDone, this, &BootloaderInstallTcc::installStage2); |
53 | downloadBlStart(m_blurl); | 53 | downloadBlStart(m_blurl); |
54 | 54 | ||
55 | return true; | 55 | return true; |