From 200a51b6703e1296a1386d7a937fcc8d01be68ec Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Sat, 5 Mar 2011 00:02:12 +0100
Subject: little things...

---
 src/JSObject.cpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/JSObject.cpp')

diff --git a/src/JSObject.cpp b/src/JSObject.cpp
index 110f200..57fa984 100644
--- a/src/JSObject.cpp
+++ b/src/JSObject.cpp
@@ -10,7 +10,7 @@
 #include <QNetworkInterface>
 //-------------------------------------------------------------------------------------------------------
 JSObject::JSObject(QWebFrame* qwf) {
-	target = qwf;
+	owner = qwf;
 }
 //-------------------------------------------------------------------------------------------------------
 JSObject::~JSObject() {}
@@ -18,7 +18,7 @@ JSObject::~JSObject() {}
 void JSObject::enableJavascriptAccess()
 {
 	// Attaches itself to the DOM
-	target->addToJavaScriptWindowObject(QString("jsObject"), this);
+	owner->addToJavaScriptWindowObject(QString("jsObject"), this);
 
 	// connect the signals of the jsObject to the slots of the fbbrowser
 	QObject::connect(this, SIGNAL(closeBrowser()), this, SLOT(quitAll()));
@@ -40,14 +40,13 @@ void JSObject::enableJavascriptAccess()
 //-------------------------------------------------------------------------------------------------------
 void JSObject::startDownload_Slot(QString filename)
 {
-	qDebug() << "Returned from JS: " << filename;
 	emit downloadFile(filename);
 }
 //-------------------------------------------------------------------------------------------------------
 void JSObject::updateProgressSlot(int i)
 {
 	QString code = QString("updateProgress(\%1)").arg(i);
-	target->evaluateJavaScript(code);
+	owner->evaluateJavaScript(code);
 }
 //-------------------------------------------------------------------------------------------------------
 void JSObject::getMacAddress_Slot()
@@ -65,9 +64,8 @@ void JSObject::getMacAddress_Slot()
 	}
 
 	//TODO:: edit jsFunction name
-	QString code;
-	code = QString("printMacAddress(\"%1\")").arg(macAddress);
-	target->evaluateJavaScript(code);
+	QString code = QString("printMacAddress(\"%1\")").arg(macAddress);
+	owner->evaluateJavaScript(code);
 }
 //-------------------------------------------------------------------------------------------------------
 void JSObject::showTime_Slot()
@@ -78,19 +76,19 @@ void JSObject::showTime_Slot()
 	//TODO:: edit jsFunction name
 	QString code;
 	code = QString("printTime(\"%1\")").arg(time);
-	target->evaluateJavaScript(code);
+	owner->evaluateJavaScript(code);
 }
 //-------------------------------------------------------------------------------------------------------
 void JSObject::showDate_Slot()
 {
 	QString date = QDate::currentDate().toString("dd.MM.yyyy");
 	//TODO:: edit jsFunction name
-	target->evaluateJavaScript("");
+	owner->evaluateJavaScript("");
 }
 //-------------------------------------------------------------------------------------------------------
 void JSObject::showHelloWorld_Slot()
 {
-	target->evaluateJavaScript("alert(\"Hello World\")");
+	owner->evaluateJavaScript("alert(\"Hello World\")");
 }
 
 //-------------------------------------------------------------------------------------------------------
-- 
cgit v1.2.3-55-g7522