summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/base
diff options
context:
space:
mode:
authorCástor Muñoz <cmvidal@gmail.com>2016-01-09 02:21:45 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2016-08-15 20:10:59 +0200
commit5a673d6df2125c5b17534e8ee9c143de9e3cd512 (patch)
treecae606cc324faa8a3819d3558974bd8d71a21a88 /rbutil/rbutilqt/base
parent6a1644c52ac8af4696356db04894245f5a0e3dc3 (diff)
downloadrockbox-5a673d6df2125c5b17534e8ee9c143de9e3cd512.tar.gz
rockbox-5a673d6df2125c5b17534e8ee9c143de9e3cd512.zip
rbutil: enable "done" signal on bootloader uninstall
This allows to implement multi-stage uninstallers. Should not affect the behaviour on current targets. Change-Id: Idf8aec5caf76cf9317798890d094a7cebdbcabec
Diffstat (limited to 'rbutil/rbutilqt/base')
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstallams.cpp1
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstallhex.cpp1
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstallimx.cpp1
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstallmi4.cpp2
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstallmpio.cpp1
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstalltcc.cpp1
6 files changed, 7 insertions, 0 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstallams.cpp b/rbutil/rbutilqt/base/bootloaderinstallams.cpp
index 33ad51c200..3905ae9fd3 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallams.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallams.cpp
@@ -185,6 +185,7 @@ bool BootloaderInstallAms::uninstall(void)
185 emit logItem(tr("To uninstall, perform a normal upgrade with an unmodified " 185 emit logItem(tr("To uninstall, perform a normal upgrade with an unmodified "
186 "original firmware"), LOGINFO); 186 "original firmware"), LOGINFO);
187 logInstall(LogRemove); 187 logInstall(LogRemove);
188 emit done(true);
188 return false; 189 return false;
189} 190}
190 191
diff --git a/rbutil/rbutilqt/base/bootloaderinstallhex.cpp b/rbutil/rbutilqt/base/bootloaderinstallhex.cpp
index 39a2392731..0c8087eaf4 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallhex.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallhex.cpp
@@ -236,6 +236,7 @@ bool BootloaderInstallHex::uninstall(void)
236{ 236{
237 emit logItem(tr("Uninstallation not possible, only installation info removed"), LOGINFO); 237 emit logItem(tr("Uninstallation not possible, only installation info removed"), LOGINFO);
238 logInstall(LogRemove); 238 logInstall(LogRemove);
239 emit done(true);
239 return false; 240 return false;
240} 241}
241 242
diff --git a/rbutil/rbutilqt/base/bootloaderinstallimx.cpp b/rbutil/rbutilqt/base/bootloaderinstallimx.cpp
index 74c6f94f78..547c8d8fc4 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallimx.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallimx.cpp
@@ -175,6 +175,7 @@ bool BootloaderInstallImx::uninstall(void)
175 emit logItem(tr("To uninstall, perform a normal upgrade with an unmodified " 175 emit logItem(tr("To uninstall, perform a normal upgrade with an unmodified "
176 "original firmware."), LOGINFO); 176 "original firmware."), LOGINFO);
177 logInstall(LogRemove); 177 logInstall(LogRemove);
178 emit done(true);
178 return false; 179 return false;
179} 180}
180 181
diff --git a/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp b/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp
index e18d3e2341..98146b0723 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp
@@ -91,6 +91,7 @@ bool BootloaderInstallMi4::uninstall(void)
91 emit logItem(tr("Checking for Rockbox bootloader"), LOGINFO); 91 emit logItem(tr("Checking for Rockbox bootloader"), LOGINFO);
92 if(installed() != BootloaderRockbox) { 92 if(installed() != BootloaderRockbox) {
93 emit logItem(tr("No Rockbox bootloader found"), LOGERROR); 93 emit logItem(tr("No Rockbox bootloader found"), LOGERROR);
94 emit done(true);
94 return false; 95 return false;
95 } 96 }
96 97
@@ -101,6 +102,7 @@ bool BootloaderInstallMi4::uninstall(void)
101 102
102 if(Utils::resolvePathCase(original).isEmpty()) { 103 if(Utils::resolvePathCase(original).isEmpty()) {
103 emit logItem(tr("Error finding original firmware file"), LOGERROR); 104 emit logItem(tr("Error finding original firmware file"), LOGERROR);
105 emit done(true);
104 return false; 106 return false;
105 } 107 }
106 108
diff --git a/rbutil/rbutilqt/base/bootloaderinstallmpio.cpp b/rbutil/rbutilqt/base/bootloaderinstallmpio.cpp
index 97b68f7f61..9984366139 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallmpio.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallmpio.cpp
@@ -127,6 +127,7 @@ bool BootloaderInstallMpio::uninstall(void)
127 emit logItem(tr("To uninstall, perform a normal upgrade with an unmodified " 127 emit logItem(tr("To uninstall, perform a normal upgrade with an unmodified "
128 "original firmware"), LOGINFO); 128 "original firmware"), LOGINFO);
129 logInstall(LogRemove); 129 logInstall(LogRemove);
130 emit done(true);
130 return false; 131 return false;
131} 132}
132 133
diff --git a/rbutil/rbutilqt/base/bootloaderinstalltcc.cpp b/rbutil/rbutilqt/base/bootloaderinstalltcc.cpp
index 73bfd5d98a..e0bfbe3cf2 100644
--- a/rbutil/rbutilqt/base/bootloaderinstalltcc.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstalltcc.cpp
@@ -150,6 +150,7 @@ bool BootloaderInstallTcc::uninstall(void)
150{ 150{
151 emit logItem(tr("To uninstall, perform a normal upgrade with an unmodified original firmware"), LOGINFO); 151 emit logItem(tr("To uninstall, perform a normal upgrade with an unmodified original firmware"), LOGINFO);
152 logInstall(LogRemove); 152 logInstall(LogRemove);
153 emit done(true);
153 return false; 154 return false;
154} 155}
155 156