summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/installzip.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/installzip.cpp')
-rw-r--r--rbutil/rbutilqt/installzip.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/rbutil/rbutilqt/installzip.cpp b/rbutil/rbutilqt/installzip.cpp
index 6514c6d13d..5842e00d3f 100644
--- a/rbutil/rbutilqt/installzip.cpp
+++ b/rbutil/rbutilqt/installzip.cpp
@@ -91,7 +91,7 @@ void ZipInstaller::installStart()
91 getter->setFile(downloadFile); 91 getter->setFile(downloadFile);
92 92
93 connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); 93 connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool)));
94 connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); 94 connect(getter, SIGNAL(dataReadProgress(int, int)), m_dp, SLOT(setProgress(int, int)));
95 connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); 95 connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort()));
96 96
97 getter->getFile(QUrl(m_url)); 97 getter->getFile(QUrl(m_url));
@@ -135,7 +135,7 @@ void ZipInstaller::downloadDone(bool error)
135 qDebug() << "file to unzip: " << m_file; 135 qDebug() << "file to unzip: " << m_file;
136 UnZip::ErrorCode ec; 136 UnZip::ErrorCode ec;
137 RbUnZip uz; 137 RbUnZip uz;
138 connect(&uz, SIGNAL(unzipProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); 138 connect(&uz, SIGNAL(unzipProgress(int, int)), m_dp, SLOT(setProgress(int, int)));
139 connect(m_dp, SIGNAL(aborted()), &uz, SLOT(abortUnzip())); 139 connect(m_dp, SIGNAL(aborted()), &uz, SLOT(abortUnzip()));
140 ec = uz.openArchive(m_file); 140 ec = uz.openArchive(m_file);
141 if(ec != UnZip::Ok) { 141 if(ec != UnZip::Ok) {
@@ -200,12 +200,4 @@ void ZipInstaller::downloadDone(bool error)
200 emit cont(); 200 emit cont();
201} 201}
202 202
203void ZipInstaller::updateDataReadProgress(int read, int total)
204{
205 m_dp->setProgressMax(total);
206 m_dp->setProgressValue(read);
207 //qDebug() << "progress:" << read << "/" << total;
208
209}
210
211 203