compiling version....

6 files changed, 61 insertions, 41 deletions

diff --git a/src/Makefile.Debug b/src/Makefile.Debug
index 63474ce..074d75a 100644
--- a/src/Makefile.Debug
+++ b/src/Makefile.Debug
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: fbgui
-# Generated by qmake (2.01a) (Qt 4.7.1) on: Tue Feb 1 15:52:20 2011
+# Generated by qmake (2.01a) (Qt 4.7.1) on: Tue Feb 1 17:28:25 2011
 # Project:  fbgui.pro
 # Template: app
 #############################################################################
@@ -43,15 +43,15 @@ OBJECTS_DIR   = debug/
 ####### Files
 
 SOURCES       = fbgui.cpp \
-		fbbrowser.cpp \
-		downloadmanager.cpp debug/moc_fbbrowser.cpp \
-		debug/moc_downloadmanager.cpp \
+		downloadmanager.cpp \
+		fbbrowser.cpp debug/moc_fbgui.cpp \
+		debug/moc_fbbrowser.cpp \
 		debug/qrc_fbgui.cpp
 OBJECTS       = debug/fbgui.o \
-		debug/fbbrowser.o \
 		debug/downloadmanager.o \
+		debug/fbbrowser.o \
+		debug/moc_fbgui.o \
 		debug/moc_fbbrowser.o \
-		debug/moc_downloadmanager.o \
 		debug/qrc_fbgui.o
 DIST          = /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/g++.conf \
 		/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/unix.conf \
@@ -113,7 +113,7 @@ qmake:  FORCE
 
 dist: 
 	@$(CHK_DIR_EXISTS) debug/fbgui1.0.0 || $(MKDIR) debug/fbgui1.0.0 
-	$(COPY_FILE) --parents $(SOURCES) $(DIST) debug/fbgui1.0.0/ && $(COPY_FILE) --parents fbbrowser.h downloadmanager.h debug/fbgui1.0.0/ && $(COPY_FILE) --parents fbgui.qrc debug/fbgui1.0.0/ && $(COPY_FILE) --parents fbgui.cpp fbbrowser.cpp downloadmanager.cpp debug/fbgui1.0.0/ && $(COPY_FILE) --parents fbbrowser.ui debug/fbgui1.0.0/ && (cd `dirname debug/fbgui1.0.0` && $(TAR) fbgui1.0.0.tar fbgui1.0.0 && $(COMPRESS) fbgui1.0.0.tar) && $(MOVE) `dirname debug/fbgui1.0.0`/fbgui1.0.0.tar.gz . && $(DEL_FILE) -r debug/fbgui1.0.0
+	$(COPY_FILE) --parents $(SOURCES) $(DIST) debug/fbgui1.0.0/ && $(COPY_FILE) --parents fbgui.h downloadmanager.h fbbrowser.h debug/fbgui1.0.0/ && $(COPY_FILE) --parents fbgui.qrc debug/fbgui1.0.0/ && $(COPY_FILE) --parents fbgui.cpp downloadmanager.cpp fbbrowser.cpp debug/fbgui1.0.0/ && $(COPY_FILE) --parents fbbrowser.ui debug/fbgui1.0.0/ && (cd `dirname debug/fbgui1.0.0` && $(TAR) fbgui1.0.0.tar fbgui1.0.0 && $(COMPRESS) fbgui1.0.0.tar) && $(MOVE) `dirname debug/fbgui1.0.0`/fbgui1.0.0.tar.gz . && $(DEL_FILE) -r debug/fbgui1.0.0
 
 
 clean:compiler_clean 
@@ -134,16 +134,16 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean
 
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
 
-compiler_moc_header_make_all: debug/moc_fbbrowser.cpp debug/moc_downloadmanager.cpp
+compiler_moc_header_make_all: debug/moc_fbgui.cpp debug/moc_fbbrowser.cpp
 compiler_moc_header_clean:
-	-$(DEL_FILE) debug/moc_fbbrowser.cpp debug/moc_downloadmanager.cpp
+	-$(DEL_FILE) debug/moc_fbgui.cpp debug/moc_fbbrowser.cpp
+debug/moc_fbgui.cpp: fbgui.h
+	/usr/local/Trolltech/QtEmbedded-4.7.1/bin/moc $(DEFINES) $(INCPATH) fbgui.h -o debug/moc_fbgui.cpp
+
 debug/moc_fbbrowser.cpp: downloadmanager.h \
 		fbbrowser.h
 	/usr/local/Trolltech/QtEmbedded-4.7.1/bin/moc $(DEFINES) $(INCPATH) fbbrowser.h -o debug/moc_fbbrowser.cpp
 
-debug/moc_downloadmanager.cpp: downloadmanager.h
-	/usr/local/Trolltech/QtEmbedded-4.7.1/bin/moc $(DEFINES) $(INCPATH) downloadmanager.h -o debug/moc_downloadmanager.cpp
-
 compiler_rcc_make_all: debug/qrc_fbgui.cpp
 compiler_rcc_clean:
 	-$(DEL_FILE) debug/qrc_fbgui.cpp
@@ -177,19 +177,19 @@ debug/fbgui.o: fbgui.cpp fbbrowser.h \
 		fbgui.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/fbgui.o fbgui.cpp
 
+debug/downloadmanager.o: downloadmanager.cpp downloadmanager.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/downloadmanager.o downloadmanager.cpp
+
 debug/fbbrowser.o: fbbrowser.cpp fbbrowser.h \
 		downloadmanager.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/fbbrowser.o fbbrowser.cpp
 
-debug/downloadmanager.o: downloadmanager.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/downloadmanager.o downloadmanager.cpp
+debug/moc_fbgui.o: debug/moc_fbgui.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_fbgui.o debug/moc_fbgui.cpp
 
 debug/moc_fbbrowser.o: debug/moc_fbbrowser.cpp 
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_fbbrowser.o debug/moc_fbbrowser.cpp
 
-debug/moc_downloadmanager.o: debug/moc_downloadmanager.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_downloadmanager.o debug/moc_downloadmanager.cpp
-
 debug/qrc_fbgui.o: debug/qrc_fbgui.cpp 
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/qrc_fbgui.o debug/qrc_fbgui.cpp
 
diff --git a/src/Makefile.Release b/src/Makefile.Release
index 673170b..ae4802e 100644
--- a/src/Makefile.Release
+++ b/src/Makefile.Release
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: fbgui
-# Generated by qmake (2.01a) (Qt 4.7.1) on: Tue Feb 1 15:52:20 2011
+# Generated by qmake (2.01a) (Qt 4.7.1) on: Tue Feb 1 17:28:25 2011
 # Project:  fbgui.pro
 # Template: app
 #############################################################################
@@ -43,15 +43,15 @@ OBJECTS_DIR   = release/
 ####### Files
 
 SOURCES       = fbgui.cpp \
-		fbbrowser.cpp \
-		downloadmanager.cpp release/moc_fbbrowser.cpp \
-		release/moc_downloadmanager.cpp \
+		downloadmanager.cpp \
+		fbbrowser.cpp release/moc_fbgui.cpp \
+		release/moc_fbbrowser.cpp \
 		release/qrc_fbgui.cpp
 OBJECTS       = release/fbgui.o \
-		release/fbbrowser.o \
 		release/downloadmanager.o \
+		release/fbbrowser.o \
+		release/moc_fbgui.o \
 		release/moc_fbbrowser.o \
-		release/moc_downloadmanager.o \
 		release/qrc_fbgui.o
 DIST          = /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/g++.conf \
 		/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/unix.conf \
@@ -113,7 +113,7 @@ qmake:  FORCE
 
 dist: 
 	@$(CHK_DIR_EXISTS) release/fbgui1.0.0 || $(MKDIR) release/fbgui1.0.0 
-	$(COPY_FILE) --parents $(SOURCES) $(DIST) release/fbgui1.0.0/ && $(COPY_FILE) --parents fbbrowser.h downloadmanager.h release/fbgui1.0.0/ && $(COPY_FILE) --parents fbgui.qrc release/fbgui1.0.0/ && $(COPY_FILE) --parents fbgui.cpp fbbrowser.cpp downloadmanager.cpp release/fbgui1.0.0/ && $(COPY_FILE) --parents fbbrowser.ui release/fbgui1.0.0/ && (cd `dirname release/fbgui1.0.0` && $(TAR) fbgui1.0.0.tar fbgui1.0.0 && $(COMPRESS) fbgui1.0.0.tar) && $(MOVE) `dirname release/fbgui1.0.0`/fbgui1.0.0.tar.gz . && $(DEL_FILE) -r release/fbgui1.0.0
+	$(COPY_FILE) --parents $(SOURCES) $(DIST) release/fbgui1.0.0/ && $(COPY_FILE) --parents fbgui.h downloadmanager.h fbbrowser.h release/fbgui1.0.0/ && $(COPY_FILE) --parents fbgui.qrc release/fbgui1.0.0/ && $(COPY_FILE) --parents fbgui.cpp downloadmanager.cpp fbbrowser.cpp release/fbgui1.0.0/ && $(COPY_FILE) --parents fbbrowser.ui release/fbgui1.0.0/ && (cd `dirname release/fbgui1.0.0` && $(TAR) fbgui1.0.0.tar fbgui1.0.0 && $(COMPRESS) fbgui1.0.0.tar) && $(MOVE) `dirname release/fbgui1.0.0`/fbgui1.0.0.tar.gz . && $(DEL_FILE) -r release/fbgui1.0.0
 
 
 clean:compiler_clean 
@@ -134,16 +134,16 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean
 
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
 
-compiler_moc_header_make_all: release/moc_fbbrowser.cpp release/moc_downloadmanager.cpp
+compiler_moc_header_make_all: release/moc_fbgui.cpp release/moc_fbbrowser.cpp
 compiler_moc_header_clean:
-	-$(DEL_FILE) release/moc_fbbrowser.cpp release/moc_downloadmanager.cpp
+	-$(DEL_FILE) release/moc_fbgui.cpp release/moc_fbbrowser.cpp
+release/moc_fbgui.cpp: fbgui.h
+	/usr/local/Trolltech/QtEmbedded-4.7.1/bin/moc $(DEFINES) $(INCPATH) fbgui.h -o release/moc_fbgui.cpp
+
 release/moc_fbbrowser.cpp: downloadmanager.h \
 		fbbrowser.h
 	/usr/local/Trolltech/QtEmbedded-4.7.1/bin/moc $(DEFINES) $(INCPATH) fbbrowser.h -o release/moc_fbbrowser.cpp
 
-release/moc_downloadmanager.cpp: downloadmanager.h
-	/usr/local/Trolltech/QtEmbedded-4.7.1/bin/moc $(DEFINES) $(INCPATH) downloadmanager.h -o release/moc_downloadmanager.cpp
-
 compiler_rcc_make_all: release/qrc_fbgui.cpp
 compiler_rcc_clean:
 	-$(DEL_FILE) release/qrc_fbgui.cpp
@@ -177,19 +177,19 @@ release/fbgui.o: fbgui.cpp fbbrowser.h \
 		fbgui.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/fbgui.o fbgui.cpp
 
+release/downloadmanager.o: downloadmanager.cpp downloadmanager.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/downloadmanager.o downloadmanager.cpp
+
 release/fbbrowser.o: fbbrowser.cpp fbbrowser.h \
 		downloadmanager.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/fbbrowser.o fbbrowser.cpp
 
-release/downloadmanager.o: downloadmanager.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/downloadmanager.o downloadmanager.cpp
+release/moc_fbgui.o: release/moc_fbgui.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_fbgui.o release/moc_fbgui.cpp
 
 release/moc_fbbrowser.o: release/moc_fbbrowser.cpp 
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_fbbrowser.o release/moc_fbbrowser.cpp
 
-release/moc_downloadmanager.o: release/moc_downloadmanager.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_downloadmanager.o release/moc_downloadmanager.cpp
-
 release/qrc_fbgui.o: release/qrc_fbgui.cpp 
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/qrc_fbgui.o release/qrc_fbgui.cpp
 
diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index d39aa14..bfaf22a 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -1,9 +1,24 @@
 #include "downloadmanager.h"
 
-void DownloadManager::downloadFile()
+void DownloadManager::downloadFile(QString& filename)
 {
+	this->filename = filename;
 	this->reply = this->qnam->get(this->request);
-			//->get(request);
+	qiod = reply;
+	QObject::connect(this->reply, SIGNAL(finished()), this, SLOT(saveData()));
+}
+
+void DownloadManager::saveData()
+{
+	QFile outfile(this->filename);
+	if (!outfile.open(QIODevice::WriteOnly))
+	{
+		qDebug() << "Couldnt open file! exiting...";
+		exit(1);
+	}
+	outfile.write(this->reply->readAll());
+	outfile.close();
+
 }
 
 void DownloadManager::setUrl(QUrl& qurl)
diff --git a/src/downloadmanager.h b/src/downloadmanager.h
index f4c070a..578fa0a 100644
--- a/src/downloadmanager.h
+++ b/src/downloadmanager.h
@@ -3,22 +3,27 @@
 
 #include <QtWebKit>
 
-class DownloadManager
+class DownloadManager : public QObject
 {
 public:
 	DownloadManager();
 	~DownloadManager();
 	void setUrl(QUrl& qurl);
 	void print();
-	void downloadFile();
+	void downloadFile(QString& filename);
 
 private:
 	QNetworkAccessManager* qnam;
 	QUrl baseUrl;
+	QString filename;
 	QNetworkRequest request;
 	QNetworkReply* reply;
 	QIODevice* qiod;
 
+
+private slots:
+	void saveData();
+
 };
 
 #endif // DOWNLOADMANAGER_H
diff --git a/src/fbbrowser.cpp b/src/fbbrowser.cpp
index a4ce046..d4762d8 100644
--- a/src/fbbrowser.cpp
+++ b/src/fbbrowser.cpp
@@ -105,7 +105,7 @@ fbbrowser::~fbbrowser()
 //
 void fbbrowser::addJSObject()
 {
-	jsObject jso = new jsObject();
+	jsObject *jso = new jsObject();
 	view->page()->mainFrame()->addToJavaScriptWindowObject(QString("jsObject"), jso);
 }
 
diff --git a/src/fbgui.pro b/src/fbgui.pro
index 551941b..0d4e767 100644
--- a/src/fbgui.pro
+++ b/src/fbgui.pro
@@ -7,8 +7,8 @@ QT += core \
     webkit \
     network
 HEADERS += jsObject.h \
-	   downloadmanager.h \
-    	   fbbrowser.h
+    downloadmanager.h \
+    fbbrowser.h
 SOURCES += jsObject.cpp \
     fbgui.cpp \
     downloadmanager.cpp \