download manager improvements

4 files changed, 20 insertions, 12 deletions

diff --git a/src/DownloadManager.cpp b/src/DownloadManager.cpp
index b16bfe4..b637994 100644
--- a/src/DownloadManager.cpp
+++ b/src/DownloadManager.cpp
@@ -1,7 +1,12 @@
 #include "DownloadManager.h"
 
+void DownloadManager::downloadFile(QString name)
+{
+	qDebug() << "Received downloadFile signal for:" << name;
+	this->processDownloadRequest(name);
+}
 // ----------------------------------------------------------------------------------------
-void DownloadManager::get(QString& filename)
+void DownloadManager::processDownloadRequest(QString& filename)
 {
 	// Forge URL from the given filename and the base URL.
 	QUrl u = this->baseUrl.resolved(filename);
diff --git a/src/DownloadManager.h b/src/DownloadManager.h
index d365b0a..12b94e1 100644
--- a/src/DownloadManager.h
+++ b/src/DownloadManager.h
@@ -1,16 +1,17 @@
 #ifndef DOWNLOADMANAGER_H
 #define DOWNLOADMANAGER_H
 
+#include "fbbrowser.h"
 #include <QtWebKit>
 
 class DownloadManager : public QObject
 {
-Q_OBJECT
+	Q_OBJECT
 
 public:
 	DownloadManager(const QUrl& baseUrl);
 	~DownloadManager();
-	void get(QString& filename);
+	void processDownloadRequest(QString& filename);
 
 private:
 	// Object required for downloading.
@@ -27,6 +28,9 @@ private:
 signals:
 	void finished();
 
+public slots:
+	void downloadFile(QString name);
+
 private slots:
 	void startNextDownload();
 	void downloadReady();
diff --git a/src/fbbrowser.cpp b/src/fbbrowser.cpp
index a75c209..51cf7d6 100644
--- a/src/fbbrowser.cpp
+++ b/src/fbbrowser.cpp
@@ -34,16 +34,13 @@ fbbrowser::fbbrowser(const QUrl & url)
 	}
 	// **** TEST ****
 	DownloadManager* dm = new DownloadManager(baseUrl);
-	QString qs;
-
-	qs = "test.php";
-	dm->get(qs);
-	qs = "blacklist.txt";
-	dm->get(qs);
-	qs = "whitelist.tar.gz";
-	dm->get(qs);
-	// **** TEST ****
+	QObject::connect(this, SIGNAL(downloadFile(QString)), dm, SLOT(downloadFile(QString)));
+	emit downloadFile(QString("test.php"));
+	emit downloadFile(QString("blacklist.txt"));
+	emit downloadFile(QString("whitelist.tar.gz"));
+
 	qDebug() << "DM blocking app?";
+	// **** TEST ****
 
 	//remove the window decoration
 	this->setWindowFlags(Qt::SplashScreen);
diff --git a/src/fbbrowser.h b/src/fbbrowser.h
index edaa350..967c6e0 100644
--- a/src/fbbrowser.h
+++ b/src/fbbrowser.h
@@ -3,6 +3,7 @@
 
 #include "DownloadManager.h"
 #include "jsObject.h"
+#include <QString>
 #include <QtGui>
 #include <QtNetwork>
 
@@ -59,6 +60,7 @@ private slots:
 	void showHelloWorld_Slot();
 
 signals:
+	void downloadFile(QString filename);
     void signalQuitAll();
 };