diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-05-02 18:40:04 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-05-02 18:40:04 +0000 |
commit | 7cfdd4758767e6c5a6fceb0cb5d12ef3b1c99b5d (patch) | |
tree | 9814a23e24cd9be26f0009835a463b5a9c097f7f /rbutil/rbutilqt/install.cpp | |
parent | b10ba5e8b34eaac0c4b72bcf3be3db180c43126a (diff) | |
download | rockbox-7cfdd4758767e6c5a6fceb0cb5d12ef3b1c99b5d.tar.gz rockbox-7cfdd4758767e6c5a6fceb0cb5d12ef3b1c99b5d.zip |
Clean up ProgressLogger state handling:
- use better names for member functions
- don't emit aborted() when exiting a successful log
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20844 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/install.cpp')
-rw-r--r-- | rbutil/rbutilqt/install.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp index 2332a713c4..946c7013fa 100644 --- a/rbutil/rbutilqt/install.cpp +++ b/rbutil/rbutilqt/install.cpp | |||
@@ -96,7 +96,7 @@ void Install::accept() | |||
96 | // show dialog with error if mount point is wrong | 96 | // show dialog with error if mount point is wrong |
97 | if(!QFileInfo(mountPoint).isDir()) { | 97 | if(!QFileInfo(mountPoint).isDir()) { |
98 | logger->addItem(tr("Mount point is wrong!"),LOGERROR); | 98 | logger->addItem(tr("Mount point is wrong!"),LOGERROR); |
99 | logger->abort(); | 99 | logger->setFinished(); |
100 | return; | 100 | return; |
101 | } | 101 | } |
102 | 102 | ||
@@ -141,7 +141,7 @@ void Install::accept() | |||
141 | == QMessageBox::Abort) | 141 | == QMessageBox::Abort) |
142 | { | 142 | { |
143 | logger->addItem(tr("Aborted!"),LOGERROR); | 143 | logger->addItem(tr("Aborted!"),LOGERROR); |
144 | logger->abort(); | 144 | logger->setFinished(); |
145 | return; | 145 | return; |
146 | } | 146 | } |
147 | } | 147 | } |
@@ -170,7 +170,7 @@ void Install::accept() | |||
170 | else | 170 | else |
171 | { | 171 | { |
172 | logger->addItem(tr("Backup failed!"),LOGERROR); | 172 | logger->addItem(tr("Backup failed!"),LOGERROR); |
173 | logger->abort(); | 173 | logger->setFinished(); |
174 | return; | 174 | return; |
175 | } | 175 | } |
176 | } | 176 | } |
@@ -212,7 +212,7 @@ void Install::done(bool error) | |||
212 | 212 | ||
213 | if(error) | 213 | if(error) |
214 | { | 214 | { |
215 | logger->abort(); | 215 | logger->setFinished(); |
216 | return; | 216 | return; |
217 | } | 217 | } |
218 | 218 | ||