diff options
| author | Jonathan Bauer | 2011-03-06 14:16:02 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2011-03-06 14:16:02 +0100 |
| commit | e910cdf8909542895102e8dd459ef2c871abc371 (patch) | |
| tree | 26b941fff4b6bd821224beff764ca663fc3d04d1 /src | |
| parent | updated JSObject to only mediate functions calls, fbbrowser does all the info... (diff) | |
| download | fbgui-e910cdf8909542895102e8dd459ef2c871abc371.tar.gz fbgui-e910cdf8909542895102e8dd459ef2c871abc371.tar.xz fbgui-e910cdf8909542895102e8dd459ef2c871abc371.zip | |
misc
Diffstat (limited to 'src')
| -rw-r--r-- | src/JSObject.cpp | 1 | ||||
| -rw-r--r-- | src/JSObject.h | 8 | ||||
| -rw-r--r-- | src/fbbrowser.cpp | 1 |
3 files changed, 1 insertions, 9 deletions
diff --git a/src/JSObject.cpp b/src/JSObject.cpp index 5f9c4ab..2775359 100644 --- a/src/JSObject.cpp +++ b/src/JSObject.cpp @@ -6,7 +6,6 @@ */ #include "JSObject.h" -#include <QTime> //------------------------------------------------------------------------------------------------------- JSObject::JSObject(QWebFrame *parent) { diff --git a/src/JSObject.h b/src/JSObject.h index 427aae8..d9a15a2 100644 --- a/src/JSObject.h +++ b/src/JSObject.h @@ -11,7 +11,6 @@ #define JSOBJECT_H_ #include "fbbrowser.h" -#include <QObject> typedef enum { @@ -53,7 +52,7 @@ signals: void signalQuitAll(); /* // should be the last signal to be emited. - // Will close the browser and continues the boot sequenze + // Will close the browser and continues the boot sequence void closeBrowser(); // will start the download of all needed files for the following boot sequence void startDownload(QString filename); @@ -72,11 +71,6 @@ signals: // starts the slot which is responsible for extracting the hard drive devices of the machine // the array of hard rive devices will be the parameter of a javascript function which will present it on the // webpag void getHardDrives(); - - // for testing - void showTime(); - void showDate(); - void showHelloWorld(); */ public slots: diff --git a/src/fbbrowser.cpp b/src/fbbrowser.cpp index f797785..6833119 100644 --- a/src/fbbrowser.cpp +++ b/src/fbbrowser.cpp @@ -76,7 +76,6 @@ fbbrowser::fbbrowser(const QUrl & url) // Enable Javascript through JSObject. qwf = view->page()->mainFrame(); jso = new JSObject(qwf); - //jso->setParent(qwf); QObject::connect(qwf, SIGNAL(javaScriptWindowObjectCleared()), jso, SLOT(attachToDOM())); QObject::connect(jso, SIGNAL(getMAC()), this, SLOT(getMAC())); |