jsobject member renaming

4 files changed, 15 insertions, 13 deletions

diff --git a/src/JSObject.cpp b/src/JSObject.cpp
index 10cffad..86d7c15 100644
--- a/src/JSObject.cpp
+++ b/src/JSObject.cpp
@@ -9,8 +9,8 @@
 #include <QTime>
 #include <QNetworkInterface>
 //-------------------------------------------------------------------------------------------------------
-JSObject::JSObject(QWebFrame* qwf) {
-	owner = qwf;
+JSObject::JSObject(QWebFrame *parent) {
+	_parent = parent;
 }
 //-------------------------------------------------------------------------------------------------------
 JSObject::~JSObject() {}
@@ -18,14 +18,14 @@ JSObject::~JSObject() {}
 void JSObject::attachToDOM()
 {
 	// Attaches itself to the DOM
-	owner->addToJavaScriptWindowObject(QString("jsObject"), this);
+	_parent->addToJavaScriptWindowObject(QString("jsObject"), this);
 }
 //-------------------------------------------------------------------------------------------------------
 void JSObject::startDownload(QString filename)
 {
 	if (filename.isEmpty())
 	{
-		owner->evaluateJavaScript("alert(\"No filename!\")");
+		_parent->evaluateJavaScript("alert(\"No filename!\")");
 		return;
 	}
 	// Erm fix this
@@ -41,7 +41,7 @@ void JSObject::updateProgress(int i)
 	if (i == 0)
 		return;
 	QString code = QString("updateProgress(\%1)").arg(i);
-	owner->evaluateJavaScript(code);
+	_parent->evaluateJavaScript(code);
 }
 //-------------------------------------------------------------------------------------------------------
 void JSObject::getMacAddress()
@@ -60,7 +60,7 @@ void JSObject::getMacAddress()
 
 	//TODO:: edit jsFunction name
 	QString code = QString("printMacAddress(\"%1\")").arg(macAddress);
-	owner->evaluateJavaScript(code);
+	_parent->evaluateJavaScript(code);
 }
 //-------------------------------------------------------------------------------------------------------
 void JSObject::showTime()
@@ -71,19 +71,19 @@ void JSObject::showTime()
 	//TODO:: edit jsFunction name
 	QString code;
 	code = QString("printTime(\"%1\")").arg(time);
-	owner->evaluateJavaScript(code);
+	_parent->evaluateJavaScript(code);
 }
 //-------------------------------------------------------------------------------------------------------
 void JSObject::showDate()
 {
 	QString date = QDate::currentDate().toString("dd.MM.yyyy");
 	//TODO:: edit jsFunction name
-	owner->evaluateJavaScript("");
+	_parent->evaluateJavaScript("");
 }
 //-------------------------------------------------------------------------------------------------------
 void JSObject::showHelloWorld()
 {
-	owner->evaluateJavaScript("alert(\"Hello World\")");
+	_parent->evaluateJavaScript("alert(\"Hello World\")");
 }
 
 //-------------------------------------------------------------------------------------------------------
diff --git a/src/JSObject.h b/src/JSObject.h
index b012958..ca6e3db 100644
--- a/src/JSObject.h
+++ b/src/JSObject.h
@@ -29,10 +29,12 @@ class QWebFrame;
 class JSObject : public QObject
 {
 	Q_OBJECT
+
 private:
-	QWebFrame* owner;
+	QWebFrame* _parent;
+
 public:
-	JSObject(QWebFrame* qwf);
+	JSObject(QWebFrame *parent);
 	virtual ~JSObject();
 
 
diff --git a/src/fbbrowser.cpp b/src/fbbrowser.cpp
index 6098afd..df4b7ed 100644
--- a/src/fbbrowser.cpp
+++ b/src/fbbrowser.cpp
@@ -26,6 +26,7 @@ fbbrowser::fbbrowser(const QUrl & url)
 	// TODO: error differentiation
 	if(reply->error() == QNetworkReply::NoError)
 	{
+		qDebug() << "Loading: " << url.toString();
 		view->load(url);
 	}
 	else 
@@ -38,6 +39,7 @@ 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(signalQuitAll()), this, SLOT(quit()));
diff --git a/src/fbgui.cpp b/src/fbgui.cpp
index 03de3b5..7a58817 100644
--- a/src/fbgui.cpp
+++ b/src/fbgui.cpp
@@ -7,7 +7,6 @@
 
 void fbgui::setUrl(QUrl& url)
 {
-	qDebug() << "Set URL to: " << url.toString();
 	this->_url=url;
 }
 
@@ -15,7 +14,6 @@ void fbgui::startBrowser()
 {
     _fbb = new fbbrowser(_url);
     QObject::connect(_fbb, SIGNAL(killApp()), this->parent(), SLOT(quit()));
-    //_fbb->show();
 }
 
 fbgui::fbgui()