summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSebastian Schmelzer2011-02-01 17:41:26 +0100
committerSebastian Schmelzer2011-02-01 17:41:26 +0100
commit7de36233d43600f0af45cf83ed2ccee36ae8b2fd (patch)
treeb895826f882bae610fb3cdc0d1bf7d9f782b0737 /src
parentremoved unneeded const (diff)
downloadfbgui-7de36233d43600f0af45cf83ed2ccee36ae8b2fd.tar.gz
fbgui-7de36233d43600f0af45cf83ed2ccee36ae8b2fd.tar.xz
fbgui-7de36233d43600f0af45cf83ed2ccee36ae8b2fd.zip
fix jsobject :)
Diffstat (limited to 'src')
-rw-r--r--src/fbbrowser.cpp2
-rw-r--r--src/jsObject.cpp20
-rw-r--r--src/jsObject.h20
3 files changed, 22 insertions, 20 deletions
diff --git a/src/fbbrowser.cpp b/src/fbbrowser.cpp
index 2bcc812..a4ce046 100644
--- a/src/fbbrowser.cpp
+++ b/src/fbbrowser.cpp
@@ -105,7 +105,7 @@ fbbrowser::~fbbrowser()
//
void fbbrowser::addJSObject()
{
- jsObject jso = new jsObject(this);
+ jsObject jso = new jsObject();
view->page()->mainFrame()->addToJavaScriptWindowObject(QString("jsObject"), jso);
}
diff --git a/src/jsObject.cpp b/src/jsObject.cpp
index 248be3e..ee7f670 100644
--- a/src/jsObject.cpp
+++ b/src/jsObject.cpp
@@ -7,8 +7,7 @@
#include "jsObject.h"
-jsObject::jsObject(const fbbrowser &browser ) {
- this.browser = browser;
+jsObject::jsObject() {
}
@@ -16,24 +15,23 @@ jsObject::~jsObject() {
// TODO Auto-generated destructor stub
}
-void jsObject::performAction(Action a)
+void jsObject::performAction(jsAction a)
{
switch (a)
{
- case Action::QUIT :
- browser.quitAll();
+ case QUIT :
break;
- case Action::SHOW_TIME :
+ case SHOW_TIME :
break;
- case Action::SHOW_DATE :
+ case SHOW_DATE :
break;
- case Action::SHOW_USB_DEVICES :
+ case SHOW_USB_DEVICES :
break;
- case Action::SHOW_HARDDRIVES :
+ case SHOW_HARDDRIVES :
break;
- case Action::SHOW_IP_ADDRESS :
+ case SHOW_IP_ADDRESS :
break;
- case Action::SHOW_MAC_ADDRESS :
+ case SHOW_MAC_ADDRESS :
break;
}
diff --git a/src/jsObject.h b/src/jsObject.h
index 20ae403..a025c5a 100644
--- a/src/jsObject.h
+++ b/src/jsObject.h
@@ -8,7 +8,10 @@
#ifndef JSOBJECT_H_
#define JSOBJECT_H_
-enum Action
+#include <QObject>
+#include "fbbrowser.h"
+
+typedef enum
{
QUIT,
SHOW_USB_DEVICES,
@@ -17,20 +20,21 @@ enum Action
SHOW_IP_ADDRESS,
SHOW_TIME,
SHOW_DATE
-};
+} jsAction;
-class jsObject {
+class jsObject : public QObject
+{
Q_OBJECT
public:
- jsObject(const fbbrowser & browser);
+ jsObject();
virtual ~jsObject();
-private:
- fbbrowser browser;
+//private:
+// fbbrowser browser;
-slots:
- void performAction(Action a));
+private slots:
+ void performAction(jsAction a);
};