Code cleanup; few optimizations; download debug messages...

4 files changed, 10 insertions, 35 deletions

diff --git a/src/DownloadManager.cpp b/src/DownloadManager.cpp
index b508723..436518f 100644
--- a/src/DownloadManager.cpp
+++ b/src/DownloadManager.cpp
@@ -5,8 +5,8 @@ void DownloadManager::downloadFile(QString& filename)
 	QUrl u = this->baseUrl.resolved(filename);
 	this->request.setUrl(u);
 	this->filename = filename;
+	qDebug() << "Downloading file: " << u.toString();
 	this->reply = this->qnam->get(this->request);
-	this->qiod = reply;
 	QObject::connect(this->reply, SIGNAL(finished()), this, SLOT(saveData()));
 }
 
@@ -18,14 +18,9 @@ void DownloadManager::saveData()
 		qDebug() << "Couldnt open file! exiting...";
 		exit(1);
 	}
-	outfile.write(this->qiod->readAll());
+	outfile.write(this->reply->readAll());
 	outfile.close();
-
-}
-
-void DownloadManager::setUrl(QUrl& qurl)
-{
-	this->baseUrl = qurl;
+	qDebug() << "Download done.";
 }
 
 void DownloadManager::print()
@@ -33,9 +28,10 @@ void DownloadManager::print()
 	qDebug() << "The download manager is still working";
 }
 
-DownloadManager::DownloadManager()
+DownloadManager::DownloadManager(const QUrl& baseUrl)
 {
 	this->qnam = new QNetworkAccessManager();
+	this->baseUrl = baseUrl;
 }
 
 DownloadManager::~DownloadManager()
diff --git a/src/DownloadManager.h b/src/DownloadManager.h
index eff2507..41ef4be 100644
--- a/src/DownloadManager.h
+++ b/src/DownloadManager.h
@@ -8,9 +8,8 @@ class DownloadManager : public QObject
 Q_OBJECT
 
 public:
-	DownloadManager();
+	DownloadManager(const QUrl& baseUrl);
 	~DownloadManager();
-	void setUrl(QUrl& qurl);
 	void print();
 	void downloadFile(QString& filename);
 
@@ -20,7 +19,6 @@ private:
 	QString filename;
 	QNetworkRequest request;
 	QNetworkReply* reply;
-	QIODevice* qiod;
 
 
 private slots:
diff --git a/src/fbbrowser.cpp b/src/fbbrowser.cpp
index edfea36..42bbe9a 100644
--- a/src/fbbrowser.cpp
+++ b/src/fbbrowser.cpp
@@ -5,18 +5,6 @@
 #include <QtWebKit>
 #include "jsObject.h"
 
-void fbbrowser::httpReqFinished()
-{
-}
-
-void fbbrowser::saveData()
-{
-}
-
-void fbbrowser::download(const QString &file)
-{
-}
-
 fbbrowser::fbbrowser(const QUrl & url)
 {
 	view = new QWebView(this);
@@ -51,9 +39,8 @@ fbbrowser::fbbrowser(const QUrl & url)
 		view->load(QUrl("qrc:/html/errorPage.html"));
 	}
 	// **** TEST ****
-	DownloadManager* dm = new DownloadManager();
-	dm->print();
-	dm->setUrl(baseUrl);
+	DownloadManager* dm = new DownloadManager(baseUrl);
+	// dm->setUrl(baseUrl);
 	QString qs = "test.php";
 	dm->downloadFile(qs);
 	// **** TEST ****
diff --git a/src/fbbrowser.h b/src/fbbrowser.h
index 1ac60e1..6cfa588 100644
--- a/src/fbbrowser.h
+++ b/src/fbbrowser.h
@@ -29,23 +29,17 @@ private:
     QNetworkAccessManager *manager;
 
     // Temporal stuff for the download function...
-    QNetworkRequest req;
-    QNetworkReply *rep;
-    QString filename;
-    QIODevice *qiod;
     // Private download function.
     void download(const QString & file);
 
 
 
 private slots:
-    void httpReqFinished();
-	void addJSObject();
-    void saveData();
+    void addJSObject();
     void getSysInfo();
 
 signals:
-	void signalQuitAll();
+    void signalQuitAll();
 };
 
 #endif // FBBROWSER_H