Code cleanup, JSO class continued, added webkitTest.html for reference

1 files changed, 8 insertions, 38 deletions

diff --git a/src/fbbrowser.h b/src/fbbrowser.h
index e349b98..7c09cef 100644
--- a/src/fbbrowser.h
+++ b/src/fbbrowser.h
@@ -1,18 +1,14 @@
 #ifndef FBBROWSER_H
 #define FBBROWSER_H
 
+#include "JSObject.h"
 #include "DownloadManager.h"
-
-#include "jsObject.h"
 #include <QString>
 #include <QtGui>
 #include <QtNetwork>
 
 class QWebView;
-//QT_BEGIN_NAMESPACE
-//class QLineEdit;
-//QT_END_NAMESPACE
-
+class JSObject;
 class DownloadManager;
 
 class fbbrowser : public QMainWindow
@@ -22,51 +18,25 @@ class fbbrowser : public QMainWindow
 public:
     fbbrowser(const QUrl& url);
     ~fbbrowser();
-    void printusage();
-    Q_INVOKABLE void writeText(QString text); //used for writing web content into a file
 
 private:
     QUrl baseUrl;
     QNetworkRequest request;
     QNetworkReply *reply;
     QWebView *view;
+    QWebFrame* qwf;
     QNetworkAccessManager *manager;
 
-    // Temporal stuff for the download function...
-    // Private download function.
-
 	//the jsObject. connection to the webpage for emiting signals
-	jsObject *jso;
+	JSObject *jso;
 	DownloadManager* dm;
-	// connects all jsObject signals with fbbrowser slots
-	void connectJsSignalsToSlots();
-
-
-public slots:
-	void updateProgressSlot(int i);
-
-private slots:
-    void addJSObject();
-    void getSysInfo();
-
-	// slots which are emited by the jsObject signals
-
-	void quitAll();
-	void startDownload_Slot(QString filename);
-	void getMacAddress_Slot();
-	void getIpAddress_Slot();
-	void getIntegratedHardwareDevices_Slot();
-	void getUsbDevices_Slot();
-	void getHardDrives_Slot();
-
-	// for testing reasons
-	void showTime_Slot();
-	void showDate_Slot();
-	void showHelloWorld_Slot();
 
 signals:
 	void downloadFile(QString filename);
-    void signalQuitAll();
+	void killApp();
+
+public slots:
+	void quit();
 };
 
 #endif // FBBROWSER_H