From 84bd2b0925c8825b819b7b062d9f2a351f2e96b5 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 7 Mar 2011 17:44:05 +0100 Subject: Reworked code structure --- src/JSObject.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/JSObject.h') diff --git a/src/JSObject.h b/src/JSObject.h index 3229def..e700ec8 100644 --- a/src/JSObject.h +++ b/src/JSObject.h @@ -21,7 +21,7 @@ typedef enum SHOW_IP_ADDRESS, SHOW_TIME, SHOW_DATE -} jsAction; +} JSAction; class fbbrowser; class QWebFrame; @@ -35,8 +35,6 @@ private: public: JSObject(QWebFrame *parent); virtual ~JSObject(); - - // no slots needed. class provides only signals // private slots: // void performAction(jsAction a); @@ -46,6 +44,7 @@ public: // the signals will be connected in the fbbrowser class with slots of the fbbrowser class signals: + void processAction(QString action); void requestFile(QString& filename); void getMAC(); void getTime(); @@ -77,11 +76,12 @@ signals: public slots: /* Slots to commucate with fbbrowser. */ void attachToDOM(); - void updateProgress(int i); + void updateProgressBar(int i); void printMAC(QString& macAddress); void printTime(QString& time); /* Slots for calling from within Javascript. */ + void doAction(QString action); void quitAll(); void startDownload(QString filename); void getMacAddress(); -- cgit v1.2.3-55-g7522