Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict

[mdictionary] / src / plugins / xdxf / XdxfDictDownloader.cpp

diff --git a/src/plugins/xdxf/XdxfDictDownloader.cpp b/src/plugins/xdxf/XdxfDictDownloader.cpp
index 887fdf5..1b65408 100644 (file)
--- a/src/plugins/xdxf/XdxfDictDownloader.cpp
+++ b/src/plugins/xdxf/XdxfDictDownloader.cpp
@@ -18,18 +18,15 @@
     Copyright 2010 Comarch S.A.
 
 *******************************************************************************/
-
 /*!
-  \file XdxfDictDownloader.cpp
-  \author Mateusz Półrola <mateusz.polrola@comarch.com>
-  */
+    \file XdxfDictDownloader.cpp
+    \author Mateusz Półrola <mateusz.polrola@comarch.com>
+*/
 
 #include "XdxfDictDownloader.h"
 #include "XdxfDictDownloadProgressDialog.h"
 #include <QDebug>
 #include <QProcess>
-
-
 #include <bzlib.h>
 #ifndef Q_WS_MAEMO_5
 #include <libtar.h>
@@ -39,26 +36,23 @@
 
 typedef void BZFILE;
 
-
-
 XdxfDictDownloader::XdxfDictDownloader(QObject *parent) :
     QObject(parent) {
     parentDialog = 0;
+    progressDialog = 0;
     manager = new QNetworkAccessManager(this);
 
     connect(manager, SIGNAL(finished(QNetworkReply*)),
             this, SLOT(dictListReceived(QNetworkReply*)));
-
-
-    progressDialog = 0;
-    connect(&http, SIGNAL(finished()), this, SLOT(processFinished()));
+    connect(&http, SIGNAL(finished()),
+            this, SLOT(processFinished()));
     connect(&http, SIGNAL(error(QString)),
             this, SLOT(downloadingError(QString)));
     connect(&http, SIGNAL(progress(qint64,qint64)),
             this, SLOT(updateDownloadProgress(qint64,qint64)));
-
 }
 
+
 void XdxfDictDownloader::download(QWidget *parent) {
     parentDialog = parent;
     aborted = false;
@@ -76,20 +70,24 @@ void XdxfDictDownloader::download(QWidget *parent) {
     progressDialog->show();
 }
 
+
 QString XdxfDictDownloader::downloadedFile() {
     return _downloadedFile;
 }
 
+
 void XdxfDictDownloader::updateDownloadProgress(qint64 downloaded,
                                                 qint64 total)   {
     Q_EMIT downloadProgress(float(downloaded) / float(total));
 }
 
+
 void XdxfDictDownloader::downloadingError(QString error) {
     breakDownloading();
     Q_EMIT notify(Notify::Error, error);
 }
 
+
 void XdxfDictDownloader::breakDownloading() {
     //if user cancel downloading we kill all running processes, hide progress dialog and set flag that user cancel downloading.
     aborted = true;
@@ -98,9 +96,9 @@ void XdxfDictDownloader::breakDownloading() {
     if(progressDialog && progressDialog->isVisible()) {
         progressDialog->accept();
     }
-
 }
 
+
 void XdxfDictDownloader::processFinished() {
     //first check if user cancel downloading
     if(aborted) return;
@@ -113,6 +111,7 @@ void XdxfDictDownloader::processFinished() {
     downloadComplete();
 }
 
+
 void XdxfDictDownloader::downloadComplete() {
     if(aborted) return;
     // Downloaded tar file name is different than extracted folder so we need
@@ -135,11 +134,11 @@ void XdxfDictDownloader::downloadComplete() {
     emit fileDownloaded(_downloadedFile);
 }
 
+
 void XdxfDictDownloader::dictListReceived(QNetworkReply *reply) {
     progressDialog->accept();
-    if(aborted) return;
-
-
+    if(aborted)
+        return;
     if(reply->error() != QNetworkReply::NoError) {
         Q_EMIT notify(Notify::Error, reply->errorString());
         return;