From 2b0eb53de0c2e27f1950e467275f35c43d3a60f0 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Sat, 5 Mar 2011 00:27:04 +0100
Subject: euhm yeah...

---
 src/JSObject.h | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'src/JSObject.h')

diff --git a/src/JSObject.h b/src/JSObject.h
index 5d543e0..282b232 100644
--- a/src/JSObject.h
+++ b/src/JSObject.h
@@ -43,14 +43,16 @@ public:
 // define all the needed signals.
 // every action gets its own signal. (the former enum is not needed anymore)
 // the signals will be connected in the fbbrowser class with slots of the fbbrowser class
+
 signals:
+	void downloadFile(QString filename);
+	void signalQuitAll();
+	/*
 	// should be the last signal to be emited. 
 	// Will close the browser and continues the boot sequenze
 	void closeBrowser();
-	void signalQuitAll();
 	// will start the download of all needed files for the following boot sequence
 	void startDownload(QString filename);
-	void downloadFile(QString filename);
 	// starts the slot which is responsible for extracting the MAC address of the machine
 	// the MAC Address will be the parameter of a javascript function which will present it on the webpage
 	void getMacAddress();
@@ -71,28 +73,29 @@ signals:
 	void showTime();
 	void showDate();
 	void showHelloWorld();
+	*/
 
 public slots:
 
-	void enableJavascriptAccess();
+	void attachToDOM();
 	// slots which are emited by the jsObject signals
 
 	void quitAll();
-	void startDownload_Slot(QString filename);
-	void updateProgressSlot(int i);
+	void startDownload(QString filename);
+	void updateProgress(int i);
 
 	// System info stuff
 	void getSysInfo();
-	void getMacAddress_Slot();
-	void getIpAddress_Slot();
-	void getIntegratedHardwareDevices_Slot();
-	void getUsbDevices_Slot();
-	void getHardDrives_Slot();
+	void getMacAddress();
+	void getIpAddress();
+	void getIntegratedHardwareDevices();
+	void getUsbDevices();
+	void getHardDrives();
 
 	// for testing reasons
-	void showTime_Slot();
-	void showDate_Slot();
-	void showHelloWorld_Slot();
+	void showTime();
+	void showDate();
+	void showHelloWorld();
 
 };
 
-- 
cgit v1.2.3-55-g7522