diff options
| author |  Fabio Bas | 2012-04-08 17:21:26 +0000 |
|---|---|---|
| committer | Fabio Bas | 2012-04-08 17:21:26 +0000 |
| commit | eddc5c53f0ac8517efcb313eb7c19c9261e30618 (patch) | |
| tree | 38960315614e561d57b1b0bf19a16cf658fdf074 /src/modules/objects | |
| parent | removed unused var, thanks gcc 4.7 (diff) | |
| download | KVIrc-eddc5c53f0ac8517efcb313eb7c19c9261e30618.tar.gz KVIrc-eddc5c53f0ac8517efcb313eb7c19c9261e30618.tar.bz2 KVIrc-eddc5c53f0ac8517efcb313eb7c19c9261e30618.zip | |
single bugfix in webview object + a lot of make gcc happy
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6129 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/objects')
| -rw-r--r-- | src/modules/objects/KvsObject_http.cpp | 3 | ||||
| -rw-r--r-- | src/modules/objects/KvsObject_webView.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/modules/objects/KvsObject_http.cpp b/src/modules/objects/KvsObject_http.cpp index 91c9e8db2..d455a0437 100644 --- a/src/modules/objects/KvsObject_http.cpp +++ b/src/modules/objects/KvsObject_http.cpp @@ -255,8 +255,7 @@ bool KvsObject_http::functionSetUser(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("user",KVS_PT_STRING,0,szUser) KVSO_PARAMETER("password",KVS_PT_STRING,0,szPass) KVSO_PARAMETERS_END(c) - kvs_int_t id; - id=m_pHttp->setUser(szUser,szPass); + m_pHttp->setUser(szUser,szPass); return true; } bool KvsObject_http::functionSetProxy(KviKvsObjectFunctionCall *c) diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp index a4ba14dd9..c6ec225a6 100644 --- a/src/modules/objects/KvsObject_webView.cpp +++ b/src/modules/objects/KvsObject_webView.cpp @@ -1053,7 +1053,7 @@ KVSO_CLASS_FUNCTION(webView,styleProperty) c->warning(__tr2qs_ctx("Unknown styleResolveStrategy: 'Q' - Switching to default CascadedStyle strategy","objects"),&szStyleResolveStrategy); } } - c->returnValue()->setString(element.styleProperty(szName,QWebElement::CascadedStyle)); + c->returnValue()->setString(element.styleProperty(szName, styleStrategy)); return true; } KVSO_CLASS_FUNCTION(webView,setStyleProperty) |