More work on webkit

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5994 17fca916-40b9-46aa-a4ea-0a15b648b75c

2 files changed, 10 insertions, 40 deletions

diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp
index 98b0c2ab1..f522feade 100644
--- a/src/modules/objects/KvsObject_webView.cpp
+++ b/src/modules/objects/KvsObject_webView.cpp
@@ -252,7 +252,7 @@ const char * const actions_tbl[] = {
 		Returns the string representation of element <element_id>.
 		!fn: string $setPlainText(<element_id>)
 		Set the string representation of the  element <element_id>.
-		!fn: $setAttribute(<element_id>,<name:string>,<value:string>)
+		!fn: $setElementAttribute(<element_id>,<name:string>,<value:string>)
 		Sets the attribute <name> with value <value> to the element <element_id>.
 		!fn: $setWebSetting(<name:string>,<value:bool>)
 		Enables or disables the <name> setting depending on <value>.
@@ -346,9 +346,9 @@ KVSO_BEGIN_REGISTERCLASS(KvsObject_webView,"webview","widget")
 	// element info
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_webView,elementTagName)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_webView,getDocumentElement)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_webView,attributeNames)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_webView,setAttribute)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_webView,attribute)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_webView,elementAttributeNames)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_webView,setElementAttribute)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_webView,elementAttribute)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_webView,hitTestContent)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_webView,toPlainText)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_webView,setPlainText)
@@ -738,7 +738,7 @@ KVSO_CLASS_FUNCTION(webView,elementTagName)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(webView,setAttribute)
+KVSO_CLASS_FUNCTION(webView,setElementAttribute)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szName,szValue;
@@ -850,7 +850,7 @@ KVSO_CLASS_FUNCTION(webView,findText)
 	((QWebView *)widget())->findText(szName,(QWebPage::FindFlags)findflag);
 	return true;
 }
-KVSO_CLASS_FUNCTION(webView,attribute)
+KVSO_CLASS_FUNCTION(webView,elementAttribute)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szName;
@@ -877,7 +877,7 @@ KVSO_CLASS_FUNCTION(webView,attribute)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(webView,attributeNames)
+KVSO_CLASS_FUNCTION(webView,elementAttributeNames)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_int_t iEleId;
@@ -1298,32 +1298,6 @@ void KvsObject_webView::slotLoadFinished(bool bOk)
 	KviKvsVariantList params(new KviKvsVariant(bOk));
 	callFunction(this,"loadFinishedEvent",&params);
 }
-void KvsObject_webView::pageEventFilter(QVariant v1)
-{
-	qDebug("come variant");
-	return;
-	//signalName();
-	//if (ele.isNull()) {qDebug ("nulle element");return;}
-	//int id=insertElement(ele);
-	/*qDebug("Elemento che arriva e id %i",id);//%s",szEvent.toUtf8().data());
-	KviKvsVariantList params;
-	params.append(new KviKvsVariant((kvs_int_t) id));
-	if(v1.type()==QVariant::String)
-	{
-		QString szV=v1.toString();
-		params.append(new KviKvsVariant(szV));
-	}
-
-	//,new KviKvsVariant(szEvent));
-//	KviKvsVariantList *lParams=0;
-	callFunction(this,"jsSubmitEvent",&params);*/
-}
-
-void KvsObject_webView::pageEventFilter(QString s)
-{
-
-	qDebug("String  che arriva di %s",s.toUtf8().data());//,szArriva.toUtf8().data());//%s",szEvent.toUtf8().data());
-}
 
 void KvsObject_webView::slotLoadStarted()
 {
diff --git a/src/modules/objects/KvsObject_webView.h b/src/modules/objects/KvsObject_webView.h
index 2a5ee8aba..1ef9644c8 100644
--- a/src/modules/objects/KvsObject_webView.h
+++ b/src/modules/objects/KvsObject_webView.h
@@ -112,11 +112,11 @@ protected:
 
 	bool hitTestContent(KviKvsObjectFunctionCall * c);
 
-	bool attributeNames(KviKvsObjectFunctionCall * c);
+	bool elementAttributeNames(KviKvsObjectFunctionCall * c);
 	bool setLinkDelegationPolicy(KviKvsObjectFunctionCall * c);
-	bool setAttribute(KviKvsObjectFunctionCall * c);
+	bool setElementAttribute(KviKvsObjectFunctionCall * c);
 	bool setWebSetting(KviKvsObjectFunctionCall * c);
-	bool attribute(KviKvsObjectFunctionCall * c);
+	bool elementAttribute(KviKvsObjectFunctionCall * c);
 	bool frames(KviKvsObjectFunctionCall * c);
 
 	bool setStyleProperty(KviKvsObjectFunctionCall * c);
@@ -148,10 +148,6 @@ protected slots:
 	void slotOnChange(QString);
 	void slotOnSubmit(QString);
 	void slotOnClick(QString);
-
-	void pageEventFilter(QVariant );
-	void pageEventFilter(QString);
-
 };
 
 class KviKvsDownloadHandler : public QObject