From eddc5c53f0ac8517efcb313eb7c19c9261e30618 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Sun, 8 Apr 2012 17:21:26 +0000 Subject: 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 --- src/modules/mediaplayer/MpInterface.cpp | 1 + src/modules/mediaplayer/MpMp3.cpp | 1 + src/modules/objects/KvsObject_http.cpp | 3 +-- src/modules/objects/KvsObject_webView.cpp | 2 +- src/modules/options/OptionsWidget_message.cpp | 1 + src/modules/popupeditor/PopupEditorWindow.cpp | 4 ++-- src/modules/reguser/RegisteredUsersDialog.cpp | 2 +- src/modules/setup/SetupWizard.cpp | 1 + 8 files changed, 9 insertions(+), 6 deletions(-) (limited to 'src/modules') diff --git a/src/modules/mediaplayer/MpInterface.cpp b/src/modules/mediaplayer/MpInterface.cpp index f5a1f569c..928aa3e1e 100644 --- a/src/modules/mediaplayer/MpInterface.cpp +++ b/src/modules/mediaplayer/MpInterface.cpp @@ -138,6 +138,7 @@ QString MpInterface::comment() QString MpInterface::year() { SCAN_MP3_FILE + Q_UNUSED(pCodec); return QString(mp3.id3.year); } diff --git a/src/modules/mediaplayer/MpMp3.cpp b/src/modules/mediaplayer/MpMp3.cpp index 9f3e68cbe..50a33f3de 100644 --- a/src/modules/mediaplayer/MpMp3.cpp +++ b/src/modules/mediaplayer/MpMp3.cpp @@ -389,6 +389,7 @@ int get_id3(mp3info *mp3) retcode |= 4; } else { size_t dummy = fread(fbuf,1,3,mp3->file); fbuf[3] = '\0'; + Q_UNUSED(dummy); mp3->id3.genre[0]=255; if(!strcmp((const char *)"TAG",(const char *)fbuf)) 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) diff --git a/src/modules/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp index 9ff8ddab3..672d782c0 100644 --- a/src/modules/options/OptionsWidget_message.cpp +++ b/src/modules/options/OptionsWidget_message.cpp @@ -606,6 +606,7 @@ void OptionsWidget_messageColors::load() //qDebug("ERRNO (%d)",errno); int dummy; // make gcc happy dummy = symlink(szGlobal.toLocal8Bit().data(),szLocal.toLocal8Bit().data()); + Q_UNUSED(dummy); // FIXME: Do it also on windows... #endif diff --git a/src/modules/popupeditor/PopupEditorWindow.cpp b/src/modules/popupeditor/PopupEditorWindow.cpp index bb20859ff..dcdea254a 100644 --- a/src/modules/popupeditor/PopupEditorWindow.cpp +++ b/src/modules/popupeditor/PopupEditorWindow.cpp @@ -371,12 +371,12 @@ void SinglePopupEditor::customContextMenuRequested(const QPoint &pos) m_pContextPopup->clear(); - PopupTreeWidgetItem * parentMenu = 0; + //PopupTreeWidgetItem * parentMenu = 0; bool bIsMenu = false; if(it) { - parentMenu = (PopupTreeWidgetItem *) (((PopupTreeWidgetItem *)it)->parent()); + //parentMenu = (PopupTreeWidgetItem *) (((PopupTreeWidgetItem *)it)->parent()); bIsMenu = ((PopupTreeWidgetItem *)it)->m_type == PopupTreeWidgetItem::Menu; } diff --git a/src/modules/reguser/RegisteredUsersDialog.cpp b/src/modules/reguser/RegisteredUsersDialog.cpp index 3cf8efcee..852c473fe 100644 --- a/src/modules/reguser/RegisteredUsersDialog.cpp +++ b/src/modules/reguser/RegisteredUsersDialog.cpp @@ -519,7 +519,7 @@ void RegisteredUsersDialog::fillList() KviPointerHashTable * d = g_pLocalRegisteredUserDataBase->userDict(); RegisteredUsersDialogItem * item; - + Q_UNUSED(item); for(KviRegisteredUser * u = d->first();u;u = d->next()) { if(u->group().isEmpty()) diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp index 981a38b43..b50095819 100644 --- a/src/modules/setup/SetupWizard.cpp +++ b/src/modules/setup/SetupWizard.cpp @@ -991,6 +991,7 @@ void SetupWizard::accept() unlink(QTextCodec::codecForLocale()->fromUnicode(localPath).data()); int dummy; // make gcc happy dummy = symlink(QTextCodec::codecForLocale()->fromUnicode(g_pApp->m_szGlobalKvircDir).data(),QTextCodec::codecForLocale()->fromUnicode(localPath).data()); + Q_UNUSED(dummy); #endif #ifdef COMPILE_KDE_SUPPORT -- cgit v1.3.1-10-gc9f91